diff --git a/src/effects/desktopgrid/qml/DesktopView.qml b/src/effects/desktopgrid/qml/DesktopView.qml
index 4fb48ff1a5..2f10f63b56 100644
--- a/src/effects/desktopgrid/qml/DesktopView.qml
+++ b/src/effects/desktopgrid/qml/DesktopView.qml
@@ -73,7 +73,7 @@ FocusScope {
             windowType: KWinComponents.WindowFilterModel.Dock | KWinComponents.WindowFilterModel.Desktop
         }
 
-        KWinComponents.WindowThumbnailItem {
+        KWinComponents.WindowThumbnail {
             wId: model.window.internalId
             x: model.window.x - targetScreen.geometry.x
             y: model.window.y - targetScreen.geometry.y
diff --git a/src/effects/overview/qml/DesktopView.qml b/src/effects/overview/qml/DesktopView.qml
index 21984d59e7..08d329fe59 100644
--- a/src/effects/overview/qml/DesktopView.qml
+++ b/src/effects/overview/qml/DesktopView.qml
@@ -21,7 +21,7 @@ Item {
             windowModel: desktopView.windowModel
         }
 
-        KWinComponents.WindowThumbnailItem {
+        KWinComponents.WindowThumbnail {
             wId: model.window.internalId
             x: model.window.x - targetScreen.geometry.x
             y: model.window.y - targetScreen.geometry.y
diff --git a/src/effects/overview/qml/ScreenView.qml b/src/effects/overview/qml/ScreenView.qml
index 4463f64b35..c2a8d0afa9 100644
--- a/src/effects/overview/qml/ScreenView.qml
+++ b/src/effects/overview/qml/ScreenView.qml
@@ -74,7 +74,7 @@ FocusScope {
         }
     }
 
-    KWinComponents.DesktopBackgroundItem {
+    KWinComponents.DesktopBackground {
         id: backgroundItem
         activity: KWinComponents.Workspace.currentActivity
         desktop: KWinComponents.Workspace.currentDesktop
@@ -301,7 +301,7 @@ FocusScope {
             windowType: KWinComponents.WindowFilterModel.Dock
         }
 
-        KWinComponents.WindowThumbnailItem {
+        KWinComponents.WindowThumbnail {
             id: windowThumbnail
             visible: !model.window.hidden && opacity > 0
             wId: model.window.internalId
diff --git a/src/effects/private/qml/WindowHeap.qml b/src/effects/private/qml/WindowHeap.qml
index e29d49b8e2..7cd2db3c35 100644
--- a/src/effects/private/qml/WindowHeap.qml
+++ b/src/effects/private/qml/WindowHeap.qml
@@ -74,10 +74,10 @@ FocusScope {
         delete dndManagerStore[key];
     }
 
-    KWinComponents.WindowThumbnailItem {
+    KWinComponents.WindowThumbnail {
         id: otherScreenThumbnail
         z: 2
-        property KWinComponents.WindowThumbnailItem cloneOf
+        property KWinComponents.WindowThumbnail cloneOf
         visible: false
         client: cloneOf ? cloneOf.client : null
         width: cloneOf ? cloneOf.width : 0
diff --git a/src/effects/private/qml/WindowHeapDelegate.qml b/src/effects/private/qml/WindowHeapDelegate.qml
index e0c0b9f99a..2371b16bb3 100644
--- a/src/effects/private/qml/WindowHeapDelegate.qml
+++ b/src/effects/private/qml/WindowHeapDelegate.qml
@@ -89,7 +89,7 @@ Item {
     TweenBehavior on width {}
     TweenBehavior on height {}
 
-    KWinComponents.WindowThumbnailItem {
+    KWinComponents.WindowThumbnail {
         id: thumbSource
         wId: thumb.window.internalId
 
diff --git a/src/effects/tileseditor/qml/main.qml b/src/effects/tileseditor/qml/main.qml
index 75167e98f2..a53fff3168 100644
--- a/src/effects/tileseditor/qml/main.qml
+++ b/src/effects/tileseditor/qml/main.qml
@@ -58,7 +58,7 @@ FocusScope {
                 windowModel: KWinComponents.WindowModel {}
             }
 
-            KWinComponents.WindowThumbnailItem {
+            KWinComponents.WindowThumbnail {
                 wId: model.window.internalId
                 x: model.window.x - targetScreen.geometry.x
                 y: model.window.y - targetScreen.geometry.y
diff --git a/src/effects/windowview/qml/main.qml b/src/effects/windowview/qml/main.qml
index caefb04506..2f52c2bdb9 100644
--- a/src/effects/windowview/qml/main.qml
+++ b/src/effects/windowview/qml/main.qml
@@ -62,7 +62,7 @@ Item {
         }
     }
 
-    KWinComponents.DesktopBackgroundItem {
+    KWinComponents.DesktopBackground {
         activity: KWinComponents.Workspace.currentActivity
         desktop: KWinComponents.Workspace.currentDesktop
         outputName: targetScreen.name
@@ -225,7 +225,7 @@ Item {
             windowType: KWinComponents.WindowFilterModel.Dock
         }
 
-        KWinComponents.WindowThumbnailItem {
+        KWinComponents.WindowThumbnail {
             id: windowThumbnail
             wId: model.window.internalId
             x: model.window.x - targetScreen.geometry.x
diff --git a/src/kcms/tabbox/layoutpreview.cpp b/src/kcms/tabbox/layoutpreview.cpp
index eb62c9bce9..5a94dd9a5d 100644
--- a/src/kcms/tabbox/layoutpreview.cpp
+++ b/src/kcms/tabbox/layoutpreview.cpp
@@ -31,7 +31,7 @@ LayoutPreview::LayoutPreview(const QString &path, bool showDesktopThumbnail, QOb
 {
     QQmlEngine *engine = new QQmlEngine(this);
     QQmlComponent *component = new QQmlComponent(engine, this);
-    qmlRegisterType<WindowThumbnailItem>("org.kde.kwin", 3, 0, "WindowThumbnailItem");
+    qmlRegisterType<WindowThumbnailItem>("org.kde.kwin", 3, 0, "WindowThumbnail");
     qmlRegisterType<SwitcherItem>("org.kde.kwin", 3, 0, "TabBoxSwitcher");
     qmlRegisterAnonymousType<QAbstractItemModel>("org.kde.kwin", 3);
     component->loadUrl(QUrl::fromLocalFile(path));
diff --git a/src/scripting/scripting.cpp b/src/scripting/scripting.cpp
index ef21bf1591..5374c8aa6a 100644
--- a/src/scripting/scripting.cpp
+++ b/src/scripting/scripting.cpp
@@ -673,8 +673,8 @@ KWin::Scripting::Scripting(QObject *parent)
 
 void KWin::Scripting::init()
 {
-    qmlRegisterType<DesktopBackgroundItem>("org.kde.kwin", 3, 0, "DesktopBackgroundItem");
-    qmlRegisterType<WindowThumbnailItem>("org.kde.kwin", 3, 0, "WindowThumbnailItem");
+    qmlRegisterType<DesktopBackgroundItem>("org.kde.kwin", 3, 0, "DesktopBackground");
+    qmlRegisterType<WindowThumbnailItem>("org.kde.kwin", 3, 0, "WindowThumbnail");
     qmlRegisterType<DBusCall>("org.kde.kwin", 3, 0, "DBusCall");
     qmlRegisterType<ScreenEdgeItem>("org.kde.kwin", 3, 0, "ScreenEdgeItem");
     qmlRegisterType<WindowModel>("org.kde.kwin", 3, 0, "WindowModel");