diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7647f3cb6..afb4129b6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,21 +51,21 @@ ${CMAKE_CURRENT_BINARY_DIR}/tests/CTestCustom.cmake)
     # Generate dbus .xml files; do not store .xml in source folder
     qt4_generate_dbus_interface( Session.h org.kde.konsole.Session.xml OPTIONS
  -m)
-    qt4_generate_dbus_interface( ViewManager.h org.kde.konsole.Konsole.xml OPTIONS -s -M)
+    qt4_generate_dbus_interface( ViewManager.h org.kde.konsole.Window.xml OPTIONS -s -M)
 
     qt4_add_dbus_adaptor( sessionadaptors_SRCS
                           ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Session.xml
                           Session.h
                           Konsole::Session )
-    qt4_add_dbus_adaptor( konsoleadaptors_SRCS 
-                          ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Konsole.xml 
+    qt4_add_dbus_adaptor( windowadaptors_SRCS
+                          ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Window.xml
                           ViewManager.h 
                           Konsole::ViewManager )
 
 
     set(konsoleprivate_SRCS
         ${sessionadaptors_SRCS}
-        ${konsoleadaptors_SRCS}
+        ${windowadaptors_SRCS}
         BookmarkHandler.cpp
         ColorScheme.cpp
         ColorSchemeManager.cpp
@@ -111,7 +111,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/tests/CTestCustom.cmake)
         ZModemDialog.cpp
         konsole_wcwidth.cpp
         WindowSystemInfo.cpp
-        ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Konsole.xml
+        ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Window.xml
         ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Session.xml
     )
 
diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
index cb153d5da..32b5c0666 100644
--- a/src/ViewManager.cpp
+++ b/src/ViewManager.cpp
@@ -34,7 +34,7 @@
 #include <KConfigGroup>
 
 // Konsole
-#include <konsoleadaptor.h>
+#include <windowadaptor.h>
 
 #include "ColorScheme.h"
 #include "ColorSchemeManager.h"
@@ -98,7 +98,8 @@ ViewManager::ViewManager(QObject* parent , KActionCollection* collection)
             SLOT(updateViewsForSession(Session*)));
 
     //prepare DBus communication
-    new KonsoleAdaptor(this);
+    new WindowAdaptor(this);
+    // TODO: remove this obsolete and bad name
     QDBusConnection::sessionBus().registerObject(QLatin1String("/Konsole"), this);
 
     _managerId = ++lastManagerId;
diff --git a/src/ViewManager.h b/src/ViewManager.h
index c91f8fd29..341c36671 100644
--- a/src/ViewManager.h
+++ b/src/ViewManager.h
@@ -67,7 +67,7 @@ class ViewSplitter;
 class KONSOLEPRIVATE_EXPORT ViewManager : public QObject
 {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.kde.konsole.Konsole")
+    Q_CLASSINFO("D-Bus Interface", "org.kde.konsole.Window")
 
 public:
     /**