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>

63 files changed, 250 insertions, 250 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:
 
diff --git a/src/tools/ivigenerator/generator/filters.py b/src/tools/ivigenerator/generator/filters.py
index 52ccd22..4e26a7c 100644
--- a/src/tools/ivigenerator/generator/filters.py
+++ b/src/tools/ivigenerator/generator/filters.py
@@ -90,7 +90,7 @@ def conf_sim_tag(symbol, path, default_value=False):
 
 def enum_value_to_cppliteral(value, module_name):
     value = value.strip().rsplit('.', 1)[-1]
-    return '{0}{1}Module::{2}'.format(Filters.classPrefix, upper_first(module_name), value)
+    return '{0}{1}::{2}'.format(Filters.classPrefix, upper_first(module_name), value)
 
 
 def enum_value(value, module_name):
@@ -121,10 +121,10 @@ def default_type_value(symbol):
     elif t.is_enum:
         module_name = t.reference.module.module_name
         value = next(iter(t.reference.members))
-        return '{0}{1}Module::{2}'.format(prefix, upper_first(module_name), value)
+        return '{0}{1}::{2}'.format(prefix, upper_first(module_name), value)
     elif t.is_flag:
         module_name = t.reference.module.module_name
-        return '{0}{1}Module::{2}()'.format(prefix, upper_first(module_name), flag_type(symbol))
+        return '{0}{1}::{2}()'.format(prefix, upper_first(module_name), flag_type(symbol))
     elif symbol.type.is_list:
         nested = Filters.returnType(symbol.type.nested)
         return 'QVariantList()'.format(nested)
@@ -157,11 +157,11 @@ def test_type_value(symbol):
     elif t.is_enum:
         module_name = t.reference.module.module_name
         value = list(iter(t.reference.members))[-1]
-        return '{0}{1}Module::{2}'.format(prefix, upper_first(module_name), value)
+        return '{0}{1}::{2}'.format(prefix, upper_first(module_name), value)
     elif t.is_flag:
         module_name = t.reference.module.module_name
         value = next(iter(t.reference.members))
-        return '{0}{1}Module::{2}'.format(prefix, upper_first(module_name), value)
+        return '{0}{1}::{2}'.format(prefix, upper_first(module_name), value)
     elif symbol.type.is_list:
         value = test_type_value(t.nested.type)
         if not (t.nested.type.is_primitive):
@@ -242,7 +242,7 @@ def parameter_type_default(symbol):
     """
     prefix = Filters.classPrefix
     if symbol.type.is_enum or symbol.type.is_flag:
-        return '{0}{1}Module::{2} {3}={4}'.format(prefix, upper_first(symbol.type.reference.module.module_name), flag_type(symbol), symbol, default_type_value(symbol))
+        return '{0}{1}::{2} {3}={4}'.format(prefix, upper_first(symbol.type.reference.module.module_name), flag_type(symbol), symbol, default_type_value(symbol))
     if symbol.type.is_void or symbol.type.is_primitive:
         if symbol.type.name == 'string':
             return 'const QString &{0}=QString()'.format(symbol)
@@ -272,7 +272,7 @@ def parameter_type(symbol):
     """
     prefix = Filters.classPrefix
     if symbol.type.is_enum or symbol.type.is_flag:
-        return '{0}{1}Module::{2} {3}'.format(prefix, upper_first(symbol.type.reference.module.module_name), flag_type(symbol), symbol)
+        return '{0}{1}::{2} {3}'.format(prefix, upper_first(symbol.type.reference.module.module_name), flag_type(symbol), symbol)
     if symbol.type.is_void or symbol.type.is_primitive:
         if symbol.type.name == 'string':
             return 'const QString &{0}'.format(symbol)
@@ -301,7 +301,7 @@ def return_type(symbol):
     """
     prefix = Filters.classPrefix
     if symbol.type.is_enum or symbol.type.is_flag:
-        return('{0}{1}Module::{2}'.format(prefix,
+        return('{0}{1}::{2}'.format(prefix,
                                           upper_first(symbol.type.reference.module.module_name),
                                           flag_type(symbol)))
     if symbol.type.is_void or symbol.type.is_primitive:
@@ -664,7 +664,7 @@ def qml_info_type(symbol):
     """
     prefix = Filters.classPrefix
     if symbol.type.is_enum or symbol.type.is_flag:
-        return('{0}{1}Module::{2}'.format(prefix, upper_first(symbol.module.module_name),
+        return('{0}{1}::{2}'.format(prefix, upper_first(symbol.module.module_name),
                flag_type(symbol)))
     elif symbol.type.is_void or symbol.type.is_primitive:
         if symbol.type.is_real:
diff --git a/src/tools/ivigenerator/templates/backend_qtro/backend.cpp.tpl b/src/tools/ivigenerator/templates/backend_qtro/backend.cpp.tpl
index b4a43c8..3aedb26 100644
--- a/src/tools/ivigenerator/templates/backend_qtro/backend.cpp.tpl
+++ b/src/tools/ivigenerator/templates/backend_qtro/backend.cpp.tpl
@@ -47,7 +47,7 @@
 #include <QDebug>
 #include <QSettings>
 #include <QTimer>
-#include "{{module.module_name|lower}}module.h"
+#include "{{module.module_name|lower}}.h"
 
 Q_LOGGING_CATEGORY(qLcRO{{interface}}, "{{module|qml_type|lower}}.{{interface|lower}}backend.remoteobjects", QtInfoMsg)
 
@@ -146,7 +146,7 @@ void {{zone_class}}::emitCurrentState()
     , m_synced(false)
 {% endif %}
 {
-    {{module.module_name|upperfirst}}Module::registerTypes();
+    {{module.module_name|upperfirst}}::registerTypes();
 
 {% if interface_zoned %}
     auto zoneObject = new {{zone_class}}(QString(), this);
diff --git a/src/tools/ivigenerator/templates/backend_simulator/plugin.cpp.tpl b/src/tools/ivigenerator/templates/backend_simulator/plugin.cpp.tpl
index 22d1a58..cc2f831 100644
--- a/src/tools/ivigenerator/templates/backend_simulator/plugin.cpp.tpl
+++ b/src/tools/ivigenerator/templates/backend_simulator/plugin.cpp.tpl
@@ -73,7 +73,7 @@ extern {{class}}::InterfaceBuilder {{module.tags.config.interfaceBuilder}};
 {%   for interface in module.interfaces %}
     auto {{interface}}Instance = new {{interface}}Backend(m_simulationEngine, this);
     //Register the types for the SimulationEngine
-    {{module.module_name|upperfirst}}Module::registerQmlTypes(QStringLiteral("{{module|qml_type}}.simulation"), {{module.majorVersion}}, {{module.minorVersion}});
+    {{module.module_name|upperfirst}}::registerQmlTypes(QStringLiteral("{{module|qml_type}}.simulation"), {{module.majorVersion}}, {{module.minorVersion}});
     m_simulationEngine->registerSimulationInstance({{interface}}Instance, "{{module|qml_type}}.simulation", {{module.majorVersion}}, {{module.minorVersion}}, "{{interface}}Backend");
     m_interfaces << {{interface}}Instance;
 {%   endfor %}
diff --git a/src/tools/ivigenerator/templates/common/backend_simulation.cpp.tpl b/src/tools/ivigenerator/templates/common/backend_simulation.cpp.tpl
index fdf597a..c4c5d64 100644
--- a/src/tools/ivigenerator/templates/common/backend_simulation.cpp.tpl
+++ b/src/tools/ivigenerator/templates/common/backend_simulation.cpp.tpl
@@ -128,7 +128,7 @@ QT_BEGIN_NAMESPACE
 {%   endif %}
 {% endfor %}
 
-    {{module.module_name|upperfirst}}Module::registerTypes();
+    {{module.module_name|upperfirst}}::registerTypes();
 }
 
 {{class}}::~{{class}}()
diff --git a/src/tools/ivigenerator/templates/common/interface.rep.tpl b/src/tools/ivigenerator/templates/common/interface.rep.tpl
index dd75f03..2b7cdf8 100644
--- a/src/tools/ivigenerator/templates/common/interface.rep.tpl
+++ b/src/tools/ivigenerator/templates/common/interface.rep.tpl
@@ -48,9 +48,9 @@
 {% import 'common/qtivi_macros.j2' as ivi %}
 {% set interface_zoned = interface.tags.config and interface.tags.config.zoned %}
 {% if interface.module.tags.config.module %}
-#include <{{interface.module.tags.config.module}}/{{module.module_name|lower}}module.h>
+#include <{{interface.module.tags.config.module}}/{{module.module_name|lower}}.h>
 {% else %}
-#include "{{module.module_name|lower}}module.h"
+#include "{{module.module_name|lower}}.h"
 {% endif %}
 {% for inc in interface|struct_includes %}
 {{inc}}
diff --git a/src/tools/ivigenerator/templates/common/plugins.qmltypes.tpl b/src/tools/ivigenerator/templates/common/plugins.qmltypes.tpl
index 5480e2e..9193f2b 100644
--- a/src/tools/ivigenerator/templates/common/plugins.qmltypes.tpl
+++ b/src/tools/ivigenerator/templates/common/plugins.qmltypes.tpl
@@ -104,7 +104,7 @@ Module {
 {% endfor %}
 
     Component {
-        name: "{{module.module_name|upperfirst}}Module"
+        name: "{{module.module_name|upperfirst}}"
         prototype: "QObject"
         exports: ["{{module|qml_type}}/{{module_qml_name}} {{module.majorVersion}}.{{module.minorVersion}}"]
         isCreatable: false
diff --git a/src/tools/ivigenerator/templates/common/simulation.qmltypes.tpl b/src/tools/ivigenerator/templates/common/simulation.qmltypes.tpl
index b8e79dc..2644f3a 100644
--- a/src/tools/ivigenerator/templates/common/simulation.qmltypes.tpl
+++ b/src/tools/ivigenerator/templates/common/simulation.qmltypes.tpl
@@ -220,7 +220,7 @@ Module {
 {% endfor %}
 
     Component {
-        name: "{{module.module_name|upperfirst}}Module"
+        name: "{{module.module_name|upperfirst}}"
         prototype: "QObject"
         exports: ["{{module|qml_type}}.simulation/{{module_qml_name}} {{module.majorVersion}}.{{module.minorVersion}}"]
         isCreatable: false
diff --git a/src/tools/ivigenerator/templates/frontend.yaml b/src/tools/ivigenerator/templates/frontend.yaml
index 7323d32..bdabab5 100644
--- a/src/tools/ivigenerator/templates/frontend.yaml
+++ b/src/tools/ivigenerator/templates/frontend.yaml
@@ -2,11 +2,11 @@ frontend:
     module:
         documents:
             - '{{module.module_name|lower}}global.h': 'global.h.tpl'
-            - '{{module.module_name|lower}}module.h': 'module.h.tpl'
-            - '{{module.module_name|lower}}module.cpp': 'module.cpp.tpl'
+            - '{{module.module_name|lower}}.h': 'module.h.tpl'
+            - '{{module.module_name|lower}}.cpp': 'module.cpp.tpl'
             - '{{module.module_name|lower}}module_enum.qdocinc': 'module_qml_enum.qdocinc.tpl'
-            - '{{module.module_name|lower}}modulefactory.h': 'modulefactory.h.tpl'
-            - '{{module.module_name|lower}}modulefactory.cpp': 'modulefactory.cpp.tpl'
+            - '{{module.module_name|lower}}factory.h': 'modulefactory.h.tpl'
+            - '{{module.module_name|lower}}factory.cpp': 'modulefactory.cpp.tpl'
             - '{{srcBase|lower}}.pri': 'module.pri.tpl'
             - '{{srcBase|lower}}.cmake': 'CMakeLists.txt.tpl'
             - 'qml/{{module|qml_type|replace(".", "/")}}/plugins.qmltypes': 'common/plugins.qmltypes.tpl'
diff --git a/src/tools/ivigenerator/templates/frontend/CMakeLists.txt.tpl b/src/tools/ivigenerator/templates/frontend/CMakeLists.txt.tpl
index 4f39367..347b288 100644
--- a/src/tools/ivigenerator/templates/frontend/CMakeLists.txt.tpl
+++ b/src/tools/ivigenerator/templates/frontend/CMakeLists.txt.tpl
@@ -9,6 +9,6 @@ target_sources(${CURRENT_TARGET}
 {% for struct in module.structs %}
     {{struct|lower}}.cpp
 {% endfor %}
-    {{module.module_name|lower}}module.cpp
-    {{module.module_name|lower}}modulefactory.cpp
+    {{module.module_name|lower}}.cpp
+    {{module.module_name|lower}}factory.cpp
 )
diff --git a/src/tools/ivigenerator/templates/frontend/backendinterface.h.tpl b/src/tools/ivigenerator/templates/frontend/backendinterface.h.tpl
index 2eb9b97..699f283 100644
--- a/src/tools/ivigenerator/templates/frontend/backendinterface.h.tpl
+++ b/src/tools/ivigenerator/templates/frontend/backendinterface.h.tpl
@@ -51,9 +51,9 @@
 #define {{oncedefine}}
 
 {% if interface.module.tags.config.module %}
-#include <{{interface.module.tags.config.module}}/{{module.module_name|lower}}module.h>
+#include <{{interface.module.tags.config.module}}/{{module.module_name|lower}}.h>
 {% else %}
-#include "{{module.module_name|lower}}module.h"
+#include "{{module.module_name|lower}}.h"
 {% endif %}
 
 {% for inc in interface|struct_includes %}
diff --git a/src/tools/ivigenerator/templates/frontend/interface.h.tpl b/src/tools/ivigenerator/templates/frontend/interface.h.tpl
index fd7d0ef..12b0389 100644
--- a/src/tools/ivigenerator/templates/frontend/interface.h.tpl
+++ b/src/tools/ivigenerator/templates/frontend/interface.h.tpl
@@ -52,9 +52,9 @@
 #define {{oncedefine}}
 
 {% if interface.module.tags.config.module %}
-#include <{{interface.module.tags.config.module}}/{{module.module_name|lower}}module.h>
+#include <{{interface.module.tags.config.module}}/{{module.module_name|lower}}.h>
 {% else %}
-#include "{{module.module_name|lower}}module.h"
+#include "{{module.module_name|lower}}.h"
 {% endif %}
 
 {% for inc in interface|struct_includes %}
diff --git a/src/tools/ivigenerator/templates/frontend/interface_p.h.tpl b/src/tools/ivigenerator/templates/frontend/interface_p.h.tpl
index 0a68644..a8b68a5 100644
--- a/src/tools/ivigenerator/templates/frontend/interface_p.h.tpl
+++ b/src/tools/ivigenerator/templates/frontend/interface_p.h.tpl
@@ -60,7 +60,7 @@
 // We mean it.
 //
 
-#include "{{module.module_name|lower}}module.h"
+#include "{{module.module_name|lower}}.h"
 
 {% if module.tags.config.disablePrivateIVI %}
 #include <QObject>
diff --git a/src/tools/ivigenerator/templates/frontend/module.cpp.tpl b/src/tools/ivigenerator/templates/frontend/module.cpp.tpl
index a99eaa6..847e7dd 100644
--- a/src/tools/ivigenerator/templates/frontend/module.cpp.tpl
+++ b/src/tools/ivigenerator/templates/frontend/module.cpp.tpl
@@ -37,7 +37,7 @@
 #
 # SPDX-License-Identifier: LGPL-3.0
 #}
-{% set class = '{0}Module'.format(module.module_name|upperfirst) %}
+{% set class = '{0}'.format(module.module_name|upperfirst) %}
 {% set qml_name = (module|qml_type).split('.')[-1]|upperfirst %}
 {% include 'common/generated_comment.cpp.tpl' %}
 {% import 'common/qtivi_macros.j2' as ivi %}
@@ -126,7 +126,7 @@ void {{class}}::registerTypes()
 {%   set name = import.split(' ')[0] %}
 {%   for mod in system.modules %}
 {%     if mod.name == name %}
-    {{mod.module_name|upperfirst}}Module::registerTypes();
+    {{mod.module_name|upperfirst}}::registerTypes();
 {%     endif %}
 {%   endfor %}
 {% endfor %}
diff --git a/src/tools/ivigenerator/templates/frontend/module.h.tpl b/src/tools/ivigenerator/templates/frontend/module.h.tpl
index 859cf51..017a52e 100644
--- a/src/tools/ivigenerator/templates/frontend/module.h.tpl
+++ b/src/tools/ivigenerator/templates/frontend/module.h.tpl
@@ -38,7 +38,7 @@
 # SPDX-License-Identifier: LGPL-3.0
 #}
 {% set exportsymbol = 'Q_{0}_EXPORT'.format(module|upper|replace('.', '_')) %}
-{% set class = '{0}Module'.format(module.module_name|upperfirst) %}
+{% set class = '{0}'.format(module.module_name|upperfirst) %}
 {% set oncedefine = '{0}_H_'.format(class|upper) %}
 {% include 'common/generated_comment.cpp.tpl' %}
 
@@ -59,7 +59,7 @@
 {%   set name = import.split(' ')[0] %}
 {%   for mod in system.modules %}
 {%     if mod.name == name %}
-#include <{{mod.module_name|lower}}module.h>
+#include <{{mod.module_name|lower}}.h>
 {%     endif %}
 {%   endfor %}
 {% endfor %}
diff --git a/src/tools/ivigenerator/templates/frontend/module.pri.tpl b/src/tools/ivigenerator/templates/frontend/module.pri.tpl
index beb9da8..9667de9 100644
--- a/src/tools/ivigenerator/templates/frontend/module.pri.tpl
+++ b/src/tools/ivigenerator/templates/frontend/module.pri.tpl
@@ -54,8 +54,8 @@ HEADERS += \
 {% for struct in module.structs %}
     $$PWD/{{struct|lower}}.h \
 {% endfor %}
-    $$PWD/{{module.module_name|lower}}module.h \
-    $$PWD/{{module.module_name|lower}}modulefactory.h \
+    $$PWD/{{module.module_name|lower}}.h \
+    $$PWD/{{module.module_name|lower}}factory.h \
     $$PWD/{{module.module_name|lower}}global.h
 
 SOURCES += \
@@ -66,5 +66,5 @@ SOURCES += \
 {% for struct in module.structs %}
     $$PWD/{{struct|lower}}.cpp \
 {% endfor %}
-    $$PWD/{{module.module_name|lower}}module.cpp \
-    $$PWD/{{module.module_name|lower}}modulefactory.cpp
+    $$PWD/{{module.module_name|lower}}.cpp \
+    $$PWD/{{module.module_name|lower}}factory.cpp
diff --git a/src/tools/ivigenerator/templates/frontend/modulefactory.cpp.tpl b/src/tools/ivigenerator/templates/frontend/modulefactory.cpp.tpl
index dcffada..6eef8be 100644
--- a/src/tools/ivigenerator/templates/frontend/modulefactory.cpp.tpl
+++ b/src/tools/ivigenerator/templates/frontend/modulefactory.cpp.tpl
@@ -37,7 +37,7 @@
 #
 # SPDX-License-Identifier: LGPL-3.0
 #}
-{% set class = '{0}ModuleFactory'.format(module.module_name|upperfirst) %}
+{% set class = '{0}Factory'.format(module.module_name|upperfirst) %}
 {% set qml_name = (module|qml_type).split('.')[-1]|upperfirst %}
 {% include 'common/generated_comment.cpp.tpl' %}
 
@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
 {% endfor %}
 */
 {{class}}::{{class}}(QObject *parent)
-    : {{module.module_name|upperfirst}}Module(parent)
+    : {{module.module_name|upperfirst}}(parent)
 {
 }
 
diff --git a/src/tools/ivigenerator/templates/frontend/modulefactory.h.tpl b/src/tools/ivigenerator/templates/frontend/modulefactory.h.tpl
index 306b728..612350e 100644
--- a/src/tools/ivigenerator/templates/frontend/modulefactory.h.tpl
+++ b/src/tools/ivigenerator/templates/frontend/modulefactory.h.tpl
@@ -38,7 +38,7 @@
 # SPDX-License-Identifier: LGPL-3.0
 #}
 {% set exportsymbol = 'Q_{0}_EXPORT'.format(module|upper|replace('.', '_')) %}
-{% set class = '{0}ModuleFactory'.format(module.module_name|upperfirst) %}
+{% set class = '{0}Factory'.format(module.module_name|upperfirst) %}
 {% set oncedefine = '{0}_H_'.format(class|upper) %}
 {% include 'common/generated_comment.cpp.tpl' %}
 
@@ -46,9 +46,9 @@
 #define {{oncedefine}}
 
 {% if module.tags.config.module %}
-#include <{{module.tags.config.module}}/{{module.module_name|lower}}module.h>
+#include <{{module.tags.config.module}}/{{module.module_name|lower}}.h>
 {% else %}
-#include "{{module.module_name|lower}}module.h"
+#include "{{module.module_name|lower}}.h"
 {% endif %}
 #include <QObject>
 
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class {{exportsymbol}} {{class}} : public {{module.module_name|upperfirst}}Module
+class {{exportsymbol}} {{class}} : public {{module.module_name|upperfirst}}
 {
     Q_OBJECT
 
diff --git a/src/tools/ivigenerator/templates/frontend/struct.h.tpl b/src/tools/ivigenerator/templates/frontend/struct.h.tpl
index 9405c60..caaf65c 100644
--- a/src/tools/ivigenerator/templates/frontend/struct.h.tpl
+++ b/src/tools/ivigenerator/templates/frontend/struct.h.tpl
@@ -48,9 +48,9 @@
 #define {{oncedefine}}
 
 {% if module.tags.config.module %}
-#include <{{module.tags.config.module}}/{{module.module_name|lower}}module.h>
+#include <{{module.tags.config.module}}/{{module.module_name|lower}}.h>
 {% else %}
-#include "{{module.module_name|lower}}module.h"
+#include "{{module.module_name|lower}}.h"
 {% endif %}
 {% for inc in struct|struct_includes %}
 {{inc}}
diff --git a/src/tools/ivigenerator/templates/qmlplugin/plugin.cpp.tpl b/src/tools/ivigenerator/templates/qmlplugin/plugin.cpp.tpl
index 0d5a492..bbd8acd 100644
--- a/src/tools/ivigenerator/templates/qmlplugin/plugin.cpp.tpl
+++ b/src/tools/ivigenerator/templates/qmlplugin/plugin.cpp.tpl
@@ -48,9 +48,9 @@
 #include <qqml.h>
 
 {% if module.tags.config.module %}
-#include <{{module.tags.config.module}}/{{module.module_name|lower}}modulefactory.h>
+#include <{{module.tags.config.module}}/{{module.module_name|lower}}factory.h>
 {% else %}
-#include "{{module.module_name|lower}}modulefactory.h"
+#include "{{module.module_name|lower}}factory.h"
 {% endif %}
 
 QT_BEGIN_NAMESPACE
@@ -65,7 +65,7 @@ public:
         Q_ASSERT(QLatin1String(uri) == QLatin1String("{{module|qml_type}}"));
         Q_UNUSED(uri);
 
-        {{module_name}}ModuleFactory::registerQmlTypes();
+        {{module_name}}Factory::registerQmlTypes();
     }
 };
 
diff --git a/src/tools/ivigenerator/templates/server_qtro/core.cpp.tpl b/src/tools/ivigenerator/templates/server_qtro/core.cpp.tpl
index 1c3450a..f7c576a 100644
--- a/src/tools/ivigenerator/templates/server_qtro/core.cpp.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro/core.cpp.tpl
@@ -42,7 +42,7 @@
 
 
 #include "{{class|lower}}.h"
-#include "{{module.module_name|lower}}module.h"
+#include "{{module.module_name|lower}}.h"
 #include <QCoreApplication>
 #include <QSettings>
 
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 
 void {{class}}::init()
 {
-    {{module.module_name|upperfirst}}Module::registerTypes();
+    {{module.module_name|upperfirst}}::registerTypes();
     QString configPath(QStringLiteral("./server.conf"));
     if (qEnvironmentVariableIsSet("SERVER_CONF_PATH"))
         configPath = QString::fromLocal8Bit(qgetenv("SERVER_CONF_PATH"));
diff --git a/src/tools/ivigenerator/templates/server_qtro_simulator/core.cpp.tpl b/src/tools/ivigenerator/templates/server_qtro_simulator/core.cpp.tpl
index a792bd8..d08945f 100644
--- a/src/tools/ivigenerator/templates/server_qtro_simulator/core.cpp.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro_simulator/core.cpp.tpl
@@ -41,7 +41,7 @@
 
 
 #include "{{class|lower}}.h"
-#include "{{module.module_name|lower}}module.h"
+#include "{{module.module_name|lower}}.h"
 #include <QCoreApplication>
 #include <QSettings>
 
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 
 void {{class}}::init()
 {
-    {{module.module_name|upperfirst}}Module::registerTypes();
+    {{module.module_name|upperfirst}}::registerTypes();
     QString configPath(QStringLiteral("./server.conf"));
     if (qEnvironmentVariableIsSet("SERVER_CONF_PATH"))
         configPath = QString::fromLocal8Bit(qgetenv("SERVER_CONF_PATH"));
diff --git a/src/tools/ivigenerator/templates/server_qtro_simulator/main.cpp.tpl b/src/tools/ivigenerator/templates/server_qtro_simulator/main.cpp.tpl
index 8da233a..82c9383 100644
--- a/src/tools/ivigenerator/templates/server_qtro_simulator/main.cpp.tpl
+++ b/src/tools/ivigenerator/templates/server_qtro_simulator/main.cpp.tpl
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 {% for interface in module.interfaces %}
     auto {{interface|lowerfirst}}Instance = new {{interface}}Backend(simulationEngine);
     //Register the types for the SimulationEngine
-    {{module.module_name|upperfirst}}Module::registerQmlTypes(QStringLiteral("{{module|qml_type}}.simulation"), {{module.majorVersion}}, {{module.minorVersion}});
+    {{module.module_name|upperfirst}}::registerQmlTypes(QStringLiteral("{{module|qml_type}}.simulation"), {{module.majorVersion}}, {{module.minorVersion}});
     simulationEngine->registerSimulationInstance({{interface|lowerfirst}}Instance, "{{module|qml_type}}.simulation", {{module.majorVersion}}, {{module.minorVersion}}, "{{interface}}Backend");
 {% endfor %}
 {% if module.tags.config_simulator and module.tags.config_simulator.simulationFile %}
diff --git a/src/tools/ivigenerator/templates/test/tst_test.cpp.tpl b/src/tools/ivigenerator/templates/test/tst_test.cpp.tpl
index 9768e8e..8ac56ef 100644
--- a/src/tools/ivigenerator/templates/test/tst_test.cpp.tpl
+++ b/src/tools/ivigenerator/templates/test/tst_test.cpp.tpl
@@ -260,7 +260,7 @@ private:
     : QObject()
 {
     QCoreApplication::setLibraryPaths(QStringList());
-    {{module.module_name|upperfirst}}Module::registerTypes();
+    {{module.module_name|upperfirst}}::registerTypes();
     manager = QIviServiceManager::instance();
 }
 
diff --git a/tests/auto/core/ivigenerator/no-private.yaml b/tests/auto/core/ivigenerator/no-private.yaml
index f502f08..f10123c 100644
--- a/tests/auto/core/ivigenerator/no-private.yaml
+++ b/tests/auto/core/ivigenerator/no-private.yaml
@@ -1,4 +1,4 @@
-org.example.echo:
+org.example.echomodule:
     config:
         disablePrivateIVI: true
         interfaceBuilder: false
diff --git a/tests/auto/core/ivigenerator/org.example.echo.noannotation.qface b/tests/auto/core/ivigenerator/org.example.echo.noannotation.qface
index 263dc16..0978388 100644
--- a/tests/auto/core/ivigenerator/org.example.echo.noannotation.qface
+++ b/tests/auto/core/ivigenerator/org.example.echo.noannotation.qface
@@ -1,7 +1,7 @@
 /**
  * module
  */
-module org.example.echo 1.0
+module org.example.echomodule 1.0
 
 /**
  * \brief the brief
diff --git a/tests/auto/core/ivigenerator/org.example.echo.qface b/tests/auto/core/ivigenerator/org.example.echo.qface
index faed373..7c5779e 100644
--- a/tests/auto/core/ivigenerator/org.example.echo.qface
+++ b/tests/auto/core/ivigenerator/org.example.echo.qface
@@ -2,7 +2,7 @@
  * module
  */
 @config: { interfaceBuilder: "echoInterfaceBuilder" }
-module org.example.echo 1.0
+module org.example.echomodule 1.0
 
 /**
  * \brief the brief
diff --git a/tests/auto/core/ivigenerator/org.example.echo.yaml b/tests/auto/core/ivigenerator/org.example.echo.yaml
index d1750bf..9c566fd 100644
--- a/tests/auto/core/ivigenerator/org.example.echo.yaml
+++ b/tests/auto/core/ivigenerator/org.example.echo.yaml
@@ -1,87 +1,87 @@
-org.example.echo.EchoZoned#stringValue:
+org.example.echomodule.EchoZoned#stringValue:
     config_simulator:
         default: "two"
 
-org.example.echo.Echo#intValue:
+org.example.echomodule.Echo#intValue:
     config_simulator:
       default_value: 61
       range_high: 150
       range_low:  0
 
-org.example.echo.Echo#contact:
+org.example.echomodule.Echo#contact:
     config_simulator:
         zoned: true
         default: [ "foo", 23, true, 1234 ]
 
-org.example.echo.Echo#combo:
+org.example.echomodule.Echo#combo:
     config_simulator:
         zoned: true
         default: [ [ "foo", 23, true, 1234 ], WeekDay.Monday ]
 
-org.example.echo.Echo#intList:
+org.example.echomodule.Echo#intList:
     config_simulator:
         default: [1, 2, 3, 4]
 
-org.example.echo.Echo#comboList:
+org.example.echomodule.Echo#comboList:
     config_simulator:
         default: [[ [ "foo", 23, true, 1234 ], WeekDay.Monday ], [ [ "bar", 21, false, "foo" ], WeekDay.Tuesday ]]
 
-org.example.echo.Echo#contactList:
+org.example.echomodule.Echo#contactList:
     config_simulator:
         default: [[ "foo", 23, true, WeekDay.Monday ], [ "bar", 12, false, false ]]
 
-org.example.echo.EchoZoned:
+org.example.echomodule.EchoZoned:
     config_simulator:
         zones: [ FrontLeft, FrontRight, Rear ]
 
-org.example.echo.EchoZoned#stringValue:
+org.example.echomodule.EchoZoned#stringValue:
     config_simulator:
         default: { FrontLeft: "two", Rear: "one", =: "general" }
 
-org.example.echo.EchoZoned#intValue:
+org.example.echomodule.EchoZoned#intValue:
     config_simulator:
         default: 11
         range: { FrontLeft: [10, 33], Rear: [0, 11] }
 
-org.example.echo.EchoZoned#zonedValue:
+org.example.echomodule.EchoZoned#zonedValue:
     config_simulator:
         default: true
         zoned: true
 
-org.example.echo.EchoZoned#valueWithDefault:
+org.example.echomodule.EchoZoned#valueWithDefault:
     config_simulator:
         default: true
 
-org.example.echo.EchoZoned#unsupportedValue:
+org.example.echomodule.EchoZoned#unsupportedValue:
     config_simulator:
         unsupported: true
 
-org.example.echo.EchoZoned#rangedValue:
+org.example.echomodule.EchoZoned#rangedValue:
     config_simulator:
       range_high: 50
       range_low:  0
 
-org.example.echo.EchoZoned#rangedValueWithDefault:
+org.example.echomodule.EchoZoned#rangedValueWithDefault:
     config_simulator:
       default_value: 42
       range_high: 150
       range_low:  0
 
-org.example.echo.EchoZoned#contact:
+org.example.echomodule.EchoZoned#contact:
     config_simulator:
         zoned: true
         default: { FrontLeft: [ "foo", 23, true, 1234 ], Rear: [ "bar", 1, false, 3456 ] }
 
-org.example.echo.EchoZoned#combo:
+org.example.echomodule.EchoZoned#combo:
     config_simulator:
         zoned: true
         default: [ [ "foo", 23, true, 1234 ], WeekDay.Monday ]
 
-org.example.echo.EchoZoned#intList:
+org.example.echomodule.EchoZoned#intList:
     config_simulator:
         default: [1, 2, 3, 4]
 
-org.example.echo.EchoZoned#comboList:
+org.example.echomodule.EchoZoned#comboList:
     config_simulator:
         default: [[ [ "foo", 23, true, 1234 ], WeekDay.Monday ], [ [ "bar", 21, false, "foo" ], WeekDay.Tuesday ]]
 
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.cpp b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.cpp
index 8088015..cdcfc42 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.cpp
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.cpp
@@ -32,10 +32,10 @@
 #include <QTimer>
 
 EchoService::EchoService()
-    : m_testCombo(Contact(QStringLiteral("Antti"), 34, true, QVariant()), EchoModule::Friday)
+    : m_testCombo(Contact(QStringLiteral("Antti"), 34, true, QVariant()), Echomodule::Friday)
     , m_testId(QStringLiteral("id123"))
 {
-    setTestEnum(EchoModule::FirstEnumValue);
+    setTestEnum(Echomodule::FirstEnumValue);
 }
 
 void EchoService::setLastMessage(QString lastMessage)
@@ -83,13 +83,13 @@ QVariant EchoService::timer(int interval)
     return QVariant::fromValue(pendingResult);
 }
 
-QVariant EchoService::flagMethod(EchoModule::AirflowDirections direction)
+QVariant EchoService::flagMethod(Echomodule::AirflowDirections direction)
 {
     emit flagMethodCalled(direction);
     return QVariant::fromValue(direction);
 }
 
-QVariant EchoService::enumMethod(EchoModule::TestEnum testEnum)
+QVariant EchoService::enumMethod(Echomodule::TestEnum testEnum)
 {
     emit enumMethodCalled(testEnum);
     return QVariant::fromValue(testEnum);
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.h b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.h
index 8e53388..1bfcc06 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.h
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echoservice.h
@@ -51,8 +51,8 @@ public Q_SLOTS:
     QVariant voidSlot() override;
     QVariant voidSlot2(int param) override;
     QVariant timer(int interval) override;
-    QVariant flagMethod(EchoModule::AirflowDirections direction) override;
-    QVariant enumMethod(EchoModule::TestEnum testEnum) override;
+    QVariant flagMethod(Echomodule::AirflowDirections direction) override;
+    QVariant enumMethod(Echomodule::TestEnum testEnum) override;
 
 Q_SIGNALS:
     void echoSlotCalled(const QString &msg);
@@ -60,8 +60,8 @@ Q_SIGNALS:
     void getComboSlotCalled();
     void voidSlotCalled();
     void voidSlot2Called(int param);
-    void flagMethodCalled(EchoModule::AirflowDirections direction);
-    void enumMethodCalled(EchoModule::TestEnum testEnum);
+    void flagMethodCalled(Echomodule::AirflowDirections direction);
+    void enumMethodCalled(Echomodule::TestEnum testEnum);
 };
 
 #endif // ECHOSERVICE_H
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp
index 0010d89..8e0c764 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.cpp
@@ -41,7 +41,7 @@
 
 EchoZonedService::EchoZonedService(QObject *parent)
     : EchoZonedSimpleSource(parent)
-    , m_testCombo(Contact(QStringLiteral("Antti"), 34, true, QVariant()), EchoModule::Friday)
+    , m_testCombo(Contact(QStringLiteral("Antti"), 34, true, QVariant()), Echomodule::Friday)
     , m_testId(QStringLiteral("id123"))
 {
     m_zoneHash.insert(QString(), ZoneObject());
@@ -123,12 +123,12 @@ void EchoZonedService::setEchoEnabled(bool echoEnabled, const QString &zone)
     SET_VALUE(m_echoEnabled, echoEnabled, echoEnabledChanged);
 }
 
-EchoModule::AirflowDirections EchoZonedService::airflowDirection(const QString &zone)
+Echomodule::AirflowDirections EchoZonedService::airflowDirection(const QString &zone)
 {
     return m_zoneHash.value(zone).m_airflowDirection;
 }
 
-void EchoZonedService::setAirflowDirection(EchoModule::AirflowDirections airflowDirection, const QString &zone)
+void EchoZonedService::setAirflowDirection(Echomodule::AirflowDirections airflowDirection, const QString &zone)
 {
     SET_VALUE(m_airflowDirection, airflowDirection, airflowDirectionChanged);
 }
@@ -193,22 +193,22 @@ void EchoZonedService::setComboList(const QVariantList &comboList, const QString
     SET_VALUE(m_comboList, comboList, comboListChanged);
 }
 
-EchoModule::DaysOfTheWeek EchoZonedService::weekDay(const QString &zone)
+Echomodule::DaysOfTheWeek EchoZonedService::weekDay(const QString &zone)
 {
    return m_zoneHash.value(zone).m_weekDay;
 }
 
-void EchoZonedService::setWeekDay(EchoModule::DaysOfTheWeek weekDay, const QString &zone)
+void EchoZonedService::setWeekDay(Echomodule::DaysOfTheWeek weekDay, const QString &zone)
 {
     SET_VALUE(m_weekDay, weekDay, weekDayChanged);
 }
 
-EchoModule::TestEnum EchoZonedService::testEnum(const QString &zone)
+Echomodule::TestEnum EchoZonedService::testEnum(const QString &zone)
 {
     return m_zoneHash.value(zone).m_testEnum;
 }
 
-void EchoZonedService::setTestEnum(EchoModule::TestEnum testEnum, const QString &zone)
+void EchoZonedService::setTestEnum(Echomodule::TestEnum testEnum, const QString &zone)
 {
     SET_VALUE(m_testEnum, testEnum, testEnumChanged);
 }
@@ -264,13 +264,13 @@ QVariant EchoZonedService::timer(int interval, const QString &zone)
     return QVariant::fromValue(pendingResult);
 }
 
-QVariant EchoZonedService::flagMethod(EchoModule::AirflowDirections direction, const QString &zone)
+QVariant EchoZonedService::flagMethod(Echomodule::AirflowDirections direction, const QString &zone)
 {
     emit flagMethodCalled(direction, zone);
     return QVariant::fromValue(direction);
 }
 
-QVariant EchoZonedService::enumMethod(EchoModule::TestEnum testEnum, const QString &zone)
+QVariant EchoZonedService::enumMethod(Echomodule::TestEnum testEnum, const QString &zone)
 {
     emit enumMethodCalled(testEnum, zone);
     return QVariant::fromValue(testEnum);
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.h b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.h
index cf7cf63..7cf4daa 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.h
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/echozonedservice.h
@@ -53,8 +53,8 @@ public slots:
     void setValueWithDefault(bool valueWithDefault, const QString &zone) override;
     bool isEchoEnabled(const QString &zone) override;
     void setEchoEnabled(bool echoEnabled, const QString &zone) override;
-    EchoModule::AirflowDirections airflowDirection(const QString &zone) override;
-    void setAirflowDirection(EchoModule::AirflowDirections airflowDirection, const QString &zone) override;
+    Echomodule::AirflowDirections airflowDirection(const QString &zone) override;
+    void setAirflowDirection(Echomodule::AirflowDirections airflowDirection, const QString &zone) override;
     int rangedValue(const QString &zone) override;
     void setRangedValue(int rangedValue, const QString &zone) override;
     int rangedValueWithDefault(const QString &zone) override;
@@ -67,10 +67,10 @@ public slots:
     void setIntList(const QVariantList &intList, const QString &zone) override;
     QVariantList comboList(const QString &zone) override;
     void setComboList(const QVariantList &comboList, const QString &zone) override;
-    EchoModule::DaysOfTheWeek weekDay(const QString &zone) override;
-    void setWeekDay(EchoModule::DaysOfTheWeek weekDay, const QString &zone) override;
-    EchoModule::TestEnum testEnum(const QString &zone) override;
-    void setTestEnum(EchoModule::TestEnum testEnum, const QString &zone) override;
+    Echomodule::DaysOfTheWeek weekDay(const QString &zone) override;
+    void setWeekDay(Echomodule::DaysOfTheWeek weekDay, const QString &zone) override;
+    Echomodule::TestEnum testEnum(const QString &zone) override;
+    void setTestEnum(Echomodule::TestEnum testEnum, const QString &zone) override;
     qreal UPPERCASEPROPERTY(const QString &zone) override;
     void setUPPERCASEPROPERTY(qreal UPPERCASEPROPERTY, const QString &zone) override;
     QStringList availableZones() override;
@@ -79,8 +79,8 @@ public slots:
     QVariant varMethod(const QString &zone) override;
     QVariant getCombo(const QString &zone) override;
     QVariant timer(int interval, const QString &zone) override;
-    QVariant flagMethod(EchoModule::AirflowDirections direction, const QString &zone) override;
-    QVariant enumMethod(EchoModule::TestEnum testEnum, const QString &zone) override;
+    QVariant flagMethod(Echomodule::AirflowDirections direction, const QString &zone) override;
+    QVariant enumMethod(Echomodule::TestEnum testEnum, const QString &zone) override;
 
 Q_SIGNALS:
     void echoSlotCalled(const QString &msg, const QString& zone);
@@ -89,8 +89,8 @@ Q_SIGNALS:
     void getComboSlotCalled(const QString& zone);
     void voidSlotCalled(const QString& zone);
     void voidSlot2Called(int param, const QString& zone);
-    void flagMethodCalled(EchoModule::AirflowDirections direction, const QString& zone);
-    void enumMethodCalled(EchoModule::TestEnum testEnum, const QString& zone);
+    void flagMethodCalled(Echomodule::AirflowDirections direction, const QString& zone);
+    void enumMethodCalled(Echomodule::TestEnum testEnum, const QString& zone);
 
 private:
     struct ZoneObject {
@@ -103,7 +103,7 @@ private:
             , m_zonedValue(bool(false))
             , m_valueWithDefault(bool(false))
             , m_echoEnabled(bool(false))
-            , m_airflowDirection(EchoModule::AirflowDirections())
+            , m_airflowDirection(Echomodule::AirflowDirections())
             , m_rangedValue(int(0))
             , m_rangedValueWithDefault(int(0))
             , m_contact(Contact())
@@ -111,7 +111,7 @@ private:
             , m_intList(QVariantList())
             , m_comboList(QVariantList())
             , m_weekDay(0)
-            , m_testEnum(EchoModule::FirstEnumValue)
+            , m_testEnum(Echomodule::FirstEnumValue)
             , m_UPPERCASEPROPERTY(qreal(0.0))
         {}
 
@@ -124,15 +124,15 @@ private:
         bool m_zonedValue;
         bool m_valueWithDefault;
         bool m_echoEnabled;
-        EchoModule::AirflowDirections m_airflowDirection;
+        Echomodule::AirflowDirections m_airflowDirection;
         int m_rangedValue;
         int m_rangedValueWithDefault;
         Contact m_contact;
         Combo m_combo;
         QVariantList m_intList;
         QVariantList m_comboList;
-        EchoModule::DaysOfTheWeek m_weekDay;
-        EchoModule::TestEnum m_testEnum;
+        Echomodule::DaysOfTheWeek m_weekDay;
+        Echomodule::TestEnum m_testEnum;
         qreal m_UPPERCASEPROPERTY;
         QStringList m_propertiesToSync;
     };
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/server.cpp b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/server.cpp
index 8d989c4..f80537e 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/server.cpp
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/server.cpp
@@ -34,9 +34,9 @@
 bool Server::start()
 {
     bool val =  true;
-    val = val && Core::instance()->host()->enableRemoting(&m_echoService, QStringLiteral("org.example.echo.Echo"));
-    val = val && Core::instance()->host()->enableRemoting(&m_contactsModelService, QStringLiteral("org.example.echo.Echo.contactList"));
-    val = val && Core::instance()->host()->enableRemoting(&m_echoZonedService, QStringLiteral("org.example.echo.EchoZoned"));
+    val = val && Core::instance()->host()->enableRemoting(&m_echoService, QStringLiteral("org.example.echomodule.Echo"));
+    val = val && Core::instance()->host()->enableRemoting(&m_contactsModelService, QStringLiteral("org.example.echomodule.Echo.contactList"));
+    val = val && Core::instance()->host()->enableRemoting(&m_echoZonedService, QStringLiteral("org.example.echomodule.EchoZoned"));
     //Give QtRO time to announce the service
     QTest::qWait(200);
     return val;
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/tst_echoqtro.cpp b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/tst_echoqtro.cpp
index 2befbe2..daac1e6 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/tst_echoqtro.cpp
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/tst_echoqtro.cpp
@@ -43,7 +43,7 @@ static QString frontLeftZone = QStringLiteral("FrontLeft");
 EchoQtroTest::EchoQtroTest()
     :QObject()
 {
-    EchoModule::registerTypes();
+    Echomodule::registerTypes();
 }
 
 void EchoQtroTest::cleanup()
@@ -62,8 +62,8 @@ void EchoQtroTest::testInit()
     QCOMPARE(client.stringValue(), QString());
     QCOMPARE(client.comboList(), QVariantList());
     QCOMPARE(client.contact(), Contact());
-    QCOMPARE(client.weekDay(), EchoModule::WeekDay());
-    QCOMPARE(client.testEnum(), EchoModule::FirstEnumValue);
+    QCOMPARE(client.weekDay(), Echomodule::WeekDay());
+    QCOMPARE(client.testEnum(), Echomodule::FirstEnumValue);
 
     Server server;
 
@@ -75,8 +75,8 @@ void EchoQtroTest::testInit()
     QCOMPARE(server.m_echoService.stringValue(), QString());
     QCOMPARE(server.m_echoService.comboList(), QVariantList());
     QCOMPARE(server.m_echoService.contact(), Contact());
-    QCOMPARE(server.m_echoService.weekDay(), EchoModule::WeekDay());
-    QCOMPARE(server.m_echoService.testEnum(), EchoModule::FirstEnumValue);
+    QCOMPARE(server.m_echoService.weekDay(), Echomodule::WeekDay());
+    QCOMPARE(server.m_echoService.testEnum(), Echomodule::FirstEnumValue);
 
     QLatin1String lastMessageTestValue("this is the last message");
     int intValueTestValue(789);
@@ -84,11 +84,11 @@ void EchoQtroTest::testInit()
     qreal floatValue2TestValue(2.71);
     QLatin1String stringValueTestValue("test string");
     QVariantList comboListTestValue(
-                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), EchoModule::Monday)),
-                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), EchoModule::Wednesday)) });
+                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), Echomodule::Monday)),
+                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), Echomodule::Wednesday)) });
     Contact contactTestValue(QStringLiteral("Nemo"), 47, true, 1);
-    EchoModule::WeekDay weekDayTestValue = EchoModule::Wednesday;
-    EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue;
+    Echomodule::WeekDay weekDayTestValue = Echomodule::Wednesday;
+    Echomodule::TestEnum testEnumTestValue = Echomodule::SecondEnumValue;
 
     server.m_echoService.setLastMessage(lastMessageTestValue);
     server.m_echoService.setIntValue(intValueTestValue);
@@ -161,11 +161,11 @@ void EchoQtroTest::testZonedInit()
     QCOMPARE(client.intValue(), 0);
     QCOMPARE(client.varValue(), QVariant());
     QCOMPARE(client.stringValue(), QString());
-    QCOMPARE(client.airflowDirection(), EchoModule::AirflowDirections());
+    QCOMPARE(client.airflowDirection(), Echomodule::AirflowDirections());
     QCOMPARE(client.contact(), Contact());
     QCOMPARE(client.comboList(), QVariantList());
     QCOMPARE(client.UPPERCASEPROPERTY(), qreal(0.0));
-    QCOMPARE(client.testEnum(), EchoModule::FirstEnumValue);
+    QCOMPARE(client.testEnum(), Echomodule::FirstEnumValue);
     QCOMPARE(client.availableZones(), QStringList());
 
     Server server;
@@ -174,22 +174,22 @@ void EchoQtroTest::testZonedInit()
     QCOMPARE(server.m_echoZonedService.intValue(QString()), 0);
     QCOMPARE(server.m_echoZonedService.varValue(QString()), QVariant());
     QCOMPARE(server.m_echoZonedService.stringValue(QString()), QString());
-    QCOMPARE(server.m_echoZonedService.airflowDirection(QString()), EchoModule::AirflowDirections());
+    QCOMPARE(server.m_echoZonedService.airflowDirection(QString()), Echomodule::AirflowDirections());
     QCOMPARE(server.m_echoZonedService.contact(QString()), Contact());
     QCOMPARE(server.m_echoZonedService.comboList(QString()), QVariantList());
     QCOMPARE(server.m_echoZonedService.UPPERCASEPROPERTY(QString()), qreal(0.0));
-    QCOMPARE(server.m_echoZonedService.testEnum(QString()), EchoModule::FirstEnumValue);
+    QCOMPARE(server.m_echoZonedService.testEnum(QString()), Echomodule::FirstEnumValue);
 
     int intValueTestValue(789);
     QVariant varValueTestValue(789);
     qreal floatValueTestValue(3.14);
     QLatin1String stringValueTestValue("test string");
     QVariantList comboListTestValue(
-                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), EchoModule::Monday)),
-                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), EchoModule::Wednesday)) });
+                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), Echomodule::Monday)),
+                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), Echomodule::Wednesday)) });
     Contact contactTestValue(QStringLiteral("Nemo"), 47, true, 1);
-    EchoModule::AirflowDirections airflowTestValue = EchoModule::Windshield;
-    EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue;
+    Echomodule::AirflowDirections airflowTestValue = Echomodule::Windshield;
+    Echomodule::TestEnum testEnumTestValue = Echomodule::SecondEnumValue;
 
 
     server.m_echoZonedService.setIntValue(intValueTestValue, QString());
@@ -368,8 +368,8 @@ void EchoQtroTest::testClient2Server()
     QSignalSpy comboListSpy(&server.m_echoService, SIGNAL(comboListChanged(QVariantList)));
     QVERIFY(comboListSpy.isValid());
     QVariantList comboListTestValue(
-                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), EchoModule::Monday)),
-                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), EchoModule::Wednesday)) });
+                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), Echomodule::Monday)),
+                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), Echomodule::Wednesday)) });
     client.setComboList(comboListTestValue);
     WAIT_AND_COMPARE(comboListSpy, 1);
     QCOMPARE(server.m_echoService.comboList().count(),comboListTestValue.count());
@@ -387,21 +387,21 @@ void EchoQtroTest::testClient2Server()
     QCOMPARE(server.m_echoService.contact(), contactTestValue);
     QCOMPARE(contactSpy[0][0].value<Contact>(), contactTestValue);
 
-    QSignalSpy weekDaySpy(&server.m_echoService, SIGNAL(weekDayChanged(EchoModule::DaysOfTheWeek)));
+    QSignalSpy weekDaySpy(&server.m_echoService, SIGNAL(weekDayChanged(Echomodule::DaysOfTheWeek)));
     QVERIFY(weekDaySpy.isValid());
-    EchoModule::DaysOfTheWeek weekDayTestValue = EchoModule::Thursday;
+    Echomodule::DaysOfTheWeek weekDayTestValue = Echomodule::Thursday;
     client.setWeekDay(weekDayTestValue);
     WAIT_AND_COMPARE(weekDaySpy, 1);
     QCOMPARE(server.m_echoService.weekDay(), weekDayTestValue);
-    QCOMPARE(weekDaySpy[0][0].value<EchoModule::DaysOfTheWeek>(), weekDayTestValue);
+    QCOMPARE(weekDaySpy[0][0].value<Echomodule::DaysOfTheWeek>(), weekDayTestValue);
 
-    QSignalSpy testEnumSpy(&server.m_echoService, SIGNAL(testEnumChanged(EchoModule::TestEnum)));
+    QSignalSpy testEnumSpy(&server.m_echoService, SIGNAL(testEnumChanged(Echomodule::TestEnum)));
     QVERIFY(testEnumSpy.isValid());
-    EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue;
+    Echomodule::TestEnum testEnumTestValue = Echomodule::SecondEnumValue;
     client.setTestEnum(testEnumTestValue);
     WAIT_AND_COMPARE(testEnumSpy, 1);
     QCOMPARE(server.m_echoService.testEnum(), testEnumTestValue);
-    QCOMPARE(testEnumSpy[0][0].value<EchoModule::TestEnum>(), testEnumTestValue);
+    QCOMPARE(testEnumSpy[0][0].value<Echomodule::TestEnum>(), testEnumTestValue);
 }
 
 void EchoQtroTest::testZonedClient2Server()
@@ -452,8 +452,8 @@ void EchoQtroTest::testZonedClient2Server()
     QSignalSpy comboListSpy(&server.m_echoZonedService, SIGNAL(comboListChanged(QVariantList, QString)));
     QVERIFY(comboListSpy.isValid());
     QVariantList comboListTestValue(
-                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), EchoModule::Monday)),
-                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), EchoModule::Wednesday)) });
+                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), Echomodule::Monday)),
+                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), Echomodule::Wednesday)) });
     zone->setComboList(comboListTestValue);
     WAIT_AND_COMPARE(comboListSpy, 1);
     QVariantList comboList = server.m_echoZonedService.comboList(frontLeftZone);
@@ -474,22 +474,22 @@ void EchoQtroTest::testZonedClient2Server()
     QCOMPARE(contactSpy[0][0].value<Contact>(), contactTestValue);
     QCOMPARE(contactSpy[0][1].toString(), frontLeftZone);
 
-    QSignalSpy airflowSpy(&server.m_echoZonedService, SIGNAL(airflowDirectionChanged(EchoModule::AirflowDirections, QString)));
+    QSignalSpy airflowSpy(&server.m_echoZonedService, SIGNAL(airflowDirectionChanged(Echomodule::AirflowDirections, QString)));
     QVERIFY(airflowSpy.isValid());
-    EchoModule::AirflowDirections airflowTestValue = EchoModule::Windshield;
+    Echomodule::AirflowDirections airflowTestValue = Echomodule::Windshield;
     zone->setAirflowDirection(airflowTestValue);
     WAIT_AND_COMPARE(airflowSpy, 1);
     QCOMPARE(server.m_echoZonedService.airflowDirection(frontLeftZone), airflowTestValue);
-    QCOMPARE(airflowSpy[0][0].value<EchoModule::AirflowDirections>(), airflowTestValue);
+    QCOMPARE(airflowSpy[0][0].value<Echomodule::AirflowDirections>(), airflowTestValue);
     QCOMPARE(airflowSpy[0][1].toString(), frontLeftZone);
 
-    QSignalSpy testEnumSpy(&server.m_echoZonedService, SIGNAL(testEnumChanged(EchoModule::TestEnum, QString)));
+    QSignalSpy testEnumSpy(&server.m_echoZonedService, SIGNAL(testEnumChanged(Echomodule::TestEnum, QString)));
     QVERIFY(testEnumSpy.isValid());
-    EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue;
+    Echomodule::TestEnum testEnumTestValue = Echomodule::SecondEnumValue;
     zone->setTestEnum(testEnumTestValue);
     WAIT_AND_COMPARE(testEnumSpy, 1);
     QCOMPARE(server.m_echoZonedService.testEnum(frontLeftZone), testEnumTestValue);
-    QCOMPARE(testEnumSpy[0][0].value<EchoModule::TestEnum>(), testEnumTestValue);
+    QCOMPARE(testEnumSpy[0][0].value<Echomodule::TestEnum>(), testEnumTestValue);
     QCOMPARE(testEnumSpy[0][1].toString(), frontLeftZone);
 }
 
@@ -544,8 +544,8 @@ void EchoQtroTest::testServer2Client()
     QSignalSpy comboListSpy(&client, SIGNAL(comboListChanged(QVariantList)));
     QVERIFY(comboListSpy.isValid());
     QVariantList comboListTestValue(
-                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), EchoModule::Monday)),
-                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), EchoModule::Wednesday)) });
+                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), Echomodule::Monday)),
+                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), Echomodule::Wednesday)) });
     server.m_echoService.setComboList(comboListTestValue);
     WAIT_AND_COMPARE(comboListSpy, 1);
     QCOMPARE(client.comboList().count(),comboListTestValue.count());
@@ -563,22 +563,22 @@ void EchoQtroTest::testServer2Client()
     QCOMPARE(client.contact(), contactTestValue);
     QCOMPARE(contactSpy[0][0].value<Contact>(), contactTestValue);
 
-    QSignalSpy weekDaySpy(&client, SIGNAL(weekDayChanged(EchoModule::DaysOfTheWeek)));
+    QSignalSpy weekDaySpy(&client, SIGNAL(weekDayChanged(Echomodule::DaysOfTheWeek)));
     QVERIFY(weekDaySpy.isValid());
-    EchoModule::WeekDay weekDayTestValue = EchoModule::Friday;
+    Echomodule::WeekDay weekDayTestValue = Echomodule::Friday;
     server.m_echoService.setWeekDay(weekDayTestValue);
     WAIT_AND_COMPARE(weekDaySpy, 1);
 
     QCOMPARE(client.weekDay(), weekDayTestValue);
-    QCOMPARE(weekDaySpy[0][0].value<EchoModule::DaysOfTheWeek>(), weekDayTestValue);
+    QCOMPARE(weekDaySpy[0][0].value<Echomodule::DaysOfTheWeek>(), weekDayTestValue);
 
-    QSignalSpy testEnumSpy(&client, SIGNAL(testEnumChanged(EchoModule::TestEnum)));
+    QSignalSpy testEnumSpy(&client, SIGNAL(testEnumChanged(Echomodule::TestEnum)));
     QVERIFY(testEnumSpy.isValid());
-    EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue;
+    Echomodule::TestEnum testEnumTestValue = Echomodule::SecondEnumValue;
     server.m_echoService.setTestEnum(testEnumTestValue);
     WAIT_AND_COMPARE(testEnumSpy, 1);
     QCOMPARE(client.testEnum(), testEnumTestValue);
-    QCOMPARE(testEnumSpy[0][0].value<EchoModule::TestEnum>(), testEnumTestValue);
+    QCOMPARE(testEnumSpy[0][0].value<Echomodule::TestEnum>(), testEnumTestValue);
 }
 
 void EchoQtroTest::testZonedServer2Client()
@@ -626,8 +626,8 @@ void EchoQtroTest::testZonedServer2Client()
     QSignalSpy comboListSpy(zone, SIGNAL(comboListChanged(QVariantList)));
     QVERIFY(comboListSpy.isValid());
     QVariantList comboListTestValue(
-                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), EchoModule::Thursday)),
-                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), EchoModule::Tuesday)) });
+                    { QVariant::fromValue<Combo>(Combo(Contact("Mr A.", 20, false, "foo"), Echomodule::Thursday)),
+                      QVariant::fromValue<Combo>(Combo(Contact("Mr B.", 40, true, "bar"), Echomodule::Tuesday)) });
     server.m_echoZonedService.setComboList(comboListTestValue, frontLeftZone);
     WAIT_AND_COMPARE(comboListSpy, 1);
     QVariantList comboList = zone->comboList();
@@ -646,21 +646,21 @@ void EchoQtroTest::testZonedServer2Client()
     QCOMPARE(zone->contact(), contactTestValue);
     QCOMPARE(contactSpy[0][0].value<Contact>(), contactTestValue);
 
-    QSignalSpy airflowSpy(zone, SIGNAL(airflowDirectionChanged(EchoModule::AirflowDirections)));
+    QSignalSpy airflowSpy(zone, SIGNAL(airflowDirectionChanged(Echomodule::AirflowDirections)));
     QVERIFY(airflowSpy.isValid());
-    EchoModule::AirflowDirections airflowTestValue = EchoModule::Windshield;
+    Echomodule::AirflowDirections airflowTestValue = Echomodule::Windshield;
     server.m_echoZonedService.setAirflowDirection(airflowTestValue, frontLeftZone);
     WAIT_AND_COMPARE(airflowSpy, 1);
     QCOMPARE(zone->airflowDirection(), airflowTestValue);
-    QCOMPARE(airflowSpy[0][0].value<EchoModule::AirflowDirections>(), airflowTestValue);
+    QCOMPARE(airflowSpy[0][0].value<Echomodule::AirflowDirections>(), airflowTestValue);
 
-    QSignalSpy testEnumSpy(zone, SIGNAL(testEnumChanged(EchoModule::TestEnum)));
+    QSignalSpy testEnumSpy(zone, SIGNAL(testEnumChanged(Echomodule::TestEnum)));
     QVERIFY(testEnumSpy.isValid());
-    EchoModule::TestEnum testEnumTestValue = EchoModule::SecondEnumValue;
+    Echomodule::TestEnum testEnumTestValue = Echomodule::SecondEnumValue;
     server.m_echoZonedService.setTestEnum(testEnumTestValue, frontLeftZone);
     WAIT_AND_COMPARE(testEnumSpy, 1);
     QCOMPARE(zone->testEnum(), testEnumTestValue);
-    QCOMPARE(testEnumSpy[0][0].value<EchoModule::TestEnum>(), testEnumTestValue);
+    QCOMPARE(testEnumSpy[0][0].value<Echomodule::TestEnum>(), testEnumTestValue);
 }
 
 void EchoQtroTest::testSlots()
@@ -718,25 +718,25 @@ void EchoQtroTest::testSlots()
     QCOMPARE(voidSlot2Spy.count(), 1);
     QCOMPARE(voidSlot2Spy[0][0].toInt(), voidSlot2TestValue);
 
-    QSignalSpy flagMethodSpy(&server.m_echoService, SIGNAL(flagMethodCalled(EchoModule::AirflowDirections)));
+    QSignalSpy flagMethodSpy(&server.m_echoService, SIGNAL(flagMethodCalled(Echomodule::AirflowDirections)));
     QVERIFY(flagMethodSpy.isValid());
-    EchoModule::AirflowDirections flagTestValue = EchoModule::Dashboard;
-    QIviPendingReply<EchoModule::AirflowDirections> flagMethodReply = client.flagMethod(flagTestValue);
+    Echomodule::AirflowDirections flagTestValue = Echomodule::Dashboard;
+    QIviPendingReply<Echomodule::AirflowDirections> flagMethodReply = client.flagMethod(flagTestValue);
     QSignalSpy flagMethodReplySpy(flagMethodReply.watcher(), SIGNAL(replySuccess()));
     WAIT_AND_COMPARE(flagMethodReplySpy, 1);
     QCOMPARE(flagMethodReply.reply(), flagTestValue);
     QCOMPARE(flagMethodSpy.count(), 1);
-    QCOMPARE(flagMethodSpy[0][0].value<EchoModule::AirflowDirections>(), flagTestValue);
+    QCOMPARE(flagMethodSpy[0][0].value<Echomodule::AirflowDirections>(), flagTestValue);
 
-    QSignalSpy enumMethodSpy(&server.m_echoService, SIGNAL(enumMethodCalled(EchoModule::TestEnum)));
+    QSignalSpy enumMethodSpy(&server.m_echoService, SIGNAL(enumMethodCalled(Echomodule::TestEnum)));
     QVERIFY(enumMethodSpy.isValid());
-    EchoModule::TestEnum enumTestValue = EchoModule::SecondEnumValue;
-    QIviPendingReply<EchoModule::TestEnum> enumMethodReply = client.enumMethod(enumTestValue);
+    Echomodule::TestEnum enumTestValue = Echomodule::SecondEnumValue;
+    QIviPendingReply<Echomodule::TestEnum> enumMethodReply = client.enumMethod(enumTestValue);
     QSignalSpy enumMethodReplySpy(enumMethodReply.watcher(), SIGNAL(replySuccess()));
     WAIT_AND_COMPARE(enumMethodReplySpy, 1);
     QCOMPARE(enumMethodReply.reply(), enumTestValue);
     QCOMPARE(enumMethodSpy.count(), 1);
-    QCOMPARE(enumMethodSpy[0][0].value<EchoModule::TestEnum>(), enumTestValue);
+    QCOMPARE(enumMethodSpy[0][0].value<Echomodule::TestEnum>(), enumTestValue);
 }
 
 void EchoQtroTest::testZonedSlots()
@@ -786,26 +786,26 @@ void EchoQtroTest::testZonedSlots()
     QCOMPARE(comboReply.reply(), server.m_echoService.m_testCombo);
     QCOMPARE(getComboSpy.count(), 1);
 
-    QSignalSpy flagMethodSpy(&server.m_echoZonedService, SIGNAL(flagMethodCalled(EchoModule::AirflowDirections, QString)));
+    QSignalSpy flagMethodSpy(&server.m_echoZonedService, SIGNAL(flagMethodCalled(Echomodule::AirflowDirections, QString)));
     QVERIFY(flagMethodSpy.isValid());
-    EchoModule::AirflowDirections flagTestValue = EchoModule::Dashboard;
-    QIviPendingReply<EchoModule::AirflowDirections> flagMethodReply = zone->flagMethod(flagTestValue);
+    Echomodule::AirflowDirections flagTestValue = Echomodule::Dashboard;
+    QIviPendingReply<Echomodule::AirflowDirections> flagMethodReply = zone->flagMethod(flagTestValue);
     QSignalSpy flagMethodReplySpy(flagMethodReply.watcher(), SIGNAL(replySuccess()));
     WAIT_AND_COMPARE(flagMethodReplySpy, 1);
     QCOMPARE(flagMethodReply.reply(), flagTestValue);
     QCOMPARE(flagMethodSpy.count(), 1);
-    QCOMPARE(flagMethodSpy[0][0].value<EchoModule::AirflowDirections>(), flagTestValue);
+    QCOMPARE(flagMethodSpy[0][0].value<Echomodule::AirflowDirections>(), flagTestValue);
     QCOMPARE(flagMethodSpy[0][1].toString(), frontLeftZone);
 
-    QSignalSpy enumMethodSpy(&server.m_echoZonedService, SIGNAL(enumMethodCalled(EchoModule::TestEnum, QString)));
+    QSignalSpy enumMethodSpy(&server.m_echoZonedService, SIGNAL(enumMethodCalled(Echomodule::TestEnum, QString)));
     QVERIFY(enumMethodSpy.isValid());
-    EchoModule::TestEnum enumTestValue = EchoModule::SecondEnumValue;
-    QIviPendingReply<EchoModule::TestEnum> enumMethodReply = zone->enumMethod(enumTestValue);
+    Echomodule::TestEnum enumTestValue = Echomodule::SecondEnumValue;
+    QIviPendingReply<Echomodule::TestEnum> enumMethodReply = zone->enumMethod(enumTestValue);
     QSignalSpy enumMethodReplySpy(enumMethodReply.watcher(), SIGNAL(replySuccess()));
     WAIT_AND_COMPARE(enumMethodReplySpy, 1);
     QCOMPARE(enumMethodReply.reply(), enumTestValue);
     QCOMPARE(enumMethodSpy.count(), 1);
-    QCOMPARE(enumMethodSpy[0][0].value<EchoModule::TestEnum>(), enumTestValue);
+    QCOMPARE(enumMethodSpy[0][0].value<Echomodule::TestEnum>(), enumTestValue);
     QCOMPARE(enumMethodSpy[0][1].toString(), frontLeftZone);
 }
 
diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/backend_simulator.cpp b/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/backend_simulator.cpp
index d2bb99f..a406556 100644
--- a/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/backend_simulator.cpp
+++ b/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/backend_simulator.cpp
@@ -1,10 +1,10 @@
 #include "echobackend.h"
 #include "echozonedbackend.h"
-#include "echosimulatorplugin.h"
+#include "echomodulesimulatorplugin.h"
 
 QT_BEGIN_NAMESPACE
 
-extern QVector<QIviFeatureInterface *> echoInterfaceBuilder(EchoSimulatorPlugin *plugin)
+extern QVector<QIviFeatureInterface *> echoInterfaceBuilder(EchomoduleSimulatorPlugin *plugin)
 {
     QVector<QIviFeatureInterface *> res;
     res << new EchoBackend(plugin);