diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@
 include(KPIMGrantleeMacros)
 
 set(CALENDARUTILS_LIB_VERSION ${PIM_VERSION})
-set(CALENDARCORE_LIB_VERSION "5.11.80")
+set(CALENDARCORE_LIB_VERSION "5.11.90")
 set(IDENTITYMANAGER_LIB_VERSION "5.11.80")
 ecm_setup_version(PROJECT VARIABLE_PREFIX KCALUTILS
                         VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcalutils_version.h"
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 # KCalUtils #
 
 This library provides a set of utility functions that help applications
-access and use calendar data via the KCalCore library.
+access and use calendar data via the KCalendarCore library.
diff --git a/autotests/testdndfactory.cpp b/autotests/testdndfactory.cpp
--- a/autotests/testdndfactory.cpp
+++ b/autotests/testdndfactory.cpp
@@ -1,8 +1,8 @@
 /*
   This file is part of the kcalcore library.
 
-  Copyright (c) 2010 Klar舁vdalens Datakonsult AB, a KDAB Group company <info@kdab.net>
-  Author: S駻gio Martins <sergio.martins@kdab.com>
+  Copyright (c) 2010 Klarﾃ､lvdalens Datakonsult AB, a KDAB Group company <info@kdab.net>
+  Author: Sﾃｩrgio Martins <sergio.martins@kdab.com>
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
@@ -24,14 +24,14 @@
 
 #include "dndfactory.h"
 
-#include <kcalcore/memorycalendar.h>
+#include <kcalendarcore/memorycalendar.h>
 
 #include <QTest>
 #include <QTimeZone>
 
 QTEST_MAIN(DndFactoryTest)   // clipboard() needs GUI
 
-using namespace KCalCore;
+using namespace KCalendarCore;
 using namespace KCalUtils;
 
 void DndFactoryTest::testPasteAllDayEvent()
diff --git a/autotests/testincidenceformatter.h b/autotests/testincidenceformatter.h
--- a/autotests/testincidenceformatter.h
+++ b/autotests/testincidenceformatter.h
@@ -24,15 +24,15 @@
 
 #include <QObject>
 
-#include <KCalCore/MemoryCalendar>
+#include <KCalendarCore/MemoryCalendar>
 
 class IncidenceFormatterTest : public QObject
 {
     Q_OBJECT
 
 private:
     /* Helper functions for testDisplayViewFormat* */
-    KCalCore::Calendar::Ptr loadCalendar(const QString &name);
+    KCalendarCore::Calendar::Ptr loadCalendar(const QString &name);
     bool validateHtml(const QString &name, const QString &html);
     bool compareHtml(const QString &name);
     void cleanup(const QString &name);
diff --git a/autotests/testincidenceformatter.cpp b/autotests/testincidenceformatter.cpp
--- a/autotests/testincidenceformatter.cpp
+++ b/autotests/testincidenceformatter.cpp
@@ -25,12 +25,12 @@
 #include "incidenceformatter.h"
 #include "grantleetemplatemanager_p.h"
 
-#include <kcalcore/event.h>
-#include <kcalcore/icalformat.h>
-#include <kcalcore/todo.h>
-#include <kcalcore/journal.h>
-#include <kcalcore/freebusy.h>
-#include <kcalcore/memorycalendar.h>
+#include <kcalendarcore/event.h>
+#include <kcalendarcore/icalformat.h>
+#include <kcalendarcore/todo.h>
+#include <kcalendarcore/journal.h>
+#include <kcalendarcore/freebusy.h>
+#include <kcalendarcore/memorycalendar.h>
 
 #include <KLocalizedString>
 
@@ -52,7 +52,7 @@
 
 Q_CONSTRUCTOR_FUNCTION(initLocale)
 #endif
-using namespace KCalCore;
+using namespace KCalendarCore;
 using namespace KCalUtils;
 
 void IncidenceFormatterTest::initTestCase()
@@ -156,13 +156,13 @@
 //  qDebug() << "recurrenceString=" << IncidenceFormatter::recurrenceString( e3 );
 }
 
-KCalCore::Calendar::Ptr IncidenceFormatterTest::loadCalendar(const QString &name)
+KCalendarCore::Calendar::Ptr IncidenceFormatterTest::loadCalendar(const QString &name)
 {
-    auto calendar = KCalCore::MemoryCalendar::Ptr::create(QTimeZone::utc());
-    KCalCore::ICalFormat format;
+    auto calendar = KCalendarCore::MemoryCalendar::Ptr::create(QTimeZone::utc());
+    KCalendarCore::ICalFormat format;
 
     if (!format.load(calendar, QStringLiteral(TEST_DATA_DIR "/%1.ical").arg(name))) {
-        return KCalCore::Calendar::Ptr();
+        return KCalendarCore::Calendar::Ptr();
     }
 
     return calendar;
@@ -283,7 +283,7 @@
 {
     QFETCH(QString, name);
 
-    KCalCore::Calendar::Ptr calendar = loadCalendar(name);
+    KCalendarCore::Calendar::Ptr calendar = loadCalendar(name);
     QVERIFY(calendar);
 
     const auto events = calendar->events();
@@ -308,7 +308,7 @@
 {
     QFETCH(QString, name);
 
-    KCalCore::Calendar::Ptr calendar = loadCalendar(name);
+    KCalendarCore::Calendar::Ptr calendar = loadCalendar(name);
     QVERIFY(calendar);
 
     const auto todos = calendar->todos();
@@ -333,7 +333,7 @@
 {
     QFETCH(QString, name);
 
-    KCalCore::Calendar::Ptr calendar = loadCalendar(name);
+    KCalendarCore::Calendar::Ptr calendar = loadCalendar(name);
     QVERIFY(calendar);
 
     const auto journals = calendar->journals();
@@ -358,15 +358,15 @@
 {
     QFETCH(QString, name);
 
-    KCalCore::Calendar::Ptr calendar = loadCalendar(name);
+    KCalendarCore::Calendar::Ptr calendar = loadCalendar(name);
     QVERIFY(calendar);
 
     QFile file(QStringLiteral(TEST_DATA_DIR "/%1.ical").arg(name));
     QVERIFY(file.open(QIODevice::ReadOnly));
     const QByteArray fbData = file.readAll();
 
-    KCalCore::ICalFormat format;
-    KCalCore::FreeBusy::Ptr freeBusy = format.parseFreeBusy(QString::fromUtf8(fbData));
+    KCalendarCore::ICalFormat format;
+    KCalendarCore::FreeBusy::Ptr freeBusy = format.parseFreeBusy(QString::fromUtf8(fbData));
     QVERIFY(freeBusy);
 
     const QString html = IncidenceFormatter::extensiveDisplayStr(calendar, freeBusy);
@@ -416,7 +416,7 @@
 {
     QFETCH(QString, name);
 
-    KCalCore::MemoryCalendar::Ptr calendar(new KCalCore::MemoryCalendar(QTimeZone::utc()));
+    KCalendarCore::MemoryCalendar::Ptr calendar(new KCalendarCore::MemoryCalendar(QTimeZone::utc()));
     InvitationFormatterHelper helper;
 
     QFile eventFile(QStringLiteral(TEST_DATA_DIR "/%1.ical").arg(name));
diff --git a/autotests/teststringify.cpp b/autotests/teststringify.cpp
--- a/autotests/teststringify.cpp
+++ b/autotests/teststringify.cpp
@@ -1,7 +1,7 @@
 /*
   This file is part of the kcalcore library.
 
-  Copyright (c) 2010 Klar舁vdalens Datakonsult AB, a KDAB Group company <info@kdab.net>
+  Copyright (c) 2010 Klarﾃ､lvdalens Datakonsult AB, a KDAB Group company <info@kdab.net>
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
@@ -34,7 +34,7 @@
 
 Q_CONSTRUCTOR_FUNCTION(initLocale)
 #endif
-using namespace KCalCore;
+using namespace KCalendarCore;
 using namespace KCalUtils;
 
 void StringifyTest::testIncidenceStrings()
diff --git a/src/dndfactory.h b/src/dndfactory.h
--- a/src/dndfactory.h
+++ b/src/dndfactory.h
@@ -35,10 +35,10 @@
 
 #include "kcalutils_export.h"
 
-#include <kcalcore/event.h>
-#include <kcalcore/journal.h>
-#include <kcalcore/todo.h>
-#include <kcalcore/memorycalendar.h>
+#include <kcalendarcore/event.h>
+#include <kcalendarcore/journal.h>
+#include <kcalendarcore/todo.h>
+#include <kcalendarcore/memorycalendar.h>
 
 #include <QDateTime>
 
@@ -69,19 +69,19 @@
 
     Q_DECLARE_FLAGS(PasteFlags, PasteFlag)
 
-    explicit DndFactory(const KCalCore::MemoryCalendar::Ptr &cal);
+    explicit DndFactory(const KCalendarCore::MemoryCalendar::Ptr &cal);
 
     ~DndFactory();
 
     /**
       Create the calendar that is contained in the drop event's data.
      */
-    KCalCore::MemoryCalendar::Ptr createDropCalendar(QDropEvent *de);
+    KCalendarCore::MemoryCalendar::Ptr createDropCalendar(QDropEvent *de);
 
     /**
      Create the calendar that is contained in the mime data.
     */
-    static KCalCore::MemoryCalendar::Ptr createDropCalendar(const QMimeData *md);
+    static KCalendarCore::MemoryCalendar::Ptr createDropCalendar(const QMimeData *md);
 
     /**
       Create the mime data for the whole calendar.
@@ -96,60 +96,60 @@
     /**
       Create the mime data for a single incidence.
     */
-    QMimeData *createMimeData(const KCalCore::Incidence::Ptr &incidence);
+    QMimeData *createMimeData(const KCalendarCore::Incidence::Ptr &incidence);
 
     /**
       Create a drag object for a single incidence.
     */
-    QDrag *createDrag(const KCalCore::Incidence::Ptr &incidence, QWidget *owner);
+    QDrag *createDrag(const KCalendarCore::Incidence::Ptr &incidence, QWidget *owner);
 
     /**
       Create Todo object from mime data.
     */
-    KCalCore::Todo::Ptr createDropTodo(const QMimeData *md);
+    KCalendarCore::Todo::Ptr createDropTodo(const QMimeData *md);
 
     /**
       Create Todo object from drop event.
     */
-    KCalCore::Todo::Ptr createDropTodo(QDropEvent *de);
+    KCalendarCore::Todo::Ptr createDropTodo(QDropEvent *de);
 
     /**
       Create Event object from mime data.
     */
-    KCalCore::Event::Ptr createDropEvent(const QMimeData *md);
+    KCalendarCore::Event::Ptr createDropEvent(const QMimeData *md);
 
     /**
       Create Event object from drop event.
     */
-    KCalCore::Event::Ptr createDropEvent(QDropEvent *de);
+    KCalendarCore::Event::Ptr createDropEvent(QDropEvent *de);
 
     /**
       Cut the incidence to the clipboard.
     */
-    void cutIncidence(const KCalCore::Incidence::Ptr &);
+    void cutIncidence(const KCalendarCore::Incidence::Ptr &);
 
     /**
       Copy the incidence to clipboard/
     */
-    bool copyIncidence(const KCalCore::Incidence::Ptr &);
+    bool copyIncidence(const KCalendarCore::Incidence::Ptr &);
 
     /**
       Cuts a list of @p incidences to the clipboard.
     */
-    bool cutIncidences(const KCalCore::Incidence::List &incidences);
+    bool cutIncidences(const KCalendarCore::Incidence::List &incidences);
 
     /**
       Copies a list of @p incidences to the clipboard.
     */
-    bool copyIncidences(const KCalCore::Incidence::List &incidences);
+    bool copyIncidences(const KCalendarCore::Incidence::List &incidences);
 
     /**
       This function clones the incidences that are in the clipboard and sets the clone's
       date/time to the specified @p newDateTime.
 
       @see pasteIncidence()
     */
-    KCalCore::Incidence::List pasteIncidences(const QDateTime &newDateTime = QDateTime(), PasteFlags pasteOptions = PasteFlags());
+    KCalendarCore::Incidence::List pasteIncidences(const QDateTime &newDateTime = QDateTime(), PasteFlags pasteOptions = PasteFlags());
 
     /**
       This function clones the incidence that's in the clipboard and sets the clone's
@@ -165,7 +165,7 @@
 
       @return A pointer to the cloned incidence.
     */
-    KCalCore::Incidence::Ptr pasteIncidence(const QDateTime &newDateTime = QDateTime(), PasteFlags pasteOptions = PasteFlags());
+    KCalendarCore::Incidence::Ptr pasteIncidence(const QDateTime &newDateTime = QDateTime(), PasteFlags pasteOptions = PasteFlags());
 
 private:
     //@cond PRIVATE
diff --git a/src/dndfactory.cpp b/src/dndfactory.cpp
--- a/src/dndfactory.cpp
+++ b/src/dndfactory.cpp
@@ -52,7 +52,7 @@
 #include <QDropEvent>
 #include <QTimeZone>
 
-using namespace KCalCore;
+using namespace KCalendarCore;
 using namespace KCalUtils;
 
 /**
diff --git a/src/htmlexport.h b/src/htmlexport.h
--- a/src/htmlexport.h
+++ b/src/htmlexport.h
@@ -24,13 +24,13 @@
 
 #include "kcalutils_export.h"
 
-#include <kcalcore/event.h>
-#include <kcalcore/incidence.h>
-#include <kcalcore/todo.h>
+#include <kcalendarcore/event.h>
+#include <kcalendarcore/incidence.h>
+#include <kcalendarcore/todo.h>
 
 #include <QString>
 
-namespace KCalCore {
+namespace KCalendarCore {
 class MemoryCalendar;
 }
 
@@ -48,7 +48,7 @@
     /**
       Create new HTML exporter for calendar.
     */
-    HtmlExport(KCalCore::MemoryCalendar *calendar, HTMLExportSettings *settings);
+    HtmlExport(KCalendarCore::MemoryCalendar *calendar, HTMLExportSettings *settings);
     virtual ~HtmlExport();
 
     /**
@@ -71,19 +71,19 @@
     void createJournalView(QTextStream *ts);
     void createFreeBusyView(QTextStream *ts);
 
-    void createTodo(QTextStream *ts, const KCalCore::Todo::Ptr &todo);
+    void createTodo(QTextStream *ts, const KCalendarCore::Todo::Ptr &todo);
 
-    void createEvent(QTextStream *ts, const KCalCore::Event::Ptr &event, QDate date, bool withDescription = true);
+    void createEvent(QTextStream *ts, const KCalendarCore::Event::Ptr &event, QDate date, bool withDescription = true);
 
     void createFooter(QTextStream *ts);
 
-    bool checkSecrecy(const KCalCore::Incidence::Ptr &incidence);
+    bool checkSecrecy(const KCalendarCore::Incidence::Ptr &incidence);
 
-    void formatLocation(QTextStream *ts, const KCalCore::Incidence::Ptr &incidence);
+    void formatLocation(QTextStream *ts, const KCalendarCore::Incidence::Ptr &incidence);
 
-    void formatCategories(QTextStream *ts, const KCalCore::Incidence::Ptr &incidence);
+    void formatCategories(QTextStream *ts, const KCalendarCore::Incidence::Ptr &incidence);
 
-    void formatAttendees(QTextStream *ts, const KCalCore::Incidence::Ptr &incidence);
+    void formatAttendees(QTextStream *ts, const KCalendarCore::Incidence::Ptr &incidence);
 
     QString breakString(const QString &text);
 
diff --git a/src/htmlexport.cpp b/src/htmlexport.cpp
--- a/src/htmlexport.cpp
+++ b/src/htmlexport.cpp
@@ -24,8 +24,8 @@
 #include "stringify.h"
 #include "incidenceformatter.h"
 
-#include <kcalcore/memorycalendar.h>
-using namespace KCalCore;
+#include <kcalendarcore/memorycalendar.h>
+using namespace KCalendarCore;
 
 #include "kcalutils_debug.h"
 
diff --git a/src/icaldrag.h b/src/icaldrag.h
--- a/src/icaldrag.h
+++ b/src/icaldrag.h
@@ -24,7 +24,7 @@
 
 #include "kcalutils_export.h"
 
-#include <kcalcore/memorycalendar.h>
+#include <kcalendarcore/memorycalendar.h>
 
 class QMimeData;
 
@@ -41,7 +41,7 @@
 /**
   Sets the iCalendar representation as data of the drag object
 */
-Q_REQUIRED_RESULT KCALUTILS_EXPORT bool populateMimeData(QMimeData *e, const KCalCore::MemoryCalendar::Ptr &cal);
+Q_REQUIRED_RESULT KCALUTILS_EXPORT bool populateMimeData(QMimeData *e, const KCalendarCore::MemoryCalendar::Ptr &cal);
 
 /**
   Return, if drag&drop object can be decode to iCalendar.
@@ -51,7 +51,7 @@
 /**
   Decode drag&drop object to iCalendar component \a cal.
 */
-Q_REQUIRED_RESULT KCALUTILS_EXPORT bool fromMimeData(const QMimeData *e, const KCalCore::MemoryCalendar::Ptr &cal);
+Q_REQUIRED_RESULT KCALUTILS_EXPORT bool fromMimeData(const QMimeData *e, const KCalendarCore::MemoryCalendar::Ptr &cal);
 }
 }
 
diff --git a/src/icaldrag.cpp b/src/icaldrag.cpp
--- a/src/icaldrag.cpp
+++ b/src/icaldrag.cpp
@@ -21,8 +21,8 @@
 */
 #include "icaldrag.h"
 
-#include "kcalcore/icalformat.h"
-using namespace KCalCore;
+#include "kcalendarcore/icalformat.h"
+using namespace KCalendarCore;
 
 #include <QMimeData>
 #include <QString>
diff --git a/src/incidenceformatter.h b/src/incidenceformatter.h
--- a/src/incidenceformatter.h
+++ b/src/incidenceformatter.h
@@ -34,8 +34,8 @@
 
 #include "kcalutils_export.h"
 
-#include <kcalcore/incidence.h>
-#include <kcalcore/memorycalendar.h>
+#include <kcalendarcore/incidence.h>
+#include <kcalendarcore/memorycalendar.h>
 
 #include <QDate>
 class InvitationFormatterHelperPrivate;
@@ -48,7 +48,7 @@
     virtual ~InvitationFormatterHelper();
     Q_REQUIRED_RESULT virtual QString generateLinkURL(const QString &id);
     Q_REQUIRED_RESULT virtual QString makeLink(const QString &id, const QString &text);
-    Q_REQUIRED_RESULT virtual KCalCore::Calendar::Ptr calendar() const;
+    Q_REQUIRED_RESULT virtual KCalendarCore::Calendar::Ptr calendar() const;
 
 private:
     //@cond PRIVATE
@@ -78,7 +78,7 @@
   the occurrence, not the start date.
   @param richText if yes, the QString will be created as RichText.
 */
-KCALUTILS_EXPORT QString toolTipStr(const QString &sourceName, const KCalCore::IncidenceBase::Ptr &incidence, QDate date = QDate(), bool richText = true);
+KCALUTILS_EXPORT QString toolTipStr(const QString &sourceName, const KCalendarCore::IncidenceBase::Ptr &incidence, QDate date = QDate(), bool richText = true);
 
 /**
   Create a RichText QString representation of an Incidence in a nice format
@@ -89,7 +89,7 @@
   @param date is the QDate for which the string representation should be computed;
   used mainly for recurring incidences.
 */
-KCALUTILS_EXPORT QString extensiveDisplayStr(const KCalCore::Calendar::Ptr &calendar, const KCalCore::IncidenceBase::Ptr &incidence, QDate date = QDate());
+KCALUTILS_EXPORT QString extensiveDisplayStr(const KCalendarCore::Calendar::Ptr &calendar, const KCalendarCore::IncidenceBase::Ptr &incidence, QDate date = QDate());
 
 /**
   Create a RichText QString representation of an Incidence in a nice format
@@ -100,15 +100,15 @@
   @param date is the QDate for which the string representation should be computed;
   used mainly for recurring incidences.
 */
-KCALUTILS_EXPORT QString extensiveDisplayStr(const QString &sourceName, const KCalCore::IncidenceBase::Ptr &incidence, QDate date = QDate());
+KCALUTILS_EXPORT QString extensiveDisplayStr(const QString &sourceName, const KCalendarCore::IncidenceBase::Ptr &incidence, QDate date = QDate());
 
 /**
   Create a QString representation of an Incidence in format suitable for
   including inside a mail message.
   All dates and times are converted to local time for display.
   @param incidence is a pointer to the Incidence to be formatted.
 */
-KCALUTILS_EXPORT QString mailBodyStr(const KCalCore::IncidenceBase::Ptr &incidence);
+KCALUTILS_EXPORT QString mailBodyStr(const KCalendarCore::IncidenceBase::Ptr &incidence);
 
 /**
   Deliver an HTML formatted string displaying an invitation.
@@ -122,7 +122,7 @@
   @since 5.23.0
 */
 KCALUTILS_EXPORT QString formatICalInvitation(
-    const QString &invitation, const KCalCore::MemoryCalendar::Ptr &calendar, InvitationFormatterHelper *helper);
+    const QString &invitation, const KCalendarCore::MemoryCalendar::Ptr &calendar, InvitationFormatterHelper *helper);
 
 /**
   Deliver an HTML formatted string displaying an invitation.
@@ -139,14 +139,14 @@
   @since 5.23.0
 */
 KCALUTILS_EXPORT QString formatICalInvitationNoHtml(
-    const QString &invitation, const KCalCore::MemoryCalendar::Ptr &calendar, InvitationFormatterHelper *helper, const QString &sender);
+    const QString &invitation, const KCalendarCore::MemoryCalendar::Ptr &calendar, InvitationFormatterHelper *helper, const QString &sender);
 
 /**
   Build a pretty QString representation of an Incidence's recurrence info.
   @param incidence is a pointer to the Incidence whose recurrence info
   is to be formatted.
 */
-KCALUTILS_EXPORT QString recurrenceString(const KCalCore::Incidence::Ptr &incidence);
+KCALUTILS_EXPORT QString recurrenceString(const KCalendarCore::Incidence::Ptr &incidence);
 
 /**
   Returns a reminder string computed for the specified Incidence.
@@ -156,7 +156,7 @@
   @param shortfmt if false, a short version of each reminder is printed;
   else a longer version of each reminder is printed.
 */
-KCALUTILS_EXPORT QStringList reminderStringList(const KCalCore::Incidence::Ptr &incidence, bool shortfmt = true);
+KCALUTILS_EXPORT QStringList reminderStringList(const KCalendarCore::Incidence::Ptr &incidence, bool shortfmt = true);
 
 /**
   Build a QString time representation of a QTime object.
@@ -192,25 +192,25 @@
   @param calendar is a pointer to the Calendar.
   @param incidence is a pointer to the Incidence.
 */
-KCALUTILS_EXPORT QString resourceString(const KCalCore::Calendar::Ptr &calendar, const KCalCore::Incidence::Ptr &incidence);
+KCALUTILS_EXPORT QString resourceString(const KCalendarCore::Calendar::Ptr &calendar, const KCalendarCore::Incidence::Ptr &incidence);
 
 /**
   Returns a duration string computed for the specified Incidence.
   Only makes sense for Events and Todos.
   @param incidence is a pointer to the Incidence.
 */
-KCALUTILS_EXPORT QString durationString(const KCalCore::Incidence::Ptr &incidence);
+KCALUTILS_EXPORT QString durationString(const KCalendarCore::Incidence::Ptr &incidence);
 
 /**
   Returns the translated string form of a specified #Status.
    @param status is a #Status type.
 */
-KCALUTILS_EXPORT QString incidenceStatusName(KCalCore::Incidence::Status status);
+KCALUTILS_EXPORT QString incidenceStatusName(KCalendarCore::Incidence::Status status);
 
 /**
    Returns a translatedstatus string for this incidence
 */
-KCALUTILS_EXPORT QString incidenceStatusStr(const KCalCore::Incidence::Ptr &incidence);
+KCALUTILS_EXPORT QString incidenceStatusStr(const KCalendarCore::Incidence::Ptr &incidence);
 
 class EventViewerVisitor;
 template<typename T> class ScheduleMessageVisitor;
diff --git a/src/incidenceformatter.cpp b/src/incidenceformatter.cpp
--- a/src/incidenceformatter.cpp
+++ b/src/incidenceformatter.cpp
@@ -37,14 +37,14 @@
 #include "stringify.h"
 #include "grantleetemplatemanager_p.h"
 
-#include <kcalcore/event.h>
-#include <kcalcore/freebusy.h>
-#include <kcalcore/icalformat.h>
-#include <kcalcore/journal.h>
-#include <kcalcore/memorycalendar.h>
-#include <kcalcore/todo.h>
-#include <kcalcore/visitor.h>
-using namespace KCalCore;
+#include <kcalendarcore/event.h>
+#include <kcalendarcore/freebusy.h>
+#include <kcalendarcore/icalformat.h>
+#include <kcalendarcore/journal.h>
+#include <kcalendarcore/memorycalendar.h>
+#include <kcalendarcore/todo.h>
+#include <kcalendarcore/visitor.h>
+using namespace KCalendarCore;
 
 #include <kidentitymanagement/identitymanager.h>
 #include <kidentitymanagement/utils.h>
@@ -404,7 +404,7 @@
     const QString uid_1 = event->customProperty("KABC", "UID-1");
     const QString name_1 = event->customProperty("KABC", "NAME-1");
     const QString email_1 = event->customProperty("KABC", "EMAIL-1");
-    const KCalCore::Person p = Person::fromFullName(email_1);
+    const KCalendarCore::Person p = Person::fromFullName(email_1);
     return displayViewFormatPerson(p.email(), name_1, uid_1, QString());
 }
 
@@ -2354,19 +2354,19 @@
 
     QString templateName;
     switch (inc->type()) {
-    case KCalCore::IncidenceBase::TypeEvent:
+    case KCalendarCore::IncidenceBase::TypeEvent:
         templateName = QStringLiteral(":/itip_event.html");
         break;
-    case KCalCore::IncidenceBase::TypeTodo:
+    case KCalendarCore::IncidenceBase::TypeTodo:
         templateName = QStringLiteral(":/itip_todo.html");
         break;
-    case KCalCore::IncidenceBase::TypeJournal:
+    case KCalendarCore::IncidenceBase::TypeJournal:
         templateName = QStringLiteral(":/itip_journal.html");
         break;
-    case KCalCore::IncidenceBase::TypeFreeBusy:
+    case KCalendarCore::IncidenceBase::TypeFreeBusy:
         templateName = QStringLiteral(":/itip_freebusy.html");
         break;
-    case KCalCore::IncidenceBase::TypeUnknown:
+    case KCalendarCore::IncidenceBase::TypeUnknown:
         return QString();
     }
 
diff --git a/src/recurrenceactions.h b/src/recurrenceactions.h
--- a/src/recurrenceactions.h
+++ b/src/recurrenceactions.h
@@ -25,7 +25,7 @@
 
 #include "kcalutils_export.h"
 
-#include <kcalcore/incidence.h>
+#include <kcalendarcore/incidence.h>
 
 class QDateTime;
 class KGuiItem;
@@ -88,7 +88,7 @@
   @return the #Scope to which actions on the given @incidence can be applied to
 */
 Q_REQUIRED_RESULT KCALUTILS_EXPORT
-int availableOccurrences(const KCalCore::Incidence::Ptr &incidence, const QDateTime &selectedOccurrence);
+int availableOccurrences(const KCalendarCore::Incidence::Ptr &incidence, const QDateTime &selectedOccurrence);
 
 /**
   @short Presents a multiple choice scope selection dialog to the user
diff --git a/src/recurrenceactions.cpp b/src/recurrenceactions.cpp
--- a/src/recurrenceactions.cpp
+++ b/src/recurrenceactions.cpp
@@ -40,7 +40,7 @@
 
 using namespace KCalUtils;
 using namespace KCalUtils::RecurrenceActions;
-using namespace KCalCore;
+using namespace KCalendarCore;
 
 class ScopeWidget : public QWidget
 {
diff --git a/src/stringify.h b/src/stringify.h
--- a/src/stringify.h
+++ b/src/stringify.h
@@ -34,12 +34,12 @@
 
 #include "kcalutils_export.h"
 
-#include <KCalCore/ScheduleMessage>
-#include <KCalCore/Todo>
+#include <KCalendarCore/ScheduleMessage>
+#include <KCalendarCore/Todo>
 
 #include <QTimeZone>
 
-namespace KCalCore {
+namespace KCalendarCore {
 class Exception;
 }
 
@@ -49,33 +49,33 @@
   Provides methods to format Incidence properties in various ways for display purposes.
 */
 namespace Stringify {
-Q_REQUIRED_RESULT KCALUTILS_EXPORT QString incidenceType(KCalCore::Incidence::IncidenceType type);
+Q_REQUIRED_RESULT KCALUTILS_EXPORT QString incidenceType(KCalendarCore::Incidence::IncidenceType type);
 
 /**
   Returns the incidence Secrecy as translated string.
   @see incidenceSecrecyList().
 */
-Q_REQUIRED_RESULT KCALUTILS_EXPORT QString incidenceSecrecy(KCalCore::Incidence::Secrecy secrecy);
+Q_REQUIRED_RESULT KCALUTILS_EXPORT QString incidenceSecrecy(KCalendarCore::Incidence::Secrecy secrecy);
 
 /**
   Returns a list of all available Secrecy types as a list of translated strings.
   @see incidenceSecrecy().
 */
 Q_REQUIRED_RESULT KCALUTILS_EXPORT QStringList incidenceSecrecyList();
 
-Q_REQUIRED_RESULT KCALUTILS_EXPORT QString incidenceStatus(KCalCore::Incidence::Status status);
-Q_REQUIRED_RESULT KCALUTILS_EXPORT QString incidenceStatus(const KCalCore::Incidence::Ptr &incidence);
-Q_REQUIRED_RESULT KCALUTILS_EXPORT QString scheduleMessageStatus(KCalCore::ScheduleMessage::Status status);
+Q_REQUIRED_RESULT KCALUTILS_EXPORT QString incidenceStatus(KCalendarCore::Incidence::Status status);
+Q_REQUIRED_RESULT KCALUTILS_EXPORT QString incidenceStatus(const KCalendarCore::Incidence::Ptr &incidence);
+Q_REQUIRED_RESULT KCALUTILS_EXPORT QString scheduleMessageStatus(KCalendarCore::ScheduleMessage::Status status);
 
 /**
   Returns string containing the date/time when the to-do was completed,
   formatted according to the user's locale settings.
   @param shortfmt If true, use a short date format; else use a long format.
 */
-Q_REQUIRED_RESULT KCALUTILS_EXPORT QString todoCompletedDateTime(const KCalCore::Todo::Ptr &todo, bool shortfmt = false);
+Q_REQUIRED_RESULT KCALUTILS_EXPORT QString todoCompletedDateTime(const KCalendarCore::Todo::Ptr &todo, bool shortfmt = false);
 
-Q_REQUIRED_RESULT KCALUTILS_EXPORT QString attendeeRole(KCalCore::Attendee::Role role);
-Q_REQUIRED_RESULT KCALUTILS_EXPORT QString attendeeStatus(KCalCore::Attendee::PartStat status);
+Q_REQUIRED_RESULT KCALUTILS_EXPORT QString attendeeRole(KCalendarCore::Attendee::Role role);
+Q_REQUIRED_RESULT KCALUTILS_EXPORT QString attendeeStatus(KCalendarCore::Attendee::PartStat status);
 
 /**
   Returns a string containing the UTC offset of the specified QTimeZone @p tz (relative to the current date).
@@ -87,7 +87,7 @@
 /**
    Build a translated message representing an exception
 */
-Q_REQUIRED_RESULT KCALUTILS_EXPORT QString errorMessage(const KCalCore::Exception &exception);
+Q_REQUIRED_RESULT KCALUTILS_EXPORT QString errorMessage(const KCalendarCore::Exception &exception);
 } // namespace Stringify
 } //namespace KCalUtils
 
diff --git a/src/stringify.cpp b/src/stringify.cpp
--- a/src/stringify.cpp
+++ b/src/stringify.cpp
@@ -36,8 +36,8 @@
 */
 #include "stringify.h"
 
-#include <KCalCore/Exceptions>
-using namespace KCalCore;
+#include <KCalendarCore/Exceptions>
+using namespace KCalendarCore;
 
 #include <KLocalizedString>
 
diff --git a/src/vcaldrag.h b/src/vcaldrag.h
--- a/src/vcaldrag.h
+++ b/src/vcaldrag.h
@@ -23,7 +23,7 @@
 #define KCALUTILS_VCALDRAG_H
 
 #include "kcalutils_export.h"
-#include <kcalcore/memorycalendar.h>
+#include <kcalendarcore/memorycalendar.h>
 
 class QMimeData;
 
@@ -45,7 +45,7 @@
 /**
   Decode drag&drop object to vCalendar component \a vcal.
 */
-Q_REQUIRED_RESULT KCALUTILS_EXPORT bool fromMimeData(const QMimeData *e, const KCalCore::MemoryCalendar::Ptr &cal);
+Q_REQUIRED_RESULT KCALUTILS_EXPORT bool fromMimeData(const QMimeData *e, const KCalendarCore::MemoryCalendar::Ptr &cal);
 }
 }
 
diff --git a/src/vcaldrag.cpp b/src/vcaldrag.cpp
--- a/src/vcaldrag.cpp
+++ b/src/vcaldrag.cpp
@@ -21,8 +21,8 @@
 */
 #include "vcaldrag.h"
 
-#include <kcalcore/vcalformat.h>
-using namespace KCalCore;
+#include <kcalendarcore/vcalformat.h>
+using namespace KCalendarCore;
 
 #include <QMimeData>
 #include <QString>