ivigenerator: Remove the "Module" postfix in the autogenerated classes

The module class which is autogenerated by the ivigenerator always got
a postfix which was used to prevent compilation errors when module and
interface had the same name.

As we don't use any extra postfix for structs or interfaces either
the "Module" postfix is now dropped as well and the module should rather
be renamed already in the IDL file instead.

Change-Id: I91bf95e824436e65e374aaf397ecd5c548444589
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

29 files changed, 73 insertions, 73 deletions

diff --git a/examples/ivicore/qface-ivi-addressbook/backend_simulator/simulation.qml b/examples/ivicore/qface-ivi-addressbook/backend_simulator/simulation.qml
index 7aed660..4fbe4f2 100644
--- a/examples/ivicore/qface-ivi-addressbook/backend_simulator/simulation.qml
+++ b/examples/ivicore/qface-ivi-addressbook/backend_simulator/simulation.qml
@@ -53,7 +53,7 @@
 
 //! [0]
 import QtQuick 2.0
-import Example.IVI.AddressBook.simulation 1.0
+import Example.IVI.AddressBookModule.simulation 1.0
 
 Item {
     AddressBookBackend {
diff --git a/examples/ivicore/qface-ivi-addressbook/demo/main.qml b/examples/ivicore/qface-ivi-addressbook/demo/main.qml
index 9a487ed..ee8bca9 100644
--- a/examples/ivicore/qface-ivi-addressbook/demo/main.qml
+++ b/examples/ivicore/qface-ivi-addressbook/demo/main.qml
@@ -55,7 +55,7 @@ import QtQuick 2.11
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import QtQuick.Window 2.2
-import Example.IVI.AddressBook 1.0
+import Example.IVI.AddressBookModule 1.0
 
 Window {
     id: root
@@ -91,7 +91,7 @@ Window {
             Button {
                 Layout.fillWidth: true
                 text: "New Contact"
-                onClicked: addressBook.insertContact(0, AddressBook.contact("Foo", "Bar", "12234"))
+                onClicked: addressBook.insertContact(0, AddressBookModule.contact("Foo", "Bar", "12234"))
             }
         }
     }
diff --git a/examples/ivicore/qface-ivi-addressbook/example-ivi-addressbook.qface b/examples/ivicore/qface-ivi-addressbook/example-ivi-addressbook.qface
index 5ef26d6..760b8ee 100644
--- a/examples/ivicore/qface-ivi-addressbook/example-ivi-addressbook.qface
+++ b/examples/ivicore/qface-ivi-addressbook/example-ivi-addressbook.qface
@@ -1,4 +1,4 @@
-module Example.IVI.AddressBook 1.0;
+module Example.IVI.AddressBookModule 1.0;
 
 @config: { qml_type: "UiAddressBook" }
 //! [0]
diff --git a/examples/ivicore/qface-ivi-addressbook/example-ivi-addressbook.yaml b/examples/ivicore/qface-ivi-addressbook/example-ivi-addressbook.yaml
index cf21d7d..275f4a8 100644
--- a/examples/ivicore/qface-ivi-addressbook/example-ivi-addressbook.yaml
+++ b/examples/ivicore/qface-ivi-addressbook/example-ivi-addressbook.yaml
@@ -1,7 +1,7 @@
-Example.IVI.AddressBook:
+Example.IVI.AddressBookModule:
     config_simulator:
         simulationFile: "qrc:/plugin_resource/simulation.qml"
 
-Example.IVI.AddressBook.AddressBook#contacts:
+Example.IVI.AddressBookModule.AddressBook#contacts:
     config_simulator:
         default: [[ "John", "Doe", "12345" ], [ "Jane", "Doe", "67890" ]]
diff --git a/examples/ivicore/qface-ivi-climate/demo/main.qml b/examples/ivicore/qface-ivi-climate/demo/main.qml
index eeb8808..4482bb1 100644
--- a/examples/ivicore/qface-ivi-climate/demo/main.qml
+++ b/examples/ivicore/qface-ivi-climate/demo/main.qml
@@ -54,7 +54,7 @@
 import QtQuick 2.7
 import QtQuick.Window 2.2
 //! [0]
-import Example.IVI.Climate 1.0
+import Example.IVI.ClimateModule 1.0
 
 Window {
 
diff --git a/examples/ivicore/qface-ivi-climate/example-ivi-climate.qface b/examples/ivicore/qface-ivi-climate/example-ivi-climate.qface
index 07b5be7..2d4246b 100644
--- a/examples/ivicore/qface-ivi-climate/example-ivi-climate.qface
+++ b/examples/ivicore/qface-ivi-climate/example-ivi-climate.qface
@@ -1,7 +1,7 @@
 /**
  * Test module
  */
-module Example.IVI.Climate 1.0;
+module Example.IVI.ClimateModule 1.0;
 
 /**
  * The ClimateControl provides a QML interface to the climate control
diff --git a/examples/ivicore/qface-ivi-climate/example-ivi-climate.yaml b/examples/ivicore/qface-ivi-climate/example-ivi-climate.yaml
index 2d1a751..3534804 100644
--- a/examples/ivicore/qface-ivi-climate/example-ivi-climate.yaml
+++ b/examples/ivicore/qface-ivi-climate/example-ivi-climate.yaml
@@ -1,62 +1,62 @@
-Example.IVI.Climate.ClimateControl:
+Example.IVI.ClimateModule.ClimateControl:
     config_simulator:
         zones: [ FrontLeft, FrontRight, Rear ]
 
-Example.IVI.Climate.ClimateControl#airConditioning:
+Example.IVI.ClimateModule.ClimateControl#airConditioning:
     config_simulator:
         default: true
 
-Example.IVI.Climate.ClimateControl#heater:
+Example.IVI.ClimateModule.ClimateControl#heater:
     config_simulator:
         default: true
 
-Example.IVI.Climate.ClimateControl#recirculation:
+Example.IVI.ClimateModule.ClimateControl#recirculation:
     config_simulator:
         default: false
 
-Example.IVI.Climate.ClimateControl#zoneSynchronization:
+Example.IVI.ClimateModule.ClimateControl#zoneSynchronization:
     config_simulator:
         default: false
 
-Example.IVI.Climate.ClimateControl#defrost:
+Example.IVI.ClimateModule.ClimateControl#defrost:
     config_simulator:
         default: false
 
-Example.IVI.Climate.ClimateControl#steeringWheelHeater:
+Example.IVI.ClimateModule.ClimateControl#steeringWheelHeater:
     config_simulator:
         default: 0
 
-Example.IVI.Climate.ClimateControl#fanSpeedLevel:
+Example.IVI.ClimateModule.ClimateControl#fanSpeedLevel:
     config_simulator:
         default: 2
 
-Example.IVI.Climate.ClimateControl#recirculationMode:
+Example.IVI.ClimateModule.ClimateControl#recirculationMode:
     config_simulator:
         default: RecirculationMode.RecirculationOff
 
-Example.IVI.Climate.ClimateControl#recirculationSensitivityLevel:
+Example.IVI.ClimateModule.ClimateControl#recirculationSensitivityLevel:
     config_simulator:
         unsupported: true
         default: 0
 
-Example.IVI.Climate.ClimateControl#climateMode:
+Example.IVI.ClimateModule.ClimateControl#climateMode:
     config_simulator:
         unsupported: true
         default: ClimateMode.ClimateOn
 
-Example.IVI.Climate.ClimateControl#automaticClimateFanIntensityLevel:
+Example.IVI.ClimateModule.ClimateControl#automaticClimateFanIntensityLevel:
     config_simulator:
         unsupported: true
         default: 0
 
-Example.IVI.Climate.ClimateControl#targetTemperature:
+Example.IVI.ClimateModule.ClimateControl#targetTemperature:
     config_simulator:
         default: 0
 
-Example.IVI.Climate.ClimateControl#seatCooler:
+Example.IVI.ClimateModule.ClimateControl#seatCooler:
     config_simulator:
         default: 0
 
-Example.IVI.Climate.ClimateControl#seatHeater:
+Example.IVI.ClimateModule.ClimateControl#seatHeater:
     config_simulator:
         default: 0
diff --git a/examples/ivicore/qface-ivi-remote/demo/main.qml b/examples/ivicore/qface-ivi-remote/demo/main.qml
index ee95384..1148479 100644
--- a/examples/ivicore/qface-ivi-remote/demo/main.qml
+++ b/examples/ivicore/qface-ivi-remote/demo/main.qml
@@ -55,7 +55,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.3
 import QtQuick.Window 2.2
 //! [0]
-import Example.IVI.Remote 1.0
+import Example.IVI.RemoteModule 1.0
 
 Window {
     visible: true
diff --git a/examples/ivicore/qface-ivi-remote/example-ivi-remote.qface b/examples/ivicore/qface-ivi-remote/example-ivi-remote.qface
index 31d6d0c..9ff028a 100644
--- a/examples/ivicore/qface-ivi-remote/example-ivi-remote.qface
+++ b/examples/ivicore/qface-ivi-remote/example-ivi-remote.qface
@@ -2,7 +2,7 @@
  * Test module
  */
 //! [0]
-module Example.IVI.Remote 1.0;
+module Example.IVI.RemoteModule 1.0;
 //! [0]
 /**
  * The ProcessingService provides a QML interface to a service doing
diff --git a/examples/ivicore/qface-ivi-remote/server_qtro/main.cpp b/examples/ivicore/qface-ivi-remote/server_qtro/main.cpp
index bd91c34..48fa0c3 100644
--- a/examples/ivicore/qface-ivi-remote/server_qtro/main.cpp
+++ b/examples/ivicore/qface-ivi-remote/server_qtro/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
     QCoreApplication app(argc, argv);
 
     ProcessingService service;
-    Core::instance()->host()->enableRemoting(&service,QStringLiteral("Example.IVI.Remote.ProcessingService"));
+    Core::instance()->host()->enableRemoting(&service,QStringLiteral("Example.IVI.RemoteModule.ProcessingService"));
 
     return app.exec();
 }
diff --git a/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster.qface b/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster.qface
index 62dc847..4f8d20d 100644
--- a/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster.qface
+++ b/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster.qface
@@ -1,4 +1,4 @@
-module Example.IVI.InstrumentCluster 1.0
+module Example.IVI.InstrumentClusterModule 1.0
 
 interface InstrumentCluster {
     int speed;
diff --git a/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster/Cluster.qml b/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster/Cluster.qml
index cbdd138..a15bdeb 100644
--- a/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster/Cluster.qml
+++ b/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster/Cluster.qml
@@ -53,7 +53,7 @@
 
 import QtQuick 2.1
 import QtQuick.Window 2.2
-import Example.IVI.InstrumentCluster 1.0
+import Example.IVI.InstrumentClusterModule 1.0
 
 Window {
     id: root
diff --git a/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster.qface b/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster.qface
index 5e74475..71d468b 100644
--- a/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster.qface
+++ b/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster.qface
@@ -1,4 +1,4 @@
-module Example.IVI.InstrumentCluster 1.0
+module Example.IVI.InstrumentClusterModule 1.0
 
 interface InstrumentCluster {
     readonly int speed;
diff --git a/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster/Cluster.qml b/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster/Cluster.qml
index 1f73533..a475a9d 100644
--- a/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster/Cluster.qml
+++ b/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster/Cluster.qml
@@ -53,7 +53,7 @@
 
 import QtQuick 2.1
 import QtQuick.Window 2.2
-import Example.IVI.InstrumentCluster 1.0
+import Example.IVI.InstrumentClusterModule 1.0
 
 Window {
     id: root
@@ -74,7 +74,7 @@ Window {
         anchors.leftMargin: 0.1 * width
 
         value: instrumentCluster.speed
-        metricSystem: instrumentCluster.systemType === InstrumentCluster.Metric
+        metricSystem: instrumentCluster.systemType === InstrumentClusterModule.Metric
     }
 
     RightDial {
diff --git a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/instrument-cluster.qface b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/instrument-cluster.qface
index e0a1ea3..8836719 100644
--- a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/instrument-cluster.qface
+++ b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/instrument-cluster.qface
@@ -1,4 +1,4 @@
-module Example.IVI.InstrumentCluster 1.0
+module Example.IVI.InstrumentClusterModule 1.0
 
 interface InstrumentCluster {
     readonly int speed;
diff --git a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/instrument-cluster/Cluster.qml b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/instrument-cluster/Cluster.qml
index cd7dd95..f1d93c0 100644
--- a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/instrument-cluster/Cluster.qml
+++ b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/instrument-cluster/Cluster.qml
@@ -53,7 +53,7 @@
 
 import QtQuick 2.1
 import QtQuick.Window 2.2
-import Example.IVI.InstrumentCluster 1.0
+import Example.IVI.InstrumentClusterModule 1.0
 
 Window {
     id: root
@@ -74,7 +74,7 @@ Window {
         anchors.leftMargin: 0.1 * width
 
         value: instrumentCluster.speed
-        metricSystem: instrumentCluster.systemType === InstrumentCluster.Metric
+        metricSystem: instrumentCluster.systemType === InstrumentClusterModule.Metric
     }
 
     RightDial {
diff --git a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/simulation.qml b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/simulation.qml
index 39c0ca4..5d22939 100644
--- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/simulation.qml
+++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/simulation.qml
@@ -52,13 +52,13 @@
 ****************************************************************************/
 
 import QtQuick 2.10
-import Example.IVI.InstrumentCluster.simulation 1.0
+import Example.IVI.InstrumentClusterModule.simulation 1.0
 
 QtObject {
     property var settings : IviSimulator.findData(IviSimulator.simulationData, "InstrumentCluster")
     property bool defaultInitialized: false
     property LoggingCategory qLcInstrumentCluster: LoggingCategory {
-        name: "example.ivi.instrumentcluster.simulation.instrumentclusterbackend"
+        name: "example.ivi.instrumentclustermodule.simulation.instrumentclusterbackend"
     }
     property var backend : InstrumentClusterBackend {
 
@@ -107,7 +107,7 @@ QtObject {
 
                     ScriptAction {
                         script: {
-                            backend.currentWarning = InstrumentCluster.warning("red","LOW FUEL", "images/fuelsymbol_orange.png")
+                            backend.currentWarning = InstrumentClusterModule.warning("red","LOW FUEL", "images/fuelsymbol_orange.png")
                         }
                     }
 
@@ -120,7 +120,7 @@ QtObject {
 
                     ScriptAction {
                         script: {
-                            backend.currentWarning = InstrumentCluster.warning()
+                            backend.currentWarning = InstrumentClusterModule.warning()
                         }
                     }
                 }
diff --git a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/instrument-cluster.qface b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/instrument-cluster.qface
index f6a5c9f..b06dffc 100644
--- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/instrument-cluster.qface
+++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/instrument-cluster.qface
@@ -1,5 +1,5 @@
 @config_simulator: { simulationFile: "qrc:/simulation.qml" }
-module Example.IVI.InstrumentCluster 1.0
+module Example.IVI.InstrumentClusterModule 1.0
 
 interface InstrumentCluster {
     readonly int speed;
diff --git a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/instrument-cluster/Cluster.qml b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/instrument-cluster/Cluster.qml
index db33660..86b996e 100644
--- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/instrument-cluster/Cluster.qml
+++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/instrument-cluster/Cluster.qml
@@ -53,7 +53,7 @@
 
 import QtQuick 2.1
 import QtQuick.Window 2.2
-import Example.IVI.InstrumentCluster 1.0
+import Example.IVI.InstrumentClusterModule 1.0
 
 Window {
     id: root
@@ -74,7 +74,7 @@ Window {
         anchors.leftMargin: 0.1 * width
 
         value: instrumentCluster.speed
-        metricSystem: instrumentCluster.systemType === InstrumentCluster.Metric
+        metricSystem: instrumentCluster.systemType === InstrumentClusterModule.Metric
     }
 
     RightDial {
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/simulation.qml b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/simulation.qml
index e052160..a65ec28 100644
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/simulation.qml
+++ b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/simulation.qml
@@ -52,13 +52,13 @@
 ****************************************************************************/
 
 import QtQuick 2.10
-import Example.IVI.InstrumentCluster.simulation 1.0
+import Example.IVI.InstrumentClusterModule.simulation 1.0
 
 QtObject {
     property var settings : IviSimulator.findData(IviSimulator.simulationData, "InstrumentCluster")
     property bool defaultInitialized: false
     property LoggingCategory qLcInstrumentCluster: LoggingCategory {
-        name: "example.ivi.instrumentcluster.simulation.instrumentclusterbackend"
+        name: "example.ivi.instrumentclustermodule.simulation.instrumentclusterbackend"
     }
     property var backend : InstrumentClusterBackend {
 
@@ -107,7 +107,7 @@ QtObject {
 
                     ScriptAction {
                         script: {
-                            backend.currentWarning = InstrumentCluster.warning("red","LOW FUEL", "images/fuelsymbol_orange.png")
+                            backend.currentWarning = InstrumentClusterModule.warning("red","LOW FUEL", "images/fuelsymbol_orange.png")
                         }
                     }
 
@@ -120,7 +120,7 @@ QtObject {
 
                     ScriptAction {
                         script: {
-                            backend.currentWarning = InstrumentCluster.warning()
+                            backend.currentWarning = InstrumentClusterModule.warning()
                         }
                     }
                 }
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/instrument-cluster.qface b/examples/ivicore/qface-tutorial/chapter5-ipc/instrument-cluster.qface
index f6a5c9f..b06dffc 100644
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/instrument-cluster.qface
+++ b/examples/ivicore/qface-tutorial/chapter5-ipc/instrument-cluster.qface
@@ -1,5 +1,5 @@
 @config_simulator: { simulationFile: "qrc:/simulation.qml" }
-module Example.IVI.InstrumentCluster 1.0
+module Example.IVI.InstrumentClusterModule 1.0
 
 interface InstrumentCluster {
     readonly int speed;
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/instrument-cluster/Cluster.qml b/examples/ivicore/qface-tutorial/chapter5-ipc/instrument-cluster/Cluster.qml
index 5ca46eb..89c26b3 100644
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/instrument-cluster/Cluster.qml
+++ b/examples/ivicore/qface-tutorial/chapter5-ipc/instrument-cluster/Cluster.qml
@@ -53,7 +53,7 @@
 
 import QtQuick 2.1
 import QtQuick.Window 2.2
-import Example.IVI.InstrumentCluster 1.0
+import Example.IVI.InstrumentClusterModule 1.0
 
 Window {
     id: root
@@ -74,7 +74,7 @@ Window {
         anchors.leftMargin: 0.1 * width
 
         value: instrumentCluster.speed
-        metricSystem: instrumentCluster.systemType === InstrumentCluster.Metric
+        metricSystem: instrumentCluster.systemType === InstrumentClusterModule.Metric
     }
 
     RightDial {
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentcluster_dbus.json b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentcluster_dbus.json
index 7461695..24c159f 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentcluster_dbus.json
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentcluster_dbus.json
@@ -1,5 +1,5 @@
 {
     "interfaces" : [
-      "Example.IVI.InstrumentCluster.InstrumentCluster"
+      "Example.IVI.InstrumentClusterModule.InstrumentCluster"
     ]
 }
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentclusterplugin.cpp b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentclusterplugin.cpp
index 8c7d65d..acb2248 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentclusterplugin.cpp
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/instrumentclusterplugin.cpp
@@ -61,12 +61,12 @@ InstrumentClusterPlugin::InstrumentClusterPlugin(QObject *parent)
 
 QStringList InstrumentClusterPlugin::interfaces() const
 {
-    return QStringList(InstrumentCluster_InstrumentCluster_iid);
+    return QStringList(InstrumentClusterModule_InstrumentCluster_iid);
 }
 
 QIviFeatureInterface *InstrumentClusterPlugin::interfaceInstance(const QString &interface) const
 {
-    if (interface == InstrumentCluster_InstrumentCluster_iid)
+    if (interface == InstrumentClusterModule_InstrumentCluster_iid)
         return m_backend;
 
     return nullptr;
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/simulation.qml b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/simulation.qml
index 58cac5b..797cfcf 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/simulation.qml
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/simulation.qml
@@ -52,13 +52,13 @@
 ****************************************************************************/
 
 import QtQuick 2.10
-import Example.IVI.InstrumentCluster.simulation 1.0
+import Example.IVI.InstrumentClusterModule.simulation 1.0
 
 QtObject {
     property var settings : IviSimulator.findData(IviSimulator.simulationData, "InstrumentCluster")
     property bool defaultInitialized: false
     property LoggingCategory qLcInstrumentCluster: LoggingCategory {
-        name: "example.ivi.instrumentcluster.simulation.instrumentclusterbackend"
+        name: "example.ivi.instrumentclustermodule.simulation.instrumentclusterbackend"
     }
     property var backend : InstrumentClusterBackend {
 
@@ -107,7 +107,7 @@ QtObject {
 
                     ScriptAction {
                         script: {
-                            backend.currentWarning = InstrumentCluster.warning("red","LOW FUEL", "images/fuelsymbol_orange.png")
+                            backend.currentWarning = InstrumentClusterModule.warning("red","LOW FUEL", "images/fuelsymbol_orange.png")
                         }
                     }
 
@@ -120,7 +120,7 @@ QtObject {
 
                     ScriptAction {
                         script: {
-                            backend.currentWarning = InstrumentCluster.warning()
+                            backend.currentWarning = InstrumentClusterModule.warning()
                         }
                     }
                 }
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster.qface b/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster.qface
index f6a5c9f..b06dffc 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster.qface
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster.qface
@@ -1,5 +1,5 @@
 @config_simulator: { simulationFile: "qrc:/simulation.qml" }
-module Example.IVI.InstrumentCluster 1.0
+module Example.IVI.InstrumentClusterModule 1.0
 
 interface InstrumentCluster {
     readonly int speed;
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster/Cluster.qml b/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster/Cluster.qml
index 3833d67..9ed127d 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster/Cluster.qml
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/instrument-cluster/Cluster.qml
@@ -53,7 +53,7 @@
 
 import QtQuick 2.1
 import QtQuick.Window 2.2
-import Example.IVI.InstrumentCluster 1.0
+import Example.IVI.InstrumentClusterModule 1.0
 
 Window {
     id: root
@@ -74,7 +74,7 @@ Window {
         anchors.leftMargin: 0.1 * width
 
         value: instrumentCluster.speed
-        metricSystem: instrumentCluster.systemType === InstrumentCluster.Metric
+        metricSystem: instrumentCluster.systemType === InstrumentClusterModule.Metric
     }
 
     RightDial {
diff --git a/examples/ivivehiclefunctions/climate_widget/mainwindow.cpp b/examples/ivivehiclefunctions/climate_widget/mainwindow.cpp
index a6d1503..dcf09dc 100644
--- a/examples/ivivehiclefunctions/climate_widget/mainwindow.cpp
+++ b/examples/ivivehiclefunctions/climate_widget/mainwindow.cpp
@@ -97,7 +97,7 @@ MainWindow::MainWindow(QWidget *parent) :
             m_climateControl, &QIviClimateControl::setAirConditioningEnabled);
 
     //Air Recirculation
-    ui->cb_airRecirculation->setChecked(m_climateControl->recirculationMode() == QtIviVehicleFunctionsModule::RecirculationOn);
+    ui->cb_airRecirculation->setChecked(m_climateControl->recirculationMode() == QtIviVehicleFunctions::RecirculationOn);
     connect(m_climateControl, &QIviClimateControl::recirculationModeChanged,
             this, &MainWindow::onAirRecirculationModeChanged);
     connect(ui->cb_airRecirculation, &QCheckBox::clicked,
@@ -120,22 +120,22 @@ MainWindow::~MainWindow()
 void MainWindow::setAirRecirculationEnabled(bool enabled)
 {
     if (enabled)
-        m_climateControl->setRecirculationMode(QtIviVehicleFunctionsModule::RecirculationOn);
+        m_climateControl->setRecirculationMode(QtIviVehicleFunctions::RecirculationOn);
     else
-        m_climateControl->setRecirculationMode(QtIviVehicleFunctionsModule::RecirculationOff);
+        m_climateControl->setRecirculationMode(QtIviVehicleFunctions::RecirculationOff);
 }
 
-void MainWindow::onAirRecirculationModeChanged(QtIviVehicleFunctionsModule::RecirculationMode mode)
+void MainWindow::onAirRecirculationModeChanged(QtIviVehicleFunctions::RecirculationMode mode)
 {
-    ui->cb_airRecirculation->setChecked(mode == QtIviVehicleFunctionsModule::RecirculationOn);
+    ui->cb_airRecirculation->setChecked(mode == QtIviVehicleFunctions::RecirculationOn);
 }
 
 //![3]
-void MainWindow::setupFlowDirectionRadioButtons(QtIviVehicleFunctionsModule::AirflowDirections direction)
+void MainWindow::setupFlowDirectionRadioButtons(QtIviVehicleFunctions::AirflowDirections direction)
 {
-    ui->cb_windshield->setChecked(direction.testFlag(QtIviVehicleFunctionsModule::Windshield));
-    ui->cb_dashboard->setChecked(direction.testFlag(QtIviVehicleFunctionsModule::Dashboard));
-    ui->cb_floor->setChecked(direction.testFlag(QtIviVehicleFunctionsModule::Floor));
+    ui->cb_windshield->setChecked(direction.testFlag(QtIviVehicleFunctions::Windshield));
+    ui->cb_dashboard->setChecked(direction.testFlag(QtIviVehicleFunctions::Dashboard));
+    ui->cb_floor->setChecked(direction.testFlag(QtIviVehicleFunctions::Floor));
 }
 
 void MainWindow::onFlowDirectionButtonToggled(QAbstractButton *button, bool checked)
@@ -143,14 +143,14 @@ void MainWindow::onFlowDirectionButtonToggled(QAbstractButton *button, bool chec
     Q_UNUSED(button)
     Q_UNUSED(checked)
 
-    QtIviVehicleFunctionsModule::AirflowDirections direction;
+    QtIviVehicleFunctions::AirflowDirections direction;
 
     if (ui->cb_windshield->isChecked())
-        direction |= QtIviVehicleFunctionsModule::Windshield;
+        direction |= QtIviVehicleFunctions::Windshield;
     if (ui->cb_dashboard->isChecked())
-        direction |= QtIviVehicleFunctionsModule::Dashboard;
+        direction |= QtIviVehicleFunctions::Dashboard;
     if (ui->cb_floor->isChecked())
-        direction |= QtIviVehicleFunctionsModule::Floor;
+        direction |= QtIviVehicleFunctions::Floor;
 
     m_climateControl->setAirflowDirections(direction);
 }
diff --git a/examples/ivivehiclefunctions/climate_widget/mainwindow.h b/examples/ivivehiclefunctions/climate_widget/mainwindow.h
index 663b8be..635a653 100644
--- a/examples/ivivehiclefunctions/climate_widget/mainwindow.h
+++ b/examples/ivivehiclefunctions/climate_widget/mainwindow.h
@@ -76,8 +76,8 @@ public:
 
 private slots:
     void setAirRecirculationEnabled(bool enabled);
-    void onAirRecirculationModeChanged(QtIviVehicleFunctionsModule::RecirculationMode mode);
-    void setupFlowDirectionRadioButtons(QtIviVehicleFunctionsModule::AirflowDirections direction);
+    void onAirRecirculationModeChanged(QtIviVehicleFunctions::RecirculationMode mode);
+    void setupFlowDirectionRadioButtons(QtIviVehicleFunctions::AirflowDirections direction);
     void onFlowDirectionButtonToggled(QAbstractButton *button, bool checked);
 private: