diff --git a/autotests/Process.cpp b/autotests/Process.cpp
index a7a0507..afa4bf1 100644
--- a/autotests/Process.cpp
+++ b/autotests/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();
 
 
diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp
index 2a81ff8..fc653a4 100644
--- a/src/lib/core/manager_p.cpp
+++ b/src/lib/core/manager_p.cpp
@@ -94,11 +94,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 46ef942..dd976c3 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -60,9 +60,9 @@ qt5_add_dbus_adaptor (
    Features.h Features
    )
 
-add_executable (kactivitymanagerd ${kactivitymanager_SRCS})
+add_executable (kactivitymanagerd5 ${kactivitymanager_SRCS})
 
-target_link_libraries (kactivitymanagerd
+target_link_libraries (kactivitymanagerd5
    Qt5::Core
    Qt5::DBus
    Qt5::Widgets
@@ -82,7 +82,7 @@ install (FILES
    )
 
 install (TARGETS
-   kactivitymanagerd ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+   kactivitymanagerd5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
    )
 
 install (FILES
diff --git a/src/service/files/kactivitymanagerd.desktop b/src/service/files/kactivitymanagerd.desktop
index 58ab7df..fb119bf 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