8 files changed, 28 insertions, 28 deletions
diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro
index 2f62a195..667235ab 100644
--- a/src/imports/controls/material/material.pro
+++ b/src/imports/controls/material/material.pro
@@ -1,4 +1,4 @@
-TARGET = qtlabsmaterialstyleplugin
+TARGET = qtquickmaterialstyleplugin
 TARGETPATH = Qt/labs/controls/material
 IMPORT_VERSION = 1.0
 
@@ -11,10 +11,10 @@ OTHER_FILES += \
     qmldir
 
 SOURCES += \
-    $$PWD/qtlabsmaterialstyleplugin.cpp
+    $$PWD/qtquickmaterialstyleplugin.cpp
 
 RESOURCES += \
-    $$PWD/qtlabsmaterialstyleplugin.qrc
+    $$PWD/qtquickmaterialstyleplugin.qrc
 
 include(material.pri)
 
diff --git a/src/imports/controls/material/qmldir b/src/imports/controls/material/qmldir
index d90e75d8..f8666f9e 100644
--- a/src/imports/controls/material/qmldir
+++ b/src/imports/controls/material/qmldir
@@ -1,5 +1,5 @@
 module Qt.labs.controls.material
-plugin qtlabsmaterialstyleplugin
-classname QtLabsMaterialStylePlugin
+plugin qtquickmaterialstyleplugin
+classname QtQuickMaterialStylePlugin
 depends Qt.labs.controls 1.0
 depends QtGraphicalEffects 1.0
diff --git a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp b/src/imports/controls/material/qtquickmaterialstyleplugin.cpp
index ee9940f2..c68fd13b 100644
--- a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
+++ b/src/imports/controls/material/qtquickmaterialstyleplugin.cpp
@@ -47,7 +47,7 @@
 
 static inline void initResources()
 {
-    Q_INIT_RESOURCE(qtlabsmaterialstyleplugin);
+    Q_INIT_RESOURCE(qtquickmaterialstyleplugin);
 #ifdef QT_STATIC
     Q_INIT_RESOURCE(qmake_Qt_labs_controls_material);
 #endif
@@ -55,14 +55,14 @@ static inline void initResources()
 
 QT_BEGIN_NAMESPACE
 
-class QtLabsMaterialStylePlugin : public QQmlExtensionPlugin
+class QtQuickMaterialStylePlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    QtLabsMaterialStylePlugin(QObject *parent = nullptr);
-    ~QtLabsMaterialStylePlugin();
+    QtQuickMaterialStylePlugin(QObject *parent = nullptr);
+    ~QtQuickMaterialStylePlugin();
     void registerTypes(const char *uri) override;
     void initializeEngine(QQmlEngine *engine, const char *uri) override;
 
@@ -70,12 +70,12 @@ private:
     QQuickProxyTheme *theme;
 };
 
-QtLabsMaterialStylePlugin::QtLabsMaterialStylePlugin(QObject *parent) : QQmlExtensionPlugin(parent)
+QtQuickMaterialStylePlugin::QtQuickMaterialStylePlugin(QObject *parent) : QQmlExtensionPlugin(parent)
 {
     initResources();
 }
 
-QtLabsMaterialStylePlugin::~QtLabsMaterialStylePlugin()
+QtQuickMaterialStylePlugin::~QtQuickMaterialStylePlugin()
 {
     if (theme) {
         QPlatformTheme *old = theme->theme();
@@ -84,12 +84,12 @@ QtLabsMaterialStylePlugin::~QtLabsMaterialStylePlugin()
     }
 }
 
-void QtLabsMaterialStylePlugin::registerTypes(const char *uri)
+void QtQuickMaterialStylePlugin::registerTypes(const char *uri)
 {
     qmlRegisterUncreatableType<QQuickMaterialStyle>(uri, 1, 0, "Material", tr("Material is an attached property"));
 }
 
-void QtLabsMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+void QtQuickMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     Q_UNUSED(engine);
 
@@ -107,4 +107,4 @@ void QtLabsMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char
 
 QT_END_NAMESPACE
 
-#include "qtlabsmaterialstyleplugin.moc"
+#include "qtquickmaterialstyleplugin.moc"
diff --git a/src/imports/controls/material/qtlabsmaterialstyleplugin.qrc b/src/imports/controls/material/qtquickmaterialstyleplugin.qrc
index 8398d505..8398d505 100644
--- a/src/imports/controls/material/qtlabsmaterialstyleplugin.qrc
+++ b/src/imports/controls/material/qtquickmaterialstyleplugin.qrc
diff --git a/src/imports/controls/universal/qmldir b/src/imports/controls/universal/qmldir
index ebf841fb..7b7d28a4 100644
--- a/src/imports/controls/universal/qmldir
+++ b/src/imports/controls/universal/qmldir
@@ -1,4 +1,4 @@
 module Qt.labs.controls.universal
-plugin qtlabsuniversalstyleplugin
-classname QtLabsUniversalStylePlugin
+plugin qtquickuniversalstyleplugin
+classname QtQuickUniversalStylePlugin
 depends Qt.labs.controls 1.0
diff --git a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp b/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp
index 7fe69493..952f0302 100644
--- a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp
+++ b/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp
@@ -47,7 +47,7 @@
 
 static inline void initResources()
 {
-    Q_INIT_RESOURCE(qtlabsuniversalstyleplugin);
+    Q_INIT_RESOURCE(qtquickuniversalstyleplugin);
 #ifdef QT_STATIC
     Q_INIT_RESOURCE(qmake_Qt_labs_controls_universal);
 #endif
@@ -55,14 +55,14 @@ static inline void initResources()
 
 QT_BEGIN_NAMESPACE
 
-class QtLabsUniversalStylePlugin: public QQmlExtensionPlugin
+class QtQuickUniversalStylePlugin: public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    QtLabsUniversalStylePlugin(QObject *parent = nullptr);
-    ~QtLabsUniversalStylePlugin();
+    QtQuickUniversalStylePlugin(QObject *parent = nullptr);
+    ~QtQuickUniversalStylePlugin();
     void registerTypes(const char *uri) override;
     void initializeEngine(QQmlEngine *engine, const char *uri) override;
 
@@ -70,12 +70,12 @@ private:
     QQuickProxyTheme *theme;
 };
 
-QtLabsUniversalStylePlugin::QtLabsUniversalStylePlugin(QObject *parent) : QQmlExtensionPlugin(parent)
+QtQuickUniversalStylePlugin::QtQuickUniversalStylePlugin(QObject *parent) : QQmlExtensionPlugin(parent)
 {
     initResources();
 }
 
-QtLabsUniversalStylePlugin::~QtLabsUniversalStylePlugin()
+QtQuickUniversalStylePlugin::~QtQuickUniversalStylePlugin()
 {
     if (theme) {
         QPlatformTheme *old = theme->theme();
@@ -84,12 +84,12 @@ QtLabsUniversalStylePlugin::~QtLabsUniversalStylePlugin()
     }
 }
 
-void QtLabsUniversalStylePlugin::registerTypes(const char *uri)
+void QtQuickUniversalStylePlugin::registerTypes(const char *uri)
 {
     qmlRegisterUncreatableType<QQuickUniversalStyle>(uri, 1, 0, "Universal", tr("Universal is an attached property"));
 }
 
-void QtLabsUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+void QtQuickUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     if (QQuickStyle::name().compare(QLatin1String("universal"), Qt::CaseInsensitive) == 0)
         QGuiApplicationPrivate::platform_theme = new QQuickUniversalTheme;
@@ -106,4 +106,4 @@ void QtLabsUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char
 
 QT_END_NAMESPACE
 
-#include "qtlabsuniversalstyleplugin.moc"
+#include "qtquickuniversalstyleplugin.moc"
diff --git a/src/imports/controls/universal/qtlabsuniversalstyleplugin.qrc b/src/imports/controls/universal/qtquickuniversalstyleplugin.qrc
index 5a0249d7..5a0249d7 100644
--- a/src/imports/controls/universal/qtlabsuniversalstyleplugin.qrc
+++ b/src/imports/controls/universal/qtquickuniversalstyleplugin.qrc
diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro
index 76d3d89e..14058547 100644
--- a/src/imports/controls/universal/universal.pro
+++ b/src/imports/controls/universal/universal.pro
@@ -1,4 +1,4 @@
-TARGET = qtlabsuniversalstyleplugin
+TARGET = qtquickuniversalstyleplugin
 TARGETPATH = Qt/labs/controls/universal
 IMPORT_VERSION = 1.0
 
@@ -11,10 +11,10 @@ OTHER_FILES += \
     qmldir
 
 SOURCES += \
-    $$PWD/qtlabsuniversalstyleplugin.cpp
+    $$PWD/qtquickuniversalstyleplugin.cpp
 
 RESOURCES += \
-    $$PWD/qtlabsuniversalstyleplugin.qrc
+    $$PWD/qtquickuniversalstyleplugin.qrc
 
 include(universal.pri)