diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop
index e6e9ce8fee..961b56a046 100644
--- a/kcmkwin/kwincompositing/kwincompositing.desktop
+++ b/kcmkwin/kwincompositing/kwincompositing.desktop
@@ -8,7 +8,7 @@ X-DocPath=kcontrol/kwincompositing/index.html
 X-KDE-Library=kcm_kwincompositing
 X-KDE-ParentApp=kcontrol
 
-X-KDE-System-Settings-Parent-Category=appearance
+X-KDE-System-Settings-Parent-Category=workspace-appearance-and-behavior
 X-KDE-Weight=50
 
 Name=Desktop Effects
diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop
index c84305c09b..9cc1712c43 100644
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -8,10 +8,10 @@ X-DocPath=kcontrol/kwindecoration/index.html
 X-KDE-Library=kcm_kwindecoration
 X-KDE-ParentApp=kcontrol
 
-X-KDE-System-Settings-Parent-Category=appearance
+X-KDE-System-Settings-Parent-Category=desktop-appearance
 X-KDE-Weight=90
 
-Name=Windows
+Name=Window Decorations
 Name[af]=Vensters
 Name[ar]=النوافذ
 Name[be]=Вокны
diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop
index 8fa77401ac..6725535d6d 100644
--- a/kcmkwin/kwindesktop/desktop.desktop
+++ b/kcmkwin/kwindesktop/desktop.desktop
@@ -8,10 +8,10 @@ Exec=kcmshell4 desktop
 X-KDE-Library=kcm_kwindesktop
 X-KDE-ParentApp=kcontrol
 
-X-KDE-System-Settings-Parent-Category=desktop
+X-KDE-System-Settings-Parent-Category=window-behaviour
 X-KDE-Weight=60
 
-Name=Multiple Desktops
+Name=Virtual Desktops
 Name[af]=Veelvuldige Werkskerms
 Name[ar]=أسطح مكتب متعددة
 Name[be]=Некалькі працоўных сталоў
diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop
index 9bfb15fa28..cf4611bb2c 100644
--- a/kcmkwin/kwinrules/kwinrules.desktop
+++ b/kcmkwin/kwinrules/kwinrules.desktop
@@ -11,7 +11,7 @@ X-KDE-ParentApp=kcontrol
 X-KDE-System-Settings-Parent-Category=window-behaviour
 X-KDE-Weight=120
 
-Name=Window-Specific
+Name=Window Rules
 Name[af]=Vensterspesifike instellings
 Name[ar]=تفضيلات النوافذ
 Name[be]=Настаўленні для асобных вокнаў
diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
index 5643ea8945..07be8fa97f 100644
--- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
+++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
@@ -8,7 +8,7 @@ X-DocPath=kcontrol/kwinscreenedges/index.html
 X-KDE-Library=kcm_kwinscreenedges
 X-KDE-ParentApp=kcontrol
 
-X-KDE-System-Settings-Parent-Category=desktop
+X-KDE-System-Settings-Parent-Category=window-behaviour
 X-KDE-Weight=65
 
 Name=Screen Edges
diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop
index 447cfbdf86..b9da4a8919 100644
--- a/kcmkwin/kwintabbox/kwintabbox.desktop
+++ b/kcmkwin/kwintabbox/kwintabbox.desktop
@@ -10,7 +10,7 @@ X-KDE-ParentApp=kcontrol
 X-KDE-System-Settings-Parent-Category=window-behaviour
 X-KDE-Weight=60
 
-Name=Navigate Through Windows
+Name=Task Switcher
 Name[ca]=Navega per les finestres
 Name[ca@valencia]=Navega per les finestres
 Name[cs]=Navigace okny