Compositor: rename QWaylandGraphicsHardwareIntegration

to QWaylandClientBufferIntegration. I have checked this with
xcomposite-egl and wayland-egl, abd have tried to do a simple search and
replace for brcm-egl and xcomposite-glx, but there will likely be some
small fixup needed

Change-Id: I48d284b8a5172273e0a26443074a87a8171b9e88
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

25 files changed, 151 insertions, 150 deletions

diff --git a/src/compositor/hardware_integration/hardware_integration.pri b/src/compositor/hardware_integration/hardware_integration.pri
index 8477243fe..351cb2e4c 100644
--- a/src/compositor/hardware_integration/hardware_integration.pri
+++ b/src/compositor/hardware_integration/hardware_integration.pri
@@ -4,14 +4,14 @@ isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
 
 !isEqual(QT_WAYLAND_GL_CONFIG,nogl) {
     HEADERS += \
-        hardware_integration/qwaylandgraphicshardwareintegration.h \
-        hardware_integration/qwaylandgraphicshardwareintegrationfactory.h \
-        hardware_integration/qwaylandgraphicshardwareintegrationplugin.h
+        hardware_integration/qwaylandclientbufferintegration.h \
+        hardware_integration/qwaylandclientbufferintegrationfactory.h \
+        hardware_integration/qwaylandclientbufferintegrationplugin.h
 
     SOURCES += \
-        hardware_integration/qwaylandgraphicshardwareintegration.cpp \
-        hardware_integration/qwaylandgraphicshardwareintegrationfactory.cpp \
-        hardware_integration/qwaylandgraphicshardwareintegrationplugin.cpp
+        hardware_integration/qwaylandclientbufferintegration.cpp \
+        hardware_integration/qwaylandclientbufferintegrationfactory.cpp \
+        hardware_integration/qwaylandclientbufferintegrationplugin.cpp
 
     DEFINES += QT_COMPOSITOR_WAYLAND_GL
 } else {
diff --git a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegration.cpp b/src/compositor/hardware_integration/qwaylandclientbufferintegration.cpp
index 7b213bfa5..ff463429f 100644
--- a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegration.cpp
+++ b/src/compositor/hardware_integration/qwaylandclientbufferintegration.cpp
@@ -38,11 +38,11 @@
 **
 ****************************************************************************/
 
-#include "qwaylandgraphicshardwareintegration.h"
+#include "qwaylandclientbufferintegration.h"
 
 QT_BEGIN_NAMESPACE
 
-QWaylandGraphicsHardwareIntegration::QWaylandGraphicsHardwareIntegration()
+QWaylandClientBufferIntegration::QWaylandClientBufferIntegration()
     : m_compositor(0)
 {
 }
diff --git a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegration.h b/src/compositor/hardware_integration/qwaylandclientbufferintegration.h
index b8cc90fb4..6451f6156 100644
--- a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegration.h
+++ b/src/compositor/hardware_integration/qwaylandclientbufferintegration.h
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-#ifndef GRAPHICSHARDWAREINTEGRATION_H
-#define GRAPHICSHARDWAREINTEGRATION_H
+#ifndef QWAYLANDCLIENTBUFFERINTEGRATION_H
+#define QWAYLANDCLIENTBUFFERINTEGRATION_H
 
 #include <QtGui/qopengl.h>
 #include <QtGui/QOpenGLContext>
@@ -53,11 +53,11 @@ namespace QtWayland {
     class Display;
 }
 
-class Q_COMPOSITOR_EXPORT QWaylandGraphicsHardwareIntegration
+class Q_COMPOSITOR_EXPORT QWaylandClientBufferIntegration
 {
 public:
-    QWaylandGraphicsHardwareIntegration();
-    virtual ~QWaylandGraphicsHardwareIntegration() { }
+    QWaylandClientBufferIntegration();
+    virtual ~QWaylandClientBufferIntegration() { }
 
     void setCompositor(QWaylandCompositor *compositor) { m_compositor = compositor; }
 
@@ -82,4 +82,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // GRAPHICSHARDWAREINTEGRATION_H
+#endif // QWAYLANDCLIENTBUFFERINTEGRATION_H
diff --git a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationfactory.cpp b/src/compositor/hardware_integration/qwaylandclientbufferintegrationfactory.cpp
index 2137fe75d..0b4ec3a79 100644
--- a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationfactory.cpp
+++ b/src/compositor/hardware_integration/qwaylandclientbufferintegrationfactory.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qwaylandgraphicshardwareintegrationfactory.h"
-#include "qwaylandgraphicshardwareintegrationplugin.h"
-#include "qwaylandgraphicshardwareintegration.h"
+#include "qwaylandclientbufferintegrationfactory.h"
+#include "qwaylandclientbufferintegrationplugin.h"
+#include "qwaylandclientbufferintegration.h"
 #include <QtCore/private/qfactoryloader_p.h>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
@@ -50,12 +50,12 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
-    (QWaylandGraphicsHardwareIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration"), Qt::CaseInsensitive))
+    (QWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration"), Qt::CaseInsensitive))
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader,
-                          (QWaylandGraphicsHardwareIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
+                          (QWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
 #endif
 
-QStringList QWaylandGraphicsHardwareIntegrationFactory::keys(const QString &pluginPath)
+QStringList QWaylandClientBufferIntegrationFactory::keys(const QString &pluginPath)
 {
 #ifndef QT_NO_LIBRARY
     QStringList list;
@@ -78,16 +78,16 @@ QStringList QWaylandGraphicsHardwareIntegrationFactory::keys(const QString &plug
 #endif
 }
 
-QWaylandGraphicsHardwareIntegration *QWaylandGraphicsHardwareIntegrationFactory::create(const QString &name, const QStringList &args, const QString &pluginPath)
+QWaylandClientBufferIntegration *QWaylandClientBufferIntegrationFactory::create(const QString &name, const QStringList &args, const QString &pluginPath)
 {
 #ifndef QT_NO_LIBRARY
     // Try loading the plugin from platformPluginPath first:
     if (!pluginPath.isEmpty()) {
         QCoreApplication::addLibraryPath(pluginPath);
-        if (QWaylandGraphicsHardwareIntegration *ret = qLoadPlugin1<QWaylandGraphicsHardwareIntegration, QWaylandGraphicsHardwareIntegrationPlugin>(directLoader(), name, args))
+        if (QWaylandClientBufferIntegration *ret = qLoadPlugin1<QWaylandClientBufferIntegration, QWaylandClientBufferIntegrationPlugin>(directLoader(), name, args))
             return ret;
     }
-    if (QWaylandGraphicsHardwareIntegration *ret = qLoadPlugin1<QWaylandGraphicsHardwareIntegration, QWaylandGraphicsHardwareIntegrationPlugin>(loader(), name, args))
+    if (QWaylandClientBufferIntegration *ret = qLoadPlugin1<QWaylandClientBufferIntegration, QWaylandClientBufferIntegrationPlugin>(loader(), name, args))
         return ret;
 #endif
     return 0;
diff --git a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationfactory.h b/src/compositor/hardware_integration/qwaylandclientbufferintegrationfactory.h
index 74e5dda0c..c9d95f8f7 100644
--- a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationfactory.h
+++ b/src/compositor/hardware_integration/qwaylandclientbufferintegrationfactory.h
@@ -39,23 +39,23 @@
 **
 ****************************************************************************/
 
-#ifndef GRAPHICSHARDWAREINTEGRATIONFACTORY_H
-#define GRAPHICSHARDWAREINTEGRATIONFACTORY_H
+#ifndef QWAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H
+#define QWAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H
 
 #include <QtCompositor/qwaylandexport.h>
 #include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandGraphicsHardwareIntegration;
+class QWaylandClientBufferIntegration;
 
-class Q_COMPOSITOR_EXPORT QWaylandGraphicsHardwareIntegrationFactory
+class Q_COMPOSITOR_EXPORT QWaylandClientBufferIntegrationFactory
 {
 public:
     static QStringList keys(const QString &pluginPath = QString());
-    static QWaylandGraphicsHardwareIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
+    static QWaylandClientBufferIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
 };
 
 QT_END_NAMESPACE
 
-#endif // GRAPHICSHARDWAREINTEGRATIONFACTORY_H
+#endif // QWAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H
diff --git a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationplugin.cpp b/src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.cpp
index 66e07352e..58bb26d19 100644
--- a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationplugin.cpp
+++ b/src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.cpp
@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 
-#include "qwaylandgraphicshardwareintegrationplugin.h"
+#include "qwaylandclientbufferintegrationplugin.h"
 
 QT_BEGIN_NAMESPACE
 
-QWaylandGraphicsHardwareIntegrationPlugin::QWaylandGraphicsHardwareIntegrationPlugin(QObject *parent) :
+QWaylandClientBufferIntegrationPlugin::QWaylandClientBufferIntegrationPlugin(QObject *parent) :
     QObject(parent)
 {
 }
 
-QWaylandGraphicsHardwareIntegrationPlugin::~QWaylandGraphicsHardwareIntegrationPlugin()
+QWaylandClientBufferIntegrationPlugin::~QWaylandClientBufferIntegrationPlugin()
 {
 }
 
diff --git a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationplugin.h b/src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.h
index 6d68a0cc9..ef65c167f 100644
--- a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationplugin.h
+++ b/src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef GRAPHICSHARDWAREINTEGRATIONPLUGIN_H
-#define GRAPHICSHARDWAREINTEGRATIONPLUGIN_H
+#ifndef QWAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H
+#define QWAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H
 
 #include <QtCompositor/qwaylandexport.h>
 
@@ -49,20 +49,20 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandGraphicsHardwareIntegration;
+class QWaylandClientBufferIntegration;
 
-#define QWaylandGraphicsHardwareIntegrationFactoryInterface_iid "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1"
+#define QWaylandClientBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.1"
 
-class Q_COMPOSITOR_EXPORT QWaylandGraphicsHardwareIntegrationPlugin : public QObject
+class Q_COMPOSITOR_EXPORT QWaylandClientBufferIntegrationPlugin : public QObject
 {
     Q_OBJECT
 public:
-    explicit QWaylandGraphicsHardwareIntegrationPlugin(QObject *parent = 0);
-    ~QWaylandGraphicsHardwareIntegrationPlugin();
+    explicit QWaylandClientBufferIntegrationPlugin(QObject *parent = 0);
+    ~QWaylandClientBufferIntegrationPlugin();
 
-    virtual QWaylandGraphicsHardwareIntegration *create(const QString &key, const QStringList &paramList) = 0;
+    virtual QWaylandClientBufferIntegration *create(const QString &key, const QStringList &paramList) = 0;
 };
 
 QT_END_NAMESPACE
 
-#endif // GRAPHICSHARDWAREINTEGRATIONPLUGIN_H
+#endif // QWAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H
diff --git a/src/compositor/wayland_wrapper/qwlcompositor.cpp b/src/compositor/wayland_wrapper/qwlcompositor.cpp
index abea0a3c3..9a321f0c9 100644
--- a/src/compositor/wayland_wrapper/qwlcompositor.cpp
+++ b/src/compositor/wayland_wrapper/qwlcompositor.cpp
@@ -84,10 +84,10 @@
 
 #include <wayland-server.h>
 
-#include "hardware_integration/qwaylandgraphicshardwareintegration.h"
+#include "hardware_integration/qwaylandclientbufferintegration.h"
 #include "waylandwindowmanagerintegration.h"
 
-#include "hardware_integration/qwaylandgraphicshardwareintegrationfactory.h"
+#include "hardware_integration/qwaylandclientbufferintegrationfactory.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -138,7 +138,7 @@ Compositor::Compositor(QWaylandCompositor *qt_compositor, QWaylandCompositor::Ex
     , m_directRenderContext(0)
     , m_directRenderActive(false)
 #if defined (QT_COMPOSITOR_WAYLAND_GL)
-    , m_graphics_hw_integration(0)
+    , m_graphics_client_buffer_integration(0)
 #endif
     , m_windowManagerIntegration(0)
     , m_outputExtension(0)
@@ -156,7 +156,7 @@ Compositor::Compositor(QWaylandCompositor *qt_compositor, QWaylandCompositor::Ex
 #if defined (QT_COMPOSITOR_WAYLAND_GL)
     QWindow *window = qt_compositor->window();
     if (window && window->surfaceType() != QWindow::RasterSurface) {
-        QStringList keys = QWaylandGraphicsHardwareIntegrationFactory::keys();
+        QStringList keys = QWaylandClientBufferIntegrationFactory::keys();
         QString targetKey;
         QByteArray hardwareIntegration = qgetenv("QT_WAYLAND_HARDWARE_INTEGRATION");
         if (keys.contains(QString::fromLocal8Bit(hardwareIntegration.constData()))) {
@@ -168,9 +168,9 @@ Compositor::Compositor(QWaylandCompositor *qt_compositor, QWaylandCompositor::Ex
         }
 
         if (!targetKey.isEmpty()) {
-            m_graphics_hw_integration = QWaylandGraphicsHardwareIntegrationFactory::create(targetKey, QStringList());
-            if (m_graphics_hw_integration) {
-                m_graphics_hw_integration->setCompositor(qt_compositor);
+            m_graphics_client_buffer_integration = QWaylandClientBufferIntegrationFactory::create(targetKey, QStringList());
+            if (m_graphics_client_buffer_integration) {
+                m_graphics_client_buffer_integration->setCompositor(qt_compositor);
             }
         }
         //BUG: if there is no hw_integration, bad things will probably happen
@@ -238,7 +238,7 @@ Compositor::~Compositor()
     delete m_data_device_manager;
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-    delete m_graphics_hw_integration;
+    delete m_graphics_client_buffer_integration;
 #endif
     delete m_output_global;
     delete m_display;
@@ -330,10 +330,10 @@ QWindow *Compositor::window() const
     return m_qt_compositor->window();
 }
 
-QWaylandGraphicsHardwareIntegration * Compositor::graphicsHWIntegration() const
+QWaylandClientBufferIntegration * Compositor::clientBufferIntegration() const
 {
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-    return m_graphics_hw_integration;
+    return m_graphics_client_buffer_integration;
 #else
     return 0;
 #endif
@@ -342,8 +342,8 @@ QWaylandGraphicsHardwareIntegration * Compositor::graphicsHWIntegration() const
 void Compositor::initializeHardwareIntegration()
 {
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-    if (m_graphics_hw_integration)
-        m_graphics_hw_integration->initializeHardware(m_display);
+    if (m_graphics_client_buffer_integration)
+        m_graphics_client_buffer_integration->initializeHardware(m_display);
 #endif
 }
 
@@ -369,7 +369,7 @@ bool Compositor::setDirectRenderSurface(Surface *surface, QOpenGLContext *contex
     if (!surface)
         setDirectRenderingActive(false);
 
-    if (m_graphics_hw_integration && m_graphics_hw_integration->setDirectRenderSurface(surface ? surface->waylandSurface() : 0)) {
+    if (m_graphics_client_buffer_integration && m_graphics_client_buffer_integration->setDirectRenderSurface(surface ? surface->waylandSurface() : 0)) {
         m_directRenderSurface = surface;
         m_directRenderContext = context;
         return true;
diff --git a/src/compositor/wayland_wrapper/qwlcompositor_p.h b/src/compositor/wayland_wrapper/qwlcompositor_p.h
index 0350d37af..2448dcb3b 100644
--- a/src/compositor/wayland_wrapper/qwlcompositor_p.h
+++ b/src/compositor/wayland_wrapper/qwlcompositor_p.h
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 class QWaylandCompositor;
 class QWaylandInputDevice;
-class QWaylandGraphicsHardwareIntegration;
+class QWaylandClientBufferIntegration;
 class WindowManagerServerIntegration;
 class QMimeData;
 class QPlatformScreenPageFlipper;
@@ -101,7 +101,7 @@ public:
 
     QWindow *window() const;
 
-    QWaylandGraphicsHardwareIntegration *graphicsHWIntegration() const;
+    QWaylandClientBufferIntegration *clientBufferIntegration() const;
     void initializeHardwareIntegration();
     void initializeDefaultInputDevice();
     void initializeWindowManagerProtocol();
@@ -199,7 +199,7 @@ private:
     bool m_directRenderActive;
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-    QWaylandGraphicsHardwareIntegration *m_graphics_hw_integration;
+    QWaylandClientBufferIntegration *m_graphics_client_buffer_integration;
 #endif
 
     //extensions
diff --git a/src/compositor/wayland_wrapper/qwlsurface.cpp b/src/compositor/wayland_wrapper/qwlsurface.cpp
index b29fb0afc..ba1175b04 100644
--- a/src/compositor/wayland_wrapper/qwlsurface.cpp
+++ b/src/compositor/wayland_wrapper/qwlsurface.cpp
@@ -59,7 +59,7 @@
 #include <wayland-server.h>
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-#include "hardware_integration/qwaylandgraphicshardwareintegration.h"
+#include "hardware_integration/qwaylandclientbufferintegration.h"
 #include <qpa/qplatformopenglcontext.h>
 #endif
 
@@ -126,14 +126,14 @@ bool Surface::isYInverted() const
 {
     bool ret = false;
     static bool negateReturn = qgetenv("QT_COMPOSITOR_NEGATE_INVERTED_Y").toInt();
-    QWaylandGraphicsHardwareIntegration *graphicsHWIntegration = m_compositor->graphicsHWIntegration();
+    QWaylandClientBufferIntegration *clientBufferIntegration = m_compositor->clientBufferIntegration();
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
     SurfaceBuffer *surfacebuffer = currentSurfaceBuffer();
     if (!surfacebuffer) {
         ret = false;
-    } else if (graphicsHWIntegration && surfacebuffer->waylandBufferHandle() && type() != QWaylandSurface::Shm) {
-        ret = graphicsHWIntegration->isYInverted(surfacebuffer->waylandBufferHandle());
+    } else if (clientBufferIntegration && surfacebuffer->waylandBufferHandle() && type() != QWaylandSurface::Shm) {
+        ret = clientBufferIntegration->isYInverted(surfacebuffer->waylandBufferHandle());
     } else
 #endif
         ret = true;
@@ -208,9 +208,9 @@ GLuint Surface::textureId(QOpenGLContext *context) const
 {
     const SurfaceBuffer *surfacebuffer = currentSurfaceBuffer();
 
-    if (m_compositor->graphicsHWIntegration() && type() == QWaylandSurface::Texture
+    if (m_compositor->clientBufferIntegration() && type() == QWaylandSurface::Texture
          && !surfacebuffer->textureCreated()) {
-        QWaylandGraphicsHardwareIntegration *hwIntegration = m_compositor->graphicsHWIntegration();
+        QWaylandClientBufferIntegration *hwIntegration = m_compositor->clientBufferIntegration();
         const_cast<SurfaceBuffer *>(surfacebuffer)->createTexture(hwIntegration,context);
     }
     return surfacebuffer->texture();
diff --git a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp
index f9c0aabfb..cdc7b33ee 100644
--- a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp
+++ b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp
@@ -44,7 +44,7 @@
 #include "qwlcompositor_p.h"
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-#include "hardware_integration/qwaylandgraphicshardwareintegration.h"
+#include "hardware_integration/qwaylandclientbufferintegration.h"
 #include <qpa/qplatformopenglcontext.h>
 #endif
 
@@ -117,7 +117,7 @@ void SurfaceBuffer::destructBufferState()
                 delete static_cast<QImage *>(m_handle);
 #ifdef QT_COMPOSITOR_WAYLAND_GL
             } else {
-                QWaylandGraphicsHardwareIntegration *hwIntegration = m_compositor->graphicsHWIntegration();
+                QWaylandClientBufferIntegration *hwIntegration = m_compositor->clientBufferIntegration();
                 hwIntegration->unlockNativeBuffer(m_handle, m_compositor->directRenderContext());
 #endif
             }
@@ -139,7 +139,7 @@ QSize SurfaceBuffer::size() const
             m_size = QSize(wl_shm_buffer_get_width(m_shmBuffer), wl_shm_buffer_get_height(m_shmBuffer));
 #ifdef QT_COMPOSITOR_WAYLAND_GL
         } else {
-            QWaylandGraphicsHardwareIntegration *hwIntegration = m_compositor->graphicsHWIntegration();
+            QWaylandClientBufferIntegration *hwIntegration = m_compositor->clientBufferIntegration();
             m_size = hwIntegration->bufferSize(m_buffer);
 #endif
         }
@@ -254,8 +254,8 @@ void *SurfaceBuffer::handle() const
             that->m_handle = image;
 #ifdef QT_COMPOSITOR_WAYLAND_GL
         } else {
-            QWaylandGraphicsHardwareIntegration *hwIntegration = m_compositor->graphicsHWIntegration();
-            that->m_handle = hwIntegration->lockNativeBuffer(m_buffer, m_compositor->directRenderContext());
+            QWaylandClientBufferIntegration *clientBufferIntegration = m_compositor->clientBufferIntegration();
+            that->m_handle = clientBufferIntegration->lockNativeBuffer(m_buffer, m_compositor->directRenderContext());
 #endif
         }
     }
@@ -296,7 +296,7 @@ void freeTexture(QOpenGLFunctions *, GLuint id)
     glDeleteTextures(1, &id);
 }
 
-void SurfaceBuffer::createTexture(QWaylandGraphicsHardwareIntegration *hwIntegration, QOpenGLContext *context)
+void SurfaceBuffer::createTexture(QWaylandClientBufferIntegration *hwIntegration, QOpenGLContext *context)
 {
 #ifdef QT_COMPOSITOR_WAYLAND_GL
     m_texture = hwIntegration->createTextureFromBuffer(m_buffer, context);
diff --git a/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h b/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h
index 93627f67b..056303e1d 100644
--- a/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h
+++ b/src/compositor/wayland_wrapper/qwlsurfacebuffer_p.h
@@ -51,7 +51,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandGraphicsHardwareIntegration;
+class QWaylandClientBufferIntegration;
 class QOpenGLContext;
 
 namespace QtWayland {
@@ -99,7 +99,7 @@ public:
 
     inline bool textureCreated() const { return m_texture; }
 
-    void createTexture(QWaylandGraphicsHardwareIntegration *hwIntegration, QOpenGLContext *context);
+    void createTexture(QWaylandClientBufferIntegration *hwIntegration, QOpenGLContext *context);
     inline GLuint texture() const;
     void destroyTexture();
 
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
index 0ef8318fb..e5975abc3 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
@@ -76,7 +76,7 @@ public:
 };
 
 BrcmEglIntegration::BrcmEglIntegration()
-    : QWaylandGraphicsHardwareIntegration()
+    : QWaylandClientBufferIntegration()
     , QtWaylandServer::qt_brcm()
     , d_ptr(new BrcmEglIntegrationPrivate)
 {
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
index 229905612..7d94e315b 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
@@ -41,7 +41,7 @@
 #ifndef BRCMEGLINTEGRATION_H
 #define BRCMEGLINTEGRATION_H
 
-#include <QtCompositor/qwaylandgraphicshardwareintegration.h>
+#include <QtCompositor/qwaylandclientbufferintegration.h>
 #include "qwayland-server-brcm.h"
 
 #include <QtCore/QScopedPointer>
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 class BrcmEglIntegrationPrivate;
 
-class BrcmEglIntegration : public QWaylandGraphicsHardwareIntegration, public QtWaylandServer::qt_brcm
+class BrcmEglIntegration : public QWaylandClientBufferIntegration, public QtWaylandServer::qt_brcm
 {
     Q_DECLARE_PRIVATE(BrcmEglIntegration)
 public:
diff --git a/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri b/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
index 27c219ac6..2d4771a2a 100644
--- a/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
+++ b/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
@@ -8,7 +8,7 @@ INCLUDEPATH += $$PWD
 }
 
 SOURCES += \
-    $$PWD/waylandeglintegration.cpp
+    $$PWD/waylandeglclientbufferintegration.cpp
 
 HEADERS += \
-    $$PWD/waylandeglintegration.h
+    $$PWD/waylandeglclientbufferintegration.h
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
index e01de7984..ffefdc86d 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglintegration.cpp
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "waylandeglintegration.h"
+#include "waylandeglclientbufferintegration.h"
 
 #include <QtCompositor/private/qwlcompositor_p.h>
 #include <QtCompositor/private/qwlsurface_p.h>
@@ -72,10 +72,10 @@ typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenu
 
 QT_BEGIN_NAMESPACE
 
-class WaylandEglIntegrationPrivate
+class WaylandEglClientBufferIntegrationPrivate
 {
 public:
-    WaylandEglIntegrationPrivate()
+    WaylandEglClientBufferIntegrationPrivate()
         : egl_display(EGL_NO_DISPLAY)
         , valid(false)
         , display_bound(false)
@@ -101,15 +101,15 @@ public:
     PFNGLEGLIMAGETARGETTEXTURE2DOESPROC gl_egl_image_target_texture_2d;
 };
 
-WaylandEglIntegration::WaylandEglIntegration()
-    : QWaylandGraphicsHardwareIntegration()
-    , d_ptr(new WaylandEglIntegrationPrivate)
+WaylandEglClientBufferIntegration::WaylandEglClientBufferIntegration()
+    : QWaylandClientBufferIntegration()
+    , d_ptr(new WaylandEglClientBufferIntegrationPrivate)
 {
 }
 
-void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDisplay)
+void WaylandEglClientBufferIntegration::initializeHardware(QtWayland::Display *waylandDisplay)
 {
-    Q_D(WaylandEglIntegration);
+    Q_D(WaylandEglClientBufferIntegration);
 
     const bool ignoreBindDisplay = !qgetenv("QT_WAYLAND_IGNORE_BIND_DISPLAY").isEmpty();
 
@@ -170,9 +170,9 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla
     qWarning("EGL Wayland extension successfully initialized.%s\n", !d->display_bound ? " eglBindWaylandDisplayWL ignored" : "");
 }
 
-GLuint WaylandEglIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *)
+GLuint WaylandEglClientBufferIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *)
 {
-    Q_D(WaylandEglIntegration);
+    Q_D(WaylandEglClientBufferIntegration);
     if (!d->valid) {
         qWarning("createTextureFromBuffer() failed\n");
         return 0;
@@ -199,9 +199,9 @@ GLuint WaylandEglIntegration::createTextureFromBuffer(struct ::wl_resource *buff
     return textureId;
 }
 
-bool WaylandEglIntegration::isYInverted(struct ::wl_resource *buffer) const
+bool WaylandEglClientBufferIntegration::isYInverted(struct ::wl_resource *buffer) const
 {
-    Q_D(const WaylandEglIntegration);
+    Q_D(const WaylandEglClientBufferIntegration);
 
 #if defined(EGL_WAYLAND_Y_INVERTED_WL)
     EGLint isYInverted;
@@ -215,13 +215,13 @@ bool WaylandEglIntegration::isYInverted(struct ::wl_resource *buffer) const
         return true;
 #endif
 
-    return QWaylandGraphicsHardwareIntegration::isYInverted(buffer);
+    return QWaylandClientBufferIntegration::isYInverted(buffer);
 }
 
 
-bool WaylandEglIntegration::setDirectRenderSurface(QWaylandSurface *surface)
+bool WaylandEglClientBufferIntegration::setDirectRenderSurface(QWaylandSurface *surface)
 {
-    Q_D(WaylandEglIntegration);
+    Q_D(WaylandEglClientBufferIntegration);
 
     QPlatformScreen *screen = QPlatformScreen::platformScreenForWindow(m_compositor->window());
     QPlatformScreenPageFlipper *flipper = screen ? screen->pageFlipper() : 0;
@@ -233,9 +233,9 @@ bool WaylandEglIntegration::setDirectRenderSurface(QWaylandSurface *surface)
     return flipper;
 }
 
-void *WaylandEglIntegration::lockNativeBuffer(struct ::wl_resource *buffer, QOpenGLContext *) const
+void *WaylandEglClientBufferIntegration::lockNativeBuffer(struct ::wl_resource *buffer, QOpenGLContext *) const
 {
-    Q_D(const WaylandEglIntegration);
+    Q_D(const WaylandEglClientBufferIntegration);
 
     EGLImageKHR image = d->egl_create_image(d->egl_display, EGL_NO_CONTEXT,
                                           EGL_WAYLAND_BUFFER_WL,
@@ -243,17 +243,17 @@ void *WaylandEglIntegration::lockNativeBuffer(struct ::wl_resource *buffer, QOpe
     return image;
 }
 
-void WaylandEglIntegration::unlockNativeBuffer(void *native_buffer, QOpenGLContext *) const
+void WaylandEglClientBufferIntegration::unlockNativeBuffer(void *native_buffer, QOpenGLContext *) const
 {
-    Q_D(const WaylandEglIntegration);
+    Q_D(const WaylandEglClientBufferIntegration);
     EGLImageKHR image = static_cast<EGLImageKHR>(native_buffer);
 
     d->egl_destroy_image(d->egl_display, image);
 }
 
-QSize WaylandEglIntegration::bufferSize(struct ::wl_resource *buffer) const
+QSize WaylandEglClientBufferIntegration::bufferSize(struct ::wl_resource *buffer) const
 {
-    Q_D(const WaylandEglIntegration);
+    Q_D(const WaylandEglClientBufferIntegration);
 
     int width, height;
     d->egl_query_wayland_buffer(d->egl_display, reinterpret_cast<struct ::wl_buffer *>(buffer), EGL_WIDTH, &width);
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglintegration.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
index ce3284291..2f93e9052 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglintegration.h
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
@@ -41,18 +41,18 @@
 #ifndef WAYLANDEGLINTEGRATION_H
 #define WAYLANDEGLINTEGRATION_H
 
-#include <QtCompositor/qwaylandgraphicshardwareintegration.h>
+#include <QtCompositor/qwaylandclientbufferintegration.h>
 #include <QtCore/QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 
-class WaylandEglIntegrationPrivate;
+class WaylandEglClientBufferIntegrationPrivate;
 
-class WaylandEglIntegration : public QWaylandGraphicsHardwareIntegration
+class WaylandEglClientBufferIntegration : public QWaylandClientBufferIntegration
 {
-    Q_DECLARE_PRIVATE(WaylandEglIntegration)
+    Q_DECLARE_PRIVATE(WaylandEglClientBufferIntegration)
 public:
-    WaylandEglIntegration();
+    WaylandEglClientBufferIntegration();
 
     void initializeHardware(QtWayland::Display *waylandDisplay) Q_DECL_OVERRIDE;
 
@@ -67,8 +67,8 @@ public:
     QSize bufferSize(struct ::wl_resource *buffer) const Q_DECL_OVERRIDE;
 
 private:
-    Q_DISABLE_COPY(WaylandEglIntegration)
-    QScopedPointer<WaylandEglIntegrationPrivate> d_ptr;
+    Q_DISABLE_COPY(WaylandEglClientBufferIntegration)
+    QScopedPointer<WaylandEglClientBufferIntegrationPrivate> d_ptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
index b80858b2c..55b0cc15e 100644
--- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
+++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp
@@ -67,14 +67,14 @@ QVector<EGLint> eglbuildSpec()
     return spec;
 }
 
-XCompositeEglIntegration::XCompositeEglIntegration()
-    : QWaylandGraphicsHardwareIntegration()
+XCompositeEglClientBufferIntegration::XCompositeEglClientBufferIntegration()
+    : QWaylandClientBufferIntegration()
     , mDisplay(0)
 {
 
 }
 
-void XCompositeEglIntegration::initializeHardware(QtWayland::Display *)
+void XCompositeEglClientBufferIntegration::initializeHardware(QtWayland::Display *)
 {
     QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();
     if (nativeInterface) {
@@ -91,7 +91,7 @@ void XCompositeEglIntegration::initializeHardware(QtWayland::Display *)
     new XCompositeHandler(m_compositor->handle(), mDisplay);
 }
 
-GLuint XCompositeEglIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *)
+GLuint XCompositeEglClientBufferIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *)
 {
     XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer);
     Pixmap pixmap = XCompositeNameWindowPixmap(mDisplay, compositorBuffer->window());
@@ -134,13 +134,13 @@ GLuint XCompositeEglIntegration::createTextureFromBuffer(struct ::wl_resource *b
     return textureId;
 }
 
-bool XCompositeEglIntegration::isYInverted(struct ::wl_resource *buffer) const
+bool XCompositeEglClientBufferIntegration::isYInverted(struct ::wl_resource *buffer) const
 {
     XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer);
     return compositorBuffer->isYInverted();
 }
 
-QSize XCompositeEglIntegration::bufferSize(struct ::wl_resource *buffer) const
+QSize XCompositeEglClientBufferIntegration::bufferSize(struct ::wl_resource *buffer) const
 {
     XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer);
 
diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
index 562fce140..65a574d1e 100644
--- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
+++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
@@ -41,7 +41,7 @@
 #ifndef XCOMPOSITEEGLINTEGRATION_H
 #define XCOMPOSITEEGLINTEGRATION_H
 
-#include <QtCompositor/qwaylandgraphicshardwareintegration.h>
+#include <QtCompositor/qwaylandclientbufferintegration.h>
 
 #include "xlibinclude.h"
 
@@ -49,10 +49,10 @@
 
 QT_BEGIN_NAMESPACE
 
-class XCompositeEglIntegration : public QWaylandGraphicsHardwareIntegration
+class XCompositeEglClientBufferIntegration : public QWaylandClientBufferIntegration
 {
 public:
-    XCompositeEglIntegration();
+    XCompositeEglClientBufferIntegration();
 
     void initializeHardware(QtWayland::Display *waylandDisplay) Q_DECL_OVERRIDE;
 
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
index 421e5df1a..1df6a4c99 100644
--- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
+++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp
@@ -71,19 +71,19 @@ QVector<int> qglx_buildSpec()
 }
 
 
-XCompositeGLXIntegration::XCompositeGLXIntegration()
-    : QWaylandGraphicsHardwareIntegration()
+XCompositeGLXClientBufferIntegration::XCompositeGLXClientBufferIntegration()
+    : QWaylandClientBufferIntegration()
     , mDisplay(0)
     , mHandler(0)
 {
 }
 
-XCompositeGLXIntegration::~XCompositeGLXIntegration()
+XCompositeGLXClientBufferIntegration::~XCompositeGLXClientBufferIntegration()
 {
     delete mHandler;
 }
 
-void XCompositeGLXIntegration::initializeHardware(QtWayland::Display *)
+void XCompositeGLXClientBufferIntegration::initializeHardware(QtWayland::Display *)
 {
     QPlatformNativeInterface *nativeInterface = QGuiApplicationPrivate::platformIntegration()->nativeInterface();
     if (nativeInterface) {
@@ -112,7 +112,7 @@ void XCompositeGLXIntegration::initializeHardware(QtWayland::Display *)
     delete glContext;
 }
 
-GLuint XCompositeGLXIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *)
+GLuint XCompositeGLXClientBufferIntegration::createTextureFromBuffer(struct ::wl_resource *buffer, QOpenGLContext *)
 {
     XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer);
     Pixmap pixmap = XCompositeNameWindowPixmap(mDisplay, compositorBuffer->window());
@@ -145,12 +145,12 @@ GLuint XCompositeGLXIntegration::createTextureFromBuffer(struct ::wl_resource *b
     return textureId;
 }
 
-bool XCompositeGLXIntegration::isYInverted(struct ::wl_resource *buffer) const
+bool XCompositeGLXClientBufferIntegration::isYInverted(struct ::wl_resource *buffer) const
 {
     return XCompositeBuffer::fromResource(buffer)->isYInverted();
 }
 
-QSize XCompositeGLXIntegration::bufferSize(struct ::wl_resource *buffer) const
+QSize XCompositeGLXClientBufferIntegration::bufferSize(struct ::wl_resource *buffer) const
 {
     XCompositeBuffer *compositorBuffer = XCompositeBuffer::fromResource(buffer);
 
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
index 11146ef23..be6b02028 100644
--- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
+++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
@@ -41,7 +41,7 @@
 #ifndef XCOMPOSITEGLXINTEGRATION_H
 #define XCOMPOSITEGLXINTEGRATION_H
 
-#include <QtCompositor/qwaylandgraphicshardwareintegration.h>
+#include <QtCompositor/qwaylandclientbufferintegration.h>
 
 #include "xlibinclude.h"
 
@@ -53,11 +53,11 @@ QT_BEGIN_NAMESPACE
 
 class XCompositeHandler;
 
-class XCompositeGLXIntegration : public QWaylandGraphicsHardwareIntegration
+class XCompositeGLXClientBufferIntegration : public QWaylandClientBufferIntegration
 {
 public:
-    XCompositeGLXIntegration();
-    ~XCompositeGLXIntegration();
+    XCompositeGLXClientBufferIntegration();
+    ~XCompositeGLXClientBufferIntegration();
 
     void initializeHardware(QtWayland::Display *waylandDisplay) Q_DECL_OVERRIDE;
 
diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
index 0fecd2ec0..303b0049b 100644
--- a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
@@ -39,28 +39,28 @@
 **
 ****************************************************************************/
 
-#include <QtCompositor/qwaylandgraphicshardwareintegrationplugin.h>
+#include <QtCompositor/qwaylandclientbufferintegrationplugin.h>
 #include "brcmeglintegration.h"
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin
+class QWaylandBrcmClientBufferIntegration : public QWaylandClientBufferIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "brcm-egl.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.1" FILE "brcm-egl.json")
 public:
     QStringList keys() const;
-    QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&);
+    QWaylandClientBufferIntegration *create(const QString&, const QStringList&);
 };
 
-QStringList QWaylandIntegrationPlugin::keys() const
+QStringList QWaylandBrcmClientBufferIntegration::keys() const
 {
     QStringList list;
     list << "wayland-brcm";
     return list;
 }
 
-QWaylandGraphicsHardwareIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList)
+QWaylandClientBufferIntegration *QWaylandBrcmClientBufferIntegration::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
     if (system.toLower() == "wayland-brcm")
diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
index 75a9fba29..8c3f46ffc 100644
--- a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
@@ -39,18 +39,19 @@
 **
 ****************************************************************************/
 
-#include <QtCompositor/qwaylandgraphicshardwareintegrationplugin.h>
-#include "waylandeglintegration.h"
+#include <QtCompositor/qwaylandclientbufferintegrationfactory.h>
+#include <QtCompositor/qwaylandclientbufferintegrationplugin.h>
+#include "waylandeglclientbufferintegration.h"
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin
+class QWaylandIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "wayland-egl.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.1" FILE "wayland-egl.json")
 public:
     QStringList keys() const;
-    QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&);
+    QWaylandClientBufferIntegration *create(const QString&, const QStringList&);
 };
 
 QStringList QWaylandIntegrationPlugin::keys() const
@@ -60,11 +61,11 @@ QStringList QWaylandIntegrationPlugin::keys() const
     return list;
 }
 
-QWaylandGraphicsHardwareIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList)
+QWaylandClientBufferIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
     if (system.toLower() == "wayland-egl")
-        return new WaylandEglIntegration();
+        return new WaylandEglClientBufferIntegration();
 
     return 0;
 }
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
index 3540d3517..d96650544 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
@@ -39,32 +39,32 @@
 **
 ****************************************************************************/
 
-#include <QtCompositor/qwaylandgraphicshardwareintegrationplugin.h>
+#include <QtCompositor/qwaylandclientbufferintegrationplugin.h>
 #include "xcompositeeglintegration.h"
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin
+class QWaylandXCompositeClientBufferIntegration : public QWaylandClientBufferIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "xcomposite-egl.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.1" FILE "xcomposite-egl.json")
 public:
     QStringList keys() const;
-    QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&);
+    QWaylandClientBufferIntegration *create(const QString&, const QStringList&);
 };
 
-QStringList QWaylandIntegrationPlugin::keys() const
+QStringList QWaylandXCompositeClientBufferIntegration::keys() const
 {
     QStringList list;
     list << "wayland-xcomposite";
     return list;
 }
 
-QWaylandGraphicsHardwareIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList)
+QWaylandClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
     if (system.toLower() == "wayland-xcomposite")
-        return new XCompositeEglIntegration();
+        return new XCompositeEglClientBufferIntegration();
 
     return 0;
 }
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
index 3b6c9f9c1..df4b3bab6 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
@@ -44,27 +44,27 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin
+class QWaylandXCompositeClientBufferIntegration : public QWaylandClientBufferIntegrationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "xcomposite-glx.json")
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandClientBufferIntegrationFactoryInterface.5.1" FILE "xcomposite-glx.json")
 public:
     QStringList keys() const;
-    QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&);
+    QWaylandClientBufferIntegration *create(const QString&, const QStringList&);
 };
 
-QStringList QWaylandIntegrationPlugin::keys() const
+QStringList QWaylandXCompositeClientBufferIntegration::keys() const
 {
     QStringList list;
     list << "wayland-xcomposite-glx";
     return list;
 }
 
-QWaylandGraphicsHardwareIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList)
+QWaylandClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
     if (system.toLower() == "wayland-xcomposite-glx")
-        return new XCompositeGLXIntegration();
+        return new XCompositeGLXClientBufferIntegration();
 
     return 0;
 }