diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,31 +43,31 @@
 
 
 ecm_setup_version(${LIBKDAV_VERSION} VARIABLE_PREFIX KDAV
-    VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kpimkdav_version.h"
-    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPimKDAVConfigVersion.cmake"
+    VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdav_version.h"
+    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KDAVConfigVersion.cmake"
     SOVERSION 5
     )
 
-set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPimKDAV")
+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5KDAV")
 
 configure_package_config_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/KPimKDAVConfig.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/KPimKDAVConfig.cmake"
+    "${CMAKE_CURRENT_SOURCE_DIR}/KF5KDAVConfig.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/KF5KDAVConfig.cmake"
     INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
     )
 
 install(FILES
-    "${CMAKE_CURRENT_BINARY_DIR}/KPimKDAVConfig.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/KPimKDAVConfigVersion.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/KF5KDAVConfig.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/KF5KDAVConfigVersion.cmake"
     DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
     COMPONENT Devel
     )
 
-install(EXPORT KPimKDAVTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPimKDAVTargets.cmake NAMESPACE KPim::)
+install(EXPORT KF5KDAVTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5KDAVTargets.cmake NAMESPACE KF5::)
 
 install(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kpimkdav_version.h
-    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim COMPONENT Devel
+    ${CMAKE_CURRENT_BINARY_DIR}/kdav_version.h
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KF5 COMPONENT Devel
     )
 
 install(FILES kdav.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
diff --git a/KPimKDAVConfig.cmake.in b/KF5KDAVConfig.cmake.in
rename from KPimKDAVConfig.cmake.in
rename to KF5KDAVConfig.cmake.in
--- a/KPimKDAVConfig.cmake.in
+++ b/KF5KDAVConfig.cmake.in
@@ -3,4 +3,4 @@
 include(CMakeFindDependencyMacro)
 find_dependency(KF5CoreAddons "@KF5_MIN_VERSION@")
 
-include("${CMAKE_CURRENT_LIST_DIR}/KPimKDAVTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/KF5KDAVTargets.cmake")
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -4,29 +4,29 @@
 ecm_add_test(davcollectiontest.cpp
     TEST_NAME davcollection
     NAME_PREFIX "kdav-"
-    LINK_LIBRARIES KPim::KDAV Qt5::Test Qt5::Core Qt5::Gui
+    LINK_LIBRARIES KF5::KDAV Qt5::Test Qt5::Core Qt5::Gui
 )
 
 ecm_add_test(davitemtest.cpp
     TEST_NAME davitem
     NAME_PREFIX "kdav-"
-    LINK_LIBRARIES KPim::KDAV Qt5::Test Qt5::Core
+    LINK_LIBRARIES KF5::KDAV Qt5::Test Qt5::Core
 )
 
 ecm_add_test(davurltest.cpp
     TEST_NAME davurl
     NAME_PREFIX "kdav-"
-    LINK_LIBRARIES KPim::KDAV Qt5::Test Qt5::Core
+    LINK_LIBRARIES KF5::KDAV Qt5::Test Qt5::Core
 )
 
 ecm_add_test(davitemfetchjobtest.cpp fakeserver.cpp
     TEST_NAME davitemfetchjob
     NAME_PREFIX "kdav-"
-    LINK_LIBRARIES KPim::KDAV Qt5::Test Qt5::Core Qt5::Network
+    LINK_LIBRARIES KF5::KDAV Qt5::Test Qt5::Core Qt5::Network
 )
 
 ecm_add_test(davitemslistjobtest.cpp fakeserver.cpp
     TEST_NAME davitemslistjob
     NAME_PREFIX "kdav-"
-    LINK_LIBRARIES KPim::KDAV Qt5::Test Qt5::Core Qt5::Network
+    LINK_LIBRARIES KF5::KDAV Qt5::Test Qt5::Core Qt5::Network
 )
diff --git a/metainfo.yaml b/metainfo.yaml
--- a/metainfo.yaml
+++ b/metainfo.yaml
@@ -8,9 +8,9 @@
 deprecated: false
 release: false
 libraries:
- - qmake: PimKDAV
-   cmake: "KPimKDAV"
-cmakename: KPimKDAV
+ - qmake: KDAV
+   cmake: "KF5DAV"
+cmakename: KF5KDAV
 
 public_lib: true
 group: kdepim
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -70,20 +70,20 @@
 
 install(FILES
     ${KDAV_Camelcase_HEADERS}
-    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim/KDAV
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KF5/KDAV
     COMPONENT Devel
     )
 
 install(FILES
     ${KDAV_HEADERS}
-    ${CMAKE_CURRENT_BINARY_DIR}/kpimkdav_export.h
+    ${CMAKE_CURRENT_BINARY_DIR}/kdav_export.h
 
-    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim/kdav
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KF5/kdav
     COMPONENT Devel
     )
 
 ecm_generate_pri_file(BASE_NAME kdav
-    LIB_NAME KPimKDAV
+    LIB_NAME KF5KDAV
     FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KDAV
     )
 
@@ -94,15 +94,15 @@
 
 ecm_qt_declare_logging_category(libkdav_SRCS HEADER libkdav_debug.h IDENTIFIER KDAV_LOG CATEGORY_NAME org.kde.pim.kdav)
 
-add_library(KPimKDAV
+add_library(KF5KDAV
    ${libkdav_SRCS}
    )
 
-generate_export_header(KPimKDAV BASE_NAME kpimkdav)
+generate_export_header(KF5KDAV BASE_NAME kdav)
 
-add_library(KPim::KDAV ALIAS KPimKDAV)
+add_library(KF5::KDAV ALIAS KF5KDAV)
 
-target_link_libraries(KPimKDAV
+target_link_libraries(KF5KDAV
 PUBLIC
     KF5::CoreAddons
 PRIVATE
@@ -113,18 +113,17 @@
     KF5::I18n
     )
 
-set_target_properties(KPimKDAV PROPERTIES
+set_target_properties(KF5KDAV PROPERTIES
     VERSION ${KDAV_VERSION_STRING}
     SOVERSION ${KDAV_SOVERSION}
     EXPORT_NAME KDAV
     )
 
 install(TARGETS
-    KPimKDAV
-    EXPORT KPimKDAVTargets
+    KF5KDAV
+    EXPORT KF5KDAVTargets
     ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
     ${LIBRARY_NAMELINK}
     )
 
-target_include_directories(KPimKDAV INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim/KDAV/;${KDE_INSTALL_INCLUDEDIR}/KPim/kdav;${KDE_INSTALL_INCLUDEDIR}/KPim>")
-
+target_include_directories(KF5KDAV INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KF5/KDAV/;${KDE_INSTALL_INCLUDEDIR}/KF5/kdav;${KDE_INSTALL_INCLUDEDIR}/KF5>")
diff --git a/src/common/davcollection.h b/src/common/davcollection.h
--- a/src/common/davcollection.h
+++ b/src/common/davcollection.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVCOLLECTION_H
 #define KDAV_DAVCOLLECTION_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "enums.h"
 
@@ -41,7 +41,7 @@
  * This class is used as container to transfer information about DAV
  * collections between the Akonadi resource and the DAV jobs.
  */
-class KPIMKDAV_EXPORT DavCollection
+class KDAV_EXPORT DavCollection
 {
 public:
     /**
diff --git a/src/common/davcollectiondeletejob.h b/src/common/davcollectiondeletejob.h
--- a/src/common/davcollectiondeletejob.h
+++ b/src/common/davcollectiondeletejob.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVCOLLECTIONDELETEJOB_H
 #define KDAV_DAVCOLLECTIONDELETEJOB_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "davjobbase.h"
 #include "davurl.h"
@@ -33,7 +33,7 @@
  *
  * This job is used to delete a DAV collection at a certain URL.
  */
-class KPIMKDAV_EXPORT DavCollectionDeleteJob : public DavJobBase
+class KDAV_EXPORT DavCollectionDeleteJob : public DavJobBase
 {
     Q_OBJECT
 
diff --git a/src/common/davcollectionmodifyjob.h b/src/common/davcollectionmodifyjob.h
--- a/src/common/davcollectionmodifyjob.h
+++ b/src/common/davcollectionmodifyjob.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVCOLLECTIONMODIFYJOB_H
 #define KDAV_DAVCOLLECTIONMODIFYJOB_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "davjobbase.h"
 #include "davurl.h"
@@ -34,7 +34,7 @@
  * This job is used to modify a property of a DAV collection
  * on the DAV server.
  */
-class KPIMKDAV_EXPORT DavCollectionModifyJob : public DavJobBase
+class KDAV_EXPORT DavCollectionModifyJob : public DavJobBase
 {
     Q_OBJECT
 
diff --git a/src/common/davcollectionsfetchjob.h b/src/common/davcollectionsfetchjob.h
--- a/src/common/davcollectionsfetchjob.h
+++ b/src/common/davcollectionsfetchjob.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVCOLLECTIONSFETCHJOB_H
 #define KDAV_DAVCOLLECTIONSFETCHJOB_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "davcollection.h"
 #include "davjobbase.h"
@@ -35,7 +35,7 @@
  * This job is used to fetch all DAV collection that are available
  * under a certain DAV url.
  */
-class KPIMKDAV_EXPORT DavCollectionsFetchJob : public DavJobBase
+class KDAV_EXPORT DavCollectionsFetchJob : public DavJobBase
 {
     Q_OBJECT
 
diff --git a/src/common/davcollectionsmultifetchjob.h b/src/common/davcollectionsmultifetchjob.h
--- a/src/common/davcollectionsmultifetchjob.h
+++ b/src/common/davcollectionsmultifetchjob.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVCOLLECTIONSMULTIFETCHJOB_H
 #define KDAV_DAVCOLLECTIONSMULTIFETCHJOB_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "davcollection.h"
 #include "davurl.h"
@@ -39,7 +39,7 @@
  * @note This class just combines multiple calls of DavCollectionsFetchJob
  *       into one job.
  */
-class KPIMKDAV_EXPORT DavCollectionsMultiFetchJob : public KJob
+class KDAV_EXPORT DavCollectionsMultiFetchJob : public KJob
 {
     Q_OBJECT
 
diff --git a/src/common/daverror.h b/src/common/daverror.h
--- a/src/common/daverror.h
+++ b/src/common/daverror.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVERROR_H
 #define KDAV_DAVERROR_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include <KJob>
 
@@ -49,7 +49,7 @@
 class ErrorPrivate;
 
 /** DAV operation error. */
-class KPIMKDAV_EXPORT Error
+class KDAV_EXPORT Error
 {
 public:
     explicit Error();
diff --git a/src/common/davitem.h b/src/common/davitem.h
--- a/src/common/davitem.h
+++ b/src/common/davitem.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVITEM_H
 #define KDAV_DAVITEM_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include <QByteArray>
 #include <QDataStream>
@@ -42,7 +42,7 @@
  * @note While the DAV RFC names them DAV resource we call them items
  *       to comply to Akonadi terminology.
  */
-class KPIMKDAV_EXPORT DavItem
+class KDAV_EXPORT DavItem
 {
 public:
     /**
@@ -114,8 +114,8 @@
     QSharedDataPointer<DavItemPrivate> d;
 };
 
-KPIMKDAV_EXPORT QDataStream &operator<<(QDataStream &out, const DavItem &item);
-KPIMKDAV_EXPORT QDataStream &operator>>(QDataStream &in, DavItem &item);
+KDAV_EXPORT QDataStream &operator<<(QDataStream &out, const DavItem &item);
+KDAV_EXPORT QDataStream &operator>>(QDataStream &in, DavItem &item);
 }
 
 Q_DECLARE_TYPEINFO(KDAV::DavItem, Q_MOVABLE_TYPE);
diff --git a/src/common/davitemcreatejob.h b/src/common/davitemcreatejob.h
--- a/src/common/davitemcreatejob.h
+++ b/src/common/davitemcreatejob.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVITEMCREATEJOB_H
 #define KDAV_DAVITEMCREATEJOB_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "davitem.h"
 #include "davjobbase.h"
@@ -30,7 +30,7 @@
 /**
  * @short A job to create a DAV item on the DAV server.
  */
-class KPIMKDAV_EXPORT DavItemCreateJob : public DavJobBase
+class KDAV_EXPORT DavItemCreateJob : public DavJobBase
 {
     Q_OBJECT
 
diff --git a/src/common/davitemdeletejob.h b/src/common/davitemdeletejob.h
--- a/src/common/davitemdeletejob.h
+++ b/src/common/davitemdeletejob.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVITEMDELETEJOB_H
 #define KDAV_DAVITEMDELETEJOB_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "davitem.h"
 #include "davjobbase.h"
@@ -30,7 +30,7 @@
 /**
  * @short A job to delete a DAV item on the DAV server.
  */
-class KPIMKDAV_EXPORT DavItemDeleteJob : public DavJobBase
+class KDAV_EXPORT DavItemDeleteJob : public DavJobBase
 {
     Q_OBJECT
 
diff --git a/src/common/davitemfetchjob.h b/src/common/davitemfetchjob.h
--- a/src/common/davitemfetchjob.h
+++ b/src/common/davitemfetchjob.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVITEMFETCHJOB_H
 #define KDAV_DAVITEMFETCHJOB_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "davitem.h"
 #include "davjobbase.h"
@@ -30,7 +30,7 @@
 /**
  * @short A job that fetches a DAV item from the DAV server.
  */
-class KPIMKDAV_EXPORT DavItemFetchJob : public DavJobBase
+class KDAV_EXPORT DavItemFetchJob : public DavJobBase
 {
     Q_OBJECT
 
diff --git a/src/common/davitemmodifyjob.h b/src/common/davitemmodifyjob.h
--- a/src/common/davitemmodifyjob.h
+++ b/src/common/davitemmodifyjob.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVITEMMODIFYJOB_H
 #define KDAV_DAVITEMMODIFYJOB_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "davitem.h"
 #include "davjobbase.h"
@@ -30,7 +30,7 @@
 /**
  * @short A job that modifies a DAV item on the DAV server.
  */
-class KPIMKDAV_EXPORT DavItemModifyJob : public DavJobBase
+class KDAV_EXPORT DavItemModifyJob : public DavJobBase
 {
     Q_OBJECT
 
diff --git a/src/common/davitemsfetchjob.h b/src/common/davitemsfetchjob.h
--- a/src/common/davitemsfetchjob.h
+++ b/src/common/davitemsfetchjob.h
@@ -19,7 +19,7 @@
 #ifndef KDAV_DAVITEMSFETCHJOB_H
 #define KDAV_DAVITEMSFETCHJOB_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "davitem.h"
 #include "davjobbase.h"
@@ -34,7 +34,7 @@
 /**
  * @short A job that fetches a list of items from a DAV server using a multiget query.
  */
-class KPIMKDAV_EXPORT DavItemsFetchJob : public DavJobBase
+class KDAV_EXPORT DavItemsFetchJob : public DavJobBase
 {
     Q_OBJECT
 
diff --git a/src/common/davitemslistjob.h b/src/common/davitemslistjob.h
--- a/src/common/davitemslistjob.h
+++ b/src/common/davitemslistjob.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVITEMSLISTJOB_H
 #define KDAV_DAVITEMSLISTJOB_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "davitem.h"
 #include "davjobbase.h"
@@ -36,7 +36,7 @@
 /**
  * @short A job that lists all DAV items inside a DAV collection.
  */
-class KPIMKDAV_EXPORT DavItemsListJob : public DavJobBase
+class KDAV_EXPORT DavItemsListJob : public DavJobBase
 {
     Q_OBJECT
 
diff --git a/src/common/davjobbase.h b/src/common/davjobbase.h
--- a/src/common/davjobbase.h
+++ b/src/common/davjobbase.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVJOBBASE_H
 #define KDAV_DAVJOBBASE_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include <KJob>
 
@@ -32,7 +32,7 @@
 /**
  * @short base class for the jobs used by the resource.
  */
-class KPIMKDAV_EXPORT DavJobBase : public KJob
+class KDAV_EXPORT DavJobBase : public KJob
 {
     Q_OBJECT
 
diff --git a/src/common/davmultigetprotocol_p.h b/src/common/davmultigetprotocol_p.h
--- a/src/common/davmultigetprotocol_p.h
+++ b/src/common/davmultigetprotocol_p.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVMULTIGETPROTOCOL_H
 #define KDAV_DAVMULTIGETPROTOCOL_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "davprotocolbase_p.h"
 
diff --git a/src/common/davprincipalhomesetsfetchjob.h b/src/common/davprincipalhomesetsfetchjob.h
--- a/src/common/davprincipalhomesetsfetchjob.h
+++ b/src/common/davprincipalhomesetsfetchjob.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVPRINCIPALHOMESETSFETCHJOB_H
 #define KDAV_DAVPRINCIPALHOMESETSFETCHJOB_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "davjobbase.h"
 #include "davurl.h"
@@ -33,7 +33,7 @@
 /**
  * @short A job that fetches home sets for a principal.
  */
-class KPIMKDAV_EXPORT DavPrincipalHomeSetsFetchJob : public DavJobBase
+class KDAV_EXPORT DavPrincipalHomeSetsFetchJob : public DavJobBase
 {
     Q_OBJECT
 
diff --git a/src/common/davprincipalsearchjob.h b/src/common/davprincipalsearchjob.h
--- a/src/common/davprincipalsearchjob.h
+++ b/src/common/davprincipalsearchjob.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVPRINCIPALSEARCHJOB_H
 #define KDAV_DAVPRINCIPALSEARCHJOB_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "davjobbase.h"
 #include "davurl.h"
@@ -40,7 +40,7 @@
  *
  * The properties to fetch are set with @ref fetchProperty().
  */
-class KPIMKDAV_EXPORT DavPrincipalSearchJob : public DavJobBase
+class KDAV_EXPORT DavPrincipalSearchJob : public DavJobBase
 {
     Q_OBJECT
 
diff --git a/src/common/davprotocolbase_p.h b/src/common/davprotocolbase_p.h
--- a/src/common/davprotocolbase_p.h
+++ b/src/common/davprotocolbase_p.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVPROTOCOLBASE_H
 #define KDAV_DAVPROTOCOLBASE_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "davcollection.h"
 
diff --git a/src/common/davurl.h b/src/common/davurl.h
--- a/src/common/davurl.h
+++ b/src/common/davurl.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_DAVURL_H
 #define KDAV_DAVURL_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include "enums.h"
 
@@ -31,7 +31,7 @@
 /**
  * @short A helper class to combine url and protocol of a DAV url.
  */
-class KPIMKDAV_EXPORT DavUrl
+class KDAV_EXPORT DavUrl
 {
 public:
     /**
@@ -84,8 +84,8 @@
     QSharedDataPointer<DavUrlPrivate> d;
 };
 
-KPIMKDAV_EXPORT QDataStream &operator<<(QDataStream &out, const DavUrl &url);
-KPIMKDAV_EXPORT QDataStream &operator>>(QDataStream &in, DavUrl &url);
+KDAV_EXPORT QDataStream &operator<<(QDataStream &out, const DavUrl &url);
+KDAV_EXPORT QDataStream &operator>>(QDataStream &in, DavUrl &url);
 }
 
 Q_DECLARE_TYPEINFO(KDAV::DavUrl, Q_MOVABLE_TYPE);
diff --git a/src/common/etagcache.h b/src/common/etagcache.h
--- a/src/common/etagcache.h
+++ b/src/common/etagcache.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_ETAGCACHE_H
 #define KDAV_ETAGCACHE_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 
 #include <QObject>
 #include <QStringList>
@@ -36,7 +36,7 @@
  * out which items have been changed in the backend and have to
  * be refetched on the next call of ResourceBase::retrieveItems()
  */
-class KPIMKDAV_EXPORT EtagCache : public QObject
+class KDAV_EXPORT EtagCache : public QObject
 {
     Q_OBJECT
 
diff --git a/src/common/protocolinfo.h b/src/common/protocolinfo.h
--- a/src/common/protocolinfo.h
+++ b/src/common/protocolinfo.h
@@ -18,7 +18,7 @@
 #ifndef KDAV_PROTOCOLINFO_H
 #define KDAV_PROTOCOLINFO_H
 
-#include "kpimkdav_export.h"
+#include "kdav_export.h"
 #include "enums.h"
 
 class QLatin1String;
@@ -37,29 +37,29 @@
      * there is no need to call ResourceBase::retrieveItem() for every single
      * dav resource.
      */
-    KPIMKDAV_EXPORT Q_REQUIRED_RESULT bool useMultiget(KDAV::Protocol protocol);
+    KDAV_EXPORT Q_REQUIRED_RESULT bool useMultiget(KDAV::Protocol protocol);
 
     /** Returns the principal home set of @p protocol. */
-    KPIMKDAV_EXPORT Q_REQUIRED_RESULT QString principalHomeSet(KDAV::Protocol protocol);
+    KDAV_EXPORT Q_REQUIRED_RESULT QString principalHomeSet(KDAV::Protocol protocol);
 
     /** Returns the principal home set namespace of @p protocol. */
-    KPIMKDAV_EXPORT Q_REQUIRED_RESULT QString principalHomeSetNS(KDAV::Protocol protocol);
+    KDAV_EXPORT Q_REQUIRED_RESULT QString principalHomeSetNS(KDAV::Protocol protocol);
 
     /**
      * Returns the untranslated name of the given DAV @p protocol dialect.
      */
-    KPIMKDAV_EXPORT Q_REQUIRED_RESULT QLatin1String protocolName(KDAV::Protocol protocol);
+    KDAV_EXPORT Q_REQUIRED_RESULT QLatin1String protocolName(KDAV::Protocol protocol);
 
     /**
      * Returns the protocol matching the given name. This is the opposite of
      * Utils::protocolName().
      */
-    KPIMKDAV_EXPORT Q_REQUIRED_RESULT KDAV::Protocol protocolByName(const QString &name);
+    KDAV_EXPORT Q_REQUIRED_RESULT KDAV::Protocol protocolByName(const QString &name);
 
     /**
      * Returns the mimetype that shall be used for contact DAV resources using @p protocol.
      */
-    KPIMKDAV_EXPORT Q_REQUIRED_RESULT QString contactsMimeType(KDAV::Protocol protocol);
+    KDAV_EXPORT Q_REQUIRED_RESULT QString contactsMimeType(KDAV::Protocol protocol);
 }
 
 }
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,7 +9,7 @@
 
 target_link_libraries(testserver
     Qt5::Core
-    KPim::KDAV
+    KF5::KDAV
     Qt5::Xml
     )