diff --git a/kcontrol/kmetainfo/CMakeLists.txt b/kcontrol/kmetainfo/CMakeLists.txt
index c726d0f0..dc52a9f0 100644
--- a/kcontrol/kmetainfo/CMakeLists.txt
+++ b/kcontrol/kmetainfo/CMakeLists.txt
@@ -1,24 +1,24 @@
 ########### next target ###############
 
-set(kmetainfoconfig_SRCS 
-    kmetainfoconfig.cpp
-    kmetainfoconfig.ui
+set(kcm_kmetainfo_SRCS 
+    kcm_kmetainfo.cpp
+    kcm_kmetainfo.ui
 )
 
-kde4_add_plugin(kcm_kmetainfoconfig ${kmetainfoconfig_SRCS})
+kde4_add_plugin(kcm_kmetainfo ${kcm_kmetainfo_SRCS})
 
-target_link_libraries(kcm_kmetainfoconfig
+target_link_libraries(kcm_kmetainfo
     KDE4::kdeui
     KDE4::kcmutils
     KDE4::kio
 )
 
 install(
-    TARGETS kcm_kmetainfoconfig
+    TARGETS kcm_kmetainfo
     DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 
 install(
-    FILES kcm_kmetainfoconfig.desktop
+    FILES kcm_kmetainfo.desktop
     DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
diff --git a/kcontrol/kmetainfo/Messages.sh b/kcontrol/kmetainfo/Messages.sh
index 2a6cfe0b..78bd47af 100644
--- a/kcontrol/kmetainfo/Messages.sh
+++ b/kcontrol/kmetainfo/Messages.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 $EXTRACTRC *.ui >> rc.cpp || exit 11
-$XGETTEXT *.cpp -o $podir/kcm_kmetainfoconfig.pot
+$XGETTEXT *.cpp -o $podir/kcm_kmetainfo.pot
 rm -f rc.cpp
diff --git a/kcontrol/kmetainfo/kmetainfoconfig.cpp b/kcontrol/kmetainfo/kcm_kmetainfo.cpp
similarity index 97%
rename from kcontrol/kmetainfo/kmetainfoconfig.cpp
rename to kcontrol/kmetainfo/kcm_kmetainfo.cpp
index d4e9268f..e0e9874c 100644
--- a/kcontrol/kmetainfo/kmetainfoconfig.cpp
+++ b/kcontrol/kmetainfo/kcm_kmetainfo.cpp
@@ -16,7 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kmetainfoconfig.h"
+#include "kcm_kmetainfo.h"
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -30,7 +30,7 @@
 #include <kpluginloader.h>
 
 K_PLUGIN_FACTORY(KCMMetaInfoFactory, registerPlugin<KCMMetaInfo>();)
-K_EXPORT_PLUGIN(KCMMetaInfoFactory("kcmmetainfoconfig", "kcm_metainfoconfig"))
+K_EXPORT_PLUGIN(KCMMetaInfoFactory("kcmkmetainfo", "kcm_kmetainfo"))
 
 KCMMetaInfo::KCMMetaInfo(QWidget* parent, const QVariantList& args)
     : KCModule(KCMMetaInfoFactory::componentData(), parent)
@@ -149,4 +149,4 @@ void KCMMetaInfo::loadMetaInfo()
     }
 }
 
-#include "moc_kmetainfoconfig.cpp"
+#include "moc_kcm_kmetainfo.cpp"
diff --git a/kcontrol/kmetainfo/kcm_kmetainfoconfig.desktop b/kcontrol/kmetainfo/kcm_kmetainfo.desktop
similarity index 78%
rename from kcontrol/kmetainfo/kcm_kmetainfoconfig.desktop
rename to kcontrol/kmetainfo/kcm_kmetainfo.desktop
index 803e99b8..c5eeb950 100644
--- a/kcontrol/kmetainfo/kcm_kmetainfoconfig.desktop
+++ b/kcontrol/kmetainfo/kcm_kmetainfo.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
-Exec=kcmshell4 kmetainfoconfig
+Exec=kcmshell4 kmetainfo
 Icon=nepomuk
 Type=Service
 
 X-KDE-ServiceTypes=KCModule
-X-KDE-Library=kcm_kmetainfoconfig
+X-KDE-Library=kcm_kmetainfo
 X-KDE-ParentApp=kcontrol
 X-KDE-System-Settings-Parent-Category=workspace-appearance-and-behavior
 X-KDE-System-Settings-Parent-Category-V2=workspace-appearance-and-behavior
-X-DocPath=kcontrol/kmetainfoconfig/index.html
+X-DocPath=kcontrol/kmetainfo/index.html
 Categories=Qt;KDE;X-KDE-settings-workspace-appearance-and-behavior;
 
 Name=Meta Information
diff --git a/kcontrol/kmetainfo/kmetainfoconfig.h b/kcontrol/kmetainfo/kcm_kmetainfo.h
similarity index 88%
rename from kcontrol/kmetainfo/kmetainfoconfig.h
rename to kcontrol/kmetainfo/kcm_kmetainfo.h
index c992f914..2cc385fa 100644
--- a/kcontrol/kmetainfo/kmetainfoconfig.h
+++ b/kcontrol/kmetainfo/kcm_kmetainfo.h
@@ -16,19 +16,19 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KDEMETAINFO_H
-#define KDEMETAINFO_H
+#ifndef KCM_KMETAINFO_H
+#define KCM_KMETAINFO_H
 
 #include <kcmodule.h>
 
-#include "ui_kmetainfoconfig.h"
+#include "ui_kcm_kmetainfo.h"
 
 /**
  * Control KFileMetaInfo output of KDE applications
  *
  * @author Ivailo Monev (xakepa10@gmail.com)
  */
-class KCMMetaInfo : public KCModule, public Ui_KMetaInfoDialog
+class KCMMetaInfo : public KCModule, public Ui_KMetaInfoWidget
 {
     Q_OBJECT
 public:
@@ -48,4 +48,4 @@ private:
     void loadMetaInfo();
 };
 
-#endif // KDEMETAINFO_H
+#endif // KCM_KMETAINFO_H
diff --git a/kcontrol/kmetainfo/kmetainfoconfig.ui b/kcontrol/kmetainfo/kcm_kmetainfo.ui
similarity index 96%
rename from kcontrol/kmetainfo/kmetainfoconfig.ui
rename to kcontrol/kmetainfo/kcm_kmetainfo.ui
index dcb9e1f8..87c43778 100644
--- a/kcontrol/kmetainfo/kmetainfoconfig.ui
+++ b/kcontrol/kmetainfo/kcm_kmetainfo.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="System"?>
 <ui version="4.0">
- <class>KMetaInfoDialog</class>
- <widget class="QWidget" name="KMetaInfoDialog">
+ <class>KMetaInfoWidget</class>
+ <widget class="QWidget" name="KMetaInfoWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/kcontrol/kpasswdstore/CMakeLists.txt b/kcontrol/kpasswdstore/CMakeLists.txt
index 252eb4fd..63de2e73 100644
--- a/kcontrol/kpasswdstore/CMakeLists.txt
+++ b/kcontrol/kpasswdstore/CMakeLists.txt
@@ -1,23 +1,23 @@
 ########### next target ###############
 
-set(kpasswdstoreconfig_SRCS 
-    kpasswdstoreconfig.cpp
+set(kcm_kpasswdstore_SRCS 
+    kcm_kpasswdstore.cpp
 )
 
-kde4_add_plugin(kcm_kpasswdstoreconfig ${kpasswdstoreconfig_SRCS})
+kde4_add_plugin(kcm_kpasswdstore ${kcm_kpasswdstore_SRCS})
 
-target_link_libraries(kcm_kpasswdstoreconfig
+target_link_libraries(kcm_kpasswdstore
     KDE4::kdeui
     KDE4::kcmutils
     KDE4::kpasswdstore
 )
 
 install(
-    TARGETS kcm_kpasswdstoreconfig
+    TARGETS kcm_kpasswdstore
     DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 
 install(
-    FILES kcm_kpasswdstoreconfig.desktop
+    FILES kcm_kpasswdstore.desktop
     DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
diff --git a/kcontrol/kpasswdstore/Messages.sh b/kcontrol/kpasswdstore/Messages.sh
index 28f2f99d..1805086b 100644
--- a/kcontrol/kpasswdstore/Messages.sh
+++ b/kcontrol/kpasswdstore/Messages.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 $EXTRACTRC *.ui >> rc.cpp || exit 11
-$XGETTEXT *.cpp -o $podir/kcm_kpasswdstoreconfig.pot
+$XGETTEXT *.cpp -o $podir/kcm_kpasswdstore.pot
 rm -f rc.cpp
diff --git a/kcontrol/kpasswdstore/kpasswdstoreconfig.cpp b/kcontrol/kpasswdstore/kcm_kpasswdstore.cpp
similarity index 98%
rename from kcontrol/kpasswdstore/kpasswdstoreconfig.cpp
rename to kcontrol/kpasswdstore/kcm_kpasswdstore.cpp
index 989f9378..bdf5ea2e 100644
--- a/kcontrol/kpasswdstore/kpasswdstoreconfig.cpp
+++ b/kcontrol/kpasswdstore/kcm_kpasswdstore.cpp
@@ -16,7 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kpasswdstoreconfig.h"
+#include "kcm_kpasswdstore.h"
 
 #include <QGroupBox>
 #include <QLabel>
@@ -39,7 +39,7 @@ static const int kpasswdstore_passretries = 3;
 static const qint64 kpasswdstore_passtimeout = 2; // minutes
 
 K_PLUGIN_FACTORY(KCMPasswdStoreFactory, registerPlugin<KCMPasswdStore>();)
-K_EXPORT_PLUGIN(KCMPasswdStoreFactory("kcmpasswdstoreconfig", "kcm_passwdstoreconfig"))
+K_EXPORT_PLUGIN(KCMPasswdStoreFactory("kcmkpasswdstore", "kcm_kpasswdstore"))
 
 KCMPasswdStore::KCMPasswdStore(QWidget* parent, const QVariantList& args)
     : KCModule(KCMPasswdStoreFactory::componentData(), parent),
@@ -265,4 +265,4 @@ void KCMPasswdStore::slotStorePressed()
     );
 }
 
-#include "moc_kpasswdstoreconfig.cpp"
+#include "moc_kcm_kpasswdstore.cpp"
diff --git a/kcontrol/kpasswdstore/kcm_kpasswdstoreconfig.desktop b/kcontrol/kpasswdstore/kcm_kpasswdstore.desktop
similarity index 73%
rename from kcontrol/kpasswdstore/kcm_kpasswdstoreconfig.desktop
rename to kcontrol/kpasswdstore/kcm_kpasswdstore.desktop
index f9388685..87c39963 100644
--- a/kcontrol/kpasswdstore/kcm_kpasswdstoreconfig.desktop
+++ b/kcontrol/kpasswdstore/kcm_kpasswdstore.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
-Exec=kcmshell4 kpasswdstoreconfig
+Exec=kcmshell4 kcm_kpasswdstore
 Icon=preferences-desktop-user-password
 Type=Service
 
 X-KDE-ServiceTypes=KCModule
-X-KDE-Library=kcm_kpasswdstoreconfig
+X-KDE-Library=kcm_kpasswdstore
 X-KDE-ParentApp=kcontrol
 X-KDE-System-Settings-Parent-Category=account-details
 X-KDE-System-Settings-Parent-Category-V2=account-details
-X-DocPath=kcontrol/kpasswdstoreconfig/index.html
+X-DocPath=kcontrol/kpasswdstore/index.html
 Categories=Qt;KDE;
 
 Name=Password Store
diff --git a/kcontrol/kpasswdstore/kpasswdstoreconfig.h b/kcontrol/kpasswdstore/kcm_kpasswdstore.h
similarity index 95%
rename from kcontrol/kpasswdstore/kpasswdstoreconfig.h
rename to kcontrol/kpasswdstore/kcm_kpasswdstore.h
index bb343975..e9190ae0 100644
--- a/kcontrol/kpasswdstore/kpasswdstoreconfig.h
+++ b/kcontrol/kpasswdstore/kcm_kpasswdstore.h
@@ -16,8 +16,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KDEPASSWDSTORE_H
-#define KDEPASSWDSTORE_H
+#ifndef KCM_KPASSWDSTORE_H
+#define KCM_KPASSWDSTORE_H
 
 #include <QComboBox>
 #include <kcmodule.h>
@@ -60,4 +60,4 @@ private:
     KPushButton* m_storebutton;
 };
 
-#endif // KDEPASSWDSTORE_H
+#endif // KCM_KPASSWDSTORE_H
diff --git a/kcontrol/mediaplayer/CMakeLists.txt b/kcontrol/mediaplayer/CMakeLists.txt
index bbed558d..566dc56a 100644
--- a/kcontrol/mediaplayer/CMakeLists.txt
+++ b/kcontrol/mediaplayer/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 ########### next target ###############
 
-kde4_add_plugin(kcm_kmediaplayer kcmplayer.cpp)
+kde4_add_plugin(kcm_kmediaplayer kcm_kmediaplayer.cpp)
 
 target_link_libraries(kcm_kmediaplayer
     KDE4::kio
@@ -13,6 +13,6 @@ install(
     DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 install(
-    FILES kcmplayer.desktop
+    FILES kcm_kmediaplayer.desktop
     DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
diff --git a/kcontrol/mediaplayer/kcmplayer.cpp b/kcontrol/mediaplayer/kcm_kmediaplayer.cpp
similarity index 93%
rename from kcontrol/mediaplayer/kcmplayer.cpp
rename to kcontrol/mediaplayer/kcm_kmediaplayer.cpp
index 9eefac9b..16140a9a 100644
--- a/kcontrol/mediaplayer/kcmplayer.cpp
+++ b/kcontrol/mediaplayer/kcm_kmediaplayer.cpp
@@ -32,7 +32,7 @@
 #include <kservice.h>
 #include <kicon.h>
 
-#include "kcmplayer.h"
+#include "kcm_kmediaplayer.h"
 
 // NOTE: keep in sync with:
 // kdelibs/kutils/kmediaplayer/kmediaplayer.cpp
@@ -166,10 +166,10 @@ void KMediaBox::slotVolume()
 }
 
 
-K_PLUGIN_FACTORY(PlayerFactory, registerPlugin<KCMPlayer>();)
-K_EXPORT_PLUGIN(PlayerFactory("kcmplayer"))
+K_PLUGIN_FACTORY(PlayerFactory, registerPlugin<KCMMediaPlayer>();)
+K_EXPORT_PLUGIN(PlayerFactory("kcmkmediaplayer", "kcm_kmediaplayer"))
 
-KCMPlayer::KCMPlayer(QWidget *parent, const QVariantList &arguments)
+KCMMediaPlayer::KCMMediaPlayer(QWidget *parent, const QVariantList &arguments)
     : KCModule(PlayerFactory::componentData(), parent),
     m_layout(nullptr),
     m_spacer(nullptr)
@@ -180,7 +180,7 @@ KCMPlayer::KCMPlayer(QWidget *parent, const QVariantList &arguments)
     setQuickHelp(i18n("<h1>Media Player</h1> This module allows you to change KDE media player options."));
 
     KAboutData *about = new KAboutData(
-        I18N_NOOP("kcmplayer"), 0,
+        I18N_NOOP("kcmkmediaplayer"), 0,
         ki18n("KDE Media Player Module"),
         "2.0", KLocalizedString(), KAboutData::License_GPL,
         ki18n("Copyright 2016, Ivailo Monev <email>xakepa10@gmail.com</email>")
@@ -192,11 +192,11 @@ KCMPlayer::KCMPlayer(QWidget *parent, const QVariantList &arguments)
     setLayout(m_layout);
 }
 
-KCMPlayer::~KCMPlayer()
+KCMMediaPlayer::~KCMMediaPlayer()
 {
 }
 
-void KCMPlayer::defaults()
+void KCMMediaPlayer::defaults()
 {
     foreach (KMediaBox* mediabox, m_mediaboxes) {
         mediabox->setDefault();
@@ -204,7 +204,7 @@ void KCMPlayer::defaults()
     emit changed(true);
 }
 
-void KCMPlayer::load()
+void KCMMediaPlayer::load()
 {
     qDeleteAll(m_mediaboxes);
     m_mediaboxes.clear();
@@ -260,7 +260,7 @@ void KCMPlayer::load()
     emit changed(false);
 }
 
-void KCMPlayer::save()
+void KCMMediaPlayer::save()
 {
     KSettings ksettings("kmediaplayer", KSettings::FullConfig);
     foreach (const KMediaBox* mediabox, m_mediaboxes) {
@@ -272,10 +272,10 @@ void KCMPlayer::save()
     emit changed(false);
 }
 
-void KCMPlayer::slotMediaChanged()
+void KCMMediaPlayer::slotMediaChanged()
 {
     emit changed(true);
 }
 
-#include "moc_kcmplayer.cpp"
-#include "kcmplayer.moc"
+#include "moc_kcm_kmediaplayer.cpp"
+#include "kcm_kmediaplayer.moc"
diff --git a/kcontrol/mediaplayer/kcmplayer.desktop b/kcontrol/mediaplayer/kcm_kmediaplayer.desktop
similarity index 100%
rename from kcontrol/mediaplayer/kcmplayer.desktop
rename to kcontrol/mediaplayer/kcm_kmediaplayer.desktop
diff --git a/kcontrol/mediaplayer/kcmplayer.h b/kcontrol/mediaplayer/kcm_kmediaplayer.h
similarity index 84%
rename from kcontrol/mediaplayer/kcmplayer.h
rename to kcontrol/mediaplayer/kcm_kmediaplayer.h
index d5e5ed84..c8b278b9 100644
--- a/kcontrol/mediaplayer/kcmplayer.h
+++ b/kcontrol/mediaplayer/kcm_kmediaplayer.h
@@ -16,8 +16,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KCMPLAYER_H
-#define KCMPLAYER_H
+#ifndef KCM_KMEDIAPLAYER_H
+#define KCM_KMEDIAPLAYER_H
 
 #include <QVBoxLayout>
 #include <QSpacerItem>
@@ -28,13 +28,13 @@
 
 class KMediaBox;
 
-class KCMPlayer : public KCModule
+class KCMMediaPlayer : public KCModule
 {
     Q_OBJECT
 
 public:
-    KCMPlayer(QWidget *parent, const QVariantList &arguments);
-    ~KCMPlayer();
+    KCMMediaPlayer(QWidget *parent, const QVariantList &arguments);
+    ~KCMMediaPlayer();
 
 public slots:
     void defaults();
@@ -49,4 +49,4 @@ private:
     QList<KMediaBox*> m_mediaboxes;
 };
 
-#endif // KCMPLAYER_H
+#endif // KCM_KMEDIAPLAYER_H
diff --git a/kfreespace/kcm/CMakeLists.txt b/kfreespace/kcm/CMakeLists.txt
index b873d38c..3eb6d1f4 100644
--- a/kfreespace/kcm/CMakeLists.txt
+++ b/kfreespace/kcm/CMakeLists.txt
@@ -1,23 +1,23 @@
 ########### next target ###############
 
-set(kfreespaceconfig_SRCS 
-    kfreespaceconfig.cpp
+set(kcm_kfreespace_SRCS 
+    kcm_kfreespace.cpp
 )
 
-kde4_add_plugin(kcm_kfreespaceconfig ${kfreespaceconfig_SRCS})
+kde4_add_plugin(kcm_kfreespace ${kcm_kfreespace_SRCS})
 
-target_link_libraries(kcm_kfreespaceconfig
+target_link_libraries(kcm_kfreespace
     KDE4::kdeui
     KDE4::kcmutils
     KDE4::solid
 )
 
 install(
-    TARGETS kcm_kfreespaceconfig
+    TARGETS kcm_kfreespace
     DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 
 install(
-    FILES kcm_kfreespaceconfig.desktop
+    FILES kcm_kfreespace.desktop
     DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
diff --git a/kfreespace/kcm/kfreespaceconfig.cpp b/kfreespace/kcm/kcm_kfreespace.cpp
similarity index 97%
rename from kfreespace/kcm/kfreespaceconfig.cpp
rename to kfreespace/kcm/kcm_kfreespace.cpp
index d6b288c8..2faa801e 100644
--- a/kfreespace/kcm/kfreespaceconfig.cpp
+++ b/kfreespace/kcm/kcm_kfreespace.cpp
@@ -16,7 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kfreespaceconfig.h"
+#include "kcm_kfreespace.h"
 #include "kfreespace.h"
 
 #include <QGroupBox>
@@ -159,7 +159,7 @@ void KFreeSpaceBox::slotFreeSpace()
 
 
 K_PLUGIN_FACTORY(KCMFreeSpaceFactory, registerPlugin<KCMFreeSpace>();)
-K_EXPORT_PLUGIN(KCMFreeSpaceFactory("kcmfreespaceconfig", "kcm_freespaceconfig"))
+K_EXPORT_PLUGIN(KCMFreeSpaceFactory("kcmkfreespace", "kcm_kfreespace"))
 
 KCMFreeSpace::KCMFreeSpace(QWidget *parent, const QVariantList &args)
     : KCModule(KCMFreeSpaceFactory::componentData(), parent),
@@ -173,7 +173,7 @@ KCMFreeSpace::KCMFreeSpace(QWidget *parent, const QVariantList &args)
     setQuickHelp(i18n("<h1>Free Space Notifier</h1> This module allows you to change KDE free space notifier options."));
 
     KAboutData *about = new KAboutData(
-        I18N_NOOP("kcmfreespaceconfig"), 0,
+        I18N_NOOP("kcmkfreespace"), 0,
         ki18n("KDE Free Space Notifier Module"),
         0, KLocalizedString(), KAboutData::License_GPL,
         ki18n("Copyright 2023, Ivailo Monev <email>xakepa10@gmail.com</email>")
@@ -277,5 +277,5 @@ void KCMFreeSpace::slotDeviceChanged()
     emit changed(true);
 }
 
-#include "moc_kfreespaceconfig.cpp"
-#include "kfreespaceconfig.moc"
+#include "moc_kcm_kfreespace.cpp"
+#include "kcm_kfreespace.moc"
diff --git a/kfreespace/kcm/kcm_kfreespaceconfig.desktop b/kfreespace/kcm/kcm_kfreespace.desktop
similarity index 75%
rename from kfreespace/kcm/kcm_kfreespaceconfig.desktop
rename to kfreespace/kcm/kcm_kfreespace.desktop
index 6c41ca2e..100244fc 100644
--- a/kfreespace/kcm/kcm_kfreespaceconfig.desktop
+++ b/kfreespace/kcm/kcm_kfreespace.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
-Exec=kcmshell4 kfreespaceconfig
+Exec=kcmshell4 kfreespace
 Icon=drive-harddisk
 Type=Service
 
 X-KDE-ServiceTypes=KCModule
-X-KDE-Library=kcm_kfreespaceconfig
+X-KDE-Library=kcm_kfreespace
 X-KDE-ParentApp=kcontrol
 X-KDE-System-Settings-Parent-Category=hardware
 X-KDE-System-Settings-Parent-Category-V2=hardware
-X-DocPath=kcontrol/kfreespaceconfig/index.html
+X-DocPath=kcontrol/kfreespace/index.html
 Categories=Qt;KDE;X-KDE-settings-hardware;
 
 Name=Free Space Notifier
diff --git a/kfreespace/kcm/kfreespaceconfig.h b/kfreespace/kcm/kcm_kfreespace.h
similarity index 94%
rename from kfreespace/kcm/kfreespaceconfig.h
rename to kfreespace/kcm/kcm_kfreespace.h
index 1621ff52..16f33908 100644
--- a/kfreespace/kcm/kfreespaceconfig.h
+++ b/kfreespace/kcm/kcm_kfreespace.h
@@ -16,8 +16,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KFREESPACECONFIG_H
-#define KFREESPACECONFIG_H
+#ifndef KCM_KFREESPACE_H
+#define KCM_KFREESPACE_H
 
 #include <QWidget>
 #include <QVBoxLayout>
@@ -55,4 +55,4 @@ private:
     QList<KFreeSpaceBox*> m_deviceboxes;
 };
 
-#endif // KFREESPACECONFIG_H
+#endif // KCM_KFREESPACE_H
diff --git a/kgreeter/kcm/CMakeLists.txt b/kgreeter/kcm/CMakeLists.txt
index f9826b6d..654a8b62 100644
--- a/kgreeter/kcm/CMakeLists.txt
+++ b/kgreeter/kcm/CMakeLists.txt
@@ -1,25 +1,25 @@
 ########### next target ###############
 
-set(kgreeterconfig_SRCS 
-    kgreeterconfig.cpp
-    kgreeterconfig.ui
+set(kcm_kgreeter_SRCS 
+    kcm_kgreeter.cpp
+    kcm_kgreeter.ui
 )
 
-kde4_add_plugin(kcm_kgreeterconfig ${kgreeterconfig_SRCS})
+kde4_add_plugin(kcm_kgreeter ${kcm_kgreeter_SRCS})
 
-target_link_libraries(kcm_kgreeterconfig
+target_link_libraries(kcm_kgreeter
     KDE4::kdeui
     KDE4::kcmutils
     KDE4::plasma
 )
 
 install(
-    TARGETS kcm_kgreeterconfig
+    TARGETS kcm_kgreeter
     DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 )
 
 install(
-    FILES kcm_kgreeterconfig.desktop
+    FILES kcm_kgreeter.desktop
     DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
 )
 
diff --git a/kgreeter/kcm/kgreeterconfig.cpp b/kgreeter/kcm/kcm_kgreeter.cpp
similarity index 98%
rename from kgreeter/kcm/kgreeterconfig.cpp
rename to kgreeter/kcm/kcm_kgreeter.cpp
index adac1948..99ddf5a1 100644
--- a/kgreeter/kcm/kgreeterconfig.cpp
+++ b/kgreeter/kcm/kcm_kgreeter.cpp
@@ -16,7 +16,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kgreeterconfig.h"
+#include "kcm_kgreeter.h"
 #include "kgreeter.h"
 
 #include <QSettings>
@@ -37,7 +37,7 @@
 #include "config-workspace.h"
 
 K_PLUGIN_FACTORY(KCMGreeterFactory, registerPlugin<KCMGreeter>();)
-K_EXPORT_PLUGIN(KCMGreeterFactory("kcmgreeterconfig", "kcm_greeterconfig"))
+K_EXPORT_PLUGIN(KCMGreeterFactory("kcmkgreeter", "kcm_kgreeter"))
 
 KCMGreeter::KCMGreeter(QWidget* parent, const QVariantList& args)
     : KCModule(KCMGreeterFactory::componentData(), parent),
@@ -339,4 +339,4 @@ void KCMGreeter::setProcessRunning(const bool running)
     }
 }
 
-#include "moc_kgreeterconfig.cpp"
+#include "moc_kcm_kgreeter.cpp"
diff --git a/kgreeter/kcm/kcm_kgreeterconfig.desktop b/kgreeter/kcm/kcm_kgreeter.desktop
similarity index 78%
rename from kgreeter/kcm/kcm_kgreeterconfig.desktop
rename to kgreeter/kcm/kcm_kgreeter.desktop
index 1af62199..56c6746d 100644
--- a/kgreeter/kcm/kcm_kgreeterconfig.desktop
+++ b/kgreeter/kcm/kcm_kgreeter.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
-Exec=kcmshell4 kgreeterconfig
+Exec=kcmshell4 kcm_kgreeter
 Icon=preferences-system-login
 Type=Service
 
 X-KDE-ServiceTypes=KCModule
-X-KDE-Library=kcm_kgreeterconfig
+X-KDE-Library=kcm_kgreeter
 X-KDE-ParentApp=kcontrol
 X-KDE-System-Settings-Parent-Category=workspace-appearance-and-behavior
 X-KDE-System-Settings-Parent-Category-V2=workspace-appearance-and-behavior
-X-DocPath=kcontrol/kgreeterconfig/index.html
+X-DocPath=kcontrol/kgreeter/index.html
 Categories=Qt;KDE;X-KDE-settings-workspace-appearance-and-behavior;
 
 Name=Greeter
diff --git a/kgreeter/kcm/kgreeterconfig.h b/kgreeter/kcm/kcm_kgreeter.h
similarity index 92%
rename from kgreeter/kcm/kgreeterconfig.h
rename to kgreeter/kcm/kcm_kgreeter.h
index 2a3a4f01..c6e4834c 100644
--- a/kgreeter/kcm/kgreeterconfig.h
+++ b/kgreeter/kcm/kcm_kgreeter.h
@@ -16,21 +16,21 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KGREETERCONFIG_H
-#define KGREETERCONFIG_H
+#ifndef KCM_KGREETER_H
+#define KCM_KGREETER_H
 
 #include <QFont>
 #include <QProcess>
 #include <kcmodule.h>
 
-#include "ui_kgreeterconfig.h"
+#include "ui_kcm_kgreeter.h"
 
 /**
  * Control look of KDE greeter
  *
  * @author Ivailo Monev (xakepa10@gmail.com)
  */
-class KCMGreeter : public KCModule, public Ui_KGreeterDialog
+class KCMGreeter : public KCModule, public Ui_KGreeterWidget
 {
     Q_OBJECT
 public:
@@ -69,4 +69,4 @@ private:
     bool m_changed;
 };
 
-#endif // KGREETERCONFIG_H
+#endif // KCM_KGREETER_H
diff --git a/kgreeter/kcm/kgreeterconfig.ui b/kgreeter/kcm/kcm_kgreeter.ui
similarity index 98%
rename from kgreeter/kcm/kgreeterconfig.ui
rename to kgreeter/kcm/kcm_kgreeter.ui
index 58135046..eb97dbb4 100644
--- a/kgreeter/kcm/kgreeterconfig.ui
+++ b/kgreeter/kcm/kcm_kgreeter.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="System"?>
 <ui version="4.0">
- <class>KGreeterDialog</class>
- <widget class="QWidget" name="KGreeterDialog">
+ <class>KGreeterWidget</class>
+ <widget class="QWidget" name="KGreeterWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/kioslave/thumbnail/CMakeLists.txt b/kioslave/thumbnail/CMakeLists.txt
index 8b16e254..ab77b9ec 100644
--- a/kioslave/thumbnail/CMakeLists.txt
+++ b/kioslave/thumbnail/CMakeLists.txt
@@ -1,36 +1,23 @@
 ########### next target ###############
 
 set(kio_thumbnail_PART_SRCS thumbnail.cpp)
-
 add_executable(kio_thumbnail ${kio_thumbnail_PART_SRCS})
-
 target_link_libraries(kio_thumbnail KDE4::kio KDE4::kdeui)
-
 install(TARGETS kio_thumbnail DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR})
 
 ########### next target ###############
 
 set(imagethumbnail_PART_SRCS imagecreator.cpp)
-
 kde4_add_kcfg_files(imagethumbnail_PART_SRCS imagecreatorsettings.kcfgc)
 kde4_add_plugin(imagethumbnail ${imagethumbnail_PART_SRCS})
-
 target_link_libraries(imagethumbnail KDE4::kio KDE4::kexiv2)
-
 install(TARGETS imagethumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
 ########### next target ###############
 
-install( FILES directorythumbnail.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
-
-########### next target ###############
-
 set(textthumbnail_PART_SRCS textcreator.cpp)
-
 kde4_add_plugin(textthumbnail ${textthumbnail_PART_SRCS})
-
 target_link_libraries(textthumbnail KDE4::kio)
-
 install(TARGETS textthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
 ########### next target ###############
@@ -39,11 +26,8 @@ if(DJVULIBRE_FOUND)
     include_directories(${DJVULIBRE_INCLUDE_DIR})
 
     set(djvuthumbnail_PART_SRCS djvucreator.cpp)
-
     kde4_add_plugin(djvuthumbnail ${djvuthumbnail_PART_SRCS})
-
     target_link_libraries(djvuthumbnail KDE4::kio ${DJVULIBRE_LIBRARY})
-
     install(TARGETS djvuthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
     install(FILES djvuthumbnail.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
 endif()
@@ -52,11 +36,8 @@ endif()
 
 if(X11_Xcursor_FOUND)
     set(cursorthumbnail_PART_SRCS cursorcreator.cpp)
-
     kde4_add_plugin(cursorthumbnail ${cursorthumbnail_PART_SRCS})
-
     target_link_libraries(cursorthumbnail ${X11_Xcursor_LIB} KDE4::kio)
-
     install(TARGETS cursorthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
     install(FILES cursorthumbnail.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
 endif()
@@ -64,7 +45,6 @@ endif()
 ########### next target ###############
 
 set(windowsexethumbnail_SRCS windowsexecreator.cpp)
-
 kde4_add_plugin(windowsexethumbnail ${windowsexethumbnail_SRCS})
 target_link_libraries( windowsexethumbnail KDE4::kio )
 install(TARGETS windowsexethumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} )
@@ -82,10 +62,8 @@ if(EPUB_FOUND)
     include_directories(${EPUB_INCLUDE_DIR})
 
     set(epubthumbnail_SRCS epubthumbnail.cpp)
-
     kde4_add_plugin(epubthumbnail ${epubthumbnail_SRCS})
     target_link_libraries(epubthumbnail KDE4::kio ${EPUB_LIBRARIES})
-
     install(TARGETS epubthumbnail DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
     install(FILES epubthumbnail.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
 endif()
@@ -100,6 +78,7 @@ install(
 install(
     FILES
     thumbnail.protocol
+    directorythumbnail.desktop
     imagethumbnail.desktop
     textthumbnail.desktop
     desktopthumbnail.desktop
diff --git a/kmediaplayer/kmediawindow.cpp b/kmediaplayer/kmediawindow.cpp
index b8c6eb14..69a95415 100644
--- a/kmediaplayer/kmediawindow.cpp
+++ b/kmediaplayer/kmediawindow.cpp
@@ -226,7 +226,7 @@ void KMediaWindow::slotClosePath()
 void KMediaWindow::slotConfigure()
 {
     KCMultiDialog kcmdialg(this);
-    kcmdialg.addModule("kcmplayer");
+    kcmdialg.addModule("kcmkmediaplayer");
     kcmdialg.exec();
 }