diff --git a/kcms/icons/main.cpp b/kcms/icons/main.cpp
--- a/kcms/icons/main.cpp
+++ b/kcms/icons/main.cpp
@@ -81,7 +81,7 @@
     // to be able to access its enums
     qmlRegisterUncreatableType<KIconLoader>("org.kde.private.kcms.icons", 1, 0, "KIconLoader", QString());
 
-    KAboutData* about = new KAboutData(QStringLiteral("kcm_icons"), i18n("Icons"), QStringLiteral("1.0"),
+    KAboutData* about = new KAboutData(QStringLiteral("kcm5_icons"), i18n("Icons"), QStringLiteral("1.0"),
                                        i18n("Icons Control Panel Module"), KAboutLicense::GPL,
                                        i18n("(c) 2000-2003 Geert Jansen"));
     about->addAuthor(i18n("Geert Jansen"), QString(), QStringLiteral("jansen@kde.org"));
diff --git a/kcms/launch/CMakeLists.txt b/kcms/launch/CMakeLists.txt
--- a/kcms/launch/CMakeLists.txt
+++ b/kcms/launch/CMakeLists.txt
@@ -1,5 +1,5 @@
 # KI18N Translation Domain for this library.
-add_definitions(-DTRANSLATION_DOMAIN=\"kcmlaunchfeedback\")
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm_launchfeedback\")
 
 ########### next target ###############
 
diff --git a/kcms/launch/Messages.sh b/kcms/launch/Messages.sh
--- a/kcms/launch/Messages.sh
+++ b/kcms/launch/Messages.sh
@@ -1,2 +1,2 @@
 #! /usr/bin/env bash
-$XGETTEXT `find . -name \*.cpp -o -name \*.qml` -o $podir/kcmlaunchfeedback.pot
+$XGETTEXT `find . -name \*.cpp -o -name \*.qml` -o $podir/kcm_launchfeedback.pot
diff --git a/kcms/translations/CMakeLists.txt b/kcms/translations/CMakeLists.txt
--- a/kcms/translations/CMakeLists.txt
+++ b/kcms/translations/CMakeLists.txt
@@ -2,7 +2,7 @@
 ecm_find_qmlmodule(org.kde.plasma.core 2.0)
 
 # KI18N Translation Domain for this library.
-add_definitions(-DTRANSLATION_DOMAIN=\"kcmtranslations\")
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm_translations\")
 
 ########### next target ###############
 
diff --git a/kcms/translations/Messages.sh b/kcms/translations/Messages.sh
--- a/kcms/translations/Messages.sh
+++ b/kcms/translations/Messages.sh
@@ -1,2 +1,2 @@
 #! /usr/bin/env bash
-$XGETTEXT `find . -name \*.cpp -o -name \*.qml` -o $podir/kcmtranslations.pot
+$XGETTEXT `find . -name \*.cpp -o -name \*.qml` -o $podir/kcm_translations.pot
diff --git a/kcms/workspaceoptions/CMakeLists.txt b/kcms/workspaceoptions/CMakeLists.txt
--- a/kcms/workspaceoptions/CMakeLists.txt
+++ b/kcms/workspaceoptions/CMakeLists.txt
@@ -1,5 +1,5 @@
 # KI18N Translation Domain for this library
-add_definitions(-DTRANSLATION_DOMAIN=\"kcm5_workspace\")
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm_workspace\")
 
 ########### next target ###############
 set(kcm_workspace_SRCS
diff --git a/kcms/workspaceoptions/Messages.sh b/kcms/workspaceoptions/Messages.sh
--- a/kcms/workspaceoptions/Messages.sh
+++ b/kcms/workspaceoptions/Messages.sh
@@ -1,2 +1,2 @@
 #! /usr/bin/env bash
-$XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/kcm5_workspace.pot
+$XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/kcm_workspace.pot