--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,9 +133,9 @@ ecm_setup_qtplugin_macro_names(
 # Make sure the KF5Akonadi_DATA_DIR is absolute before passing it to KF5AkonadiConfig.cmake.in
 # otherwise build fails either on OSX CI, or for normal users
 if (IS_ABSOLUTE "${KDE_INSTALL_DATADIR_KF}")
-    set(KF5Akonadi_DATA_DIR "${KDE_INSTALL_DATADIR_KF}/akonadi")
+    set(KF5Akonadi_DATA_DIR "${KDE_INSTALL_DATADIR_KF}/akonadi5")
 else()
-    set(KF5Akonadi_DATA_DIR "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF}/akonadi")
+    set(KF5Akonadi_DATA_DIR "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF}/akonadi5")
 endif()
 
 check_symbol_exists(malloc_trim "malloc.h" HAVE_MALLOC_TRIM)
--- a/src/akonadicontrol/agentmanager.cpp
+++ b/src/akonadicontrol/agentmanager.cpp
@@ -559,7 +559,7 @@ void AgentManager::readPluginInfos(const
 
 QStringList AgentManager::pluginInfoPathList()
 {
-    return Akonadi::StandardDirs::locateAllResourceDirs(QStringLiteral("akonadi/agents"));
+    return Akonadi::StandardDirs::locateAllResourceDirs(QStringLiteral("akonadi5/agents"));
 }
 
 void AgentManager::load()
--- a/src/akonadictl/main.cpp
+++ b/src/akonadictl/main.cpp
@@ -124,7 +124,7 @@ static bool checkSearchSupportStatus()
 
 static bool checkAvailableAgentTypes()
 {
-    const auto dirs = Akonadi::StandardDirs::locateAllResourceDirs(QStringLiteral("akonadi/agents"));
+    const auto dirs = Akonadi::StandardDirs::locateAllResourceDirs(QStringLiteral("akonadi5/agents"));
     QStringList types;
     for (const QString &pluginDir : dirs) {
         QDir dir(pluginDir);
--- a/src/core/firstrun.cpp
+++ b/src/core/firstrun.cpp
@@ -78,7 +78,7 @@ Firstrun::~Firstrun()
 void Firstrun::findPendingDefaults()
 {
     const KConfigGroup cfg(mConfig, "ProcessedDefaults");
-    const auto paths = StandardDirs::locateAllResourceDirs(QStringLiteral("akonadi/firstrun"));
+    const auto paths = StandardDirs::locateAllResourceDirs(QStringLiteral("akonadi5/firstrun"));
     for (const QString &dirName : paths) {
         const QStringList files = QDir(dirName).entryList(QDir::Files | QDir::Readable);
         for (const QString &fileName : files) {
--- a/src/core/pluginloader.cpp
+++ b/src/core/pluginloader.cpp
@@ -119,7 +119,7 @@ PluginMetaData PluginLoader::infoForName
 
 void PluginLoader::scan()
 {
-    const auto dirs = StandardDirs::locateAllResourceDirs(QStringLiteral("akonadi/plugins/serializer/"));
+    const auto dirs = StandardDirs::locateAllResourceDirs(QStringLiteral("akonadi5/plugins/serializer/"));
     for (const QString &dir : dirs) {
         const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.desktop"));
         for (const QString &file : fileNames) {
--- a/src/widgets/selftestdialog.cpp
+++ b/src/widgets/selftestdialog.cpp
@@ -471,7 +471,7 @@ void SelfTestDialog::testResources()
         }
     }
 
-    const auto pathList = StandardDirs::locateAllResourceDirs(QStringLiteral("akonadi/agents"));
+    const auto pathList = StandardDirs::locateAllResourceDirs(QStringLiteral("akonadi5/agents"));
     QStandardItem *item = nullptr;
     if (resourceFound) {
         item = report(Success, ki18n("Resource agents found."), ki18n("At least one resource agent has been found."));