diff --git a/src/blogger/CMakeLists.txt b/src/blogger/CMakeLists.txt
index aab9257..e27d137 100644
--- a/src/blogger/CMakeLists.txt
+++ b/src/blogger/CMakeLists.txt
@@ -1,102 +1,102 @@
 set(kgapiblogger_SRCS
     blog.cpp
     blogfetchjob.cpp
     bloggerservice.cpp
     comment.cpp
     commentapprovejob.cpp
     commentdeletecontentjob.cpp
     commentdeletejob.cpp
     commentfetchjob.cpp
     page.cpp
     pagecreatejob.cpp
     pagedeletejob.cpp
     pagefetchjob.cpp
     pagemodifyjob.cpp
     post.cpp
     postcreatejob.cpp
     postdeletejob.cpp
     postfetchjob.cpp
     postmodifyjob.cpp
     postpublishjob.cpp
     postsearchjob.cpp
 
     ../debug.cpp
 )
 
 ecm_generate_headers(kgapiblogger_CamelCase_HEADERS
     HEADER_NAMES
     Blog
     BlogFetchJob
     Comment
     CommentApproveJob
     CommentDeleteContentJob
     CommentDeleteJob
     CommentFetchJob
     Page
     PageCreateJob
     PageDeleteJob
     PageFetchJob
     PageModifyJob
     Post
     PostCreateJob
     PostDeleteJob
     PostFetchJob
     PostModifyJob
     PostPublishJob
     PostSearchJob
     PREFIX KGAPI/Blogger
     REQUIRED_HEADERS kgapiblogger_HEADERS
 )
 
 add_library(KPimGAPIBlogger
     ${kgapiblogger_SRCS}
 )
 
 generate_export_header(KPimGAPIBlogger BASE_NAME kgapiblogger)
 
 add_library(KPim::GAPIBlogger ALIAS KPimGAPIBlogger)
 # TODO: Backwards compatibility, remove in next major release
 add_library(KF5::GAPIBlogger ALIAS KPimGAPIBlogger)
 target_include_directories(KPimGAPIBlogger INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI>")
 
 target_link_libraries(KPimGAPIBlogger
 PUBLIC
     KPim::GAPICore
 PRIVATE
     Qt5::Network
 )
 
 set_target_properties(KPimGAPIBlogger PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPIBlogger
 )
 
 install(TARGETS
     KPimGAPIBlogger
-    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    EXPORT KPimGAPITargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapiblogger_CamelCase_HEADERS}
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI/Blogger"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapiblogger_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapiblogger_export.h"
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi/blogger"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPIBlogger
     LIB_NAME KPimGAPIBlogger
     DEPS "GAPICore"
     FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
     "${PRI_FILENAME}"
     DESTINATION "${ECM_MKSPECS_INSTALL_DIR}"
 )
diff --git a/src/calendar/CMakeLists.txt b/src/calendar/CMakeLists.txt
index 703cfc9..3922347 100644
--- a/src/calendar/CMakeLists.txt
+++ b/src/calendar/CMakeLists.txt
@@ -1,88 +1,88 @@
 set(kgapicalendar_SRCS
     calendar.cpp
     calendarcreatejob.cpp
     calendardeletejob.cpp
     calendarfetchjob.cpp
     calendarmodifyjob.cpp
     calendarservice.cpp
     event.cpp
     eventcreatejob.cpp
     eventdeletejob.cpp
     eventfetchjob.cpp
     eventmodifyjob.cpp
     eventmovejob.cpp
     reminder.cpp
     freebusyqueryjob.cpp
     ../debug.cpp
 )
 
 ecm_generate_headers(kgapicalendar_CamelCase_HEADERS
     HEADER_NAMES
     Calendar
     CalendarCreateJob
     CalendarDeleteJob
     CalendarFetchJob
     CalendarModifyJob
     Event
     EventCreateJob
     EventDeleteJob
     EventFetchJob
     EventModifyJob
     EventMoveJob
     Reminder
     FreeBusyQueryJob
     PREFIX KGAPI/Calendar
     REQUIRED_HEADERS kgapicalendar_HEADERS
 )
 
 add_library(KPimGAPICalendar
     ${kgapicalendar_SRCS}
 )
 
 generate_export_header(KPimGAPICalendar BASE_NAME kgapicalendar)
 
 add_library(KPim::GAPICalendar ALIAS KPimGAPICalendar)
 # TODO: Backwards compatibility, remove in next major release
 add_library(KF5::GAPICalendar ALIAS KPimGAPICalendar)
 target_include_directories(KPimGAPICalendar INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI>")
 
 target_link_libraries(KPimGAPICalendar
 PUBLIC
     KPim::GAPICore
     KF5::CalendarCore
 )
 
 set_target_properties(KPimGAPICalendar PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPICalendar
 )
 
 install(TARGETS
     KPimGAPICalendar
-    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    EXPORT KPimGAPITargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapicalendar_CamelCase_HEADERS}
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI/Calendar"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapicalendar_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapicalendar_export.h"
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi/calendar"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPICalendar
     LIB_NAME KPimGAPICalendar
     DEPS "GAPICore CalendarCore"
     FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
     "${PRI_FILENAME}"
     DESTINATION "${ECM_MKSPECS_INSTALL_DIR}"
 )
diff --git a/src/contacts/CMakeLists.txt b/src/contacts/CMakeLists.txt
index 0651119..c0f3e60 100644
--- a/src/contacts/CMakeLists.txt
+++ b/src/contacts/CMakeLists.txt
@@ -1,88 +1,88 @@
 set(kgapicontacts_SRCS
     contact.cpp
     contactcreatejob.cpp
     contactdeletejob.cpp
     contactfetchjob.cpp
     contactfetchphotojob.cpp
     contactmodifyjob.cpp
     contactsgroup.cpp
     contactsgroupcreatejob.cpp
     contactsgroupdeletejob.cpp
     contactsgroupfetchjob.cpp
     contactsgroupmodifyjob.cpp
     contactsservice.cpp
 
     ../debug.cpp
 )
 
 ecm_generate_headers(kgapicontacts_CamelCase_HEADERS
     HEADER_NAMES
     Contact
     ContactCreateJob
     ContactDeleteJob
     ContactFetchJob
     ContactFetchPhotoJob
     ContactModifyJob
     ContactsGroup
     ContactsGroupCreateJob
     ContactsGroupDeleteJob
     ContactsGroupFetchJob
     ContactsGroupModifyJob
     PREFIX KGAPI/Contacts
     REQUIRED_HEADERS kgapicontacts_HEADERS
 )
 
 add_library(KPimGAPIContacts
     ${kgapicontacts_SRCS}
 )
 
 generate_export_header(KPimGAPIContacts BASE_NAME kgapicontacts)
 
 add_library(KPim::GAPIContacts ALIAS KPimGAPIContacts)
 # TODO: Backwards compatibility, remove in next major release
 add_library(KF5::GAPIContacts ALIAS KPimGAPIContacts)
 target_include_directories(KPimGAPIContacts INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI>")
 
 target_link_libraries(KPimGAPIContacts
 PUBLIC
     KPim::GAPICore
     KF5::Contacts
 PRIVATE
     Qt5::Xml
     Qt5::Network
 )
 
 set_target_properties(KPimGAPIContacts PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPIContacts
 )
 
 install(TARGETS
     KPimGAPIContacts
-    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    EXPORT KPimGAPITargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapicontacts_CamelCase_HEADERS}
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI/Contacts"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapicontacts_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapicontacts_export.h"
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi/contacts"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPIContacts
     LIB_NAME KPimGAPIContacts
     DEPS "KPim::GAPICore KF5::Contacts Qt5::Xml"
     FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
     "${PRI_FILENAME}"
     DESTINATION "${ECM_MKSPECS_INSTALL_DIR}"
 )
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 1d33472..ec5fcdd 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,111 +1,111 @@
 ecm_create_qm_loader(QM_LOADER libkgapi_qt)
 
 set(kgapicore_SRCS
     accountinfo/accountinfo.cpp
     accountinfo/accountinfofetchjob.cpp
     private/newtokensfetchjob.cpp
     ui/authwidget.cpp
     ui/authwidget_p.cpp
     account.cpp
     authjob.cpp
     createjob.cpp
     deletejob.cpp
     fetchjob.cpp
     job.cpp
     modifyjob.cpp
     object.cpp
     utils.cpp
     ${QM_LOADER}
 
     ../debug.cpp
 )
 
 ecm_generate_headers(kgapicore_base_CamelCase_HEADERS
     HEADER_NAMES
     Account
     AuthJob
     CreateJob
     DeleteJob
     FetchJob
     Job
     ModifyJob
     Object
     Types
     Utils
     PREFIX KGAPI
     REQUIRED_HEADERS kgapicore_base_HEADERS
 )
 
 ecm_generate_headers(kgapicore_accountinfo_CamelCase_HEADERS
     HEADER_NAMES
     AccountInfo
     AccountInfoFetchJob
     REQUIRED_HEADERS kgapicore_accountinfo_HEADERS
     RELATIVE accountinfo
 )
 
 ecm_generate_headers(kgapicore_ui_CamelCase_HEADERS
     HEADER_NAMES
     AuthWidget
     REQUIRED_HEADERS kgapicore_ui_HEADERS
     RELATIVE ui
 )
 
 add_library(KPimGAPICore
     ${kgapicore_SRCS}
 )
 
 generate_export_header(KPimGAPICore BASE_NAME kgapicore)
 
 add_library(KPim::GAPICore ALIAS KPimGAPICore)
 # TODO: Backwards compatibility, remove in next major release
 add_library(KF5::GAPICore ALIAS KPimGAPICore)
 target_include_directories(KPimGAPICore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI;${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi>")
 
 target_link_libraries(KPimGAPICore
 PRIVATE
     KF5::KIOWidgets
     KF5::WindowSystem
     Qt5::WebEngineWidgets
 PUBLIC
     Qt5::Widgets
 )
 
 set_target_properties(KPimGAPICore PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPICore
 )
 
 install(TARGETS
     KPimGAPICore
-    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    EXPORT KPimGAPITargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapicore_base_CamelCase_HEADERS}
     ${kgapicore_accountinfo_CamelCase_HEADERS}
     ${kgapicore_ui_CamelCase_HEADERS}
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapicore_base_HEADERS}
     ${kgapicore_accountinfo_HEADERS}
     ${kgapicore_ui_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapicore_export.h"
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPICore
     LIB_NAME KPimGAPICore
     DEPS "Qt5::Widgets"
     FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
     "${PRI_FILENAME}"
     DESTINATION "${ECM_MKSPECS_INSTALL_DIR}"
 )
diff --git a/src/drive/CMakeLists.txt b/src/drive/CMakeLists.txt
index d625c43..2b3ce87 100644
--- a/src/drive/CMakeLists.txt
+++ b/src/drive/CMakeLists.txt
@@ -1,140 +1,140 @@
 set(kgapidrive_SRCS
     about.cpp
     aboutfetchjob.cpp
     app.cpp
     appfetchjob.cpp
     change.cpp
     changefetchjob.cpp
     childreference.cpp
     childreferencecreatejob.cpp
     childreferencedeletejob.cpp
     childreferencefetchjob.cpp
     driveservice.cpp
     file.cpp
     fileabstractdatajob.cpp
     fileabstractmodifyjob.cpp
     fileabstractuploadjob.cpp
     filecopyjob.cpp
     filecreatejob.cpp
     filedeletejob.cpp
     filefetchcontentjob.cpp
     filefetchjob.cpp
     filemodifyjob.cpp
     filesearchquery.cpp
     filetouchjob.cpp
     filetrashjob.cpp
     fileuntrashjob.cpp
     parentreference.cpp
     parentreferencecreatejob.cpp
     parentreferencedeletejob.cpp
     parentreferencefetchjob.cpp
     permission.cpp
     permissioncreatejob.cpp
     permissiondeletejob.cpp
     permissionfetchjob.cpp
     permissionmodifyjob.cpp
     revision.cpp
     revisiondeletejob.cpp
     revisionfetchjob.cpp
     revisionmodifyjob.cpp
     user.cpp
 
     ../debug.cpp
 )
 
 ecm_generate_headers(kgapidrive_CamelCase_HEADERS
     HEADER_NAMES
     About
     AboutFetchJob
     App
     AppFetchJob
     Change
     ChangeFetchJob
     ChildReference
     ChildReferenceCreateJob
     ChildReferenceDeleteJob
     ChildReferenceFetchJob
     File
     FileAbstractDataJob
     FileAbstractModifyJob
     FileAbstractUploadJob
     FileCopyJob
     FileCreateJob
     FileDeleteJob
     FileFetchContentJob
     FileFetchJob
     FileModifyJob
     FileSearchQuery
     FileTouchJob
     FileTrashJob
     FileUntrashJob
     ParentReference
     ParentReferenceCreateJob
     ParentReferenceDeleteJob
     ParentReferenceFetchJob
     Permission
     PermissionCreateJob
     PermissionDeleteJob
     PermissionFetchJob
     PermissionModifyJob
     Revision
     RevisionDeleteJob
     RevisionFetchJob
     RevisionModifyJob
     User
     PREFIX KGAPI/Drive
     REQUIRED_HEADERS kgapidrive_HEADERS
 )
 
 add_library(KPimGAPIDrive
     ${kgapidrive_SRCS}
 )
 
 generate_export_header(KPimGAPIDrive BASE_NAME kgapidrive)
 
 add_library(KPim::GAPIDrive ALIAS KPimGAPIDrive)
 # TODO: Backwards compatibility, remove in next major release
 add_library(KF5::GAPIDrive ALIAS KPimGAPIDrive)
 target_include_directories(KPimGAPIDrive INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI>")
 
 target_link_libraries(KPimGAPIDrive
 PUBLIC
     KPim::GAPICore
 PRIVATE
     Qt5::Network
 )
 
 set_target_properties(KPimGAPIDrive PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPIDrive
 )
 
 install(TARGETS
     KPimGAPIDrive
-    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    EXPORT KPimGAPITargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapidrive_CamelCase_HEADERS}
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI/Drive"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapidrive_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapidrive_export.h"
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi/drive"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPIDrive
     LIB_NAME KPimGAPIDrive
     DEPS "GAPICore"
     FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
     "${PRI_FILENAME}"
     DESTINATION "${ECM_MKSPECS_INSTALL_DIR}"
 )
diff --git a/src/latitude/CMakeLists.txt b/src/latitude/CMakeLists.txt
index 780dc26..2ed9d1a 100644
--- a/src/latitude/CMakeLists.txt
+++ b/src/latitude/CMakeLists.txt
@@ -1,77 +1,77 @@
 set(kgapilatitude_SRCS
     latitudeservice.cpp
     latitude.h
     location.cpp
     locationcreatejob.cpp
     locationdeletejob.cpp
     locationfetchhistoryjob.cpp
     locationfetchjob.cpp
 
     ../debug.cpp
 )
 
 ecm_generate_headers(kgapilatitude_CamelCase_HEADERS
     HEADER_NAMES
     Location
     LocationCreateJob
     LocationDeleteJob
     LocationFetchHistoryJob
     LocationFetchJob
     Latitude
     PREFIX KGAPI/Latitude
     REQUIRED_HEADERS kgapilatitude_HEADERS
 )
 
 add_library(KPimGAPILatitude
     ${kgapilatitude_SRCS}
 )
 
 generate_export_header(KPimGAPILatitude BASE_NAME kgapilatitude)
 
 add_library(KPim::GAPILatitude ALIAS KPimGAPILatitude)
 # TODO: Backwards compatibility, remove in next major release
 add_library(KF5::GAPILatitude ALIAS KPimGAPILatitude)
 target_include_directories(KPimGAPILatitude INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI>")
 
 target_link_libraries(KPimGAPILatitude
 PUBLIC
     KPim::GAPICore
     KF5::Contacts
 PRIVATE
     Qt5::Network
 )
 
 set_target_properties(KPimGAPILatitude PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPILatitude
 )
 
 install(TARGETS
     KPimGAPILatitude
-    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    EXPORT KPimGAPITargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapilatitude_CamelCase_HEADERS}
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI/Latitude"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapilatitude_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapilatitude_export.h"
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi/latitude"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPILatitude
     LIB_NAME KPimGAPILatitude
     DEPS "GAPICore Contacts"
     FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
     "${PRI_FILENAME}"
     DESTINATION "${ECM_MKSPECS_INSTALL_DIR}"
 )
diff --git a/src/staticmaps/CMakeLists.txt b/src/staticmaps/CMakeLists.txt
index a51f2fe..919ac9c 100644
--- a/src/staticmaps/CMakeLists.txt
+++ b/src/staticmaps/CMakeLists.txt
@@ -1,72 +1,72 @@
 set(kgapimaps_SRCS
     staticmapmarker.cpp
     staticmappath.cpp
     staticmaptilefetchjob.cpp
     staticmapurl.cpp
 
     ../debug.cpp
 )
 
 ecm_generate_headers(kgapimaps_CamelCase_HEADERS
     HEADER_NAMES
     StaticMapMarker
     StaticMapPath
     StaticMapTileFetchJob
     StaticMapUrl
     PREFIX KGAPI/Maps
     REQUIRED_HEADERS kgapimaps_HEADERS
 )
 
 add_library(KPimGAPIMaps
     ${kgapimaps_SRCS}
 )
 
 generate_export_header(KPimGAPIMaps BASE_NAME kgapimaps)
 
 add_library(KPim::GAPIMaps ALIAS KPimGAPIMaps)
 # TODO: Backwards compatibility, remove in next major release
 add_library(KF5::GAPIMaps ALIAS KPimGAPIMaps)
 target_include_directories(KPimGAPIMaps INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI>")
 
 target_link_libraries(KPimGAPIMaps
 PUBLIC
     KPim::GAPICore
     KF5::Contacts
 PRIVATE
     Qt5::Network
 )
 
 set_target_properties(KPimGAPIMaps PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPIMaps
 )
 
 install(TARGETS
     KPimGAPIMaps
-    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    EXPORT KPimGAPITargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapimaps_CamelCase_HEADERS}
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI/Maps"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapimaps_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapimaps_export.h"
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi/maps"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPIMaps
     LIB_NAME KPimGAPIMaps
     DEPS "GAPICore Contacts"
     FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
     "${PRI_FILENAME}"
     DESTINATION "${ECM_MKSPECS_INSTALL_DIR}"
 )
diff --git a/src/tasks/CMakeLists.txt b/src/tasks/CMakeLists.txt
index 69da5ae..8eccc07 100644
--- a/src/tasks/CMakeLists.txt
+++ b/src/tasks/CMakeLists.txt
@@ -1,85 +1,85 @@
 set(kgapitasks_SRCS
     task.cpp
     taskcreatejob.cpp
     taskdeletejob.cpp
     taskfetchjob.cpp
     tasklist.cpp
     tasklistcreatejob.cpp
     tasklistdeletejob.cpp
     tasklistfetchjob.cpp
     tasklistmodifyjob.cpp
     taskmodifyjob.cpp
     taskmovejob.cpp
     tasksservice.cpp
 
     ../debug.cpp
 )
 
 ecm_generate_headers(kgapitasks_CamelCase_HEADERS
     HEADER_NAMES
     Task
     TaskCreateJob
     TaskDeleteJob
     TaskFetchJob
     TaskList
     TaskListCreateJob
     TaskListDeleteJob
     TaskListFetchJob
     TaskListModifyJob
     TaskModifyJob
     TaskMoveJob
     PREFIX KGAPI/Tasks
     REQUIRED_HEADERS kgapitasks_HEADERS
 )
 
 add_library(KPimGAPITasks
     ${kgapitasks_SRCS}
 )
 
 generate_export_header(KPimGAPITasks BASE_NAME kgapitasks)
 
 add_library(KPim::GAPITasks ALIAS KPimGAPITasks)
 # TODO: Backwards compatibility, remove in next major release
 add_library(KF5::GAPITasks ALIAS KPimGAPITasks)
 target_include_directories(KPimGAPITasks INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI>")
 
 target_link_libraries(KPimGAPITasks
 PUBLIC
     KPim::GAPICore
     KF5::CalendarCore
 )
 
 set_target_properties(KPimGAPITasks PROPERTIES
     VERSION ${KGAPI_VERSION_STRING}
     SOVERSION ${KGAPI_SOVERSION}
     EXPORT_NAME GAPITasks
 )
 
 install(TARGETS
     KPimGAPITasks
-    EXPORT KPimGAPITargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+    EXPORT KPimGAPITargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
 install(FILES
     ${kgapitasks_CamelCase_HEADERS}
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/KGAPI/Tasks"
     COMPONENT Devel
 )
 
 install(FILES
     ${kgapitasks_HEADERS}
     "${CMAKE_CURRENT_BINARY_DIR}/kgapitasks_export.h"
     DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI/kgapi/tasks"
     COMPONENT Devel
 )
 
 ecm_generate_pri_file(BASE_NAME KGAPITasks
     LIB_NAME KPimGAPITasks
     DEPS "GAPICore CalendarCore"
     FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/KPim/KGAPI"
 )
 
 install(FILES
     "${PRI_FILENAME}"
     DESTINATION "${ECM_MKSPECS_INSTALL_DIR}"
 )