Rename QWaylandExtension to QWaylandCompositorExtension

Since we have QWaylandClientExtension

Change-Id: Ie8d60322c8e730bda651e06ed5db0fe1359d946e
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>

36 files changed, 154 insertions, 154 deletions

diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h
index c03bcc5d1..9b4452395 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.h
+++ b/src/compositor/compositor_api/qwaylandcompositor.h
@@ -38,7 +38,7 @@
 #define QWAYLANDCOMPOSITOR_H
 
 #include <QtWaylandCompositor/qwaylandexport.h>
-#include <QtWaylandCompositor/qwaylandextension.h>
+#include <QtWaylandCompositor/qwaylandcompositorextension.h>
 #include <QtWaylandCompositor/QWaylandOutput>
 
 #include <QObject>
diff --git a/src/compositor/compositor_api/qwaylandinput.h b/src/compositor/compositor_api/qwaylandinput.h
index 7384e1e5a..d1cb922b7 100644
--- a/src/compositor/compositor_api/qwaylandinput.h
+++ b/src/compositor/compositor_api/qwaylandinput.h
@@ -42,7 +42,7 @@
 #include <QtCore/QString>
 
 #include <QtWaylandCompositor/qwaylandexport.h>
-#include <QtWaylandCompositor/qwaylandextension.h>
+#include <QtWaylandCompositor/qwaylandcompositorextension.h>
 #include <QtWaylandCompositor/qwaylandkeyboard.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.h b/src/compositor/compositor_api/qwaylandkeyboard.h
index e327cd3d6..cee32f4e4 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.h
+++ b/src/compositor/compositor_api/qwaylandkeyboard.h
@@ -40,7 +40,7 @@
 
 #include <QtCore/QObject>
 
-#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandCompositorExtension>
 #include <QtWaylandCompositor/QWaylandSurface>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h
index 46c5ff97f..e4cbb6109 100644
--- a/src/compositor/compositor_api/qwaylandoutput.h
+++ b/src/compositor/compositor_api/qwaylandoutput.h
@@ -38,7 +38,7 @@
 #ifndef QWAYLANDOUTPUT_H
 #define QWAYLANDOUTPUT_H
 
-#include <QtWaylandCompositor/qwaylandextension.h>
+#include <QtWaylandCompositor/qwaylandcompositorextension.h>
 #include <QtCore/QObject>
 
 #include <QObject>
diff --git a/src/compositor/compositor_api/qwaylandpointer.h b/src/compositor/compositor_api/qwaylandpointer.h
index 6aa31bd51..2032b9a26 100644
--- a/src/compositor/compositor_api/qwaylandpointer.h
+++ b/src/compositor/compositor_api/qwaylandpointer.h
@@ -37,7 +37,7 @@
 #ifndef QWAYLANDPOINTER_H
 #define QWAYLANDPOINTER_H
 
-#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandCompositorExtension>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/compositor/compositor_api/qwaylandsurface.h b/src/compositor/compositor_api/qwaylandsurface.h
index 4abe9e741..816b5c987 100644
--- a/src/compositor/compositor_api/qwaylandsurface.h
+++ b/src/compositor/compositor_api/qwaylandsurface.h
@@ -39,7 +39,7 @@
 #define QWAYLANDSURFACE_H
 
 #include <QtWaylandCompositor/qwaylandexport.h>
-#include <QtWaylandCompositor/qwaylandextension.h>
+#include <QtWaylandCompositor/qwaylandcompositorextension.h>
 #include <QtWaylandCompositor/qwaylandclient.h>
 
 #include <QtCore/QScopedPointer>
diff --git a/src/compositor/compositor_api/qwaylandtouch.h b/src/compositor/compositor_api/qwaylandtouch.h
index 9c235e4cd..b93b6d21d 100644
--- a/src/compositor/compositor_api/qwaylandtouch.h
+++ b/src/compositor/compositor_api/qwaylandtouch.h
@@ -37,7 +37,7 @@
 #ifndef QWAYLANDTOUCH_H
 #define QWAYLANDTOUCH_H
 
-#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandCompositorExtension>
 
 #include <QtCore/QObject>
 #include <QtGui/QTouchEvent>
diff --git a/src/compositor/extensions/qwaylandquickwlshellsurfaceitem.h b/src/compositor/extensions/qwaylandquickwlshellsurfaceitem.h
index 0b24e43a5..b456b95fb 100644
--- a/src/compositor/extensions/qwaylandquickwlshellsurfaceitem.h
+++ b/src/compositor/extensions/qwaylandquickwlshellsurfaceitem.h
@@ -37,7 +37,7 @@
 #ifndef QWAYLANDQUICKWLSHELLSURFACEITEM_H
 #define QWAYLANDQUICKWLSHELLSURFACEITEM_H
 
-#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandCompositorExtension>
 #include <QtWaylandCompositor/QWaylandQuickItem>
 #include <QtWaylandCompositor/QWaylandWlShellSurface>
 
diff --git a/src/compositor/extensions/qwaylandtextinput.cpp b/src/compositor/extensions/qwaylandtextinput.cpp
index 5ec203c13..3ac960245 100644
--- a/src/compositor/extensions/qwaylandtextinput.cpp
+++ b/src/compositor/extensions/qwaylandtextinput.cpp
@@ -118,7 +118,7 @@ Qt::InputMethodQueries QWaylandTextInputClientState::mergeChanged(const QWayland
 }
 
 QWaylandTextInputPrivate::QWaylandTextInputPrivate(QWaylandCompositor *compositor)
-    : QWaylandExtensionTemplatePrivate()
+    : QWaylandCompositorExtensionTemplatePrivate()
     , QtWaylandServer::zwp_text_input_v2()
     , compositor(compositor)
     , focus(nullptr)
@@ -507,7 +507,7 @@ void QWaylandTextInputPrivate::zwp_text_input_v2_set_surrounding_text(Resource *
 }
 
 QWaylandTextInput::QWaylandTextInput(QWaylandObject *container, QWaylandCompositor *compositor)
-    : QWaylandExtensionTemplate(container, *new QWaylandTextInputPrivate(compositor))
+    : QWaylandCompositorExtensionTemplate(container, *new QWaylandTextInputPrivate(compositor))
 {
     connect(&d_func()->focusDestroyListener, &QWaylandDestroyListener::fired,
             this, &QWaylandTextInput::focusSurfaceDestroyed);
diff --git a/src/compositor/extensions/qwaylandtextinput.h b/src/compositor/extensions/qwaylandtextinput.h
index ef289f1b5..f050ab1c3 100644
--- a/src/compositor/extensions/qwaylandtextinput.h
+++ b/src/compositor/extensions/qwaylandtextinput.h
@@ -37,7 +37,7 @@
 #ifndef QWAYLANDTEXTINPUT_H
 #define QWAYLANDTEXTINPUT_H
 
-#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandCompositorExtension>
 
 struct wl_client;
 
@@ -49,7 +49,7 @@ class QInputMethodEvent;
 class QKeyEvent;
 class QWaylandSurface;
 
-class QWaylandTextInput : public QWaylandExtensionTemplate<QWaylandTextInput>
+class QWaylandTextInput : public QWaylandCompositorExtensionTemplate<QWaylandTextInput>
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandTextInput)
diff --git a/src/compositor/extensions/qwaylandtextinput_p.h b/src/compositor/extensions/qwaylandtextinput_p.h
index 79706a7e2..aeba77b05 100644
--- a/src/compositor/extensions/qwaylandtextinput_p.h
+++ b/src/compositor/extensions/qwaylandtextinput_p.h
@@ -37,7 +37,7 @@
 #ifndef QWAYLANDTEXTINPUT_P_H
 #define QWAYLANDTEXTINPUT_P_H
 
-#include <QtWaylandCompositor/private/qwaylandextension_p.h>
+#include <QtWaylandCompositor/private/qwaylandcompositorextension_p.h>
 #include <QtWaylandCompositor/private/qwayland-server-text-input-unstable-v2.h>
 #include <QtWaylandCompositor/QWaylandDestroyListener>
 
@@ -83,7 +83,7 @@ public:
     Qt::InputMethodQueries changedState;
 };
 
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTextInputPrivate : public QWaylandExtensionTemplatePrivate, public QtWaylandServer::zwp_text_input_v2
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTextInputPrivate : public QWaylandCompositorExtensionTemplatePrivate, public QtWaylandServer::zwp_text_input_v2
 {
     Q_DECLARE_PUBLIC(QWaylandTextInput)
 public:
diff --git a/src/compositor/extensions/qwaylandtextinputmanager.cpp b/src/compositor/extensions/qwaylandtextinputmanager.cpp
index 62e8ac88c..61cd28fc6 100644
--- a/src/compositor/extensions/qwaylandtextinputmanager.cpp
+++ b/src/compositor/extensions/qwaylandtextinputmanager.cpp
@@ -45,7 +45,7 @@
 QT_BEGIN_NAMESPACE
 
 QWaylandTextInputManagerPrivate::QWaylandTextInputManagerPrivate()
-    : QWaylandExtensionTemplatePrivate()
+    : QWaylandCompositorExtensionTemplatePrivate()
     , QtWaylandServer::zwp_text_input_manager_v2()
 {
 }
@@ -63,12 +63,12 @@ void QWaylandTextInputManagerPrivate::zwp_text_input_manager_v2_get_text_input(R
 }
 
 QWaylandTextInputManager::QWaylandTextInputManager()
-    : QWaylandExtensionTemplate<QWaylandTextInputManager>(*new QWaylandTextInputManagerPrivate)
+    : QWaylandCompositorExtensionTemplate<QWaylandTextInputManager>(*new QWaylandTextInputManagerPrivate)
 {
 }
 
 QWaylandTextInputManager::QWaylandTextInputManager(QWaylandCompositor *compositor)
-    : QWaylandExtensionTemplate<QWaylandTextInputManager>(compositor, *new QWaylandTextInputManagerPrivate)
+    : QWaylandCompositorExtensionTemplate<QWaylandTextInputManager>(compositor, *new QWaylandTextInputManagerPrivate)
 {
 }
 
@@ -76,7 +76,7 @@ void QWaylandTextInputManager::initialize()
 {
     Q_D(QWaylandTextInputManager);
 
-    QWaylandExtensionTemplate::initialize();
+    QWaylandCompositorExtensionTemplate::initialize();
     QWaylandCompositor *compositor = static_cast<QWaylandCompositor *>(extensionContainer());
     if (!compositor) {
         qWarning() << "Failed to find QWaylandCompositor when initializing QWaylandTextInputManager";
diff --git a/src/compositor/extensions/qwaylandtextinputmanager.h b/src/compositor/extensions/qwaylandtextinputmanager.h
index 6c250d58c..805c61af8 100644
--- a/src/compositor/extensions/qwaylandtextinputmanager.h
+++ b/src/compositor/extensions/qwaylandtextinputmanager.h
@@ -37,7 +37,7 @@
 #ifndef QWAYLANDTEXTINPUTMANAGER_H
 #define QWAYLANDTEXTINPUTMANAGER_H
 
-#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandCompositorExtension>
 
 #include <QtCore/QSize>
 
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 
 class QWaylandTextInputManagerPrivate;
 
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTextInputManager : public QWaylandExtensionTemplate<QWaylandTextInputManager>
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTextInputManager : public QWaylandCompositorExtensionTemplate<QWaylandTextInputManager>
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandTextInputManager)
diff --git a/src/compositor/extensions/qwaylandtextinputmanager_p.h b/src/compositor/extensions/qwaylandtextinputmanager_p.h
index 8052301c9..7d7171ebc 100644
--- a/src/compositor/extensions/qwaylandtextinputmanager_p.h
+++ b/src/compositor/extensions/qwaylandtextinputmanager_p.h
@@ -37,7 +37,7 @@
 #ifndef QWAYLANDTEXTINPUTMANAGER_P_H
 #define QWAYLANDTEXTINPUTMANAGER_P_H
 
-#include <QtWaylandCompositor/private/qwaylandextension_p.h>
+#include <QtWaylandCompositor/private/qwaylandcompositorextension_p.h>
 
 #include <QtWaylandCompositor/private/qwayland-server-text-input-unstable-v2.h>
 
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTextInputManagerPrivate : public QWaylandExtensionTemplatePrivate, public QtWaylandServer::zwp_text_input_manager_v2
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTextInputManagerPrivate : public QWaylandCompositorExtensionTemplatePrivate, public QtWaylandServer::zwp_text_input_manager_v2
 {
     Q_DECLARE_PUBLIC(QWaylandTextInputManager)
 public:
diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension.cpp b/src/compositor/extensions/qwaylandwindowmanagerextension.cpp
index 3dcca4277..2b80cac3b 100644
--- a/src/compositor/extensions/qwaylandwindowmanagerextension.cpp
+++ b/src/compositor/extensions/qwaylandwindowmanagerextension.cpp
@@ -45,17 +45,17 @@
 QT_BEGIN_NAMESPACE
 
 QWaylandWindowManagerExtension::QWaylandWindowManagerExtension()
-    : QWaylandExtensionTemplate<QWaylandWindowManagerExtension>(*new QWaylandWindowManagerExtensionPrivate)
+    : QWaylandCompositorExtensionTemplate<QWaylandWindowManagerExtension>(*new QWaylandWindowManagerExtensionPrivate)
 {
 }
 
 QWaylandWindowManagerExtension::QWaylandWindowManagerExtension(QWaylandCompositor *compositor)
-    : QWaylandExtensionTemplate<QWaylandWindowManagerExtension>(compositor, *new QWaylandWindowManagerExtensionPrivate)
+    : QWaylandCompositorExtensionTemplate<QWaylandWindowManagerExtension>(compositor, *new QWaylandWindowManagerExtensionPrivate)
 {
 }
 
 QWaylandWindowManagerExtensionPrivate::QWaylandWindowManagerExtensionPrivate()
-    : QWaylandExtensionTemplatePrivate()
+    : QWaylandCompositorExtensionTemplatePrivate()
     , QtWaylandServer::qt_windowmanager()
     , showIsFullScreen(false)
 {
@@ -94,7 +94,7 @@ void QWaylandWindowManagerExtension::initialize()
 {
     Q_D(QWaylandWindowManagerExtension);
 
-    QWaylandExtensionTemplate::initialize();
+    QWaylandCompositorExtensionTemplate::initialize();
     QWaylandCompositor *compositor = static_cast<QWaylandCompositor *>(extensionContainer());
     if (!compositor) {
         qWarning() << "Failed to find QWaylandCompositor when initializing QWaylandWindowManagerExtension";
diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension.h b/src/compositor/extensions/qwaylandwindowmanagerextension.h
index b365ff20f..184bcc3c5 100644
--- a/src/compositor/extensions/qwaylandwindowmanagerextension.h
+++ b/src/compositor/extensions/qwaylandwindowmanagerextension.h
@@ -37,7 +37,7 @@
 #ifndef WAYLANDWINDOWMANAGERINTEGRATION_H
 #define WAYLANDWINDOWMANAGERINTEGRATION_H
 
-#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandCompositorExtension>
 #include <QtWaylandCompositor/QWaylandClient>
 
 #include <QtCore/QUrl>
@@ -48,7 +48,7 @@ class QWaylandCompositor;
 
 class QWaylandWindowManagerExtensionPrivate;
 
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWindowManagerExtension : public QWaylandExtensionTemplate<QWaylandWindowManagerExtension>
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWindowManagerExtension : public QWaylandCompositorExtensionTemplate<QWaylandWindowManagerExtension>
 {
     Q_OBJECT
     Q_PROPERTY(bool showIsFullScreen READ showIsFullScreen WRITE setShowIsFullScreen NOTIFY showIsFullScreenChanged)
diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension_p.h b/src/compositor/extensions/qwaylandwindowmanagerextension_p.h
index 79e2256e0..5b4314f1d 100644
--- a/src/compositor/extensions/qwaylandwindowmanagerextension_p.h
+++ b/src/compositor/extensions/qwaylandwindowmanagerextension_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <QtWaylandCompositor/private/qwaylandextension_p.h>
+#include <QtWaylandCompositor/private/qwaylandcompositorextension_p.h>
 
 #include <QtWaylandCompositor/private/qwayland-server-windowmanager.h>
 
@@ -57,7 +57,7 @@
 QT_BEGIN_NAMESPACE
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWindowManagerExtensionPrivate
-        : public QWaylandExtensionTemplatePrivate
+        : public QWaylandCompositorExtensionTemplatePrivate
         , public QtWaylandServer::qt_windowmanager
 {
     Q_DECLARE_PUBLIC(QWaylandWindowManagerExtension)
diff --git a/src/compositor/extensions/qwaylandwlshell.cpp b/src/compositor/extensions/qwaylandwlshell.cpp
index 6953f72b6..2674f3979 100644
--- a/src/compositor/extensions/qwaylandwlshell.cpp
+++ b/src/compositor/extensions/qwaylandwlshell.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 QWaylandSurfaceRole QWaylandWlShellSurfacePrivate::s_role("wl_shell_surface");
 
 QWaylandWlShellPrivate::QWaylandWlShellPrivate()
-    : QWaylandExtensionTemplatePrivate()
+    : QWaylandCompositorExtensionTemplatePrivate()
     , wl_shell()
 {
 }
@@ -88,7 +88,7 @@ void QWaylandWlShellPrivate::shell_get_shell_surface(Resource *resource, uint32_
 }
 
 QWaylandWlShellSurfacePrivate::QWaylandWlShellSurfacePrivate()
-    : QWaylandExtensionTemplatePrivate()
+    : QWaylandCompositorExtensionTemplatePrivate()
     , wl_shell_surface()
     , m_shell(Q_NULLPTR)
     , m_surface(Q_NULLPTR)
@@ -280,14 +280,14 @@ void QWaylandWlShellSurfacePrivate::shell_surface_set_class(Resource *resource,
  * Constructs a QWaylandWlShell object.
  */
 QWaylandWlShell::QWaylandWlShell()
-    : QWaylandExtensionTemplate<QWaylandWlShell>(*new QWaylandWlShellPrivate())
+    : QWaylandCompositorExtensionTemplate<QWaylandWlShell>(*new QWaylandWlShellPrivate())
 { }
 
 /*!
  * Constructs a QWaylandWlShell object for the provided \a compositor.
  */
 QWaylandWlShell::QWaylandWlShell(QWaylandCompositor *compositor)
-    : QWaylandExtensionTemplate<QWaylandWlShell>(compositor, *new QWaylandWlShellPrivate())
+    : QWaylandCompositorExtensionTemplate<QWaylandWlShell>(compositor, *new QWaylandWlShellPrivate())
 { }
 
 
@@ -297,7 +297,7 @@ QWaylandWlShell::QWaylandWlShell(QWaylandCompositor *compositor)
 void QWaylandWlShell::initialize()
 {
     Q_D(QWaylandWlShell);
-    QWaylandExtensionTemplate::initialize();
+    QWaylandCompositorExtensionTemplate::initialize();
     QWaylandCompositor *compositor = static_cast<QWaylandCompositor *>(extensionContainer());
     if (!compositor) {
         qWarning() << "Failed to find QWaylandCompositor when initializing QWaylandWlShell";
@@ -370,7 +370,7 @@ QByteArray QWaylandWlShell::interfaceName()
  * Constructs a QWaylandWlShellSurface.
  */
 QWaylandWlShellSurface::QWaylandWlShellSurface()
-    : QWaylandExtensionTemplate<QWaylandWlShellSurface>(*new QWaylandWlShellSurfacePrivate)
+    : QWaylandCompositorExtensionTemplate<QWaylandWlShellSurface>(*new QWaylandWlShellSurfacePrivate)
 {
 }
 
@@ -378,7 +378,7 @@ QWaylandWlShellSurface::QWaylandWlShellSurface()
  * Constructs a QWaylandWlShellSurface for \a surface and initializes it with the given \a shell and \a resource.
  */
 QWaylandWlShellSurface::QWaylandWlShellSurface(QWaylandWlShell *shell, QWaylandSurface *surface, const QWaylandResource &res)
-    : QWaylandExtensionTemplate<QWaylandWlShellSurface>(*new QWaylandWlShellSurfacePrivate)
+    : QWaylandCompositorExtensionTemplate<QWaylandWlShellSurface>(*new QWaylandWlShellSurfacePrivate)
 {
     initialize(shell, surface, res);
 }
@@ -400,7 +400,7 @@ void QWaylandWlShellSurface::initialize(QWaylandWlShell *shell, QWaylandSurface
     d->init(resource.resource());
     setExtensionContainer(surface);
     emit surfaceChanged();
-    QWaylandExtension::initialize();
+    QWaylandCompositorExtension::initialize();
 }
 
 /*!
@@ -408,7 +408,7 @@ void QWaylandWlShellSurface::initialize(QWaylandWlShell *shell, QWaylandSurface
  */
 void QWaylandWlShellSurface::initialize()
 {
-    QWaylandExtensionTemplate::initialize();
+    QWaylandCompositorExtensionTemplate::initialize();
 }
 
 const struct wl_interface *QWaylandWlShellSurface::interface()
diff --git a/src/compositor/extensions/qwaylandwlshell.h b/src/compositor/extensions/qwaylandwlshell.h
index 12905549e..93022a4fa 100644
--- a/src/compositor/extensions/qwaylandwlshell.h
+++ b/src/compositor/extensions/qwaylandwlshell.h
@@ -37,7 +37,7 @@
 #ifndef QWAYLANDWLSHELL_H
 #define QWAYLANDWLSHELL_H
 
-#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandCompositorExtension>
 #include <QtWaylandCompositor/QWaylandResource>
 
 #include <QtCore/QSize>
@@ -53,7 +53,7 @@ class QWaylandOutput;
 class QWaylandSurfaceRole;
 class QWaylandWlShellSurface;
 
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWlShell : public QWaylandExtensionTemplate<QWaylandWlShell>
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWlShell : public QWaylandCompositorExtensionTemplate<QWaylandWlShell>
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandWlShell)
@@ -71,7 +71,7 @@ Q_SIGNALS:
     void shellSurfaceCreated(QWaylandWlShellSurface *shellSurface);
 };
 
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWlShellSurface : public QWaylandExtensionTemplate<QWaylandWlShellSurface>
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWlShellSurface : public QWaylandCompositorExtensionTemplate<QWaylandWlShellSurface>
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandWlShellSurface)
diff --git a/src/compositor/extensions/qwaylandwlshell_p.h b/src/compositor/extensions/qwaylandwlshell_p.h
index 8d7129fa8..c7c7cb8f0 100644
--- a/src/compositor/extensions/qwaylandwlshell_p.h
+++ b/src/compositor/extensions/qwaylandwlshell_p.h
@@ -39,7 +39,7 @@
 
 #include <QtWaylandCompositor/qwaylandexport.h>
 #include <QtWaylandCompositor/qwaylandsurface.h>
-#include <QtWaylandCompositor/private/qwaylandextension_p.h>
+#include <QtWaylandCompositor/private/qwaylandcompositorextension_p.h>
 #include <QtWaylandCompositor/QWaylandWlShellSurface>
 #include <QtWaylandCompositor/QWaylandInputDevice>
 
@@ -64,7 +64,7 @@
 QT_BEGIN_NAMESPACE
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWlShellPrivate
-                                        : public QWaylandExtensionTemplatePrivate
+                                        : public QWaylandCompositorExtensionTemplatePrivate
                                         , public QtWaylandServer::wl_shell
 {
     Q_DECLARE_PUBLIC(QWaylandWlShell)
@@ -77,7 +77,7 @@ protected:
 };
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWlShellSurfacePrivate
-                                        : public QWaylandExtensionTemplatePrivate
+                                        : public QWaylandCompositorExtensionTemplatePrivate
                                         , public QtWaylandServer::wl_shell_surface
 {
     Q_DECLARE_PUBLIC(QWaylandWlShellSurface)
diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp
index 3ca39a18b..157e4d135 100644
--- a/src/compositor/extensions/qwaylandxdgshell.cpp
+++ b/src/compositor/extensions/qwaylandxdgshell.cpp
@@ -53,7 +53,7 @@ QWaylandSurfaceRole QWaylandXdgSurfacePrivate::s_role("xdg_surface");
 QWaylandSurfaceRole QWaylandXdgPopupPrivate::s_role("xdg_popup");
 
 QWaylandXdgShellPrivate::QWaylandXdgShellPrivate()
-    : QWaylandExtensionTemplatePrivate()
+    : QWaylandCompositorExtensionTemplatePrivate()
     , xdg_shell()
 {
 }
@@ -216,7 +216,7 @@ void QWaylandXdgShellPrivate::xdg_shell_pong(Resource *resource, uint32_t serial
 }
 
 QWaylandXdgSurfacePrivate::QWaylandXdgSurfacePrivate()
-    : QWaylandExtensionTemplatePrivate()
+    : QWaylandCompositorExtensionTemplatePrivate()
     , xdg_surface()
     , m_surface(nullptr)
     , m_parentSurface(nullptr)
@@ -439,7 +439,7 @@ void QWaylandXdgSurfacePrivate::xdg_surface_set_window_geometry(Resource *resour
 }
 
 QWaylandXdgPopupPrivate::QWaylandXdgPopupPrivate()
-    : QWaylandExtensionTemplatePrivate()
+    : QWaylandCompositorExtensionTemplatePrivate()
     , xdg_popup()
     , m_surface(nullptr)
     , m_parentSurface(nullptr)
@@ -465,14 +465,14 @@ void QWaylandXdgPopupPrivate::xdg_popup_destroy(Resource *resource)
  * Constructs a QWaylandXdgShell object.
  */
 QWaylandXdgShell::QWaylandXdgShell()
-    : QWaylandExtensionTemplate<QWaylandXdgShell>(*new QWaylandXdgShellPrivate())
+    : QWaylandCompositorExtensionTemplate<QWaylandXdgShell>(*new QWaylandXdgShellPrivate())
 { }
 
 /*!
  * Constructs a QWaylandXdgShell object for the provided \a compositor.
  */
 QWaylandXdgShell::QWaylandXdgShell(QWaylandCompositor *compositor)
-    : QWaylandExtensionTemplate<QWaylandXdgShell>(compositor, *new QWaylandXdgShellPrivate())
+    : QWaylandCompositorExtensionTemplate<QWaylandXdgShell>(compositor, *new QWaylandXdgShellPrivate())
 { }
 
 /*!
@@ -481,7 +481,7 @@ QWaylandXdgShell::QWaylandXdgShell(QWaylandCompositor *compositor)
 void QWaylandXdgShell::initialize()
 {
     Q_D(QWaylandXdgShell);
-    QWaylandExtensionTemplate::initialize();
+    QWaylandCompositorExtensionTemplate::initialize();
     QWaylandCompositor *compositor = static_cast<QWaylandCompositor *>(extensionContainer());
     if (!compositor) {
         qWarning() << "Failed to find QWaylandCompositor when initializing QWaylandXdgShell";
@@ -592,7 +592,7 @@ void QWaylandXdgShell::handleFocusChanged(QWaylandSurface *newSurface, QWaylandS
  * Constructs a QWaylandXdgSurface.
  */
 QWaylandXdgSurface::QWaylandXdgSurface()
-    : QWaylandExtensionTemplate<QWaylandXdgSurface>(*new QWaylandXdgSurfacePrivate)
+    : QWaylandCompositorExtensionTemplate<QWaylandXdgSurface>(*new QWaylandXdgSurfacePrivate)
 {
 }
 
@@ -601,7 +601,7 @@ QWaylandXdgSurface::QWaylandXdgSurface()
  * given \a xdgShell, \a surface and \a resource.
  */
 QWaylandXdgSurface::QWaylandXdgSurface(QWaylandXdgShell *xdgShell, QWaylandSurface *surface, const QWaylandResource &res)
-    : QWaylandExtensionTemplate<QWaylandXdgSurface>(*new QWaylandXdgSurfacePrivate)
+    : QWaylandCompositorExtensionTemplate<QWaylandXdgSurface>(*new QWaylandXdgSurfacePrivate)
 {
     initialize(xdgShell, surface, res);
 }
@@ -628,7 +628,7 @@ void QWaylandXdgSurface::initialize(QWaylandXdgShell *xdgShell, QWaylandSurface
     connect(surface, &QWaylandSurface::sizeChanged, this, &QWaylandXdgSurface::handleSurfaceSizeChanged);
     emit surfaceChanged();
     emit windowGeometryChanged();
-    QWaylandExtension::initialize();
+    QWaylandCompositorExtension::initialize();
 }
 
 /*!
@@ -636,7 +636,7 @@ void QWaylandXdgSurface::initialize(QWaylandXdgShell *xdgShell, QWaylandSurface
  */
 void QWaylandXdgSurface::initialize()
 {
-    QWaylandExtensionTemplate::initialize();
+    QWaylandCompositorExtensionTemplate::initialize();
 }
 
 QList<int> QWaylandXdgSurface::statesAsInts() const
@@ -934,7 +934,7 @@ uint QWaylandXdgSurface::requestResizing(const QSize &maxSize)
  * Constructs a QWaylandXdgPopup.
  */
 QWaylandXdgPopup::QWaylandXdgPopup()
-    : QWaylandExtensionTemplate<QWaylandXdgPopup>(*new QWaylandXdgPopupPrivate)
+    : QWaylandCompositorExtensionTemplate<QWaylandXdgPopup>(*new QWaylandXdgPopupPrivate)
 {
 }
 
@@ -944,7 +944,7 @@ QWaylandXdgPopup::QWaylandXdgPopup()
  */
 QWaylandXdgPopup::QWaylandXdgPopup(QWaylandXdgShell *xdgShell, QWaylandSurface *surface,
                                    QWaylandSurface *parentSurface, const QWaylandResource &resource)
-    : QWaylandExtensionTemplate<QWaylandXdgPopup>(*new QWaylandXdgPopupPrivate)
+    : QWaylandCompositorExtensionTemplate<QWaylandXdgPopup>(*new QWaylandXdgPopupPrivate)
 {
     initialize(xdgShell, surface, parentSurface, resource);
 }
@@ -971,7 +971,7 @@ void QWaylandXdgPopup::initialize(QWaylandXdgShell *shell, QWaylandSurface *surf
     setExtensionContainer(surface);
     emit surfaceChanged();
     emit parentSurfaceChanged();
-    QWaylandExtension::initialize();
+    QWaylandCompositorExtension::initialize();
 }
 
 /*!
@@ -1014,7 +1014,7 @@ QWaylandSurface *QWaylandXdgPopup::parentSurface() const
  */
 void QWaylandXdgPopup::initialize()
 {
-    QWaylandExtensionTemplate::initialize();
+    QWaylandCompositorExtensionTemplate::initialize();
 }
 
 /*!
diff --git a/src/compositor/extensions/qwaylandxdgshell.h b/src/compositor/extensions/qwaylandxdgshell.h
index 2b751aee9..c994d9934 100644
--- a/src/compositor/extensions/qwaylandxdgshell.h
+++ b/src/compositor/extensions/qwaylandxdgshell.h
@@ -37,7 +37,7 @@
 #ifndef QWAYLANDXDGSHELL_H
 #define QWAYLANDXDGSHELL_H
 
-#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandCompositorExtension>
 #include <QtWaylandCompositor/QWaylandResource>
 
 #include <QtCore/QRect>
@@ -58,7 +58,7 @@ class QWaylandInputDevice;
 class QWaylandOutput;
 class QWaylandClient;
 
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgShell : public QWaylandExtensionTemplate<QWaylandXdgShell>
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgShell : public QWaylandCompositorExtensionTemplate<QWaylandXdgShell>
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandXdgShell)
@@ -88,7 +88,7 @@ private Q_SLOTS:
 
 };
 
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgSurface : public QWaylandExtensionTemplate<QWaylandXdgSurface>
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgSurface : public QWaylandCompositorExtensionTemplate<QWaylandXdgSurface>
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandXdgSurface)
@@ -189,7 +189,7 @@ private Q_SLOTS:
     void handleSurfaceSizeChanged();
 };
 
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPopup : public QWaylandExtensionTemplate<QWaylandXdgPopup>
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPopup : public QWaylandCompositorExtensionTemplate<QWaylandXdgPopup>
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandXdgPopup)
diff --git a/src/compositor/extensions/qwaylandxdgshell_p.h b/src/compositor/extensions/qwaylandxdgshell_p.h
index 4c53b0d20..6b7325148 100644
--- a/src/compositor/extensions/qwaylandxdgshell_p.h
+++ b/src/compositor/extensions/qwaylandxdgshell_p.h
@@ -37,7 +37,7 @@
 #ifndef QWAYLANDXDGSHELL_P_H
 #define QWAYLANDXDGSHELL_P_H
 
-#include <QtWaylandCompositor/private/qwaylandextension_p.h>
+#include <QtWaylandCompositor/private/qwaylandcompositorextension_p.h>
 #include <QtWaylandCompositor/private/qwayland-server-xdg-shell.h>
 
 #include <QtWaylandCompositor/QWaylandXdgShell>
@@ -58,7 +58,7 @@
 QT_BEGIN_NAMESPACE
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgShellPrivate
-        : public QWaylandExtensionTemplatePrivate
+        : public QWaylandCompositorExtensionTemplatePrivate
         , public QtWaylandServer::xdg_shell
 {
     Q_DECLARE_PUBLIC(QWaylandXdgShell)
@@ -91,7 +91,7 @@ private:
 };
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgSurfacePrivate
-        : public QWaylandExtensionTemplatePrivate
+        : public QWaylandCompositorExtensionTemplatePrivate
         , public QtWaylandServer::xdg_surface
 {
     Q_DECLARE_PUBLIC(QWaylandXdgSurface)
@@ -148,7 +148,7 @@ private:
 };
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPopupPrivate
-        : public QWaylandExtensionTemplatePrivate
+        : public QWaylandCompositorExtensionTemplatePrivate
         , public QtWaylandServer::xdg_popup
 {
     Q_DECLARE_PUBLIC(QWaylandXdgPopup)
diff --git a/src/compositor/extensions/qwlextendedsurface.cpp b/src/compositor/extensions/qwlextendedsurface.cpp
index f619ec339..fb89ebf3b 100644
--- a/src/compositor/extensions/qwlextendedsurface.cpp
+++ b/src/compositor/extensions/qwlextendedsurface.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 namespace QtWayland {
 
 SurfaceExtensionGlobal::SurfaceExtensionGlobal(QWaylandCompositor *compositor)
-    : QWaylandExtensionTemplate(compositor)
+    : QWaylandCompositorExtensionTemplate(compositor)
     , QtWaylandServer::qt_surface_extension(compositor->display(), 1)
 {
 }
@@ -58,7 +58,7 @@ void SurfaceExtensionGlobal::surface_extension_get_extended_surface(Resource *re
 }
 
 ExtendedSurface::ExtendedSurface(struct wl_client *client, uint32_t id, int version, QWaylandSurface *surface)
-    : QWaylandExtensionTemplate(surface)
+    : QWaylandCompositorExtensionTemplate(surface)
     , QtWaylandServer::qt_extended_surface(client, id, version)
     , m_surface(surface)
     , m_windowFlags(0)
diff --git a/src/compositor/extensions/qwlextendedsurface_p.h b/src/compositor/extensions/qwlextendedsurface_p.h
index 6ce1b426a..a868cd831 100644
--- a/src/compositor/extensions/qwlextendedsurface_p.h
+++ b/src/compositor/extensions/qwlextendedsurface_p.h
@@ -52,7 +52,7 @@
 
 #include <QtWaylandCompositor/private/qwayland-server-surface-extension.h>
 #include <QtWaylandCompositor/qwaylandsurface.h>
-#include <QtWaylandCompositor/qwaylandextension.h>
+#include <QtWaylandCompositor/qwaylandcompositorextension.h>
 
 #include <QtCore/QVariant>
 #include <QtCore/QLinkedList>
@@ -67,7 +67,7 @@ namespace QtWayland {
 
 class ExtendedSurface;
 
-class Q_WAYLAND_COMPOSITOR_EXPORT SurfaceExtensionGlobal : public QWaylandExtensionTemplate<SurfaceExtensionGlobal>, public QtWaylandServer::qt_surface_extension
+class Q_WAYLAND_COMPOSITOR_EXPORT SurfaceExtensionGlobal : public QWaylandCompositorExtensionTemplate<SurfaceExtensionGlobal>, public QtWaylandServer::qt_surface_extension
 {
     Q_OBJECT
 public:
@@ -83,7 +83,7 @@ private:
 
 };
 
-class Q_WAYLAND_COMPOSITOR_EXPORT ExtendedSurface : public QWaylandExtensionTemplate<ExtendedSurface>, public QtWaylandServer::qt_extended_surface
+class Q_WAYLAND_COMPOSITOR_EXPORT ExtendedSurface : public QWaylandCompositorExtensionTemplate<ExtendedSurface>, public QtWaylandServer::qt_extended_surface
 {
     Q_OBJECT
     Q_PROPERTY(Qt::ScreenOrientations contentOrientationMask READ contentOrientationMask NOTIFY contentOrientationMaskChanged)
diff --git a/src/compositor/extensions/qwlqtkey.cpp b/src/compositor/extensions/qwlqtkey.cpp
index 52373df08..da8c19d75 100644
--- a/src/compositor/extensions/qwlqtkey.cpp
+++ b/src/compositor/extensions/qwlqtkey.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
 namespace QtWayland {
 
 QtKeyExtensionGlobal::QtKeyExtensionGlobal(QWaylandCompositor *compositor)
-    : QWaylandExtensionTemplate(compositor)
+    : QWaylandCompositorExtensionTemplate(compositor)
     , QtWaylandServer::qt_key_extension(compositor->display(), 2)
     , m_compositor(compositor)
 {
diff --git a/src/compositor/extensions/qwlqtkey_p.h b/src/compositor/extensions/qwlqtkey_p.h
index aebfab6e3..1b9c7391e 100644
--- a/src/compositor/extensions/qwlqtkey_p.h
+++ b/src/compositor/extensions/qwlqtkey_p.h
@@ -50,7 +50,7 @@
 
 #include "wayland-util.h"
 
-#include <QtWaylandCompositor/QWaylandExtensionTemplate>
+#include <QtWaylandCompositor/QWaylandCompositorExtensionTemplate>
 #include <QtWaylandCompositor/QWaylandCompositor>
 #include <QtWaylandCompositor/private/qwayland-server-qtkey-extension.h>
 
@@ -61,7 +61,7 @@ class QKeyEvent;
 
 namespace QtWayland {
 
-class QtKeyExtensionGlobal : public QWaylandExtensionTemplate<QtKeyExtensionGlobal>, public QtWaylandServer::qt_key_extension
+class QtKeyExtensionGlobal : public QWaylandCompositorExtensionTemplate<QtKeyExtensionGlobal>, public QtWaylandServer::qt_key_extension
 {
     Q_OBJECT
 public:
diff --git a/src/compositor/extensions/qwlqttouch.cpp b/src/compositor/extensions/qwlqttouch.cpp
index 70738ce20..17246b397 100644
--- a/src/compositor/extensions/qwlqttouch.cpp
+++ b/src/compositor/extensions/qwlqttouch.cpp
@@ -46,7 +46,7 @@ namespace QtWayland {
 static const int maxRawPos = 24;
 
 TouchExtensionGlobal::TouchExtensionGlobal(QWaylandCompositor *compositor)
-    : QWaylandExtensionTemplate(compositor)
+    : QWaylandCompositorExtensionTemplate(compositor)
     , QtWaylandServer::qt_touch_extension(compositor->display(), 1)
     , m_compositor(compositor)
     , m_flags(0)
diff --git a/src/compositor/extensions/qwlqttouch_p.h b/src/compositor/extensions/qwlqttouch_p.h
index e2daad63c..32d7658f0 100644
--- a/src/compositor/extensions/qwlqttouch_p.h
+++ b/src/compositor/extensions/qwlqttouch_p.h
@@ -50,7 +50,7 @@
 
 #include <QtWaylandCompositor/private/qwayland-server-touch-extension.h>
 #include <QtWaylandCompositor/QWaylandCompositor>
-#include <QtWaylandCompositor/QWaylandExtensionTemplate>
+#include <QtWaylandCompositor/QWaylandCompositorExtensionTemplate>
 #include "wayland-util.h"
 
 QT_BEGIN_NAMESPACE
@@ -61,7 +61,7 @@ class QWaylandView;
 
 namespace QtWayland {
 
-class TouchExtensionGlobal : public QWaylandExtensionTemplate<TouchExtensionGlobal>, public QtWaylandServer::qt_touch_extension
+class TouchExtensionGlobal : public QWaylandCompositorExtensionTemplate<TouchExtensionGlobal>, public QtWaylandServer::qt_touch_extension
 {
     Q_OBJECT
     Q_PROPERTY(BehaviorFlags behaviorFlags READ behaviorFlags WRITE setBehviorFlags NOTIFY behaviorFlagsChanged)
diff --git a/src/compositor/global/global.pri b/src/compositor/global/global.pri
index 6edfd9685..e48b8a8c2 100644
--- a/src/compositor/global/global.pri
+++ b/src/compositor/global/global.pri
@@ -2,10 +2,10 @@ INCLUDEPATH += global/
 
 HEADERS += \
     global/qwaylandexport.h \
-    global/qwaylandextension.h \
-    global/qwaylandextension_p.h \
+    global/qwaylandcompositorextension.h \
+    global/qwaylandcompositorextension_p.h \
     global/qwaylandquickextension.h \
 
 SOURCES += \
-    global/qwaylandextension.cpp
+    global/qwaylandcompositorextension.cpp
 
diff --git a/src/compositor/global/qwaylandextension.cpp b/src/compositor/global/qwaylandcompositorextension.cpp
index 4fee48df1..ddfd25837 100644
--- a/src/compositor/global/qwaylandextension.cpp
+++ b/src/compositor/global/qwaylandcompositorextension.cpp
@@ -35,8 +35,8 @@
 ****************************************************************************/
 
 
-#include "qwaylandextension.h"
-#include "qwaylandextension_p.h"
+#include "qwaylandcompositorextension.h"
+#include "qwaylandcompositorextension_p.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
@@ -45,59 +45,59 @@
 
 QT_BEGIN_NAMESPACE
 
-QWaylandExtension::QWaylandExtension()
-    : QWaylandObject(*new QWaylandExtensionPrivate())
+QWaylandCompositorExtension::QWaylandCompositorExtension()
+    : QWaylandObject(*new QWaylandCompositorExtensionPrivate())
 {
 }
 
-QWaylandExtension::QWaylandExtension(QWaylandObject *container)
-    : QWaylandObject(*new QWaylandExtensionPrivate())
+QWaylandCompositorExtension::QWaylandCompositorExtension(QWaylandObject *container)
+    : QWaylandObject(*new QWaylandCompositorExtensionPrivate())
 {
     d_func()->extension_container = container;
     QCoreApplication::postEvent(this, new QEvent(QEvent::Polish));
 }
 
-QWaylandExtension::QWaylandExtension(QWaylandExtensionPrivate &dd)
+QWaylandCompositorExtension::QWaylandCompositorExtension(QWaylandCompositorExtensionPrivate &dd)
     : QWaylandObject(dd)
 {
 }
 
-QWaylandExtension::QWaylandExtension(QWaylandObject *container, QWaylandExtensionPrivate &dd)
+QWaylandCompositorExtension::QWaylandCompositorExtension(QWaylandObject *container, QWaylandCompositorExtensionPrivate &dd)
     : QWaylandObject(dd)
 {
     d_func()->extension_container = container;
     QCoreApplication::postEvent(this, new QEvent(QEvent::Polish));
 }
 
-QWaylandExtension::~QWaylandExtension()
+QWaylandCompositorExtension::~QWaylandCompositorExtension()
 {
-    Q_D(QWaylandExtension);
+    Q_D(QWaylandCompositorExtension);
     if (d->extension_container)
         d->extension_container->removeExtension(this);
 }
 
-QWaylandObject *QWaylandExtension::extensionContainer() const
+QWaylandObject *QWaylandCompositorExtension::extensionContainer() const
 {
-    Q_D(const QWaylandExtension);
+    Q_D(const QWaylandCompositorExtension);
     return d->extension_container;
 }
 
-void QWaylandExtension::setExtensionContainer(QWaylandObject *container)
+void QWaylandCompositorExtension::setExtensionContainer(QWaylandObject *container)
 {
-    Q_D(QWaylandExtension);
+    Q_D(QWaylandCompositorExtension);
     d->extension_container = container;
 }
 
-void QWaylandExtension::initialize()
+void QWaylandCompositorExtension::initialize()
 {
-    Q_D(QWaylandExtension);
+    Q_D(QWaylandCompositorExtension);
     if (d->initialized) {
-        qWarning() << "QWaylandExtension:" << extensionInterface()->name << "is already initialized";
+        qWarning() << "QWaylandCompositorExtension:" << extensionInterface()->name << "is already initialized";
         return;
     }
 
     if (!d->extension_container) {
-        qWarning() << "QWaylandExtension:" << extensionInterface()->name << "requests to initialize with no extension container set";
+        qWarning() << "QWaylandCompositorExtension:" << extensionInterface()->name << "requests to initialize with no extension container set";
         return;
     }
 
@@ -105,13 +105,13 @@ void QWaylandExtension::initialize()
     d->initialized = true;
 }
 
-bool QWaylandExtension::isInitialized() const
+bool QWaylandCompositorExtension::isInitialized() const
 {
-    Q_D(const QWaylandExtension);
+    Q_D(const QWaylandCompositorExtension);
     return d->initialized;
 }
 
-bool QWaylandExtension::event(QEvent *event)
+bool QWaylandCompositorExtension::event(QEvent *event)
 {
     switch(event->type()) {
     case QEvent::Polish:
@@ -136,11 +136,11 @@ QWaylandObject::QWaylandObject(QObjectPrivate &d, QObject *parent)
 
 QWaylandObject::~QWaylandObject()
 {
-    foreach (QWaylandExtension *extension, extension_vector)
-        QWaylandExtensionPrivate::get(extension)->extension_container = Q_NULLPTR;
+    foreach (QWaylandCompositorExtension *extension, extension_vector)
+        QWaylandCompositorExtensionPrivate::get(extension)->extension_container = Q_NULLPTR;
 }
 
-QWaylandExtension *QWaylandObject::extension(const QByteArray &name)
+QWaylandCompositorExtension *QWaylandObject::extension(const QByteArray &name)
 {
     for (int i = 0; i < extension_vector.size(); i++) {
         if (extension_vector.at(i)->extensionInterface()->name == name)
@@ -149,7 +149,7 @@ QWaylandExtension *QWaylandObject::extension(const QByteArray &name)
     return Q_NULLPTR;
 }
 
-QWaylandExtension *QWaylandObject::extension(const wl_interface *interface)
+QWaylandCompositorExtension *QWaylandObject::extension(const wl_interface *interface)
 {
     for (int i = 0; i < extension_vector.size(); i++) {
         if (extension_vector.at(i)->extensionInterface() == interface)
@@ -158,18 +158,18 @@ QWaylandExtension *QWaylandObject::extension(const wl_interface *interface)
     return Q_NULLPTR;
 }
 
-QList<QWaylandExtension *> QWaylandObject::extensions() const
+QList<QWaylandCompositorExtension *> QWaylandObject::extensions() const
 {
     return extension_vector;
 }
 
-void QWaylandObject::addExtension(QWaylandExtension *extension)
+void QWaylandObject::addExtension(QWaylandCompositorExtension *extension)
 {
     Q_ASSERT(!extension_vector.contains(extension));
     extension_vector.append(extension);
 }
 
-void QWaylandObject::removeExtension(QWaylandExtension *extension)
+void QWaylandObject::removeExtension(QWaylandCompositorExtension *extension)
 {
     Q_ASSERT(extension_vector.contains(extension));
     extension_vector.removeOne(extension);
diff --git a/src/compositor/global/qwaylandextension.h b/src/compositor/global/qwaylandcompositorextension.h
index 7692aac8f..fd9cfad0e 100644
--- a/src/compositor/global/qwaylandextension.h
+++ b/src/compositor/global/qwaylandcompositorextension.h
@@ -47,35 +47,35 @@ struct wl_interface;
 QT_BEGIN_NAMESPACE
 
 class QWaylandCompositor;
-class QWaylandExtension;
-class QWaylandExtensionPrivate;
-class QWaylandExtensionTemplatePrivate;
+class QWaylandCompositorExtension;
+class QWaylandCompositorExtensionPrivate;
+class QWaylandCompositorExtensionTemplatePrivate;
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandObject : public QObject
 {
 public:
     virtual ~QWaylandObject();
 
-    QWaylandExtension *extension(const QByteArray &name);
-    QWaylandExtension *extension(const wl_interface *interface);
-    QList<QWaylandExtension *> extensions() const;
-    void addExtension(QWaylandExtension *extension);
-    void removeExtension(QWaylandExtension *extension);
+    QWaylandCompositorExtension *extension(const QByteArray &name);
+    QWaylandCompositorExtension *extension(const wl_interface *interface);
+    QList<QWaylandCompositorExtension *> extensions() const;
+    void addExtension(QWaylandCompositorExtension *extension);
+    void removeExtension(QWaylandCompositorExtension *extension);
 
 protected:
     QWaylandObject(QObject *parent = 0);
     QWaylandObject(QObjectPrivate &d, QObject *parent = 0);
-    QList<QWaylandExtension *> extension_vector;
+    QList<QWaylandCompositorExtension *> extension_vector;
 };
 
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandExtension : public QWaylandObject
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorExtension : public QWaylandObject
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QWaylandExtension)
+    Q_DECLARE_PRIVATE(QWaylandCompositorExtension)
 public:
-    QWaylandExtension();
-    QWaylandExtension(QWaylandObject *container);
-    virtual ~QWaylandExtension();
+    QWaylandCompositorExtension();
+    QWaylandCompositorExtension(QWaylandObject *container);
+    virtual ~QWaylandCompositorExtension();
 
     QWaylandObject *extensionContainer() const;
     void setExtensionContainer(QWaylandObject *container);
@@ -86,23 +86,23 @@ public:
     virtual const struct wl_interface *extensionInterface() const = 0;
 
 protected:
-    QWaylandExtension(QWaylandExtensionPrivate &dd);
-    QWaylandExtension(QWaylandObject *container, QWaylandExtensionPrivate &dd);
+    QWaylandCompositorExtension(QWaylandCompositorExtensionPrivate &dd);
+    QWaylandCompositorExtension(QWaylandObject *container, QWaylandCompositorExtensionPrivate &dd);
 
     bool event(QEvent *event) Q_DECL_OVERRIDE;
 };
 
 template <typename T>
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandExtensionTemplate : public QWaylandExtension
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorExtensionTemplate : public QWaylandCompositorExtension
 {
-    Q_DECLARE_PRIVATE(QWaylandExtensionTemplate)
+    Q_DECLARE_PRIVATE(QWaylandCompositorExtensionTemplate)
 public:
-    QWaylandExtensionTemplate()
-        : QWaylandExtension()
+    QWaylandCompositorExtensionTemplate()
+        : QWaylandCompositorExtension()
     { }
 
-    QWaylandExtensionTemplate(QWaylandObject *container)
-        : QWaylandExtension(container)
+    QWaylandCompositorExtensionTemplate(QWaylandObject *container)
+        : QWaylandCompositorExtension(container)
     { }
 
     const struct wl_interface *extensionInterface() const Q_DECL_OVERRIDE
@@ -117,12 +117,12 @@ public:
     }
 
 protected:
-    QWaylandExtensionTemplate(QWaylandExtensionPrivate &dd)
-        : QWaylandExtension(dd)
+    QWaylandCompositorExtensionTemplate(QWaylandCompositorExtensionPrivate &dd)
+        : QWaylandCompositorExtension(dd)
     { }
 
-    QWaylandExtensionTemplate(QWaylandObject *container, QWaylandExtensionPrivate &dd)
-        : QWaylandExtension(container,dd)
+    QWaylandCompositorExtensionTemplate(QWaylandObject *container, QWaylandCompositorExtensionPrivate &dd)
+        : QWaylandCompositorExtension(container,dd)
     { }
 };
 
diff --git a/src/compositor/global/qwaylandextension_p.h b/src/compositor/global/qwaylandcompositorextension_p.h
index 3aaf235c7..5548da949 100644
--- a/src/compositor/global/qwaylandextension_p.h
+++ b/src/compositor/global/qwaylandcompositorextension_p.h
@@ -48,34 +48,34 @@
 // We mean it.
 //
 
-#include "qwaylandextension.h"
+#include "qwaylandcompositorextension.h"
 #include <QtCore/private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandExtensionPrivate : public QObjectPrivate
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorExtensionPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QWaylandExtension)
+    Q_DECLARE_PUBLIC(QWaylandCompositorExtension)
 
 public:
-    QWaylandExtensionPrivate()
+    QWaylandCompositorExtensionPrivate()
         : QObjectPrivate()
         , extension_container(Q_NULLPTR)
         , initialized(false)
     {
     }
 
-    static QWaylandExtensionPrivate *get(QWaylandExtension *extension) { return extension->d_func(); }
+    static QWaylandCompositorExtensionPrivate *get(QWaylandCompositorExtension *extension) { return extension->d_func(); }
 
     QWaylandObject *extension_container;
     bool initialized;
 };
 
-class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandExtensionTemplatePrivate : public QWaylandExtensionPrivate
+class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorExtensionTemplatePrivate : public QWaylandCompositorExtensionPrivate
 {
 public:
-    QWaylandExtensionTemplatePrivate()
-        : QWaylandExtensionPrivate()
+    QWaylandCompositorExtensionTemplatePrivate()
+        : QWaylandCompositorExtensionPrivate()
     { }
 };
 
diff --git a/src/compositor/global/qwaylandquickextension.h b/src/compositor/global/qwaylandquickextension.h
index 64359ffa1..32f4e6527 100644
--- a/src/compositor/global/qwaylandquickextension.h
+++ b/src/compositor/global/qwaylandquickextension.h
@@ -37,7 +37,7 @@
 #ifndef QWAYLANDQUICKEXTENSION_H
 #define QWAYLANDQUICKEXTENSION_H
 
-#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandCompositorExtension>
 #include <QtQml/QQmlParserStatus>
 #include <QtQml/QQmlListProperty>
 
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
     { \
 /* qmake ignore Q_OBJECT */ \
         Q_OBJECT \
-        Q_PROPERTY(QQmlListProperty<QWaylandExtension> extensions READ extensions) \
+        Q_PROPERTY(QQmlListProperty<QWaylandCompositorExtension> extensions READ extensions) \
         Q_PROPERTY(QQmlListProperty<QObject> data READ data DESIGNABLE false) \
         Q_CLASSINFO("DefaultProperty", "data") \
     public: \
@@ -74,28 +74,28 @@ QT_BEGIN_NAMESPACE
         { \
             return QQmlListProperty<QObject>(this, m_objects); \
         } \
-        QQmlListProperty<QWaylandExtension> extensions() \
+        QQmlListProperty<QWaylandCompositorExtension> extensions() \
         { \
-            return QQmlListProperty<QWaylandExtension>(this, this, \
+            return QQmlListProperty<QWaylandCompositorExtension>(this, this, \
                                                        &className##QuickExtensionContainer::append_extension, \
                                                        &className##QuickExtensionContainer::countFunction, \
                                                        &className##QuickExtensionContainer::atFunction, \
                                                        &className##QuickExtensionContainer::clearFunction); \
         } \
-        static int countFunction(QQmlListProperty<QWaylandExtension> *list) \
+        static int countFunction(QQmlListProperty<QWaylandCompositorExtension> *list) \
         { \
             return static_cast<className##QuickExtensionContainer *>(list->data)->extension_vector.size(); \
         } \
-        static QWaylandExtension *atFunction(QQmlListProperty<QWaylandExtension> *list, int index) \
+        static QWaylandCompositorExtension *atFunction(QQmlListProperty<QWaylandCompositorExtension> *list, int index) \
         { \
             return static_cast<className##QuickExtensionContainer *>(list->data)->extension_vector.at(index); \
         } \
-        static void append_extension(QQmlListProperty<QWaylandExtension> *list, QWaylandExtension *extension) \
+        static void append_extension(QQmlListProperty<QWaylandCompositorExtension> *list, QWaylandCompositorExtension *extension) \
         { \
             className##QuickExtensionContainer *quickExtObj = static_cast<className##QuickExtensionContainer *>(list->data); \
             extension->setExtensionContainer(quickExtObj); \
         } \
-        static void clearFunction(QQmlListProperty<QWaylandExtension> *list) \
+        static void clearFunction(QQmlListProperty<QWaylandCompositorExtension> *list) \
         { \
             static_cast<className##QuickExtensionContainer *>(list->data)->extension_vector.clear(); \
         } \
diff --git a/src/compositor/hardware_integration/qwlhwintegration.cpp b/src/compositor/hardware_integration/qwlhwintegration.cpp
index a163d4c26..7fb2c8b58 100644
--- a/src/compositor/hardware_integration/qwlhwintegration.cpp
+++ b/src/compositor/hardware_integration/qwlhwintegration.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 namespace QtWayland {
 
 HardwareIntegration::HardwareIntegration(QWaylandCompositor *compositor)
-    : QWaylandExtensionTemplate<HardwareIntegration>(compositor)
+    : QWaylandCompositorExtensionTemplate<HardwareIntegration>(compositor)
     , qt_hardware_integration(compositor->display(), 1)
 {
 }
diff --git a/src/compositor/hardware_integration/qwlhwintegration_p.h b/src/compositor/hardware_integration/qwlhwintegration_p.h
index 2cc11a87e..2cd368bc2 100644
--- a/src/compositor/hardware_integration/qwlhwintegration_p.h
+++ b/src/compositor/hardware_integration/qwlhwintegration_p.h
@@ -50,7 +50,7 @@
 
 #include <QtWaylandCompositor/private/qwayland-server-hardware-integration.h>
 
-#include <QtWaylandCompositor/QWaylandExtension>
+#include <QtWaylandCompositor/QWaylandCompositorExtension>
 
 #include <QtCore/QString>
 
@@ -60,7 +60,7 @@ class QWaylandCompositor;
 
 namespace QtWayland {
 
-class HardwareIntegration : public QWaylandExtensionTemplate<HardwareIntegration>, public QtWaylandServer::qt_hardware_integration
+class HardwareIntegration : public QWaylandCompositorExtensionTemplate<HardwareIntegration>, public QtWaylandServer::qt_hardware_integration
 {
 public:
     HardwareIntegration(QWaylandCompositor *compositor);