diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
--- a/startkde/startplasma-waylandsession.cpp
+++ b/startkde/startplasma-waylandsession.cpp
@@ -56,7 +56,7 @@
         return 2;
     }
 
-    if (!startKSMServer(true))
+    if (!startPlasmaSession(true))
         return 4;
 
     // Anything after here is logout
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
--- a/startkde/startplasma-x11.cpp
+++ b/startkde/startplasma-x11.cpp
@@ -99,7 +99,7 @@
         return 1;
     }
 
-    if (!startKSMServer(false))
+    if (!startPlasmaSession(false))
         return 1;
 
     // Anything after here is logout
diff --git a/startkde/startplasma.h b/startkde/startplasma.h
--- a/startkde/startplasma.h
+++ b/startkde/startplasma.h
@@ -45,7 +45,7 @@
 void setupX11();
 
 bool startKDEInit();
-bool startKSMServer(bool wayland);
+bool startPlasmaSession(bool wayland);
 
 void waitForKonqi();
 
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
--- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp
@@ -327,7 +327,7 @@
     }
 }
 
-bool startKSMServer(bool wayland)
+bool startPlasmaSession(bool wayland)
 {
     OrgKdeKSplashInterface iface(QStringLiteral("org.kde.KSplash"), QStringLiteral("/KSplash"), QDBusConnection::sessionBus());
     iface.setStage(QStringLiteral("kinit"));
@@ -345,19 +345,19 @@
     // lock now and do the rest of the KDE startup underneath the locker.
 
 
-    QStringList ksmserverOptions;
+    QStringList plasmaSessionOptions;
     if (wayland) {
-        ksmserverOptions << QStringLiteral("--no-lockscreen");
+        plasmaSessionOptions << QStringLiteral("--no-lockscreen");
     } else {
         if (qEnvironmentVariableIsSet("KDEWM")) {
-            ksmserverOptions << QStringLiteral("--windowmanager") << qEnvironmentVariable("KDEWM");
+            plasmaSessionOptions << QStringLiteral("--windowmanager") << qEnvironmentVariable("KDEWM");
         }
         if (desktopLockedAtStart) {
-            ksmserverOptions << QStringLiteral("--lockscreen");
+            plasmaSessionOptions << QStringLiteral("--lockscreen");
         }
     }
 
-    const auto exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/plasma_session"), ksmserverOptions);
+    const auto exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/plasma_session"), plasmaSessionOptions);
 
     if (exitCode == 255) {
         // Startup error