diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp
index 57f60be..5f47fa9 100644
--- a/src/lib/core/manager_p.cpp
+++ b/src/lib/core/manager_p.cpp
@@ -101,11 +101,11 @@ Manager *Manager::self()
                      ->property("org.kde.KActivities.core.disableAutostart")
                      .toBool()) {
                 qCDebug(KAMD_CORELIB) << "Starting the activity manager daemon";
-                QProcess::startDetached(QStringLiteral("kactivitymanagerd"));
+                QProcess::startDetached(QStringLiteral("kactivitymanagerd5"));
             }
 
             #else
-            QProcess::startDetached(QStringLiteral("kactivitymanagerd"));
+            QProcess::startDetached(QStringLiteral("kactivitymanagerd5"));
             #endif
         }
 
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 348f8a3..927727b 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -71,7 +71,7 @@ target_link_libraries (activity-manager
    )
 
 set_target_properties (activity-manager
-   PROPERTIES OUTPUT_NAME kactivitymanagerd
+   PROPERTIES OUTPUT_NAME kactivitymanagerd5
    )
 
 ########### install application ###############
diff --git a/src/service/files/kactivitymanagerd.desktop b/src/service/files/kactivitymanagerd.desktop
index ce68a49..34e0c13 100644
--- a/src/service/files/kactivitymanagerd.desktop
+++ b/src/service/files/kactivitymanagerd.desktop
@@ -4,7 +4,7 @@ Icon=preferences-activities
 X-KDE-ServiceTypes=
 X-DBUS-StartupType=Unique
 X-KDE-StartupNotify=false
-Exec=kactivitymanagerd
+Exec=kactivitymanagerd5
 
 Name=Activity Manager
 Name[bs]=Menadžer aktivnosti
diff --git a/tests/core/Process.cpp b/tests/core/Process.cpp
index b6279d0..4dcc8be 100644
--- a/tests/core/Process.cpp
+++ b/tests/core/Process.cpp
@@ -83,7 +83,7 @@ void Modifier::initTestCase()
             // qDebug() << env;
 
             s_process->setEnvironment(env);
-            s_process->start(QStringLiteral(KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd"));
+            s_process->start(QStringLiteral(KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd5"));
             s_process->waitForStarted();