15 files changed, 19 insertions, 19 deletions
diff --git a/src/imports/bluetoothsettings/bluetoothsettings.pro b/src/imports/bluetoothsettings/bluetoothsettings.pro
index 3475ffa..3e6e6b5 100644
--- a/src/imports/bluetoothsettings/bluetoothsettings.pro
+++ b/src/imports/bluetoothsettings/bluetoothsettings.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 QT += qml bluetooth bluetoothsettings
-uri = com.theqtcompany.settings.bluetooth
+uri = QtDeviceUtilities.BluetoothSettings
 
 TARGET  = btsettingsplugin
 
diff --git a/src/imports/bluetoothsettings/plugin.cpp b/src/imports/bluetoothsettings/plugin.cpp
index 20f5b28..55b8a0f 100644
--- a/src/imports/bluetoothsettings/plugin.cpp
+++ b/src/imports/bluetoothsettings/plugin.cpp
@@ -58,7 +58,7 @@ class BluetoothSettingsQmlPlugin : public QQmlExtensionPlugin
 public:
     void registerTypes(const char *uri)
     {
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("com.theqtcompany.settings.bluetooth"));
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtDeviceUtilities.BluetoothSettings"));
         qmlRegisterUncreatableType<BtDeviceItem>(uri, 1, 0, "BtDeviceItem", "Cannot be instantiated directly.");
         qmlRegisterSingletonType<BluetoothDevice>(uri, 1, 0, "BtDevice", &instance<BluetoothDevice>);
     }
diff --git a/src/imports/bluetoothsettings/qmldir b/src/imports/bluetoothsettings/qmldir
index f63b52f..eda1c88 100644
--- a/src/imports/bluetoothsettings/qmldir
+++ b/src/imports/bluetoothsettings/qmldir
@@ -1,2 +1,2 @@
-module com.theqtcompany.settings.bluetooth
+module QtDeviceUtilities.BluetoothSettings
 plugin btsettingsplugin
diff --git a/src/imports/displaysettings/displaysettings.pro b/src/imports/displaysettings/displaysettings.pro
index 4c581f4..c148227 100644
--- a/src/imports/displaysettings/displaysettings.pro
+++ b/src/imports/displaysettings/displaysettings.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 CONFIG += plugin
 QT += qml displaysettings
 
-uri = com.theqtcompany.settings.display
+uri = QtDeviceUtilities.DisplaySettings
 
 TARGET  = qmldisplaysettingsplugin
 
diff --git a/src/imports/displaysettings/qmldir b/src/imports/displaysettings/qmldir
index 4f8a3db..35c1462 100644
--- a/src/imports/displaysettings/qmldir
+++ b/src/imports/displaysettings/qmldir
@@ -1,2 +1,2 @@
-module com.theqtcompany.settings.display
+module QtDeviceUtilities.DisplaySettings
 plugin qmldisplaysettingsplugin
diff --git a/src/imports/localdevice/localdevice.pro b/src/imports/localdevice/localdevice.pro
index dfcbcf9..0ef1980 100644
--- a/src/imports/localdevice/localdevice.pro
+++ b/src/imports/localdevice/localdevice.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 TARGET  = localdeviceplugin
-uri = com.theqtcompany.localdevice
+uri = QtDeviceUtilities.LocalDeviceSettings
 
 QT += qml localdevice
 
diff --git a/src/imports/localdevice/plugin.cpp b/src/imports/localdevice/plugin.cpp
index b69d9b4..cbf08cb 100644
--- a/src/imports/localdevice/plugin.cpp
+++ b/src/imports/localdevice/plugin.cpp
@@ -20,7 +20,7 @@
 #include <QtQml>
 
 /*!
-    \qmlmodule com.theqtcompany.localdevice 1.0
+    \qmlmodule QtDeviceUtilities.LocalDeviceSettings 1.0
     \title Qt Local Device QML Module
     \ingroup qtee-qmlmodules
     \brief A collection of the local device related utility functions, accessible from QML.
@@ -38,7 +38,7 @@
     Import the module as follows:
 
     \badcode
-    import com.theqtcompany.localdevice 1.0
+    import QtDeviceUtilities.LocalDeviceSettings 1.0
     \endcode
 
     This will give you access to the singleton QML type LocalDevice.
@@ -53,7 +53,7 @@
 
 /*!
     \qmltype LocalDevice
-    \inqmlmodule com.theqtcompany.localdevice
+    \inqmlmodule QtDeviceUtilities.LocalDeviceSettings
     \ingroup utils-qmltypes
     \brief Singleton QML type providing access to utility functions.
 
@@ -64,7 +64,7 @@
     simply import the \c {LocalDevice} module:
 
     \qml
-    com.theqtcompany.localdevice
+    QtDeviceUtilities.LocalDeviceSettings
 
     \endqml
 
@@ -109,7 +109,7 @@ public:
 
     void registerTypes(const char *uri)
     {
-        Q_ASSERT(QLatin1String(uri) == "com.theqtcompany.localdevice");
+        Q_ASSERT(QLatin1String(uri) == "QtDeviceUtilities.LocalDeviceSettings");
         qmlRegisterSingletonType<QLocalDevice>(uri, 1, 0, "LocalDevice", module_api_factory);
     }
 };
diff --git a/src/imports/localdevice/qmldir b/src/imports/localdevice/qmldir
index ae1b1c5..1d9791b 100644
--- a/src/imports/localdevice/qmldir
+++ b/src/imports/localdevice/qmldir
@@ -1,3 +1,3 @@
-module com.theqtcompany.localdevice
+module QtDeviceUtilities.LocalDeviceSettings
 plugin localdeviceplugin
 typeinfo plugins.qmltypes
diff --git a/src/imports/localesettings/localesettings.pro b/src/imports/localesettings/localesettings.pro
index 891e4f8..35656ea 100644
--- a/src/imports/localesettings/localesettings.pro
+++ b/src/imports/localesettings/localesettings.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 CONFIG += plugin
 QT += qml localesettings
 
-uri = com.theqtcompany.settings.locale
+uri = QtDeviceUtilities.LocaleSettings
 
 TARGET  = localesettingsplugin
 
diff --git a/src/imports/localesettings/qmldir b/src/imports/localesettings/qmldir
index 3c59bb0..e02d748 100644
--- a/src/imports/localesettings/qmldir
+++ b/src/imports/localesettings/qmldir
@@ -1,2 +1,2 @@
-module com.theqtcompany.settings.locale
+module QtDeviceUtilities.LocaleSettings
 plugin localesettingsplugin
diff --git a/src/imports/networksettings/networksettings.pro b/src/imports/networksettings/networksettings.pro
index 45228c5..1b16421 100644
--- a/src/imports/networksettings/networksettings.pro
+++ b/src/imports/networksettings/networksettings.pro
@@ -3,7 +3,7 @@ TARGET = networksettingsplugin
 QT += qml quick networksettings
 CONFIG += qt plugin
 
-uri = com.theqtcompany.settings.network
+uri = QtDeviceUtilities.NetworkSettings
 
 SOURCES += \
     plugin.cpp \
diff --git a/src/imports/networksettings/plugin.cpp b/src/imports/networksettings/plugin.cpp
index ab81e31..9a3b5ce 100644
--- a/src/imports/networksettings/plugin.cpp
+++ b/src/imports/networksettings/plugin.cpp
@@ -52,7 +52,7 @@ QObject *instance(QQmlEngine *engine, QJSEngine *) {
 
 void NetworksettingspluginPlugin::registerTypes(const char *uri)
 {
-    Q_ASSERT(QLatin1String(uri) == QLatin1String("com.theqtcompany.settings.network"));
+    Q_ASSERT(QLatin1String(uri) == QLatin1String("QtDeviceUtilities.NetworkSettings"));
     qmlRegisterUncreatableType<QNetworkSettingsService>(uri, 1, 0, "NetworkService", "Cannot be instantiated directly.");
     qmlRegisterUncreatableType<QNetworkSettingsIPv4>(uri, 1, 0, "NetworkSettingsIPv4", "Cannot be instantiated directly.");
     qmlRegisterUncreatableType<QNetworkSettingsIPv6>(uri, 1, 0, "NetworkSettingsIPv6", "Cannot be instantiated directly.");
diff --git a/src/imports/networksettings/qmldir b/src/imports/networksettings/qmldir
index 7774745..c2c0dec 100644
--- a/src/imports/networksettings/qmldir
+++ b/src/imports/networksettings/qmldir
@@ -1,3 +1,3 @@
-module com.theqtcompany.settings.network
+module QtDeviceUtilities.NetworkSettings
 plugin networksettingsplugin
 
diff --git a/src/imports/timedatesettings/qmldir b/src/imports/timedatesettings/qmldir
index 3fc8fec..cd39356 100644
--- a/src/imports/timedatesettings/qmldir
+++ b/src/imports/timedatesettings/qmldir
@@ -1,2 +1,2 @@
-module com.theqtcompany.settings.timedate
+module QtDeviceUtilities.TimeDateSettings
 plugin qmltimedatesettingsplugin
diff --git a/src/imports/timedatesettings/timedatesettings.pro b/src/imports/timedatesettings/timedatesettings.pro
index ec86d4e..5e5f913 100644
--- a/src/imports/timedatesettings/timedatesettings.pro
+++ b/src/imports/timedatesettings/timedatesettings.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
 CONFIG += plugin
 QT += qml timedatesettings
 
-uri = com.theqtcompany.settings.timedate
+uri = QtDeviceUtilities.TimeDateSettings
 
 DESTDIR = imports/TimeDate
 TARGET  = qmltimedatesettingsplugin