Renamed the classes and imports to match the Qt conventions

QML:
import QtIVICore 1.0 -> import QtIvi 1.0
import QtIVIVehicleFunctions 1.0 -> import QtIvi.VehicleFunctions 1.0

On C++ side:
Includes:
- #include <QtIviCore/QIviAbstractFeature>
- #include <QtIviVehicleFunctions/QIviClimateControl>

The renaming of the files will be done in separate commit to
make the diffs easier to read

Task-number: QTAUTO-40
Task-number: QTAUTO-41
Change-Id: I2efdaf1f4a15e09481532df1333fa9883e82d1fb
Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com>

114 files changed, 2793 insertions, 2793 deletions

diff --git a/config.tests/dlt/main.cpp b/config.tests/dlt/main.cpp
index a54fc1c..f85bf95 100644
--- a/config.tests/dlt/main.cpp
+++ b/config.tests/dlt/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
diff --git a/examples/geniviextras/qdlt/loggingcategories.cpp b/examples/geniviextras/qdlt/loggingcategories.cpp
index a6fa65d..6a2c0cb 100644
--- a/examples/geniviextras/qdlt/loggingcategories.cpp
+++ b/examples/geniviextras/qdlt/loggingcategories.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
diff --git a/examples/geniviextras/qdlt/loggingcategories.h b/examples/geniviextras/qdlt/loggingcategories.h
index c0c17ed..32ba95f 100644
--- a/examples/geniviextras/qdlt/loggingcategories.h
+++ b/examples/geniviextras/qdlt/loggingcategories.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
diff --git a/examples/geniviextras/qdlt/main.cpp b/examples/geniviextras/qdlt/main.cpp
index 55d30b1..2003a6c 100644
--- a/examples/geniviextras/qdlt/main.cpp
+++ b/examples/geniviextras/qdlt/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
diff --git a/examples/vehiclefunctions/climate_qml/main.cpp b/examples/vehiclefunctions/climate_qml/main.cpp
index 422d692..1b4c909 100644
--- a/examples/vehiclefunctions/climate_qml/main.cpp
+++ b/examples/vehiclefunctions/climate_qml/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
diff --git a/examples/vehiclefunctions/climate_qml/main.qml b/examples/vehiclefunctions/climate_qml/main.qml
index 68c11ae..c4bb1d0 100644
--- a/examples/vehiclefunctions/climate_qml/main.qml
+++ b/examples/vehiclefunctions/climate_qml/main.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
@@ -56,7 +56,7 @@ import QtQuick.Window 2.2
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.2
 
-import QtIVIVehicleFunctions 1.0
+import QtIvi.VehicleFunctions 1.0
 
 ApplicationWindow {
     title: "Climate Control"
diff --git a/examples/vehiclefunctions/climate_widget/main.cpp b/examples/vehiclefunctions/climate_widget/main.cpp
index 97dd735..19ce2b6 100644
--- a/examples/vehiclefunctions/climate_widget/main.cpp
+++ b/examples/vehiclefunctions/climate_widget/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.cpp b/examples/vehiclefunctions/climate_widget/mainwindow.cpp
index 343a83e..3e9dba6 100644
--- a/examples/vehiclefunctions/climate_widget/mainwindow.cpp
+++ b/examples/vehiclefunctions/climate_widget/mainwindow.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
@@ -71,7 +71,7 @@ MainWindow::MainWindow(QWidget *parent) :
     m_buttonGroup->addButton(ui->cb_floor);
 
 //![1]
-    m_climateControl = new QtIVIClimateControl(QString(), this);
+    m_climateControl = new QIviClimateControl(QString(), this);
     m_climateControl->startAutoDiscovery();
 
     if (!m_climateControl->isValid())
@@ -85,27 +85,27 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(m_buttonGroup, static_cast<void (QButtonGroup::*)(QAbstractButton *, bool)>(&QButtonGroup::buttonToggled),
             this, &MainWindow::onFlowDirectionButtonToggled);
 
-    connect(m_climateControl, &QtIVIClimateControl::airflowDirectionsChanged,
+    connect(m_climateControl, &QIviClimateControl::airflowDirectionsChanged,
             this, &MainWindow::setupFlowDirectionRadioButtons);
-    connect(m_climateControl, &QtIVIClimateControl::airflowDirectionsAttributeChanged,
+    connect(m_climateControl, &QIviClimateControl::airflowDirectionsAttributeChanged,
             this, &MainWindow::setupFlowDirectionAttribute);
 
     //Air Condition
     ui->cb_airCondition->setChecked(m_climateControl->isAirConditioningEnabled());
     ui->cb_airCondition->setEnabled(m_climateControl->airConditioningAttribute().isAvailable());
-    connect(m_climateControl, &QtIVIClimateControl::airConditioningEnabledChanged,
+    connect(m_climateControl, &QIviClimateControl::airConditioningEnabledChanged,
             ui->cb_airCondition, &QCheckBox::setChecked);
-    connect(m_climateControl, &QtIVIClimateControl::airConditioningAttributeChanged,
+    connect(m_climateControl, &QIviClimateControl::airConditioningAttributeChanged,
             this, &MainWindow::onAirConditioningAttributeChanged);
     connect(ui->cb_airCondition, &QCheckBox::clicked,
-            m_climateControl, &QtIVIClimateControl::setAirConditioningEnabled);
+            m_climateControl, &QIviClimateControl::setAirConditioningEnabled);
 
     //Air Recirculation
-    ui->cb_airRecirculation->setChecked(m_climateControl->recirculationMode() == QtIVIClimateControl::RecirculationOn);
+    ui->cb_airRecirculation->setChecked(m_climateControl->recirculationMode() == QIviClimateControl::RecirculationOn);
     ui->cb_airRecirculation->setEnabled(m_climateControl->recirculationModeAttribute().isAvailable());
-    connect(m_climateControl, &QtIVIClimateControl::recirculationModeChanged,
+    connect(m_climateControl, &QIviClimateControl::recirculationModeChanged,
             this, &MainWindow::onAirRecirculationModeChanged);
-    connect(m_climateControl, &QtIVIClimateControl::recirculationModeAttributeChanged,
+    connect(m_climateControl, &QIviClimateControl::recirculationModeAttributeChanged,
             this, &MainWindow::onAirRecirculationAttributeChanged);
     connect(ui->cb_airRecirculation, &QCheckBox::clicked,
             this, &MainWindow::setAirRecirculationEnabled);
@@ -113,12 +113,12 @@ MainWindow::MainWindow(QWidget *parent) :
     //Heater
     ui->cb_heater->setChecked(m_climateControl->isHeaterEnabled());
     ui->cb_heater->setEnabled(m_climateControl->heaterAttribute().isAvailable());
-    connect(m_climateControl, &QtIVIClimateControl::heaterEnabledChanged,
+    connect(m_climateControl, &QIviClimateControl::heaterEnabledChanged,
             ui->cb_heater, &QCheckBox::setChecked);
-    connect(m_climateControl, &QtIVIClimateControl::heaterAttributeChanged,
+    connect(m_climateControl, &QIviClimateControl::heaterAttributeChanged,
             this, &MainWindow::onHeaterAttributeChanged);
     connect(ui->cb_heater, &QCheckBox::clicked,
-            m_climateControl, &QtIVIClimateControl::setHeaterEnabled);
+            m_climateControl, &QIviClimateControl::setHeaterEnabled);
 }
 //![2]
 
@@ -130,44 +130,44 @@ MainWindow::~MainWindow()
 void MainWindow::setAirRecirculationEnabled(bool enabled)
 {
     if (enabled)
-        m_climateControl->setRecirculationMode(QtIVIClimateControl::RecirculationOn);
+        m_climateControl->setRecirculationMode(QIviClimateControl::RecirculationOn);
     else
-        m_climateControl->setRecirculationMode(QtIVIClimateControl::RecirculationOff);
+        m_climateControl->setRecirculationMode(QIviClimateControl::RecirculationOff);
 }
 
-void MainWindow::onAirRecirculationModeChanged(QtIVIClimateControl::RecirculationMode mode)
+void MainWindow::onAirRecirculationModeChanged(QIviClimateControl::RecirculationMode mode)
 {
-    ui->cb_airRecirculation->setChecked(mode == QtIVIClimateControl::RecirculationOn);
+    ui->cb_airRecirculation->setChecked(mode == QIviClimateControl::RecirculationOn);
 }
 
-void MainWindow::onAirRecirculationAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> & attribute)
+void MainWindow::onAirRecirculationAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::RecirculationMode> & attribute)
 {
     ui->cb_airRecirculation->setEnabled(attribute.isAvailable());
 }
 
-void MainWindow::onHeaterAttributeChanged(const QtIVIPropertyAttribute<bool> & attribute)
+void MainWindow::onHeaterAttributeChanged(const QIviPropertyAttribute<bool> & attribute)
 {
     ui->cb_heater->setEnabled(attribute.isAvailable());
 }
 
-void MainWindow::onAirConditioningAttributeChanged(const QtIVIPropertyAttribute<bool> & attribute)
+void MainWindow::onAirConditioningAttributeChanged(const QIviPropertyAttribute<bool> & attribute)
 {
     ui->cb_airCondition->setEnabled(attribute.isAvailable());
 }
 
 //![3]
-void MainWindow::setupFlowDirectionRadioButtons(QtIVIClimateControl::AirflowDirections direction)
+void MainWindow::setupFlowDirectionRadioButtons(QIviClimateControl::AirflowDirections direction)
 {
-    ui->cb_windshield->setChecked(direction.testFlag(QtIVIClimateControl::Windshield));
-    ui->cb_dashboard->setChecked(direction.testFlag(QtIVIClimateControl::Dashboard));
-    ui->cb_floor->setChecked(direction.testFlag(QtIVIClimateControl::Floor));
+    ui->cb_windshield->setChecked(direction.testFlag(QIviClimateControl::Windshield));
+    ui->cb_dashboard->setChecked(direction.testFlag(QIviClimateControl::Dashboard));
+    ui->cb_floor->setChecked(direction.testFlag(QIviClimateControl::Floor));
 }
 
-void MainWindow::setupFlowDirectionAttribute(const QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> & attribute)
+void MainWindow::setupFlowDirectionAttribute(const QIviPropertyAttribute<QIviClimateControl::AirflowDirections> & attribute)
 {
-    ui->cb_windshield->setEnabled(attribute.availableValues().contains(QtIVIClimateControl::Windshield));
-    ui->cb_dashboard->setEnabled(attribute.availableValues().contains(QtIVIClimateControl::Dashboard));
-    ui->cb_floor->setEnabled(attribute.availableValues().contains(QtIVIClimateControl::Floor));
+    ui->cb_windshield->setEnabled(attribute.availableValues().contains(QIviClimateControl::Windshield));
+    ui->cb_dashboard->setEnabled(attribute.availableValues().contains(QIviClimateControl::Dashboard));
+    ui->cb_floor->setEnabled(attribute.availableValues().contains(QIviClimateControl::Floor));
 }
 
 void MainWindow::onFlowDirectionButtonToggled(QAbstractButton *button, bool checked)
@@ -175,14 +175,14 @@ void MainWindow::onFlowDirectionButtonToggled(QAbstractButton *button, bool chec
     Q_UNUSED(button)
     Q_UNUSED(checked)
 
-    QtIVIClimateControl::AirflowDirections direction;
+    QIviClimateControl::AirflowDirections direction;
 
     if (ui->cb_windshield->isChecked())
-        direction |= QtIVIClimateControl::Windshield;
+        direction |= QIviClimateControl::Windshield;
     if (ui->cb_dashboard->isChecked())
-        direction |= QtIVIClimateControl::Dashboard;
+        direction |= QIviClimateControl::Dashboard;
     if (ui->cb_floor->isChecked())
-        direction |= QtIVIClimateControl::Floor;
+        direction |= QIviClimateControl::Floor;
 
     m_climateControl->setAirflowDirections(direction);
 }
diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.h b/examples/vehiclefunctions/climate_widget/mainwindow.h
index 81564bd..ec80863 100644
--- a/examples/vehiclefunctions/climate_widget/mainwindow.h
+++ b/examples/vehiclefunctions/climate_widget/mainwindow.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
@@ -54,7 +54,7 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include <QtIVIVehicleFunctions/QtIVIClimateControl>
+#include <QtIviVehicleFunctions/QIviClimateControl>
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
@@ -75,18 +75,18 @@ public:
 
 private slots:
     void setAirRecirculationEnabled(bool enabled);
-    void onAirRecirculationModeChanged(QtIVIClimateControl::RecirculationMode mode);
-    void onAirRecirculationAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> &attribute);
-    void onHeaterAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
-    void onAirConditioningAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
-    void setupFlowDirectionRadioButtons(QtIVIClimateControl::AirflowDirections direction);
-    void setupFlowDirectionAttribute(const QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> &attribute);
+    void onAirRecirculationModeChanged(QIviClimateControl::RecirculationMode mode);
+    void onAirRecirculationAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::RecirculationMode> &attribute);
+    void onHeaterAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
+    void onAirConditioningAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
+    void setupFlowDirectionRadioButtons(QIviClimateControl::AirflowDirections direction);
+    void setupFlowDirectionAttribute(const QIviPropertyAttribute<QIviClimateControl::AirflowDirections> &attribute);
     void onFlowDirectionButtonToggled(QAbstractButton * button, bool checked);
 private:
 
     Ui::MainWindow *ui;
     QButtonGroup *m_buttonGroup;
-    QtIVIClimateControl* m_climateControl;
+    QIviClimateControl* m_climateControl;
 };
 
 #endif // MAINWINDOW_H
diff --git a/examples/vehiclefunctions/window_qml/WindowItem.qml b/examples/vehiclefunctions/window_qml/WindowItem.qml
index b289ac5..ca4a8d4 100644
--- a/examples/vehiclefunctions/window_qml/WindowItem.qml
+++ b/examples/vehiclefunctions/window_qml/WindowItem.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
@@ -56,7 +56,7 @@ import QtQuick.Window 2.2
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.2
 
-import QtIVIVehicleFunctions 1.0
+import QtIvi.VehicleFunctions 1.0
 
 GroupBox {
     property WindowControl zone
diff --git a/examples/vehiclefunctions/window_qml/main.cpp b/examples/vehiclefunctions/window_qml/main.cpp
index 422d692..1b4c909 100644
--- a/examples/vehiclefunctions/window_qml/main.cpp
+++ b/examples/vehiclefunctions/window_qml/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
diff --git a/examples/vehiclefunctions/window_qml/main.qml b/examples/vehiclefunctions/window_qml/main.qml
index 5831d70..6d99f23 100644
--- a/examples/vehiclefunctions/window_qml/main.qml
+++ b/examples/vehiclefunctions/window_qml/main.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
@@ -56,7 +56,7 @@ import QtQuick.Window 2.2
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.2
 
-import QtIVIVehicleFunctions 1.0
+import QtIvi.VehicleFunctions 1.0
 
 ApplicationWindow {
     title: "Window Control"
diff --git a/header.BSD-QTAS b/header.BSD-QTAS
index 1fcd032..76d83ea 100644
--- a/header.BSD-QTAS
+++ b/header.BSD-QTAS
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
diff --git a/header.FDL-QTAS b/header.FDL-QTAS
index 5617df7..d71d9b7 100644
--- a/header.FDL-QTAS
+++ b/header.FDL-QTAS
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the documentation of the QtIVI module of the Qt Toolkit.
+** This file is part of the documentation of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL-QTAS$
 ** Commercial License Usage
diff --git a/header.GPL-EXCEPT-QTAS b/header.GPL-EXCEPT-QTAS
index 40a3ac9..5a19eab 100644
--- a/header.GPL-EXCEPT-QTAS
+++ b/header.GPL-EXCEPT-QTAS
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
diff --git a/header.LGPL-QTAS b/header.LGPL-QTAS
index d7b130f..8ac309a 100644
--- a/header.LGPL-QTAS
+++ b/header.LGPL-QTAS
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
diff --git a/qtivi.pro b/qtivi.pro
index 2f464c0..abc2858 100644
--- a/qtivi.pro
+++ b/qtivi.pro
@@ -10,7 +10,7 @@ enable-tests {
 
 QML_IMPORT_PATH = $$shadowed($$PWD)/qml
 
-lessThan(QT_MAJOR_VERSION, 5): error("QtIVI only supports Qt 5.")
+lessThan(QT_MAJOR_VERSION, 5): error("QtIvi only supports Qt 5.")
 load(configure)
 qtCompileTest(dlt)
 load(qt_parts)
diff --git a/src/doc/qtivi.qdocconf b/src/doc/qtivi.qdocconf
index 9056e81..9cf283d 100644
--- a/src/doc/qtivi.qdocconf
+++ b/src/doc/qtivi.qdocconf
@@ -1,7 +1,7 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
-project                       = QtIVI
-description                   = Qt IVI Reference Documentation
+project                       = QtIvi
+description                   = QtIvi Reference Documentation
 version                       = $QT_VERSION
 
 sourcedirs                   += .
@@ -11,34 +11,34 @@ headerdirs                   += .
 include(../ivicore/doc/qtivicore.qdocconf)
 include(../ivivehiclefunctions/doc/qtivivehiclefunctions.qdocconf)
 
-qhp.projects                  = QtIVI
+qhp.projects                  = QtIvi
 
-qhp.QtIVI.file                = qtivi.qhp
-qhp.QtIVI.namespace           = org.qt-project.qtivi.$QT_VERSION_TAG
-qhp.QtIVI.virtualFolder       = qtivi
-qhp.QtIVI.indexTitle          = Qt IVI
-qhp.QtIVI.indexRoot           =
+qhp.QtIvi.file                = qtivi.qhp
+qhp.QtIvi.namespace           = org.qt-project.qtivi.$QT_VERSION_TAG
+qhp.QtIvi.virtualFolder       = qtivi
+qhp.QtIvi.indexTitle          = Qt IVI
+qhp.QtIvi.indexRoot           =
 
-qhp.QtIVI.filterAttributes    = qtivi $QT_VERSION qtrefdoc
-qhp.QtIVI.customFilters.Qt.name = QtIVI $QT_VERSION
-qhp.QtIVI.customFilters.Qt.filterAttributes = qtivi $QT_VERSION
+qhp.QtIvi.filterAttributes    = qtivi $QT_VERSION qtrefdoc
+qhp.QtIvi.customFilters.Qt.name = QtIvi $QT_VERSION
+qhp.QtIvi.customFilters.Qt.filterAttributes = qtivi $QT_VERSION
 
-qhp.QtIVI.subprojects         = classes qml examples
+qhp.QtIvi.subprojects         = classes qml examples
 
-qhp.QtIVI.subprojects.classes.title = C++ Classes
-qhp.QtIVI.subprojects.classes.indexTitle = Qt IVI C++ Classes
-qhp.QtIVI.subprojects.classes.selectors = class fake:headerfile
-qhp.QtIVI.subprojects.classes.sortPages = true
+qhp.QtIvi.subprojects.classes.title = C++ Classes
+qhp.QtIvi.subprojects.classes.indexTitle = Qt IVI C++ Classes
+qhp.QtIvi.subprojects.classes.selectors = class fake:headerfile
+qhp.QtIvi.subprojects.classes.sortPages = true
 
-qhp.QtIVI.subprojects.qml.title = QML Types
-qhp.QtIVI.subprojects.qml.indexTitle = Qt IVI QML Types
-qhp.QtIVI.subprojects.qml.selectors = qmlclass
-qhp.QtIVI.subprojects.qml.sortPages = true
+qhp.QtIvi.subprojects.qml.title = QML Types
+qhp.QtIvi.subprojects.qml.indexTitle = Qt IVI QML Types
+qhp.QtIvi.subprojects.qml.selectors = qmlclass
+qhp.QtIvi.subprojects.qml.sortPages = true
 
-qhp.QtIVI.subprojects.examples.title = Examples
-qhp.QtIVI.subprojects.examples.indexTitle = Qt IVI Examples
-qhp.QtIVI.subprojects.examples.selectors = fake:example
-qhp.QtIVI.subprojects.examples.sortPages = true
+qhp.QtIvi.subprojects.examples.title = Examples
+qhp.QtIvi.subprojects.examples.indexTitle = Qt IVI Examples
+qhp.QtIvi.subprojects.examples.selectors = fake:example
+qhp.QtIvi.subprojects.examples.sortPages = true
 
 tagfile                 = qtivi.tags
 
diff --git a/src/doc/src/qtivi-modules.qdoc b/src/doc/src/qtivi-modules.qdoc
index 5d839f3..3498531 100644
--- a/src/doc/src/qtivi-modules.qdoc
+++ b/src/doc/src/qtivi-modules.qdoc
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the documentation of the QtIVI module of the Qt Toolkit.
+** This file is part of the documentation of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL-QTAS$
 ** Commercial License Usage
@@ -38,10 +38,10 @@
     \section1 Classes
 
     \section2 Qt IVI Core C++ Classes
-    \generatelist classesbymodule QtIVICore
+    \generatelist classesbymodule QtIviCore
 
     \section2 Qt IVI Vehicle Functions C++ Classes
-    \generatelist classesbymodule QtIVIVehicleFunctions
+    \generatelist classesbymodule QtIviVehicleFunctions
 */
 
 /*!
@@ -58,8 +58,8 @@
     \section1 QML Types
 
     \section2 Qt IVI Core QML Types
-    \generatelist qmltypesbymodule QtIVICore
+    \generatelist qmltypesbymodule QtIvi
 
     \section2 Qt IVI VehicleFunctions QML Types
-    \generatelist qmltypesbymodule QtIVIVehicleFunctions
+    \generatelist qmltypesbymodule QtIvi.VehicleFunctions
 */
diff --git a/src/doc/src/qtivi.qdoc b/src/doc/src/qtivi.qdoc
index 95ac2e9..0ce2674 100644
--- a/src/doc/src/qtivi.qdoc
+++ b/src/doc/src/qtivi.qdoc
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the documentation of the QtIVI module of the Qt Toolkit.
+** This file is part of the documentation of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL-QTAS$
 ** Commercial License Usage
@@ -27,7 +27,7 @@
 /*!
     \page index.html
     \title Qt IVI
-    \keyword QtIVI
+    \keyword QtIvi
 
     The Qt IVI (In-Vehicle Infotainment) module provides C++ classes and QML types
     for accessing vehicle features, as well as a core API for implementing
diff --git a/src/geniviextras/qdlt.h b/src/geniviextras/qdlt.h
index fd96c4d..480249f 100644
--- a/src/geniviextras/qdlt.h
+++ b/src/geniviextras/qdlt.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
diff --git a/src/geniviextras/qdltregistration.cpp b/src/geniviextras/qdltregistration.cpp
index ff4a7fe..9644ff5 100644
--- a/src/geniviextras/qdltregistration.cpp
+++ b/src/geniviextras/qdltregistration.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
diff --git a/src/geniviextras/qdltregistration.h b/src/geniviextras/qdltregistration.h
index a1eb1f7..239826c 100644
--- a/src/geniviextras/qdltregistration.h
+++ b/src/geniviextras/qdltregistration.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
diff --git a/src/geniviextras/qdltregistration_p.h b/src/geniviextras/qdltregistration_p.h
index ff8bd1a..495b741 100644
--- a/src/geniviextras/qdltregistration_p.h
+++ b/src/geniviextras/qdltregistration_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
diff --git a/src/geniviextras/qgeniviextrasglobal.h b/src/geniviextras/qgeniviextrasglobal.h
index f3797f1..1d0df9d 100644
--- a/src/geniviextras/qgeniviextrasglobal.h
+++ b/src/geniviextras/qgeniviextrasglobal.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
diff --git a/src/imports/core/core.pro b/src/imports/core/core.pro
index bd9102f..796ef1e 100644
--- a/src/imports/core/core.pro
+++ b/src/imports/core/core.pro
@@ -1,6 +1,6 @@
 CXX_MODULE = qml
 TARGET  = qtivicoreplugin
-TARGETPATH = QtIVICore
+TARGETPATH = QtIvi
 
 SOURCES += \
     plugin.cpp
diff --git a/src/imports/core/plugin.cpp b/src/imports/core/plugin.cpp
index 3760148..22f6530 100644
--- a/src/imports/core/plugin.cpp
+++ b/src/imports/core/plugin.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -41,22 +41,22 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <qqml.h>
 
-#include <QtIVICore/QtIVICore>
+#include <QtIviCore/QtIviCore>
 
 QT_BEGIN_NAMESPACE
 
-class QtIVICorePlugin : public QQmlExtensionPlugin
+class QIviCorePlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 public:
     virtual void registerTypes(const char *uri)
     {
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtIVICore"));
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtIvi"));
         Q_UNUSED(uri);
 
-        qmlRegisterUncreatableType<QtIVIAbstractFeature>(uri, 1, 0, "AbstractFeature", "AbstractFeature is not accessible directly");
-        qmlRegisterUncreatableType<QtIVIAbstractZonedFeature>(uri, 1, 0, "AbstractZonedFeature", "AbstractZonedFeature is not accessible directly");
+        qmlRegisterUncreatableType<QIviAbstractFeature>(uri, 1, 0, "AbstractFeature", "AbstractFeature is not accessible directly");
+        qmlRegisterUncreatableType<QIviAbstractZonedFeature>(uri, 1, 0, "AbstractZonedFeature", "AbstractZonedFeature is not accessible directly");
     }
 };
 
diff --git a/src/imports/core/qmldir b/src/imports/core/qmldir
index 1edec73..7790500 100644
--- a/src/imports/core/qmldir
+++ b/src/imports/core/qmldir
@@ -1,3 +1,3 @@
-module QtIVICore
+module QtIvi
 plugin qtivicoreplugin
-classname QtIVICorePlugin
+classname QtIviCorePlugin
diff --git a/src/imports/vehiclefunctions/plugin.cpp b/src/imports/vehiclefunctions/plugin.cpp
index fcc7638..f7160da 100644
--- a/src/imports/vehiclefunctions/plugin.cpp
+++ b/src/imports/vehiclefunctions/plugin.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -42,23 +42,23 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <qqml.h>
 
-#include <QtIVIVehicleFunctions/QtIVIClimateControl>
-#include <QtIVIVehicleFunctions/QtIVIWindowControl>
+#include <QtIviVehicleFunctions/QIviClimateControl>
+#include <QtIviVehicleFunctions/QIviWindowControl>
 
 QT_BEGIN_NAMESPACE
 
-class QtIVIVehicleFunctionsPlugin : public QQmlExtensionPlugin
+class QIviVehicleFunctionsPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 public:
     virtual void registerTypes(const char *uri)
     {
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtIVIVehicleFunctions"));
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtIvi.VehicleFunctions"));
         Q_UNUSED(uri);
 
-        qmlRegisterType<QtIVIClimateControl>(uri, 1, 0, "ClimateControl");
-        qmlRegisterType<QtIVIWindowControl>(uri, 1, 0, "WindowControl");
+        qmlRegisterType<QIviClimateControl>(uri, 1, 0, "ClimateControl");
+        qmlRegisterType<QIviWindowControl>(uri, 1, 0, "WindowControl");
     }
 };
 
diff --git a/src/imports/vehiclefunctions/qmldir b/src/imports/vehiclefunctions/qmldir
index 2c3c28e..d43cf26 100644
--- a/src/imports/vehiclefunctions/qmldir
+++ b/src/imports/vehiclefunctions/qmldir
@@ -1,3 +1,3 @@
-module QtIVIVehicleFunctions
+module QtIvi.VehicleFunctions
 plugin qtivivehiclefunctionsplugin
-classname QtIVIVehicleFunctionsPlugin
+classname QtIviVehicleFunctionsPlugin
diff --git a/src/imports/vehiclefunctions/vehiclefunctions.pro b/src/imports/vehiclefunctions/vehiclefunctions.pro
index 17617ca..0224a4d 100644
--- a/src/imports/vehiclefunctions/vehiclefunctions.pro
+++ b/src/imports/vehiclefunctions/vehiclefunctions.pro
@@ -1,6 +1,6 @@
 CXX_MODULE = qml
 TARGET  = qtivivehiclefunctionsplugin
-TARGETPATH = QtIVIVehicleFunctions
+TARGETPATH = QtIvi/VehicleFunctions
 
 SOURCES += \
     plugin.cpp
diff --git a/src/ivicore/doc/src/qmlqtiviproperty.qdocinc b/src/ivicore/doc/src/qmlqtiviproperty.qdocinc
index 9620449..f28dc6e 100644
--- a/src/ivicore/doc/src/qmlqtiviproperty.qdocinc
+++ b/src/ivicore/doc/src/qmlqtiviproperty.qdocinc
@@ -1 +1 @@
-\note This grouped property is implemented using the QtIVIProperty class.
+\note This grouped property is implemented using the QtIviProperty class.
diff --git a/src/ivicore/doc/src/qtivicore.qdoc b/src/ivicore/doc/src/qtivicore.qdoc
index 7f22c49..d41a80e 100644
--- a/src/ivicore/doc/src/qtivicore.qdoc
+++ b/src/ivicore/doc/src/qtivicore.qdoc
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the documentation of the QtIVI module of the Qt Toolkit.
+** This file is part of the documentation of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL-QTAS$
 ** Commercial License Usage
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \module QtIVICore
+    \module QtIviCore
     \title Qt IVI Core C++ Classes
     \ingroup modules
     \ingroup qtivi_modules
@@ -78,7 +78,7 @@
     notation, e.g. com.example.FeatureName. This is what is used by Core to find service objects
     for a feature.
 
-    The feature is derived from the QtIVIAbstractFeature class. The backend interface is commonly
+    The feature is derived from the QIviAbstractFeature class. The backend interface is commonly
     based on QObject.
 
     To make the API useable from QML, the feature needs to include a QML plugin registering types
@@ -95,12 +95,12 @@
 
     The backends are loaded by Core when the features request them. Each backend has to provide a Qt
     IVI plugin that exposes a factory to the Core. This is what is used to load and create backends.
-    The plugin interface is called QtIVIServiceInterface.
+    The plugin interface is called QIviServiceInterface.
 
     \section2 Simple vs Dynamic Features
 
     Most features are simple. This means that each feature element needs a single service object. By
-    setting the autoDiscover property of QtIVIAbstractFeature to true, the Core module provides the
+    setting the autoDiscover property of QIviAbstractFeature to true, the Core module provides the
     first compatible service object to the feature and issues a warning if none or more than one
     compatible service object is found.
 
@@ -112,10 +112,10 @@
     the auto discovery mechanism does not work. Instead the application must take responsibility for
     finding the right service object for each feature instance.
 
-    QtIVIServiceManager can be used in this case to manually search for plugins with a specific
+    QIviServiceManager can be used in this case to manually search for plugins with a specific
     BackendInterface. The discovery and loading of the backends takes place in this class.
 
-    The QtIVIServiceManager class can also be used to register backends which are part of the same
+    The QIviServiceManager class can also be used to register backends which are part of the same
     application and shouldn’t go into a plugin. This is especially useful for autotest as you need
     to control the backend and the feature at the same time.
 
@@ -228,7 +228,7 @@
 */
 
 /*!
-    \qmlmodule QtIVICore 1.0
+    \qmlmodule QtIvi 1.0
     \title Qt IVI Core QML Types
     \ingroup qmlmodules
     \ingroup qtivi_qmlmodules
diff --git a/src/ivicore/ivicore.pro b/src/ivicore/ivicore.pro
index 95835ad..8cce832 100644
--- a/src/ivicore/ivicore.pro
+++ b/src/ivicore/ivicore.pro
@@ -1,4 +1,4 @@
-TARGET = QtIVICore
+TARGET = QtIviCore
 
 QT = core core-private qml qml-private
 CONFIG += c++11
diff --git a/src/ivicore/qtiviabstractfeature.cpp b/src/ivicore/qtiviabstractfeature.cpp
index 90c22dd..b92c4f3 100644
--- a/src/ivicore/qtiviabstractfeature.cpp
+++ b/src/ivicore/qtiviabstractfeature.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -48,54 +48,54 @@
 #include <QMetaEnum>
 #include <QDebug>
 
-QtIVIAbstractFeaturePrivate::QtIVIAbstractFeaturePrivate(const QString &interface, QtIVIAbstractFeature *parent)
+QIviAbstractFeaturePrivate::QIviAbstractFeaturePrivate(const QString &interface, QIviAbstractFeature *parent)
     : QObjectPrivate()
     , q_ptr(parent)
     , m_interface(interface)
     , m_serviceObject(0)
-    , m_discoveryMode(QtIVIAbstractFeature::AutoDiscovery)
-    , m_discoveryResult(QtIVIAbstractFeature::NoResult)
-    , m_error(QtIVIAbstractFeature::NoError)
+    , m_discoveryMode(QIviAbstractFeature::AutoDiscovery)
+    , m_discoveryResult(QIviAbstractFeature::NoResult)
+    , m_error(QIviAbstractFeature::NoError)
     , m_qmlCreation(false)
 {
 }
 
-void QtIVIAbstractFeaturePrivate::setDiscoveryResult(QtIVIAbstractFeature::DiscoveryResult discoveryResult)
+void QIviAbstractFeaturePrivate::setDiscoveryResult(QIviAbstractFeature::DiscoveryResult discoveryResult)
 {
     if (m_discoveryResult == discoveryResult)
         return;
 
     m_discoveryResult = discoveryResult;
-    Q_Q(QtIVIAbstractFeature);
+    Q_Q(QIviAbstractFeature);
     emit q->discoveryResultChanged(discoveryResult);
 }
 
 /*!
- * \class QtIVIAbstractFeature
- * \inmodule QtIVICore
- * \brief The QtIVIAbstractFeature is the base class for all QtIVI Features
+ * \class QIviAbstractFeature
+ * \inmodule QtIviCore
+ * \brief The QIviAbstractFeature is the base class for all QtIvi Features
  *
- * QtIVIAbstractFeature is the base class for the front facing API towards the developer.
- * The QtIVIAbstractFeature provides you with a way to automatically connect to a backend implementing
+ * QIviAbstractFeature is the base class for the front facing API towards the developer.
+ * The QIviAbstractFeature provides you with a way to automatically connect to a backend implementing
  * the interface needed. This discovery is started by using the startAutoDiscovery() function.
  *
  * Once the auto discovery is done, it can be checked whether a backend has been found by using the
  * isValid function.
  *
  * The auto discovery gives you an easy way to automatically connect to the right backend implementation.
- * If you don't want to use the auto discovery, it's also possible to use QtIVIServiceManager to retrieve
- * all Backends and search manually for the right one and connect it to the QtIVIAbstractFeature by calling
+ * If you don't want to use the auto discovery, it's also possible to use QIviServiceManager to retrieve
+ * all Backends and search manually for the right one and connect it to the QIviAbstractFeature by calling
  * setServiceObject().
  *
  * The type of backend to be loaded can be controlled by setting the auto discovery mode. By default,
  * it is set to AutoDiscovery, which indicates that a production backend will be preferred over a simulation backend.
  *
- * QtIVIAbstractFeature is an abstract base class that needs to be subclassed to create an API for your
+ * QIviAbstractFeature is an abstract base class that needs to be subclassed to create an API for your
  * Feature.
  *
  * \chapter Subclassing
  *
- * When subclassing QtIVIAbstractFeature, you must provide implementations of the following functions:
+ * When subclassing QIviAbstractFeature, you must provide implementations of the following functions:
  * \list
  * \li acceptServiceObject()
  * \li connectToServiceObject()
@@ -103,8 +103,8 @@ void QtIVIAbstractFeaturePrivate::setDiscoveryResult(QtIVIAbstractFeature::Disco
  * \li clearServiceObject()
  * \endlist
  *
- * Once a QtIVIServiceObject has been set, either by auto discovery or by manually setting it, the acceptServiceObject()
- * function will be called to make sure the QtIVIServiceObject provides everything needed by the Feature.
+ * Once a QIviServiceObject has been set, either by auto discovery or by manually setting it, the acceptServiceObject()
+ * function will be called to make sure the QIviServiceObject provides everything needed by the Feature.
  *
  * If the interface provides signals, you need to do all the connect statements in connectToServiceObject() and
  * disconnect them again in disconnectFromServiceObject().
@@ -114,7 +114,7 @@ void QtIVIAbstractFeaturePrivate::setDiscoveryResult(QtIVIAbstractFeature::Disco
  */
 
 /*!
-   \enum QtIVIAbstractFeature::Error
+   \enum QIviAbstractFeature::Error
 
    \value NoError
           No error
@@ -131,7 +131,7 @@ void QtIVIAbstractFeaturePrivate::setDiscoveryResult(QtIVIAbstractFeature::Disco
  */
 
 /*!
-   \enum QtIVIAbstractFeature::DiscoveryMode
+   \enum QIviAbstractFeature::DiscoveryMode
 
    \value NoAutoDiscovery
           No Auto Discovery is done and the ServiceObject needs to be set manually
@@ -144,7 +144,7 @@ void QtIVIAbstractFeaturePrivate::setDiscoveryResult(QtIVIAbstractFeature::Disco
  */
 
 /*!
-   \enum QtIVIAbstractFeature::DiscoveryResult
+   \enum QIviAbstractFeature::DiscoveryResult
 
    \value NoResult
           Indicates that no auto discovery was started because the feature has already assigned a valid ServiceObject
@@ -158,8 +158,8 @@ void QtIVIAbstractFeaturePrivate::setDiscoveryResult(QtIVIAbstractFeature::Disco
 
 /*!
     \qmltype AbstractFeature
-    \instantiates QtIVIAbstractFeature
-    \inqmlmodule QtIVICore
+    \instantiates QIviAbstractFeature
+    \inqmlmodule QtIvi
 
     \brief The AbstractFeature is not directly accessible. QML type provides
     base QML properties for the feature, like autoDiscovery and isValid.
@@ -169,9 +169,9 @@ void QtIVIAbstractFeaturePrivate::setDiscoveryResult(QtIVIAbstractFeature::Disco
 */
 
 /*!
- * \fn bool QtIVIAbstractFeature::acceptServiceObject(QtIVIServiceObject *so)
+ * \fn bool QIviAbstractFeature::acceptServiceObject(QIviServiceObject *so)
  *
- * This method is expected to be implemented by any class subclassing QtIVIAbstractFeature.
+ * This method is expected to be implemented by any class subclassing QIviAbstractFeature.
  *
  * This method is expected to return \c true if the given service object, \a so, is accepted and
  * can be used, otherwise \c false.
@@ -183,9 +183,9 @@ void QtIVIAbstractFeaturePrivate::setDiscoveryResult(QtIVIAbstractFeature::Disco
  */
 
 /*!
- * \fn void QtIVIAbstractFeature::connectToServiceObject(QtIVIServiceObject *so)
+ * \fn void QIviAbstractFeature::connectToServiceObject(QIviServiceObject *so)
  *
- * This method is expected to be implemented by any class subclassing QtIVIAbstractFeature.
+ * This method is expected to be implemented by any class subclassing QIviAbstractFeature.
  *
  * The implementation is expected to connect to the service object, \a so, and to set all
  * properties to reflect the state of the service object.
@@ -200,9 +200,9 @@ void QtIVIAbstractFeaturePrivate::setDiscoveryResult(QtIVIAbstractFeature::Disco
  */
 
 /*!
- * \fn void QtIVIAbstractFeature::disconnectFromServiceObject(QtIVIServiceObject *so)
+ * \fn void QIviAbstractFeature::disconnectFromServiceObject(QIviServiceObject *so)
  *
- * This method is expected to be implemented by any class subclassing QtIVIAbstractFeature.
+ * This method is expected to be implemented by any class subclassing QIviAbstractFeature.
  *
  * The implementation is expected to disconnect from the service object, \a so.
  *
@@ -213,9 +213,9 @@ void QtIVIAbstractFeaturePrivate::setDiscoveryResult(QtIVIAbstractFeature::Disco
  */
 
 /*!
- * \fn void QtIVIAbstractFeature::clearServiceObject()
+ * \fn void QIviAbstractFeature::clearServiceObject()
  *
- * This method is expected to be implemented by any class subclassing QtIVIAbstractFeature.
+ * This method is expected to be implemented by any class subclassing QIviAbstractFeature.
  *
  * Called when no service object is available. The implementation is expected to set all
  * properties to safe defaults and forget all links to the previous service object.
@@ -233,24 +233,24 @@ void QtIVIAbstractFeaturePrivate::setDiscoveryResult(QtIVIAbstractFeature::Disco
  *
  * The \a interface argument is used to locate suitable service objects.
  */
-QtIVIAbstractFeature::QtIVIAbstractFeature(const QString &interface, QObject *parent)
-    : QObject(*new QtIVIAbstractFeaturePrivate(interface, this), parent)
+QIviAbstractFeature::QIviAbstractFeature(const QString &interface, QObject *parent)
+    : QObject(*new QIviAbstractFeaturePrivate(interface, this), parent)
 {
-    qRegisterMetaType<QtIVIAbstractFeature::Error>();
-    qRegisterMetaType<QtIVIAbstractFeature::DiscoveryMode>();
-    qRegisterMetaType<QtIVIAbstractFeature::DiscoveryResult>();
+    qRegisterMetaType<QIviAbstractFeature::Error>();
+    qRegisterMetaType<QIviAbstractFeature::DiscoveryMode>();
+    qRegisterMetaType<QIviAbstractFeature::DiscoveryResult>();
 }
 
 /*!
  * Destructor.
  */
-QtIVIAbstractFeature::~QtIVIAbstractFeature()
+QIviAbstractFeature::~QIviAbstractFeature()
 {
 
 }
 
 /*!
- * \property QtIVIAbstractFeature::serviceObject
+ * \property QIviAbstractFeature::serviceObject
  * \brief Sets the service object for the feature.
  *
  * As features only expose the front API facing the developer, a service object implementing the
@@ -260,9 +260,9 @@ QtIVIAbstractFeature::~QtIVIAbstractFeature()
  *
  * \sa discoveryMode
  */
-bool QtIVIAbstractFeature::setServiceObject(QtIVIServiceObject *so)
+bool QIviAbstractFeature::setServiceObject(QIviServiceObject *so)
 {
-    Q_D(QtIVIAbstractFeature);
+    Q_D(QIviAbstractFeature);
     if (d->m_serviceObject == so)
         return false;
 
@@ -321,14 +321,14 @@ bool QtIVIAbstractFeature::setServiceObject(QtIVIServiceObject *so)
  */
 
 /*!
- * \property QtIVIAbstractFeature::discoveryMode
+ * \property QIviAbstractFeature::discoveryMode
  * \brief Holds the mode that is used for the autoDiscovery
  *
  * \sa startAutoDiscovery()
  */
-void QtIVIAbstractFeature::setDiscoveryMode(QtIVIAbstractFeature::DiscoveryMode discoveryMode)
+void QIviAbstractFeature::setDiscoveryMode(QIviAbstractFeature::DiscoveryMode discoveryMode)
 {
-    Q_D(QtIVIAbstractFeature);
+    Q_D(QIviAbstractFeature);
     if (d->m_discoveryMode == discoveryMode)
         return;
 
@@ -340,18 +340,18 @@ void QtIVIAbstractFeature::setDiscoveryMode(QtIVIAbstractFeature::DiscoveryMode
  * \internal
  * \overload
  */
-void QtIVIAbstractFeature::classBegin()
+void QIviAbstractFeature::classBegin()
 {
-    Q_D(QtIVIAbstractFeature);
+    Q_D(QIviAbstractFeature);
     d->m_qmlCreation = true;
 }
 
 /*!
  * Invoked automatically when used from QML. Calls \l startAutoDiscovery().
  */
-void QtIVIAbstractFeature::componentComplete()
+void QIviAbstractFeature::componentComplete()
 {
-    Q_D(QtIVIAbstractFeature);
+    Q_D(QIviAbstractFeature);
     d->m_qmlCreation = false;
     startAutoDiscovery();
 }
@@ -359,21 +359,21 @@ void QtIVIAbstractFeature::componentComplete()
 /*!
  * Returns the interface name.
  */
-QString QtIVIAbstractFeature::interfaceName() const
+QString QIviAbstractFeature::interfaceName() const
 {
-    Q_D(const QtIVIAbstractFeature);
+    Q_D(const QIviAbstractFeature);
     return d->m_interface;
 }
 
-QtIVIServiceObject *QtIVIAbstractFeature::serviceObject() const
+QIviServiceObject *QIviAbstractFeature::serviceObject() const
 {
-    Q_D(const QtIVIAbstractFeature);
+    Q_D(const QIviAbstractFeature);
     return d->m_serviceObject;
 }
 
-QtIVIAbstractFeature::DiscoveryMode QtIVIAbstractFeature::discoveryMode() const
+QIviAbstractFeature::DiscoveryMode QIviAbstractFeature::discoveryMode() const
 {
-    Q_D(const QtIVIAbstractFeature);
+    Q_D(const QIviAbstractFeature);
     return d->m_discoveryMode;
 }
 
@@ -393,14 +393,14 @@ QtIVIAbstractFeature::DiscoveryMode QtIVIAbstractFeature::discoveryMode() const
  */
 
 /*!
- *  \property QtIVIAbstractFeature::discoveryResult
+ *  \property QIviAbstractFeature::discoveryResult
  *  \brief Holds the result of the last autoDiscovery
  *
  *  \sa startAutoDiscovery()
  */
-QtIVIAbstractFeature::DiscoveryResult QtIVIAbstractFeature::discoveryResult() const
+QIviAbstractFeature::DiscoveryResult QIviAbstractFeature::discoveryResult() const
 {
-    Q_D(const QtIVIAbstractFeature);
+    Q_D(const QIviAbstractFeature);
     return d->m_discoveryResult;
 }
 
@@ -409,14 +409,14 @@ QtIVIAbstractFeature::DiscoveryResult QtIVIAbstractFeature::discoveryResult() co
 
    Emits errorChanged() signal.
 
-   \sa QtIVIAbstractZonedFeature::Error
+   \sa QIviAbstractZonedFeature::Error
  */
-void QtIVIAbstractFeature::setError(QtIVIAbstractFeature::Error error, const QString &message)
+void QIviAbstractFeature::setError(QIviAbstractFeature::Error error, const QString &message)
 {
-    Q_D(QtIVIAbstractFeature);
+    Q_D(QIviAbstractFeature);
     d->m_error = error;
     d->m_errorMessage = errorText() + QStringLiteral(" ") + message;
-    if (d->m_error == QtIVIAbstractFeature::NoError)
+    if (d->m_error == QIviAbstractFeature::NoError)
         d->m_errorMessage.clear();
     emit errorChanged(d->m_error, d->m_errorMessage);
 }
@@ -424,28 +424,28 @@ void QtIVIAbstractFeature::setError(QtIVIAbstractFeature::Error error, const QSt
 /*!
    Returns the last error code.
 
-   \sa QtIVIAbstractFeature::Error
+   \sa QIviAbstractFeature::Error
  */
-QtIVIAbstractFeature::Error QtIVIAbstractFeature::error() const
+QIviAbstractFeature::Error QIviAbstractFeature::error() const
 {
-    Q_D(const QtIVIAbstractFeature);
+    Q_D(const QIviAbstractFeature);
     return d->m_error;
 }
 
 
 /*!
-   \qmlproperty QString QtIVIAbstractFeature::error
+   \qmlproperty QString QIviAbstractFeature::error
 
    Last error message of the feature. Empty if no error.
  */
 /*!
-   \property QtIVIAbstractFeature::error
+   \property QIviAbstractFeature::error
 
    Last error message of the feature. Empty if no error.
  */
-QString QtIVIAbstractFeature::errorMessage() const
+QString QIviAbstractFeature::errorMessage() const
 {
-    Q_D(const QtIVIAbstractFeature);
+    Q_D(const QIviAbstractFeature);
     return d->m_errorMessage;
 }
 
@@ -454,12 +454,12 @@ QString QtIVIAbstractFeature::errorMessage() const
 
    Empty if no error.
 */
-QString QtIVIAbstractFeature::errorText() const
+QString QIviAbstractFeature::errorText() const
 {
-    Q_D(const QtIVIAbstractFeature);
-    if (d->m_error == QtIVIAbstractFeature::NoError)
+    Q_D(const QIviAbstractFeature);
+    if (d->m_error == QIviAbstractFeature::NoError)
         return QString();
-    QMetaEnum metaEnum = QMetaEnum::fromType<QtIVIAbstractFeature::Error>();
+    QMetaEnum metaEnum = QMetaEnum::fromType<QIviAbstractFeature::Error>();
     return QLatin1String(metaEnum.valueToKey(d->m_error));
 }
 
@@ -476,8 +476,8 @@ QString QtIVIAbstractFeature::errorText() const
  *
  * Either the type of the backend which was loaded or an error is returned.
  *
- * If the discoveryMode is set to QtIVIAbstractFeature::NoAutoDiscovery this function will
- * do nothing and return QtIVIAbstractFeature::NoResult.
+ * If the discoveryMode is set to QIviAbstractFeature::NoAutoDiscovery this function will
+ * do nothing and return QIviAbstractFeature::NoResult.
  *
  *  Return values are:
  *  \value NoResult
@@ -500,26 +500,26 @@ QString QtIVIAbstractFeature::errorText() const
  *
  * Either the type of the backend which was loaded or an error is returned.
  *
- * If the discoveryMode is set to QtIVIAbstractFeature::NoAutoDiscovery this function will
- * do nothing and return QtIVIAbstractFeature::NoResult.
+ * If the discoveryMode is set to QIviAbstractFeature::NoAutoDiscovery this function will
+ * do nothing and return QIviAbstractFeature::NoResult.
  *
  * \sa discoveryMode()
  */
-QtIVIAbstractFeature::DiscoveryResult QtIVIAbstractFeature::startAutoDiscovery()
+QIviAbstractFeature::DiscoveryResult QIviAbstractFeature::startAutoDiscovery()
 {
-    Q_D(QtIVIAbstractFeature);
+    Q_D(QIviAbstractFeature);
 
      // No need to discover a new backend when we already have one
-    if (d->m_serviceObject || d->m_discoveryMode == QtIVIAbstractFeature::NoAutoDiscovery) {
+    if (d->m_serviceObject || d->m_discoveryMode == QIviAbstractFeature::NoAutoDiscovery) {
         d->setDiscoveryResult(NoResult);
         return NoResult;
     }
 
-    QtIVIServiceManager* serviceManager = QtIVIServiceManager::instance();
-    QList<QtIVIServiceObject*> serviceObjects;
+    QIviServiceManager* serviceManager = QIviServiceManager::instance();
+    QList<QIviServiceObject*> serviceObjects;
     DiscoveryResult result = NoResult;
     if (d->m_discoveryMode == AutoDiscovery || d->m_discoveryMode == LoadOnlyProductionBackends) {
-        serviceObjects = serviceManager->findServiceByInterface(d->m_interface, QtIVIServiceManager::IncludeProductionBackends);
+        serviceObjects = serviceManager->findServiceByInterface(d->m_interface, QIviServiceManager::IncludeProductionBackends);
         result = ProductionBackendLoaded;
     }
 
@@ -529,7 +529,7 @@ QtIVIAbstractFeature::DiscoveryResult QtIVIAbstractFeature::startAutoDiscovery()
             qWarning() << "There is no production backend implementing" << d->m_interface << ".";
 
         if (d->m_discoveryMode == AutoDiscovery || d->m_discoveryMode == LoadOnlySimulationBackends) {
-            serviceObjects = serviceManager->findServiceByInterface(d->m_interface, QtIVIServiceManager::IncludeSimulationBackends);
+            serviceObjects = serviceManager->findServiceByInterface(d->m_interface, QIviServiceManager::IncludeSimulationBackends);
             result = SimulationBackendLoaded;
             if (Q_UNLIKELY(serviceObjects.isEmpty())) {
                 qWarning() << "There is no simulation backend implementing" << d->m_interface << ".";
@@ -546,7 +546,7 @@ QtIVIAbstractFeature::DiscoveryResult QtIVIAbstractFeature::startAutoDiscovery()
         qWarning() << "There is more than one backend implementing" << d->m_interface << ".";
 
     bool serviceObjectSet = false;
-    foreach (QtIVIServiceObject* object, serviceObjects) {
+    foreach (QIviServiceObject* object, serviceObjects) {
         if (setServiceObject(object)) {
             serviceObjectSet = true;
             break;
@@ -563,7 +563,7 @@ QtIVIAbstractFeature::DiscoveryResult QtIVIAbstractFeature::startAutoDiscovery()
     return result;
 }
 
-QtIVIAbstractFeature::QtIVIAbstractFeature(QtIVIAbstractFeaturePrivate &dd, QObject *parent)
+QIviAbstractFeature::QIviAbstractFeature(QIviAbstractFeaturePrivate &dd, QObject *parent)
     : QObject(dd, parent)
 {
 }
@@ -576,21 +576,21 @@ QtIVIAbstractFeature::QtIVIAbstractFeature(QtIVIAbstractFeaturePrivate &dd, QObj
  * ready usually indicates that no suitable service object could be found, or that automatic
  * discovery has not been triggered.
  *
- * \sa QtIVIServiceObject, discoveryMode
+ * \sa QIviServiceObject, discoveryMode
  */
 /*!
- * \property QtIVIAbstractFeature::isValid
+ * \property QIviAbstractFeature::isValid
  * \brief Holds whether the feature is ready to use.
  *
  * The property holds \c true if the feature is ready to be used, otherwise \c false. Not being
  * ready usually indicates that no suitable service object could be found, or that automatic
  * discovery has not been triggered.
  *
- * \sa QtIVIServiceObject, discoveryMode
+ * \sa QIviServiceObject, discoveryMode
  */
-bool QtIVIAbstractFeature::isValid() const
+bool QIviAbstractFeature::isValid() const
 {
-    Q_D(const QtIVIAbstractFeature);
+    Q_D(const QIviAbstractFeature);
     return d->m_serviceObject != 0;
 }
 
@@ -599,14 +599,14 @@ bool QtIVIAbstractFeature::isValid() const
 
    This slot can be used when implementing a new Feature to report generic errors.
 */
-void QtIVIAbstractFeature::onErrorChanged(QtIVIAbstractFeature::Error error, const QString &message)
+void QIviAbstractFeature::onErrorChanged(QIviAbstractFeature::Error error, const QString &message)
 {
     setError(error, message);
 }
 
-void QtIVIAbstractFeature::serviceObjectDestroyed()
+void QIviAbstractFeature::serviceObjectDestroyed()
 {
-    Q_D(QtIVIAbstractFeature);
+    Q_D(QIviAbstractFeature);
     d->m_serviceObject = 0;
     clearServiceObject();
     emit serviceObjectChanged();
diff --git a/src/ivicore/qtiviabstractfeature.h b/src/ivicore/qtiviabstractfeature.h
index 37dd342..80cb130 100644
--- a/src/ivicore/qtiviabstractfeature.h
+++ b/src/ivicore/qtiviabstractfeature.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,27 +39,27 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIABSTRACTFEATURE_H
-#define QTIVIABSTRACTFEATURE_H
+#ifndef QIVIABSTRACTFEATURE_H
+#define QIVIABSTRACTFEATURE_H
 
 #include <QtCore/QObject>
 #include <QtQml/QQmlParserStatus>
 
-#include <QtIVICore/qtiviglobal.h>
+#include <QtIviCore/qtiviglobal.h>
 
 QT_BEGIN_NAMESPACE
 
-class QtIVIServiceObject;
-class QtIVIAbstractFeaturePrivate;
+class QIviServiceObject;
+class QIviAbstractFeaturePrivate;
 
-class Q_QTIVICORE_EXPORT QtIVIAbstractFeature : public QObject, public QQmlParserStatus
+class Q_QTIVICORE_EXPORT QIviAbstractFeature : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
 
     Q_PROPERTY(DiscoveryMode discoveryMode READ discoveryMode WRITE setDiscoveryMode NOTIFY discoveryModeChanged)
     Q_PROPERTY(DiscoveryResult discoveryResult READ discoveryResult NOTIFY discoveryResultChanged)
-    Q_PROPERTY(QtIVIServiceObject* serviceObject READ serviceObject WRITE setServiceObject NOTIFY serviceObjectChanged)
+    Q_PROPERTY(QIviServiceObject* serviceObject READ serviceObject WRITE setServiceObject NOTIFY serviceObjectChanged)
     Q_PROPERTY(bool isValid READ isValid NOTIFY isValidChanged)
     Q_PROPERTY(QString error READ errorMessage NOTIFY errorChanged)
 
@@ -91,34 +91,34 @@ public:
     };
     Q_ENUM(DiscoveryResult)
 
-    explicit QtIVIAbstractFeature(const QString &interface, QObject *parent = 0);
-    virtual ~QtIVIAbstractFeature();
+    explicit QIviAbstractFeature(const QString &interface, QObject *parent = Q_NULLPTR);
+    virtual ~QIviAbstractFeature();
 
-    QtIVIServiceObject *serviceObject() const;
-    QtIVIAbstractFeature::DiscoveryMode discoveryMode() const;
-    QtIVIAbstractFeature::DiscoveryResult discoveryResult() const;
+    QIviServiceObject *serviceObject() const;
+    QIviAbstractFeature::DiscoveryMode discoveryMode() const;
+    QIviAbstractFeature::DiscoveryResult discoveryResult() const;
     bool isValid() const;
-    QtIVIAbstractFeature::Error error() const;
+    QIviAbstractFeature::Error error() const;
     QString errorMessage() const;
 
 public Q_SLOTS:
-    bool setServiceObject(QtIVIServiceObject *so);
-    void setDiscoveryMode(QtIVIAbstractFeature::DiscoveryMode discoveryMode);
-    QtIVIAbstractFeature::DiscoveryResult startAutoDiscovery();
+    bool setServiceObject(QIviServiceObject *so);
+    void setDiscoveryMode(QIviAbstractFeature::DiscoveryMode discoveryMode);
+    QIviAbstractFeature::DiscoveryResult startAutoDiscovery();
 
 Q_SIGNALS:
     void serviceObjectChanged();
-    void discoveryModeChanged(QtIVIAbstractFeature::DiscoveryMode discoveryMode);
-    void discoveryResultChanged(QtIVIAbstractFeature::DiscoveryResult discoveryResult);
+    void discoveryModeChanged(QIviAbstractFeature::DiscoveryMode discoveryMode);
+    void discoveryResultChanged(QIviAbstractFeature::DiscoveryResult discoveryResult);
     void isValidChanged(bool arg);
-    void errorChanged(QtIVIAbstractFeature::Error error, const QString &message);
+    void errorChanged(QIviAbstractFeature::Error error, const QString &message);
 
 protected:
-    QtIVIAbstractFeature(QtIVIAbstractFeaturePrivate &dd, QObject *parent = Q_NULLPTR);
+    QIviAbstractFeature(QIviAbstractFeaturePrivate &dd, QObject *parent = Q_NULLPTR);
 
-    virtual bool acceptServiceObject(QtIVIServiceObject*) = 0;
-    virtual void connectToServiceObject(QtIVIServiceObject*) = 0;
-    virtual void disconnectFromServiceObject(QtIVIServiceObject*) = 0;
+    virtual bool acceptServiceObject(QIviServiceObject*) = 0;
+    virtual void connectToServiceObject(QIviServiceObject*) = 0;
+    virtual void disconnectFromServiceObject(QIviServiceObject*) = 0;
     virtual void clearServiceObject() = 0;
 
     virtual void classBegin();
@@ -126,18 +126,18 @@ protected:
 
     QString interfaceName() const;
     QString errorText() const;
-    void setError(QtIVIAbstractFeature::Error error, const QString &message = QString());
+    void setError(QIviAbstractFeature::Error error, const QString &message = QString());
 
 protected Q_SLOTS:
-    virtual void onErrorChanged(QtIVIAbstractFeature::Error error, const QString &message = QString());
+    virtual void onErrorChanged(QIviAbstractFeature::Error error, const QString &message = QString());
 
 private Q_SLOTS:
     void serviceObjectDestroyed();
 
 private:
-    Q_DECLARE_PRIVATE(QtIVIAbstractFeature)
+    Q_DECLARE_PRIVATE(QIviAbstractFeature)
 };
 
 QT_END_NAMESPACE
 
-#endif // QTIVIABSTRACTFEATURE_H
+#endif // QIVIABSTRACTFEATURE_H
diff --git a/src/ivicore/qtiviabstractfeature_p.h b/src/ivicore/qtiviabstractfeature_p.h
index 25fb2cc..8658e08 100644
--- a/src/ivicore/qtiviabstractfeature_p.h
+++ b/src/ivicore/qtiviabstractfeature_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIABSTRACTFEATURE_P_H
-#define QTIVIABSTRACTFEATURE_P_H
+#ifndef QIVIABSTRACTFEATURE_P_H
+#define QIVIABSTRACTFEATURE_P_H
 
 //
 //  W A R N I N G
@@ -59,25 +59,25 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QTIVICORE_EXPORT QtIVIAbstractFeaturePrivate : public QObjectPrivate
+class Q_QTIVICORE_EXPORT QIviAbstractFeaturePrivate : public QObjectPrivate
 {
 public:
-    QtIVIAbstractFeaturePrivate(const QString &interface, QtIVIAbstractFeature *parent);
+    QIviAbstractFeaturePrivate(const QString &interface, QIviAbstractFeature *parent);
 
-    void setDiscoveryResult(QtIVIAbstractFeature::DiscoveryResult discoveryResult);
+    void setDiscoveryResult(QIviAbstractFeature::DiscoveryResult discoveryResult);
 
-    QtIVIAbstractFeature * const q_ptr;
-    Q_DECLARE_PUBLIC(QtIVIAbstractFeature)
+    QIviAbstractFeature * const q_ptr;
+    Q_DECLARE_PUBLIC(QIviAbstractFeature)
 
     QString m_interface;
-    QtIVIServiceObject* m_serviceObject;
-    QtIVIAbstractFeature::DiscoveryMode m_discoveryMode;
-    QtIVIAbstractFeature::DiscoveryResult m_discoveryResult;
+    QIviServiceObject* m_serviceObject;
+    QIviAbstractFeature::DiscoveryMode m_discoveryMode;
+    QIviAbstractFeature::DiscoveryResult m_discoveryResult;
     QString m_errorMessage;
-    QtIVIAbstractFeature::Error m_error;
+    QIviAbstractFeature::Error m_error;
     bool m_qmlCreation;
 };
 
 QT_END_NAMESPACE
 
-#endif // QTIVIABSTRACTFEATURE_P_H
+#endif // QIVIABSTRACTFEATURE_P_H
diff --git a/src/ivicore/qtiviabstractfeaturelistmodel.cpp b/src/ivicore/qtiviabstractfeaturelistmodel.cpp
index a2368b0..75258c2 100644
--- a/src/ivicore/qtiviabstractfeaturelistmodel.cpp
+++ b/src/ivicore/qtiviabstractfeaturelistmodel.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -42,139 +42,139 @@
 #include "qtiviabstractfeaturelistmodel.h"
 #include "qtiviabstractfeaturelistmodel_p.h"
 
-QtIVIHelperFeature::QtIVIHelperFeature(const QString &interface, QtIVIAbstractFeatureListModel *model)
-    : QtIVIAbstractFeature(interface)
+QIviHelperFeature::QIviHelperFeature(const QString &interface, QIviAbstractFeatureListModel *model)
+    : QIviAbstractFeature(interface)
     , m_model(model)
 {
 }
 
-bool QtIVIHelperFeature::acceptServiceObject(QtIVIServiceObject *so)
+bool QIviHelperFeature::acceptServiceObject(QIviServiceObject *so)
 {
     return m_model->acceptServiceObject(so);
 }
 
-void QtIVIHelperFeature::connectToServiceObject(QtIVIServiceObject *so)
+void QIviHelperFeature::connectToServiceObject(QIviServiceObject *so)
 {
     m_model->connectToServiceObject(so);
 }
 
-void QtIVIHelperFeature::disconnectFromServiceObject(QtIVIServiceObject *so)
+void QIviHelperFeature::disconnectFromServiceObject(QIviServiceObject *so)
 {
     m_model->disconnectFromServiceObject(so);
 }
 
-void QtIVIHelperFeature::clearServiceObject()
+void QIviHelperFeature::clearServiceObject()
 {
     m_model->clearServiceObject();
 }
 
-QtIVIAbstractFeatureListModelPrivate::QtIVIAbstractFeatureListModelPrivate(const QString &interface, QtIVIAbstractFeatureListModel *model)
+QIviAbstractFeatureListModelPrivate::QIviAbstractFeatureListModelPrivate(const QString &interface, QIviAbstractFeatureListModel *model)
     : QAbstractItemModelPrivate()
-    , m_feature(new QtIVIHelperFeature(interface, model))
+    , m_feature(new QIviHelperFeature(interface, model))
 {
 
 }
 
-QtIVIAbstractFeatureListModelPrivate::~QtIVIAbstractFeatureListModelPrivate()
+QIviAbstractFeatureListModelPrivate::~QIviAbstractFeatureListModelPrivate()
 {
     delete m_feature;
 }
 
-QtIVIAbstractFeatureListModel::QtIVIAbstractFeatureListModel(const QString &interface, QObject *parent)
-    : QAbstractListModel(*new QtIVIAbstractFeatureListModelPrivate(interface, this), parent)
+QIviAbstractFeatureListModel::QIviAbstractFeatureListModel(const QString &interface, QObject *parent)
+    : QAbstractListModel(*new QIviAbstractFeatureListModelPrivate(interface, this), parent)
 {
-    Q_D(QtIVIAbstractFeatureListModel);
-    connect(d->m_feature, &QtIVIAbstractFeature::serviceObjectChanged, this, &QtIVIAbstractFeatureListModel::serviceObjectChanged);
-    connect(d->m_feature, &QtIVIAbstractFeature::discoveryModeChanged, this, &QtIVIAbstractFeatureListModel::discoveryModeChanged);
-    connect(d->m_feature, &QtIVIAbstractFeature::discoveryResultChanged, this, &QtIVIAbstractFeatureListModel::discoveryResultChanged);
-    connect(d->m_feature, &QtIVIAbstractFeature::isValidChanged, this, &QtIVIAbstractFeatureListModel::isValidChanged);
-    connect(d->m_feature, &QtIVIAbstractFeature::errorChanged, this, &QtIVIAbstractFeatureListModel::errorChanged);
+    Q_D(QIviAbstractFeatureListModel);
+    connect(d->m_feature, &QIviAbstractFeature::serviceObjectChanged, this, &QIviAbstractFeatureListModel::serviceObjectChanged);
+    connect(d->m_feature, &QIviAbstractFeature::discoveryModeChanged, this, &QIviAbstractFeatureListModel::discoveryModeChanged);
+    connect(d->m_feature, &QIviAbstractFeature::discoveryResultChanged, this, &QIviAbstractFeatureListModel::discoveryResultChanged);
+    connect(d->m_feature, &QIviAbstractFeature::isValidChanged, this, &QIviAbstractFeatureListModel::isValidChanged);
+    connect(d->m_feature, &QIviAbstractFeature::errorChanged, this, &QIviAbstractFeatureListModel::errorChanged);
 }
 
-QtIVIAbstractFeatureListModel::~QtIVIAbstractFeatureListModel()
+QIviAbstractFeatureListModel::~QIviAbstractFeatureListModel()
 {
 
 }
 
-QtIVIServiceObject *QtIVIAbstractFeatureListModel::serviceObject() const
+QIviServiceObject *QIviAbstractFeatureListModel::serviceObject() const
 {
-    Q_D(const QtIVIAbstractFeatureListModel);
+    Q_D(const QIviAbstractFeatureListModel);
     return d->m_feature->serviceObject();
 }
 
-QtIVIAbstractFeature::DiscoveryMode QtIVIAbstractFeatureListModel::discoveryMode() const
+QIviAbstractFeature::DiscoveryMode QIviAbstractFeatureListModel::discoveryMode() const
 {
-    Q_D(const QtIVIAbstractFeatureListModel);
+    Q_D(const QIviAbstractFeatureListModel);
     return d->m_feature->discoveryMode();
 }
 
-QtIVIAbstractFeature::DiscoveryResult QtIVIAbstractFeatureListModel::discoveryResult() const
+QIviAbstractFeature::DiscoveryResult QIviAbstractFeatureListModel::discoveryResult() const
 {
-    Q_D(const QtIVIAbstractFeatureListModel);
+    Q_D(const QIviAbstractFeatureListModel);
     return d->m_feature->discoveryResult();
 }
 
-bool QtIVIAbstractFeatureListModel::isValid() const
+bool QIviAbstractFeatureListModel::isValid() const
 {
-    Q_D(const QtIVIAbstractFeatureListModel);
+    Q_D(const QIviAbstractFeatureListModel);
     return d->m_feature->isValid();
 }
 
-QtIVIAbstractFeature::Error QtIVIAbstractFeatureListModel::error() const
+QIviAbstractFeature::Error QIviAbstractFeatureListModel::error() const
 {
-    Q_D(const QtIVIAbstractFeatureListModel);
+    Q_D(const QIviAbstractFeatureListModel);
     return d->m_feature->error();
 }
 
-QString QtIVIAbstractFeatureListModel::errorMessage() const
+QString QIviAbstractFeatureListModel::errorMessage() const
 {
-    Q_D(const QtIVIAbstractFeatureListModel);
+    Q_D(const QIviAbstractFeatureListModel);
     return d->m_feature->errorMessage();
 }
 
-bool QtIVIAbstractFeatureListModel::setServiceObject(QtIVIServiceObject *so)
+bool QIviAbstractFeatureListModel::setServiceObject(QIviServiceObject *so)
 {
-    Q_D(QtIVIAbstractFeatureListModel);
+    Q_D(QIviAbstractFeatureListModel);
     return d->m_feature->setServiceObject(so);
 }
 
-void QtIVIAbstractFeatureListModel::setDiscoveryMode(QtIVIAbstractFeature::DiscoveryMode discoveryMode)
+void QIviAbstractFeatureListModel::setDiscoveryMode(QIviAbstractFeature::DiscoveryMode discoveryMode)
 {
-    Q_D(QtIVIAbstractFeatureListModel);
+    Q_D(QIviAbstractFeatureListModel);
     return d->m_feature->setDiscoveryMode(discoveryMode);
 }
 
-QtIVIAbstractFeature::DiscoveryResult QtIVIAbstractFeatureListModel::startAutoDiscovery()
+QIviAbstractFeature::DiscoveryResult QIviAbstractFeatureListModel::startAutoDiscovery()
 {
-    Q_D(QtIVIAbstractFeatureListModel);
+    Q_D(QIviAbstractFeatureListModel);
     return d->m_feature->startAutoDiscovery();
 }
 
-QtIVIAbstractFeatureListModel::QtIVIAbstractFeatureListModel(QtIVIAbstractFeatureListModelPrivate &dd, QObject *parent)
+QIviAbstractFeatureListModel::QIviAbstractFeatureListModel(QIviAbstractFeatureListModelPrivate &dd, QObject *parent)
     : QAbstractListModel(dd, parent)
 {
-    Q_D(QtIVIAbstractFeatureListModel);
-    connect(d->m_feature, &QtIVIAbstractFeature::serviceObjectChanged, this, &QtIVIAbstractFeatureListModel::serviceObjectChanged);
-    connect(d->m_feature, &QtIVIAbstractFeature::discoveryModeChanged, this, &QtIVIAbstractFeatureListModel::discoveryModeChanged);
-    connect(d->m_feature, &QtIVIAbstractFeature::discoveryResultChanged, this, &QtIVIAbstractFeatureListModel::discoveryResultChanged);
-    connect(d->m_feature, &QtIVIAbstractFeature::isValidChanged, this, &QtIVIAbstractFeatureListModel::isValidChanged);
-    connect(d->m_feature, &QtIVIAbstractFeature::errorChanged, this, &QtIVIAbstractFeatureListModel::errorChanged);
+    Q_D(QIviAbstractFeatureListModel);
+    connect(d->m_feature, &QIviAbstractFeature::serviceObjectChanged, this, &QIviAbstractFeatureListModel::serviceObjectChanged);
+    connect(d->m_feature, &QIviAbstractFeature::discoveryModeChanged, this, &QIviAbstractFeatureListModel::discoveryModeChanged);
+    connect(d->m_feature, &QIviAbstractFeature::discoveryResultChanged, this, &QIviAbstractFeatureListModel::discoveryResultChanged);
+    connect(d->m_feature, &QIviAbstractFeature::isValidChanged, this, &QIviAbstractFeatureListModel::isValidChanged);
+    connect(d->m_feature, &QIviAbstractFeature::errorChanged, this, &QIviAbstractFeatureListModel::errorChanged);
 }
 
-QString QtIVIAbstractFeatureListModel::interfaceName() const
+QString QIviAbstractFeatureListModel::interfaceName() const
 {
-    Q_D(const QtIVIAbstractFeatureListModel);
+    Q_D(const QIviAbstractFeatureListModel);
     return d->m_feature->interfaceName();
 }
 
-QString QtIVIAbstractFeatureListModel::errorText() const
+QString QIviAbstractFeatureListModel::errorText() const
 {
-    Q_D(const QtIVIAbstractFeatureListModel);
+    Q_D(const QIviAbstractFeatureListModel);
     return d->m_feature->errorText();
 }
 
-void QtIVIAbstractFeatureListModel::setError(QtIVIAbstractFeature::Error error, const QString &message)
+void QIviAbstractFeatureListModel::setError(QIviAbstractFeature::Error error, const QString &message)
 {
-    Q_D(QtIVIAbstractFeatureListModel);
+    Q_D(QIviAbstractFeatureListModel);
     d->m_feature->setError(error, message);
 }
diff --git a/src/ivicore/qtiviabstractfeaturelistmodel.h b/src/ivicore/qtiviabstractfeaturelistmodel.h
index 5c80e00..259dccb 100644
--- a/src/ivicore/qtiviabstractfeaturelistmodel.h
+++ b/src/ivicore/qtiviabstractfeaturelistmodel.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,67 +39,67 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIABSTRACTFEATURELISTMODEL_H
-#define QTIVIABSTRACTFEATURELISTMODEL_H
+#ifndef QIVIABSTRACTFEATURELISTMODEL_H
+#define QIVIABSTRACTFEATURELISTMODEL_H
 
 #include <QAbstractListModel>
-#include <QtIVICore/QtIVIAbstractFeature>
+#include <QtIviCore/QIviAbstractFeature>
 
 QT_BEGIN_NAMESPACE
 
-class QtIVIAbstractFeatureListModelPrivate;
+class QIviAbstractFeatureListModelPrivate;
 
-class Q_QTIVICORE_EXPORT QtIVIAbstractFeatureListModel : public QAbstractListModel
+class Q_QTIVICORE_EXPORT QIviAbstractFeatureListModel : public QAbstractListModel
 {
     Q_OBJECT
 
-    Q_PROPERTY(QtIVIAbstractFeature::DiscoveryMode discoveryMode READ discoveryMode WRITE setDiscoveryMode NOTIFY discoveryModeChanged)
-    Q_PROPERTY(QtIVIAbstractFeature::DiscoveryResult discoveryResult READ discoveryResult NOTIFY discoveryResultChanged)
-    Q_PROPERTY(QtIVIServiceObject* serviceObject READ serviceObject WRITE setServiceObject NOTIFY serviceObjectChanged)
+    Q_PROPERTY(QIviAbstractFeature::DiscoveryMode discoveryMode READ discoveryMode WRITE setDiscoveryMode NOTIFY discoveryModeChanged)
+    Q_PROPERTY(QIviAbstractFeature::DiscoveryResult discoveryResult READ discoveryResult NOTIFY discoveryResultChanged)
+    Q_PROPERTY(QIviServiceObject* serviceObject READ serviceObject WRITE setServiceObject NOTIFY serviceObjectChanged)
     Q_PROPERTY(bool isValid READ isValid NOTIFY isValidChanged)
     Q_PROPERTY(QString error READ errorMessage NOTIFY errorChanged)
 
 public:
 
-    explicit QtIVIAbstractFeatureListModel(const QString &interface, QObject *parent = 0);
-    ~QtIVIAbstractFeatureListModel();
+    explicit QIviAbstractFeatureListModel(const QString &interface, QObject *parent = Q_NULLPTR);
+    ~QIviAbstractFeatureListModel();
 
-    QtIVIServiceObject *serviceObject() const;
-    QtIVIAbstractFeature::DiscoveryMode discoveryMode() const;
-    QtIVIAbstractFeature::DiscoveryResult discoveryResult() const;
+    QIviServiceObject *serviceObject() const;
+    QIviAbstractFeature::DiscoveryMode discoveryMode() const;
+    QIviAbstractFeature::DiscoveryResult discoveryResult() const;
     bool isValid() const;
-    QtIVIAbstractFeature::Error error() const;
+    QIviAbstractFeature::Error error() const;
     QString errorMessage() const;
 
 public Q_SLOTS:
-    bool setServiceObject(QtIVIServiceObject *so);
-    void setDiscoveryMode(QtIVIAbstractFeature::DiscoveryMode discoveryMode);
-    QtIVIAbstractFeature::DiscoveryResult startAutoDiscovery();
+    bool setServiceObject(QIviServiceObject *so);
+    void setDiscoveryMode(QIviAbstractFeature::DiscoveryMode discoveryMode);
+    QIviAbstractFeature::DiscoveryResult startAutoDiscovery();
 
 Q_SIGNALS:
     void serviceObjectChanged();
-    void discoveryModeChanged(QtIVIAbstractFeature::DiscoveryMode discoveryMode);
-    void discoveryResultChanged(QtIVIAbstractFeature::DiscoveryResult discoveryResult);
+    void discoveryModeChanged(QIviAbstractFeature::DiscoveryMode discoveryMode);
+    void discoveryResultChanged(QIviAbstractFeature::DiscoveryResult discoveryResult);
     void isValidChanged(bool arg);
-    void errorChanged(QtIVIAbstractFeature::Error error, const QString &message);
+    void errorChanged(QIviAbstractFeature::Error error, const QString &message);
 
 protected:
-    QtIVIAbstractFeatureListModel(QtIVIAbstractFeatureListModelPrivate &dd, QObject *parent = Q_NULLPTR);
+    QIviAbstractFeatureListModel(QIviAbstractFeatureListModelPrivate &dd, QObject *parent = Q_NULLPTR);
 
-    virtual bool acceptServiceObject(QtIVIServiceObject*) = 0;
-    virtual void connectToServiceObject(QtIVIServiceObject*) = 0;
-    virtual void disconnectFromServiceObject(QtIVIServiceObject*) = 0;
+    virtual bool acceptServiceObject(QIviServiceObject*) = 0;
+    virtual void connectToServiceObject(QIviServiceObject*) = 0;
+    virtual void disconnectFromServiceObject(QIviServiceObject*) = 0;
     virtual void clearServiceObject() = 0;
 
     QString interfaceName() const;
     QString errorText() const;
-    void setError(QtIVIAbstractFeature::Error error, const QString &message = QString());
+    void setError(QIviAbstractFeature::Error error, const QString &message = QString());
 
 private:
-    Q_DECLARE_PRIVATE(QtIVIAbstractFeatureListModel)
-    friend class QtIVIHelperFeature;
+    Q_DECLARE_PRIVATE(QIviAbstractFeatureListModel)
+    friend class QIviHelperFeature;
 };
 
 QT_END_NAMESPACE
 
-#endif // QTIVIABSTRACTFEATURELISTMODEL_H
+#endif // QIVIABSTRACTFEATURELISTMODEL_H
diff --git a/src/ivicore/qtiviabstractfeaturelistmodel_p.h b/src/ivicore/qtiviabstractfeaturelistmodel_p.h
index 08ddd49..a9edb98 100644
--- a/src/ivicore/qtiviabstractfeaturelistmodel_p.h
+++ b/src/ivicore/qtiviabstractfeaturelistmodel_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIABSTRACTFEATURELISTMODEL_P_H
-#define QTIVIABSTRACTFEATURELISTMODEL_P_H
+#ifndef QIVIABSTRACTFEATURELISTMODEL_P_H
+#define QIVIABSTRACTFEATURELISTMODEL_P_H
 
 //
 //  W A R N I N G
@@ -59,32 +59,32 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtIVIHelperFeature : public QtIVIAbstractFeature
+class QIviHelperFeature : public QIviAbstractFeature
 {
 public:
-    QtIVIHelperFeature(const QString &interface, QtIVIAbstractFeatureListModel *model);
+    QIviHelperFeature(const QString &interface, QIviAbstractFeatureListModel *model);
 
-    bool acceptServiceObject(QtIVIServiceObject *so);
-    void connectToServiceObject(QtIVIServiceObject *so);
-    void disconnectFromServiceObject(QtIVIServiceObject *so);
+    bool acceptServiceObject(QIviServiceObject *so);
+    void connectToServiceObject(QIviServiceObject *so);
+    void disconnectFromServiceObject(QIviServiceObject *so);
     void clearServiceObject();
 
-    using QtIVIAbstractFeature::interfaceName;
-    using QtIVIAbstractFeature::errorText;
-    using QtIVIAbstractFeature::setError;
+    using QIviAbstractFeature::interfaceName;
+    using QIviAbstractFeature::errorText;
+    using QIviAbstractFeature::setError;
 
-    QtIVIAbstractFeatureListModel *m_model;
+    QIviAbstractFeatureListModel *m_model;
 };
 
-class Q_QTIVICORE_EXPORT QtIVIAbstractFeatureListModelPrivate : public QAbstractItemModelPrivate
+class Q_QTIVICORE_EXPORT QIviAbstractFeatureListModelPrivate : public QAbstractItemModelPrivate
 {
 public:
-    QtIVIAbstractFeatureListModelPrivate(const QString &interface, QtIVIAbstractFeatureListModel *model);
-    virtual ~QtIVIAbstractFeatureListModelPrivate();
+    QIviAbstractFeatureListModelPrivate(const QString &interface, QIviAbstractFeatureListModel *model);
+    virtual ~QIviAbstractFeatureListModelPrivate();
 
-    QtIVIHelperFeature *m_feature;
+    QIviHelperFeature *m_feature;
 };
 
 QT_END_NAMESPACE
 
-#endif // QTIVIABSTRACTFEATURELISTMODEL_P_H
+#endif // QIVIABSTRACTFEATURELISTMODEL_P_H
diff --git a/src/ivicore/qtiviabstractzonedfeature.cpp b/src/ivicore/qtiviabstractzonedfeature.cpp
index 22d1326..75a4b77 100644
--- a/src/ivicore/qtiviabstractzonedfeature.cpp
+++ b/src/ivicore/qtiviabstractzonedfeature.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -40,32 +40,32 @@
 ****************************************************************************/
 
 #include <QtCore/qmetaobject.h>
-#include <QtIVICore/qtiviserviceobject.h>
+#include <QtIviCore/qtiviserviceobject.h>
 
 #include "qtiviabstractzonedfeature.h"
 #include "qtiviabstractzonedfeature_p.h"
 #include "qtivizonedfeatureinterface.h"
 
-QtIVIAbstractZonedFeaturePrivate::QtIVIAbstractZonedFeaturePrivate(const QString &interface, const QString &zone, QtIVIAbstractFeature *parent)
-    : QtIVIAbstractFeaturePrivate(interface, parent)
+QIviAbstractZonedFeaturePrivate::QIviAbstractZonedFeaturePrivate(const QString &interface, const QString &zone, QIviAbstractFeature *parent)
+    : QIviAbstractFeaturePrivate(interface, parent)
     , m_zone(zone)
 {}
 
 /*!
-    \class QtIVIAbstractZonedFeature
-    \inmodule QtIVICore
+    \class QIviAbstractZonedFeature
+    \inmodule QtIviCore
 
     \since 5.6
 
-    \brief The QtIVIAbstractZonedFeature is the base class for all QtIVI vehicle features.
+    \brief The QIviAbstractZonedFeature is the base class for all QtIvi vehicle features.
 
-    QtIVIAbstractZonedFeature contains all feature attributes and zone handling.
+    QIviAbstractZonedFeature contains all feature attributes and zone handling.
 */
 
 /*!
     \qmltype AbstractZonedFeature
-    \instantiates QtIVIAbstractZonedFeature
-    \inqmlmodule QtIVICore 1.0
+    \instantiates QIviAbstractZonedFeature
+    \inqmlmodule QtIvi 1.0
     \inherits AbstractFeature
     \brief The AbstractZonedFeature is not directly accessible. QML type provides
     base QML properties for each QML Vehicle feature like zone and error access.
@@ -74,30 +74,30 @@ QtIVIAbstractZonedFeaturePrivate::QtIVIAbstractZonedFeaturePrivate(const QString
 /*!
     Constructs a vehicle feature with a specific \a interface and \a zone.
 
-    If \a parent is of type QtIVIAbstractZonedFeature, then the created instance
+    If \a parent is of type QIviAbstractZonedFeature, then the created instance
     uses parent for the backend connection. Parent is connected to the
     backend and will forward updates between child features and the backend.
 
-    \sa QtIVIAbstractFeature
+    \sa QIviAbstractFeature
 */
-QtIVIAbstractZonedFeature::QtIVIAbstractZonedFeature(const QString &interface, const QString &zone, QObject *parent)
-    : QtIVIAbstractFeature(*new QtIVIAbstractZonedFeaturePrivate(interface, zone, this), parent)
+QIviAbstractZonedFeature::QIviAbstractZonedFeature(const QString &interface, const QString &zone, QObject *parent)
+    : QIviAbstractFeature(*new QIviAbstractZonedFeaturePrivate(interface, zone, this), parent)
 {
 }
 
 /*!
     Destroys vehicle feature
 */
-QtIVIAbstractZonedFeature::~QtIVIAbstractZonedFeature()
+QIviAbstractZonedFeature::~QIviAbstractZonedFeature()
 {
 }
 
 /*!
     \reimp
 */
-bool QtIVIAbstractZonedFeature::acceptServiceObject(QtIVIServiceObject *serviceObject)
+bool QIviAbstractZonedFeature::acceptServiceObject(QIviServiceObject *serviceObject)
 {
-    if (QtIVIAbstractZonedFeature* parentFeature = qobject_cast<QtIVIAbstractZonedFeature*>(parent()))
+    if (QIviAbstractZonedFeature* parentFeature = qobject_cast<QIviAbstractZonedFeature*>(parent()))
         return parentFeature->acceptServiceObject(serviceObject);
     else if (serviceObject)
         return serviceObject->interfaces().contains(interfaceName());
@@ -107,16 +107,16 @@ bool QtIVIAbstractZonedFeature::acceptServiceObject(QtIVIServiceObject *serviceO
 /*!
     \reimp
 */
-void QtIVIAbstractZonedFeature::connectToServiceObject(QtIVIServiceObject *serviceObject)
+void QIviAbstractZonedFeature::connectToServiceObject(QIviServiceObject *serviceObject)
 {
-    QtIVIZonedFeatureInterface *backend(0);
-    if (QtIVIAbstractZonedFeature* parentFeature = qobject_cast<QtIVIAbstractZonedFeature*>(parent()))
+    QIviZonedFeatureInterface *backend(0);
+    if (QIviAbstractZonedFeature* parentFeature = qobject_cast<QIviAbstractZonedFeature*>(parent()))
         backend = parentFeature->backend();
     else if (serviceObject)
-        backend = qobject_cast<QtIVIZonedFeatureInterface*>(serviceObject->interfaceInstance(interfaceName()));
+        backend = qobject_cast<QIviZonedFeatureInterface*>(serviceObject->interfaceInstance(interfaceName()));
 
     if (backend) {
-        connect(backend, &QtIVIZonedFeatureInterface::errorChanged, this, &QtIVIAbstractZonedFeature::onErrorChanged);
+        connect(backend, &QIviZonedFeatureInterface::errorChanged, this, &QIviAbstractZonedFeature::onErrorChanged);
         initializeZones();
     }
 }
@@ -124,9 +124,9 @@ void QtIVIAbstractZonedFeature::connectToServiceObject(QtIVIServiceObject *servi
 /*!
     \reimp
 */
-void QtIVIAbstractZonedFeature::clearServiceObject()
+void QIviAbstractZonedFeature::clearServiceObject()
 {
-    Q_D(QtIVIAbstractZonedFeature);
+    Q_D(QIviAbstractZonedFeature);
     qDeleteAll(d->m_zoneFeatures);
     d->m_zoneFeatures.clear();
     d->m_zoneFeatureList.clear();
@@ -136,26 +136,26 @@ void QtIVIAbstractZonedFeature::clearServiceObject()
 /*!
    Returns pointer to the backend \a interface
 
-   Returns parent backend if parent is QtIVIAbstractZonedFeature type.
+   Returns parent backend if parent is QIviAbstractZonedFeature type.
    Returns zero if no backend connected.
 */
-QtIVIZonedFeatureInterface *QtIVIAbstractZonedFeature::backend(const QString &interface) const
+QIviZonedFeatureInterface *QIviAbstractZonedFeature::backend(const QString &interface) const
 {
     QString iface = interface;
     if (iface.isEmpty())
         iface = interfaceName();
 
-    if (QtIVIAbstractZonedFeature* parentFeature = qobject_cast<QtIVIAbstractZonedFeature*>(parent())) {
+    if (QIviAbstractZonedFeature* parentFeature = qobject_cast<QIviAbstractZonedFeature*>(parent())) {
         return parentFeature->backend();
-    } else if (QtIVIServiceObject* so = serviceObject()) {
-        return qobject_cast<QtIVIZonedFeatureInterface*>(so->interfaceInstance(iface));
+    } else if (QIviServiceObject* so = serviceObject()) {
+        return qobject_cast<QIviZonedFeatureInterface*>(so->interfaceInstance(iface));
     }
     return 0;
 }
 
 
 /*!
-   \fn virtual QtIVIAbstractZonedFeature *QtIVIAbstractZonedFeature::createZoneFeature(const QString &zone) = 0
+   \fn virtual QIviAbstractZonedFeature *QIviAbstractZonedFeature::createZoneFeature(const QString &zone) = 0
 
    Create new child feature to the given \a zone.
 
@@ -184,7 +184,7 @@ QtIVIZonedFeatureInterface *QtIVIAbstractZonedFeature::backend(const QString &in
    \endqml
  */
 /*!
-   \property QtIVIAbstractZonedFeature::zone
+   \property QIviAbstractZonedFeature::zone
 
    \brief Name of the zone of this zoned feature.
 
@@ -198,34 +198,34 @@ QtIVIZonedFeatureInterface *QtIVIAbstractZonedFeature::backend(const QString &in
    It's recommended to initialize the zone in the feature constructor:
 
    \code
-   QtIVIClimateControl* climateControl = new QtIVIClimateControl("FrontLeft", this);
+   QIviClimateControl* climateControl = new QIviClimateControl("FrontLeft", this);
    climateControl->startAutoDiscovery();
    QString zone = climateControl->zone();
    \endcode
  */
-QString QtIVIAbstractZonedFeature::zone() const
+QString QIviAbstractZonedFeature::zone() const
 {
-    Q_D(const QtIVIAbstractZonedFeature);
+    Q_D(const QIviAbstractZonedFeature);
     return d->m_zone;
 }
 
-void QtIVIAbstractZonedFeature::setZone(const QString &zone)
+void QIviAbstractZonedFeature::setZone(const QString &zone)
 {
-    Q_D(QtIVIAbstractZonedFeature);
+    Q_D(QIviAbstractZonedFeature);
     if (backend() || d->m_zone == zone)
         return;
     d->m_zone = zone;
     emit zoneChanged();
 }
 
-void QtIVIAbstractZonedFeature::initializeZones()
+void QIviAbstractZonedFeature::initializeZones()
 {
     if (!backend() || !zone().isEmpty())
         return;
 
-    Q_D(QtIVIAbstractZonedFeature);
+    Q_D(QIviAbstractZonedFeature);
     foreach (const QString &zone, backend()->availableZones()) {
-        QtIVIAbstractZonedFeature* f = zoneAt(zone);
+        QIviAbstractZonedFeature* f = zoneAt(zone);
         if (!f) {
             if (this->zone() == zone)
                 f = this;
@@ -248,11 +248,11 @@ void QtIVIAbstractZonedFeature::initializeZones()
    List of the available zones.
  */
 /*!
-   \property QtIVIAbstractZonedFeature::availableZones
+   \property QIviAbstractZonedFeature::availableZones
 
    List of the available zones.
  */
-QStringList QtIVIAbstractZonedFeature::availableZones() const
+QStringList QIviAbstractZonedFeature::availableZones() const
 {
     if (backend()) {
         return backend()->availableZones();
@@ -264,10 +264,10 @@ QStringList QtIVIAbstractZonedFeature::availableZones() const
 /*!
    Returns the given \a zone instance of the feature.
 */
-QtIVIAbstractZonedFeature *QtIVIAbstractZonedFeature::zoneAt(const QString &zone) const
+QIviAbstractZonedFeature *QIviAbstractZonedFeature::zoneAt(const QString &zone) const
 {
-    Q_D(const QtIVIAbstractZonedFeature);
-    foreach (QtIVIAbstractZonedFeature *f, d->m_zoneFeatures)
+    Q_D(const QIviAbstractZonedFeature);
+    foreach (QIviAbstractZonedFeature *f, d->m_zoneFeatures)
         if (f->zone() == zone)
             return f;
     return 0;
@@ -276,14 +276,14 @@ QtIVIAbstractZonedFeature *QtIVIAbstractZonedFeature::zoneAt(const QString &zone
 /*!
    Returns all zone instances of the feature.
 */
-QList<QtIVIAbstractZonedFeature*> QtIVIAbstractZonedFeature::zones() const
+QList<QIviAbstractZonedFeature*> QIviAbstractZonedFeature::zones() const
 {
-    Q_D(const QtIVIAbstractZonedFeature);
+    Q_D(const QIviAbstractZonedFeature);
     return d->m_zoneFeatures;
 }
 
-QtIVIAbstractZonedFeature::QtIVIAbstractZonedFeature(QtIVIAbstractZonedFeaturePrivate &dd, QObject *parent)
-    : QtIVIAbstractFeature(dd, parent)
+QIviAbstractZonedFeature::QIviAbstractZonedFeature(QIviAbstractZonedFeaturePrivate &dd, QObject *parent)
+    : QIviAbstractFeature(dd, parent)
 {
 }
 
@@ -297,13 +297,13 @@ QtIVIAbstractZonedFeature::QtIVIAbstractZonedFeature(QtIVIAbstractZonedFeaturePr
    \endcode
  */
 /*!
-   \property QtIVIAbstractZonedFeature::zoneAt
+   \property QIviAbstractZonedFeature::zoneAt
 
    Direct feature access to the given zone.
  */
-QVariantMap QtIVIAbstractZonedFeature::zoneFeatureMap() const
+QVariantMap QIviAbstractZonedFeature::zoneFeatureMap() const
 {
-    Q_D(const QtIVIAbstractZonedFeature);
+    Q_D(const QIviAbstractZonedFeature);
     return d->m_zoneFeatureMap;
 }
 
@@ -317,12 +317,12 @@ QVariantMap QtIVIAbstractZonedFeature::zoneFeatureMap() const
    \endcode
  */
 /*!
-   \property QtIVIAbstractZonedFeature::zones
+   \property QIviAbstractZonedFeature::zones
 
    Access to the feature zones model.
  */
-QVariantList QtIVIAbstractZonedFeature::zoneFeatureList() const
+QVariantList QIviAbstractZonedFeature::zoneFeatureList() const
 {
-    Q_D(const QtIVIAbstractZonedFeature);
+    Q_D(const QIviAbstractZonedFeature);
     return d->m_zoneFeatureList;
 }
diff --git a/src/ivicore/qtiviabstractzonedfeature.h b/src/ivicore/qtiviabstractzonedfeature.h
index 0e8c351..54bc0d8 100644
--- a/src/ivicore/qtiviabstractzonedfeature.h
+++ b/src/ivicore/qtiviabstractzonedfeature.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,20 +39,20 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIABSTRACTZONEDFEATURE_H
-#define QTIVIABSTRACTZONEDFEATURE_H
+#ifndef QIVIABSTRACTZONEDFEATURE_H
+#define QIVIABSTRACTZONEDFEATURE_H
 
 #include <QtCore/QVariant>
 #include <QtCore/QMap>
-#include <QtIVICore/QtIVIAbstractFeature>
-#include <QtIVICore/qtiviglobal.h>
+#include <QtIviCore/QIviAbstractFeature>
+#include <QtIviCore/qtiviglobal.h>
 
 QT_BEGIN_NAMESPACE
 
-class QtIVIZonedFeatureInterface;
-class QtIVIAbstractZonedFeaturePrivate;
+class QIviZonedFeatureInterface;
+class QIviAbstractZonedFeaturePrivate;
 
-class Q_QTIVICORE_EXPORT QtIVIAbstractZonedFeature : public QtIVIAbstractFeature
+class Q_QTIVICORE_EXPORT QIviAbstractZonedFeature : public QIviAbstractFeature
 {
     Q_OBJECT
 
@@ -63,15 +63,15 @@ class Q_QTIVICORE_EXPORT QtIVIAbstractZonedFeature : public QtIVIAbstractFeature
 
 public:
 
-    explicit QtIVIAbstractZonedFeature(const QString &interface, const QString &zone = QString(), QObject *parent = 0);
-    virtual ~QtIVIAbstractZonedFeature();
+    explicit QIviAbstractZonedFeature(const QString &interface, const QString &zone = QString(), QObject *parent = Q_NULLPTR);
+    virtual ~QIviAbstractZonedFeature();
 
     QString zone() const;
 
     QStringList availableZones() const;
 
-    QtIVIAbstractZonedFeature *zoneAt(const QString &zone) const;
-    QList<QtIVIAbstractZonedFeature*> zones() const;
+    QIviAbstractZonedFeature *zoneAt(const QString &zone) const;
+    QList<QIviAbstractZonedFeature*> zones() const;
 
 Q_SIGNALS:
     void availableZonesChanged(QStringList zones);
@@ -79,13 +79,13 @@ Q_SIGNALS:
     void zonesChanged();
 
 protected:
-    QtIVIAbstractZonedFeature(QtIVIAbstractZonedFeaturePrivate &dd, QObject *parent = Q_NULLPTR);
+    QIviAbstractZonedFeature(QIviAbstractZonedFeaturePrivate &dd, QObject *parent = Q_NULLPTR);
 
-    virtual QtIVIAbstractZonedFeature *createZoneFeature(const QString &zone) = 0;
-    QtIVIZonedFeatureInterface *backend(const QString &interface = QString()) const;
+    virtual QIviAbstractZonedFeature *createZoneFeature(const QString &zone) = 0;
+    QIviZonedFeatureInterface *backend(const QString &interface = QString()) const;
 
-    virtual bool acceptServiceObject(QtIVIServiceObject *serviceObject) Q_DECL_OVERRIDE;
-    virtual void connectToServiceObject(QtIVIServiceObject *serviceObject) Q_DECL_OVERRIDE;
+    virtual bool acceptServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
+    virtual void connectToServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
     virtual void clearServiceObject() Q_DECL_OVERRIDE;
 
 private Q_SLOTS:
@@ -102,9 +102,9 @@ private:
     void resetAttributes();
 
 private:
-    Q_DECLARE_PRIVATE(QtIVIAbstractZonedFeature)
+    Q_DECLARE_PRIVATE(QIviAbstractZonedFeature)
 };
 
 QT_END_NAMESPACE
 
-#endif // QTIVIABSTRACTZONEDFEATURE_H
+#endif // QIVIABSTRACTZONEDFEATURE_H
diff --git a/src/ivicore/qtiviabstractzonedfeature_p.h b/src/ivicore/qtiviabstractzonedfeature_p.h
index 9f37923..58427c7 100644
--- a/src/ivicore/qtiviabstractzonedfeature_p.h
+++ b/src/ivicore/qtiviabstractzonedfeature_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIABSTRACTZONEDFEATURE_P_H
-#define QTIVIABSTRACTZONEDFEATURE_P_H
+#ifndef QIVIABSTRACTZONEDFEATURE_P_H
+#define QIVIABSTRACTZONEDFEATURE_P_H
 
 //
 //  W A R N I N G
@@ -58,17 +58,17 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QTIVICORE_EXPORT QtIVIAbstractZonedFeaturePrivate : public QtIVIAbstractFeaturePrivate
+class Q_QTIVICORE_EXPORT QIviAbstractZonedFeaturePrivate : public QIviAbstractFeaturePrivate
 {
 public:
-    QtIVIAbstractZonedFeaturePrivate(const QString &interface, const QString &zone, QtIVIAbstractFeature *parent);
+    QIviAbstractZonedFeaturePrivate(const QString &interface, const QString &zone, QIviAbstractFeature *parent);
 
     QString m_zone;
-    QList<QtIVIAbstractZonedFeature*> m_zoneFeatures;
+    QList<QIviAbstractZonedFeature*> m_zoneFeatures;
     QVariantMap m_zoneFeatureMap;
     QVariantList m_zoneFeatureList;
 };
 
 QT_END_NAMESPACE
 
-#endif // QTIVIABSTRACTZONEDFEATURE_P_H
+#endif // QIVIABSTRACTZONEDFEATURE_P_H
diff --git a/src/ivicore/qtiviglobal.h b/src/ivicore/qtiviglobal.h
index c319bb8..1afc7c0 100644
--- a/src/ivicore/qtiviglobal.h
+++ b/src/ivicore/qtiviglobal.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIGLOBAL_H
-#define QTIVIGLOBAL_H
+#ifndef QIVIGLOBAL_H
+#define QIVIGLOBAL_H
 
 #include <QtCore/qglobal.h>
 
@@ -58,5 +58,5 @@ QT_BEGIN_NAMESPACE
 
 QT_END_NAMESPACE
 
-#endif // QTIVIGLOBAL_H
+#endif // QIVIGLOBAL_H
 
diff --git a/src/ivicore/qtiviproperty.cpp b/src/ivicore/qtiviproperty.cpp
index afdd577..56cd014 100644
--- a/src/ivicore/qtiviproperty.cpp
+++ b/src/ivicore/qtiviproperty.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -48,14 +48,14 @@
 #include <private/qv8engine_p.h>
 #include <private/qv4engine_p.h>
 
-QtIVIPropertyPrivate::QtIVIPropertyPrivate(int userType, QtPrivate::QSlotObjectBase *attributeGetter, QtPrivate::QSlotObjectBase *valueGetter)
+QIviPropertyPrivate::QIviPropertyPrivate(int userType, QtPrivate::QSlotObjectBase *attributeGetter, QtPrivate::QSlotObjectBase *valueGetter)
     : m_type(userType)
     , m_attributeGetter(attributeGetter)
     , m_valueGetter(valueGetter)
     , m_valueSetter(Q_NULLPTR)
 {}
 
-void QtIVIPropertyPrivate::throwError(QObject *object, const QString &error)
+void QIviPropertyPrivate::throwError(QObject *object, const QString &error)
 {
     QJSEngine* jsEngine = qjsEngine(object);
     if (jsEngine) {
@@ -67,62 +67,62 @@ void QtIVIPropertyPrivate::throwError(QObject *object, const QString &error)
 }
 
 /*!
- * \class QtIVIProperty
- * \inmodule QtIVICore
- * \brief The QtIVIProperty combines a normal property and a QtIVIPropertyAttribute
+ * \class QIviProperty
+ * \inmodule QtIviCore
+ * \brief The QIviProperty combines a normal property and a QIviPropertyAttribute
  *
- * The QtIVIProperty is used to retrieve the value of a property and its corresponding
- * QtIVIPropertyAttribute in an easy way. It's designed for QML (but is not limited to)
+ * The QIviProperty is used to retrieve the value of a property and its corresponding
+ * QIviPropertyAttribute in an easy way. It's designed for QML (but is not limited to)
  * and acts as a Grouped Property.
  *
- * Although the QtIVIProperty only contains QVariant properties, it still stores
+ * Although the QIviProperty only contains QVariant properties, it still stores
  * the real type of the value and checks that only values of the correct type can be
  * stored in it.
- * The QtIVIProperty doesn't store a copy of the values, instead it just acts as a
+ * The QIviProperty doesn't store a copy of the values, instead it just acts as a
  * forwarder which calls the respective getters and forwards the notification signals.
  *
- * By default a QtIVIProperty is also able to write a value change back to its origin,
+ * By default a QIviProperty is also able to write a value change back to its origin,
  * but it also supports read-only properties which don't provide a setter for the value.
  *
- * QtIVIProperty is an abstract class and can only be created by using the QtIVIPropertyFactory
+ * QIviProperty is an abstract class and can only be created by using the QIviPropertyFactory
  * class.
  */
 /*!
- * \property QtIVIProperty::available
+ * \property QIviProperty::available
  * True if this property is available.
- * \sa QtIVIPropertyAttribute::isAvailable()
+ * \sa QIviPropertyAttribute::isAvailable()
  */
 /*!
- * \property QtIVIProperty::minimumValue
+ * \property QIviProperty::minimumValue
  * The minimum value of the property.
- * \sa QtIVIPropertyAttribute::minimumValue()
+ * \sa QIviPropertyAttribute::minimumValue()
  */
 /*!
- * \property QtIVIProperty::maximumValue
+ * \property QIviProperty::maximumValue
  * The maximum value of the property.
- * \sa QtIVIPropertyAttribute::maximumValue()
+ * \sa QIviPropertyAttribute::maximumValue()
  */
 /*!
- * \property QtIVIProperty::availableValues
+ * \property QIviProperty::availableValues
  * All available Values for this property.
  * This can be used when exposing for example an enum and the backend only supports some of the values.
- * \sa QtIVIPropertyAttribute::availableValues()
+ * \sa QIviPropertyAttribute::availableValues()
  */
 
 /*!
  * Destructor.
  */
-QtIVIProperty::~QtIVIProperty()
+QIviProperty::~QIviProperty()
 {
 }
 
 /*!
- * \property QtIVIProperty::value
+ * \property QIviProperty::value
  * Stores the value of the property as a QVariant
  */
-void QtIVIProperty::setValue(const QVariant &value)
+void QIviProperty::setValue(const QVariant &value)
 {
-    Q_D(QtIVIProperty);
+    Q_D(QIviProperty);
     QVariant var = value;
 
     //Try to behave like QML would be ;-)
@@ -166,35 +166,35 @@ void QtIVIProperty::setValue(const QVariant &value)
 /*!
  * \internal
  */
-QtIVIProperty::QtIVIProperty(int userType, const QObject *receiver,  QtPrivate::QSlotObjectBase *attributeGetter, QtPrivate::QSlotObjectBase *valueGetter)
+QIviProperty::QIviProperty(int userType, const QObject *receiver,  QtPrivate::QSlotObjectBase *attributeGetter, QtPrivate::QSlotObjectBase *valueGetter)
     : QObject(const_cast<QObject*>(receiver))
-    , d_ptr(new QtIVIPropertyPrivate(userType, attributeGetter, valueGetter))
+    , d_ptr(new QIviPropertyPrivate(userType, attributeGetter, valueGetter))
 {
 }
 
 /*!
  * \internal
  */
-void QtIVIProperty::setValueSetter(QtPrivate::QSlotObjectBase *valueSetter)
+void QIviProperty::setValueSetter(QtPrivate::QSlotObjectBase *valueSetter)
 {
-    Q_D(QtIVIProperty);
+    Q_D(QIviProperty);
     d->m_valueSetter = valueSetter;
 }
 
 /*!
  * \internal
  */
-QtPrivate::QSlotObjectBase *QtIVIProperty::attributeGetter() const
+QtPrivate::QSlotObjectBase *QIviProperty::attributeGetter() const
 {
-    Q_D(const QtIVIProperty);
+    Q_D(const QIviProperty);
     return d->m_attributeGetter;
 }
 
 /*!
  * \internal
  */
-QtPrivate::QSlotObjectBase *QtIVIProperty::valueGetter() const
+QtPrivate::QSlotObjectBase *QIviProperty::valueGetter() const
 {
-    Q_D(const QtIVIProperty);
+    Q_D(const QIviProperty);
     return d->m_valueGetter;
 }
diff --git a/src/ivicore/qtiviproperty.h b/src/ivicore/qtiviproperty.h
index 19f228c..e359366 100644
--- a/src/ivicore/qtiviproperty.h
+++ b/src/ivicore/qtiviproperty.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,18 +39,18 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIPROPERTY_H
-#define QTIVIPROPERTY_H
+#ifndef QIVIPROPERTY_H
+#define QIVIPROPERTY_H
 
 #include <QtCore/QObject>
 #include <QtCore/QVariant>
-#include <QtIVICore/qtiviglobal.h>
-#include <QtIVICore/QtIVIPropertyAttribute>
+#include <QtIviCore/qtiviglobal.h>
+#include <QtIviCore/QIviPropertyAttribute>
 
 QT_BEGIN_NAMESPACE
 
-class QtIVIPropertyPrivate;
-class Q_QTIVICORE_EXPORT QtIVIProperty : public QObject
+class QIviPropertyPrivate;
+class Q_QTIVICORE_EXPORT QIviProperty : public QObject
 {
     Q_OBJECT
 
@@ -61,7 +61,7 @@ class Q_QTIVICORE_EXPORT QtIVIProperty : public QObject
     Q_PROPERTY(QVariantList availableValues READ availableValues NOTIFY availableValuesChanged)
 
 public:
-    virtual ~QtIVIProperty();
+    virtual ~QIviProperty();
 
     virtual bool isAvailable() const = 0;
     virtual QVariant minimumValue() const  = 0;
@@ -80,16 +80,16 @@ Q_SIGNALS:
     void availableValuesChanged(const QVariantList &availableValues);
 
 protected:
-    QtIVIProperty(int userType, const QObject *receiver, QtPrivate::QSlotObjectBase *attributeGetter, QtPrivate::QSlotObjectBase *valueGetter);
+    QIviProperty(int userType, const QObject *receiver, QtPrivate::QSlotObjectBase *attributeGetter, QtPrivate::QSlotObjectBase *valueGetter);
     void setValueSetter(QtPrivate::QSlotObjectBase *valueSetter);
     QtPrivate::QSlotObjectBase *attributeGetter() const;
     QtPrivate::QSlotObjectBase *valueGetter() const;
 
 private:
-    QtIVIPropertyPrivate * const d_ptr;
-    Q_DECLARE_PRIVATE(QtIVIProperty)
+    QIviPropertyPrivate * const d_ptr;
+    Q_DECLARE_PRIVATE(QIviProperty)
 };
 
 QT_END_NAMESPACE
 
-#endif // QTIVIPROPERTY_H
+#endif // QIVIPROPERTY_H
diff --git a/src/ivicore/qtiviproperty_p.h b/src/ivicore/qtiviproperty_p.h
index 44157b2..2039e65 100644
--- a/src/ivicore/qtiviproperty_p.h
+++ b/src/ivicore/qtiviproperty_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIPROPERTY_P_H
-#define QTIVIPROPERTY_P_H
+#ifndef QIVIPROPERTY_P_H
+#define QIVIPROPERTY_P_H
 
 //
 //  W A R N I N G
@@ -57,10 +57,10 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtIVIPropertyPrivate
+class QIviPropertyPrivate
 {
 public:
-    QtIVIPropertyPrivate(int userType,  QtPrivate::QSlotObjectBase *attributeGetter, QtPrivate::QSlotObjectBase *valueGetter);
+    QIviPropertyPrivate(int userType,  QtPrivate::QSlotObjectBase *attributeGetter, QtPrivate::QSlotObjectBase *valueGetter);
 
     void throwError(QObject *object, const QString &error);
 
@@ -72,4 +72,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QTIVIPROPERTY_P_H
+#endif // QIVIPROPERTY_P_H
diff --git a/src/ivicore/qtivipropertyattribute.cpp b/src/ivicore/qtivipropertyattribute.cpp
index e967898..52eac04 100644
--- a/src/ivicore/qtivipropertyattribute.cpp
+++ b/src/ivicore/qtivipropertyattribute.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -41,34 +41,34 @@
 
 #include "qtivipropertyattribute.h"
 
-QtIVIPropertyAttributeBase::QtIVIPropertyAttributeBase()
+QIviPropertyAttributeBase::QIviPropertyAttributeBase()
 {
     registerTypes();
 }
 
-void QtIVIPropertyAttributeBase::registerTypes()
+void QIviPropertyAttributeBase::registerTypes()
 {
-    qRegisterMetaType<QtIVIPropertyAttribute<int>>();
-    qRegisterMetaType<QtIVIPropertyAttribute<bool>>();
-    qRegisterMetaType<QtIVIPropertyAttribute<double>>();
+    qRegisterMetaType<QIviPropertyAttribute<int>>();
+    qRegisterMetaType<QIviPropertyAttribute<bool>>();
+    qRegisterMetaType<QIviPropertyAttribute<double>>();
 #if defined(QT_COORD_TYPE)
-    qRegisterMetaType<QtIVIPropertyAttribute<qreal>>();
+    qRegisterMetaType<QIviPropertyAttribute<qreal>>();
 #endif
-    qRegisterMetaType<QtIVIPropertyAttribute<QString>>();
+    qRegisterMetaType<QIviPropertyAttribute<QString>>();
 }
 
 
 /*!
- * \class QtIVIPropertyAttribute
- * \inmodule QtIVICore
- * \brief The QtIVIPropertyAttribute encapsulates the attributes of a property
+ * \class QIviPropertyAttribute
+ * \inmodule QtIviCore
+ * \brief The QIviPropertyAttribute encapsulates the attributes of a property
  *
- * QtIVIPropertyAttribute sets the boundaries for a property in Qt IVI. In a
- * Qt IVI backend interface, the QtIVIPropertyAttributes are used to control
+ * QIviPropertyAttribute sets the boundaries for a property in Qt IVI. In a
+ * Qt IVI backend interface, the QIviPropertyAttributes are used to control
  * which properties are implemented by a backend and to set the boundaries like
  * the minimum or the maximum value of a property.
  *
- * By default a QtIVIPropertyAttribute is initialized with the "Invalid" type,
+ * By default a QIviPropertyAttribute is initialized with the "Invalid" type,
  * which indicates that this property is not available. This could be the case
  * when the backend doesn't support this property or the property is not available
  * because the current backend configuration does not support it.
@@ -77,7 +77,7 @@ void QtIVIPropertyAttributeBase::registerTypes()
  */
 
 /*!
- * \enum QtIVIPropertyAttributeBase::AttributeType
+ * \enum QIviPropertyAttributeBase::AttributeType
  *
  * \value Invalid
  *        The attribute is invalid and is not available.
@@ -90,85 +90,85 @@ void QtIVIPropertyAttributeBase::registerTypes()
  */
 
 /*!
- * \fn QtIVIPropertyAttribute::QtIVIPropertyAttribute()
- * Constructs an invalid QtIVIPropertyAttribute.
+ * \fn QIviPropertyAttribute::QIviPropertyAttribute()
+ * Constructs an invalid QIviPropertyAttribute.
  *
  * This constructor can be used to indicate that the property is not available.
  * For example, because the backend doesn't support this property.
  */
 
 /*!
- * \fn QtIVIPropertyAttribute::QtIVIPropertyAttribute(bool available)
- * Constructs an QtIVIPropertyAttribute of type NoAttributes.
+ * \fn QIviPropertyAttribute::QIviPropertyAttribute(bool available)
+ * Constructs an QIviPropertyAttribute of type NoAttributes.
  *
  * The argument \a available defines whether the property is supported by the backend.
  */
 
 /*!
- * \fn QtIVIPropertyAttribute::QtIVIPropertyAttribute(const T &minValue, const T &maxValue)
- * Constructs an QtIVIPropertyAttribute of type MinimumMaximum.
+ * \fn QIviPropertyAttribute::QIviPropertyAttribute(const T &minValue, const T &maxValue)
+ * Constructs an QIviPropertyAttribute of type MinimumMaximum.
  *
  * The arguments \a minValue and \a maxValue define the boundaries the value of the property.
  */
 
 /*!
- * \fn QtIVIPropertyAttribute::QtIVIPropertyAttribute(const QVector<T> &avValues)
- * Constructs an QtIVIPropertyAttribute of type AvailableValues.
+ * \fn QIviPropertyAttribute::QIviPropertyAttribute(const QVector<T> &avValues)
+ * Constructs an QIviPropertyAttribute of type AvailableValues.
  *
  * The argument \a avValues defines the valid values for the property.
  */
 
 /*!
- * \fn AttributeType QtIVIPropertyAttribute::type() const
+ * \fn AttributeType QIviPropertyAttribute::type() const
  *
  * Returns the type of the attribute.
  */
 
 /*!
- * \fn bool QtIVIPropertyAttribute::isAvailable() const
+ * \fn bool QIviPropertyAttribute::isAvailable() const
  *
  * Returns true if the property is available for this backend.
  */
 
 /*!
- * \fn T QtIVIPropertyAttribute::minimumValue() const
+ * \fn T QIviPropertyAttribute::minimumValue() const
  *
  * Returns the minimum value of the property.
  * If the attributeType is not MinimumMaximum, a default constructed value is returned.
  */
 
 /*!
- * \fn T QtIVIPropertyAttribute::maximumValue() const
+ * \fn T QIviPropertyAttribute::maximumValue() const
  *
  * Returns the maximum value of the property.
  * If the attributeType is not MinimumMaximum, a default constructed value is returned.
  */
 
 /*!
- * \fn QList<T> QtIVIPropertyAttribute::availableValues() const
+ * \fn QList<T> QIviPropertyAttribute::availableValues() const
  *
  * Returns a list of valid values for this property.
  * If the attributeType is not AvailableValues an empty list is returned.
  */
 
 /*!
- * \fn QString QtIVIPropertyAttribute::toString() const
+ * \fn QString QIviPropertyAttribute::toString() const
  *
  * Returns a QString with a string representation of the attribute.
  */
 
 /*!
- * \fn bool QtIVIPropertyAttribute::operator==(const QtIVIPropertyAttribute& other) const
+ * \fn bool QIviPropertyAttribute::operator==(const QIviPropertyAttribute& other) const
  *
- * Returns \c true if this QtIVIPropertyAttribute is equal to the \a other QtIVIPropertyAttribute; otherwise returns \c false.
+ * Returns \c true if this QIviPropertyAttribute is equal to the \a other QIviPropertyAttribute; otherwise returns \c false.
  *
- * All elements of QtIVIPropertyAttribute are used for the comparison.
+ * All elements of QIviPropertyAttribute are used for the comparison.
  */
 
 /*!
- * \fn bool QtIVIPropertyAttribute::operator!=(const QtIVIPropertyAttribute& other) const
+ * \fn bool QIviPropertyAttribute::operator!=(const QIviPropertyAttribute& other) const
  *
- * Returns \c true if this QtIVIPropertyAttribute is NOT equal to the \a other QtIVIPropertyAttribute; otherwise returns \c false.
+ * Returns \c true if this QIviPropertyAttribute is NOT equal to the \a other QIviPropertyAttribute; otherwise returns \c false.
  *
- * All elements of QtIVIPropertyAttribute are used for the comparison.
+ * All elements of QIviPropertyAttribute are used for the comparison.
  */
diff --git a/src/ivicore/qtivipropertyattribute.h b/src/ivicore/qtivipropertyattribute.h
index 001a85f..fab4a0a 100644
--- a/src/ivicore/qtivipropertyattribute.h
+++ b/src/ivicore/qtivipropertyattribute.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,18 +39,18 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIPROPERTYATTRIBUTE_H
-#define QTIVIPROPERTYATTRIBUTE_H
+#ifndef QIVIPROPERTYATTRIBUTE_H
+#define QIVIPROPERTYATTRIBUTE_H
 
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
 #include <QtCore/QtDebug>
-#include <QtIVICore/qtiviglobal.h>
+#include <QtIviCore/qtiviglobal.h>
 
 QT_BEGIN_NAMESPACE
 
 //TODO Do we really need to document the base class and move into it's own header ?
-class Q_QTIVICORE_EXPORT QtIVIPropertyAttributeBase
+class Q_QTIVICORE_EXPORT QIviPropertyAttributeBase
 {
 public:
     enum AttributeType {
@@ -60,47 +60,47 @@ public:
         AvailableValues
     };
 
-    QtIVIPropertyAttributeBase();
+    QIviPropertyAttributeBase();
 
 private:
     void registerTypes();
 };
 
 template <class T>
-class QtIVIPropertyAttribute : public QtIVIPropertyAttributeBase
+class QIviPropertyAttribute : public QIviPropertyAttributeBase
 {
 public:
     //TODO Do we want to keep this and the Invalid type or should NoAttribute be the default type
-    QtIVIPropertyAttribute()
+    QIviPropertyAttribute()
         : m_available(false)
-        , m_type(QtIVIPropertyAttributeBase::Invalid)
+        , m_type(QIviPropertyAttributeBase::Invalid)
         , m_minimumValue(T())
         , m_maximumValue(T())
     {
         registerConverter();
     }
 
-    explicit QtIVIPropertyAttribute(bool available)
+    explicit QIviPropertyAttribute(bool available)
         : m_available(available)
-        , m_type(QtIVIPropertyAttributeBase::NoAttributes)
+        , m_type(QIviPropertyAttributeBase::NoAttributes)
         , m_minimumValue(T())
         , m_maximumValue(T())
     {
         registerConverter();
     }
 
-    explicit QtIVIPropertyAttribute(const T &minValue, const T &maxValue)
+    explicit QIviPropertyAttribute(const T &minValue, const T &maxValue)
         : m_available(true)
-        , m_type(QtIVIPropertyAttributeBase::MinimumMaximum)
+        , m_type(QIviPropertyAttributeBase::MinimumMaximum)
         , m_minimumValue(minValue)
         , m_maximumValue(maxValue)
     {
         registerConverter();
     }
 
-    QtIVIPropertyAttribute(const QVector<T> &avValues)
+    QIviPropertyAttribute(const QVector<T> &avValues)
         : m_available(true)
-        , m_type(QtIVIPropertyAttributeBase::AvailableValues)
+        , m_type(QIviPropertyAttributeBase::AvailableValues)
         , m_minimumValue(T())
         , m_maximumValue(T())
         , m_availableValues(avValues)
@@ -108,13 +108,13 @@ public:
         registerConverter();
     }
 
-    QtIVIPropertyAttributeBase::AttributeType type() const { return m_type; }
+    QIviPropertyAttributeBase::AttributeType type() const { return m_type; }
     bool isAvailable() const  { return m_available; }
     T minimumValue() const { return m_minimumValue; }
     T maximumValue() const { return m_maximumValue; }
     QVector<T> availableValues() const { return m_availableValues; }
 
-    bool operator==(const QtIVIPropertyAttribute &other) const
+    bool operator==(const QIviPropertyAttribute &other) const
     {
         return (m_available == other.m_available) &&
                (m_type == other.m_type) &&
@@ -123,13 +123,13 @@ public:
                (m_availableValues == other.m_availableValues);
     }
 
-    bool operator!=(const QtIVIPropertyAttribute &other) const
+    bool operator!=(const QIviPropertyAttribute &other) const
     {
         return !operator==(other);
     }
 
 #ifndef Q_QDOC
-    bool operator<(const QtIVIPropertyAttribute &other) const
+    bool operator<(const QIviPropertyAttribute &other) const
     {
         Q_UNUSED(other)
         return false;
@@ -146,24 +146,24 @@ public:
     //TODO Pimpl needed ?
 private:
 
-    //The converters are needed to get meaningfull output if QCOMPARE failed to compare to variants containing a QtIVIPropertyAttribute
+    //The converters are needed to get meaningfull output if QCOMPARE failed to compare to variants containing a QIviPropertyAttribute
     void registerConverter()
     {
-        if (!QMetaType::hasRegisteredConverterFunction<QtIVIPropertyAttribute<T>, QString>())
-            QMetaType::registerConverter<QtIVIPropertyAttribute<T>, QString>(&QtIVIPropertyAttribute<T>::toString);
-        if (!QMetaType::hasRegisteredComparators<QtIVIPropertyAttribute<T>>())
-            QMetaType::registerComparators<QtIVIPropertyAttribute<T>>();
+        if (!QMetaType::hasRegisteredConverterFunction<QIviPropertyAttribute<T>, QString>())
+            QMetaType::registerConverter<QIviPropertyAttribute<T>, QString>(&QIviPropertyAttribute<T>::toString);
+        if (!QMetaType::hasRegisteredComparators<QIviPropertyAttribute<T>>())
+            QMetaType::registerComparators<QIviPropertyAttribute<T>>();
     }
 
     bool m_available;
-    QtIVIPropertyAttributeBase::AttributeType m_type;
+    QIviPropertyAttributeBase::AttributeType m_type;
     T m_minimumValue;
     T m_maximumValue;
     QVector<T> m_availableValues;
 };
 
 
-// Not all types used in QtIVIPropertyAttribute have a debug stream operator implemented.
+// Not all types used in QIviPropertyAttribute have a debug stream operator implemented.
 // This functions checks whether it's implemented or not
 namespace qt_has_debug_operator_impl {
   typedef char no;
@@ -193,32 +193,32 @@ struct qt_has_debug_operator :
 
 //If no debug operator exists for type T
 template <typename T> Q_INLINE_TEMPLATE typename QtPrivate::QEnableIf<!qt_has_debug_operator<T>::value, QDebug>::Type
-operator<<(QDebug debug, const QtIVIPropertyAttribute<T> &ptr)
+operator<<(QDebug debug, const QIviPropertyAttribute<T> &ptr)
 {
     QDebugStateSaver saver(debug);
-    debug.nospace() << "QtIVIPropertyAttribute(" << ptr.type() << ", " << ptr.isAvailable() << ", rest of the values not representable as string)";
+    debug.nospace() << "QIviPropertyAttribute(" << ptr.type() << ", " << ptr.isAvailable() << ", rest of the values not representable as string)";
     return debug;
 }
 
 //If a debug operator exists for type T
 template <typename T> Q_INLINE_TEMPLATE typename QtPrivate::QEnableIf<qt_has_debug_operator<T>::value, QDebug>::Type
-operator<<(QDebug debug, const QtIVIPropertyAttribute<T> &ptr)
+operator<<(QDebug debug, const QIviPropertyAttribute<T> &ptr)
 {
     QDebugStateSaver saver(debug);
-    debug.nospace() << "QtIVIPropertyAttribute(" << ptr.type() << ", " << ptr.isAvailable() << ", " << ptr.minimumValue() << ", " << ptr.maximumValue() << ", " << ptr.availableValues() << ")";
+    debug.nospace() << "QIviPropertyAttribute(" << ptr.type() << ", " << ptr.isAvailable() << ", " << ptr.minimumValue() << ", " << ptr.maximumValue() << ", " << ptr.availableValues() << ")";
     return debug;
 }
 
 QT_END_NAMESPACE
 
 
-Q_DECLARE_METATYPE(QtIVIPropertyAttribute<int>)
-Q_DECLARE_METATYPE(QtIVIPropertyAttribute<bool>)
-Q_DECLARE_METATYPE(QtIVIPropertyAttribute<double>)
+Q_DECLARE_METATYPE(QIviPropertyAttribute<int>)
+Q_DECLARE_METATYPE(QIviPropertyAttribute<bool>)
+Q_DECLARE_METATYPE(QIviPropertyAttribute<double>)
 #if defined(QT_COORD_TYPE)
-Q_DECLARE_METATYPE(QtIVIPropertyAttribute<qreal>)
+Q_DECLARE_METATYPE(QIviPropertyAttribute<qreal>)
 #endif
-Q_DECLARE_METATYPE(QtIVIPropertyAttribute<QString>)
+Q_DECLARE_METATYPE(QIviPropertyAttribute<QString>)
 
 
-#endif // QTIVIPROPERTYATTRIBUTE_H
+#endif // QIVIPROPERTYATTRIBUTE_H
diff --git a/src/ivicore/qtivipropertyfactory.cpp b/src/ivicore/qtivipropertyfactory.cpp
index 8dd1f1c..da68981 100644
--- a/src/ivicore/qtivipropertyfactory.cpp
+++ b/src/ivicore/qtivipropertyfactory.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -42,82 +42,82 @@
 #include "qtivipropertyfactory.h"
 
 /*!
- * \class QtIVIPropertyFactory
- * \inmodule QtIVICore
- * \brief The QtIVIPropertyFactory is used as a factory class for creating instances of QtIVIProperty
+ * \class QIviPropertyFactory
+ * \inmodule QtIviCore
+ * \brief The QIviPropertyFactory is used as a factory class for creating instances of QIviProperty
  *
- * QtIVIPropertyFactory will preserve the type information about the template type in QtIVIProperty and
+ * QIviPropertyFactory will preserve the type information about the template type in QIviProperty and
  * does a compile time check whether all provided functions and signals match this type and each other.
  *
  * The following code creates a property of type int:
  * \code
- * QtIVIPropertyFactory<int>::create(this,
- *                                   &QtIVIClimateControl::targetTemperatureAttribute,
- *                                   &QtIVIClimateControl::targetTemperatureAttributeChanged,
- *                                   &QtIVIClimateControl::targetTemperature,
- *                                   &QtIVIClimateControl::targetTemperatureChanged,
- *                                   &QtIVIClimateControl::setTargetTemperature)
+ * QIviPropertyFactory<int>::create(this,
+ *                                   &QIviClimateControl::targetTemperatureAttribute,
+ *                                   &QIviClimateControl::targetTemperatureAttributeChanged,
+ *                                   &QIviClimateControl::targetTemperature,
+ *                                   &QIviClimateControl::targetTemperatureChanged,
+ *                                   &QIviClimateControl::setTargetTemperature)
  * \endcode
  *
  * This Factory provides two functions, one for creating a read-write property and one for a read-only property.
  */
 
 /*!
- * \fn QtIVIPropertyFactory::create(const QtPrivate::FunctionPointer<attributeGetterFunc>::Object *sender, attributeGetterFunc attributeGetter, attributeSignalFunc attributeSignal, valueGetterFunc valueGetter, valueSignalFunc valueSignal, valueSlotFunc valueSlot)
+ * \fn QIviPropertyFactory::create(const QtPrivate::FunctionPointer<attributeGetterFunc>::Object *sender, attributeGetterFunc attributeGetter, attributeSignalFunc attributeSignal, valueGetterFunc valueGetter, valueSignalFunc valueSignal, valueSlotFunc valueSlot)
  *
- *  Returns an new QtIVIProperty instance for a attribute and value of type T.
+ *  Returns an new QIviProperty instance for a attribute and value of type T.
  *
  *  The \a sender argument needs to be a pointer to the QObject* instance which implements all functions and signals provided next.
  *  The arguments \a attributeGetter and \a attributeSignal need to be functions pointers to your attribute getter function and the attribute signal function.
- *  These arguments need to be of QtIVIPropertyAttribute<T>.
- *  \a valueGetter, \a valueSignal, and \a valueSlot need to be function pointers to the getter, signal, and setter for the value that should be stored in this QtIVIQmlProperty instance.
+ *  These arguments need to be of QIviPropertyAttribute<T>.
+ *  \a valueGetter, \a valueSignal, and \a valueSlot need to be function pointers to the getter, signal, and setter for the value that should be stored in this QIviQmlProperty instance.
  *  The value functions need to have arguments and return values of type T.
  *
- * \sa QtIVIPropertyFactory::create(const QtPrivate::FunctionPointer<attributeGetterFunc>::Object *sender, attributeGetterFunc attributeGetter, attributeSignalFunc attributeSignal, valueGetterFunc valueGetter, valueSignalFunc valueSignal)
+ * \sa QIviPropertyFactory::create(const QtPrivate::FunctionPointer<attributeGetterFunc>::Object *sender, attributeGetterFunc attributeGetter, attributeSignalFunc attributeSignal, valueGetterFunc valueGetter, valueSignalFunc valueSignal)
  */
 
 /*!
- * \fn QtIVIPropertyFactory::create(const QtPrivate::FunctionPointer<attributeGetterFunc>::Object *sender, attributeGetterFunc attributeGetter, attributeSignalFunc attributeSignal, valueGetterFunc valueGetter, valueSignalFunc valueSignal)
+ * \fn QIviPropertyFactory::create(const QtPrivate::FunctionPointer<attributeGetterFunc>::Object *sender, attributeGetterFunc attributeGetter, attributeSignalFunc attributeSignal, valueGetterFunc valueGetter, valueSignalFunc valueSignal)
  *
- *  Returns a new QtIVIProperty instance for an attribute and value of type T.
+ *  Returns a new QIviProperty instance for an attribute and value of type T.
  *
  *  The \a sender argument needs to be a pointer to the QObject* instance which implements all functions and signals provided next.
  *  The arguments \a attributeGetter and \a attributeSignal need to be functions pointers to your attribute getter function and the attribute signal function.
- *  These arguments need to be of QtIVIPropertyAttribute<T>.
- *  \a valueGetter, \a valueSignal need to be function pointers to the getter and signal for the value which should be stored in this QtIVIQmlProperty instance.
+ *  These arguments need to be of QIviPropertyAttribute<T>.
+ *  \a valueGetter, \a valueSignal need to be function pointers to the getter and signal for the value which should be stored in this QIviQmlProperty instance.
  *  The value functions need to have arguments and return values of type T.
  *
  *  \note This factory function will create a readonly property as no value setter needs to be provided
  *
- * \sa QtIVIPropertyFactory::create(const QtPrivate::FunctionPointer<attributeGetterFunc>::Object *sender, attributeGetterFunc attributeGetter, attributeSignalFunc attributeSignal, valueGetterFunc valueGetter, valueSignalFunc valueSignal, valueSlotFunc valueSlot)
+ * \sa QIviPropertyFactory::create(const QtPrivate::FunctionPointer<attributeGetterFunc>::Object *sender, attributeGetterFunc attributeGetter, attributeSignalFunc attributeSignal, valueGetterFunc valueGetter, valueSignalFunc valueSignal, valueSlotFunc valueSlot)
  */
 
 /*!
- * \fn bool QtIVIPropertyFactory::isAvailable() const
+ * \fn bool QIviPropertyFactory::isAvailable() const
  *
  * \reimp
  */
 
 /*!
- * \fn bool QtIVIPropertyFactory::minimumValue() const
+ * \fn bool QIviPropertyFactory::minimumValue() const
  *
  * \reimp
  */
 
 /*!
- * \fn bool QtIVIPropertyFactory::maximumValue() const
+ * \fn bool QIviPropertyFactory::maximumValue() const
  *
  * \reimp
  */
 
 /*!
- * \fn bool QtIVIPropertyFactory::availableValues() const
+ * \fn bool QIviPropertyFactory::availableValues() const
  *
  * \reimp
  */
 
 /*!
- * \fn bool QtIVIPropertyFactory::value() const
+ * \fn bool QIviPropertyFactory::value() const
  *
  * \reimp
  */
diff --git a/src/ivicore/qtivipropertyfactory.h b/src/ivicore/qtivipropertyfactory.h
index 4ca5b7b..39707ca 100644
--- a/src/ivicore/qtivipropertyfactory.h
+++ b/src/ivicore/qtivipropertyfactory.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,25 +39,25 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIPROPERTYFACTORY_H
-#define QTIVIPROPERTYFACTORY_H
+#ifndef QIVIPROPERTYFACTORY_H
+#define QIVIPROPERTYFACTORY_H
 
-#include <QtIVICore/qtiviglobal.h>
-#include <QtIVICore/QtIVIProperty>
-#include <QtIVICore/qtivitypetraits.h>
-#include <QtIVICore/qtiviqmlconversion_helper.h>
+#include <QtIviCore/qtiviglobal.h>
+#include <QtIviCore/QIviProperty>
+#include <QtIviCore/qtivitypetraits.h>
+#include <QtIviCore/qtiviqmlconversion_helper.h>
 #include <QMetaEnum>
 
 QT_BEGIN_NAMESPACE
 
 template <typename T>
-class QtIVIPropertyFactory : public QtIVIProperty
+class QIviPropertyFactory : public QIviProperty
 {
 public:
 
     //readwrite property
     template <typename attributeGetterFunc, typename attributeSignalFunc, typename valueGetterFunc, typename valueSignalFunc, typename valueSlotFunc>
-    static inline QtIVIPropertyFactory *create(const typename QtPrivate::FunctionPointer<attributeGetterFunc>::Object *sender, attributeGetterFunc attributeGetter, attributeSignalFunc attributeSignal, valueGetterFunc valueGetter, valueSignalFunc valueSignal, valueSlotFunc valueSlot)
+    static inline QIviPropertyFactory *create(const typename QtPrivate::FunctionPointer<attributeGetterFunc>::Object *sender, attributeGetterFunc attributeGetter, attributeSignalFunc attributeSignal, valueGetterFunc valueGetter, valueSignalFunc valueSignal, valueSlotFunc valueSlot)
     {
         typedef QtPrivate::FunctionPointer<valueSignalFunc> ValueSignalType;
         typedef QtPrivate::FunctionPointer<valueSlotFunc> SlotType;
@@ -71,7 +71,7 @@ public:
         Q_STATIC_ASSERT_X((QtPrivate::CheckCompatibleArguments<ValueType, typename SlotType::Arguments>::value),
                           "Property type and value slot arguments are not compatible.");
 
-        QtIVIPropertyFactory *prop = create(sender, attributeGetter, attributeSignal, valueGetter, valueSignal);
+        QIviPropertyFactory *prop = create(sender, attributeGetter, attributeSignal, valueGetter, valueSignal);
         prop->setValueSetterHelper(new QtPrivate::QSlotObject<valueSlotFunc, typename SlotType::Arguments, void>(valueSlot));
 
         return prop;
@@ -79,7 +79,7 @@ public:
 
     //readonly property (no write slot)
     template <typename attributeGetterFunc, typename attributeSignalFunc, typename valueGetterFunc, typename valueSignalFunc>
-    static inline QtIVIPropertyFactory *create(const typename QtPrivate::FunctionPointer<attributeGetterFunc>::Object *sender, attributeGetterFunc attributeGetter, attributeSignalFunc attributeSignal, valueGetterFunc valueGetter, valueSignalFunc valueSignal)
+    static inline QIviPropertyFactory *create(const typename QtPrivate::FunctionPointer<attributeGetterFunc>::Object *sender, attributeGetterFunc attributeGetter, attributeSignalFunc attributeSignal, valueGetterFunc valueGetter, valueSignalFunc valueSignal)
     {
         typedef QtPrivate::FunctionPointer<attributeGetterFunc> AttributeGetterType;
         typedef QtPrivate::FunctionPointer<attributeSignalFunc> AttributeSignalType;
@@ -96,7 +96,7 @@ public:
                           "The value signal needs to have exactly one argument");
 
         typedef QtPrivate::List<typename ValueGetterType::ReturnType, void> ValueGetterReturnType;
-        typedef QtPrivate::List<QtIVIPropertyAttribute<T>, void> AttributeType;
+        typedef QtPrivate::List<QIviPropertyAttribute<T>, void> AttributeType;
         typedef QtPrivate::List<typename AttributeGetterType::ReturnType, void> AttributeGetterReturnType;
 
         Q_STATIC_ASSERT_X((QtPrivate::CheckCompatibleArguments<ValueGetterReturnType, typename ValueSignalType::Arguments>::value),
@@ -120,11 +120,11 @@ public:
                 //TODO Do we want to use a qFatal() here or just report a qCritical instead ?
                 qFatal("The provided enum needs to be declared as Q_ENUM or Q_FLAG");
         }
-        QtIVIPropertyFactory *prop = new QtIVIPropertyFactory(userType, sender,
+        QIviPropertyFactory *prop = new QIviPropertyFactory(userType, sender,
                                                       new QtPrivate::QSlotObject<attributeGetterFunc, typename AttributeGetterType::Arguments, typename AttributeGetterType::ReturnType>(attributeGetter),
                                                       new QtPrivate::QSlotObject<valueGetterFunc, typename ValueGetterType::Arguments, typename ValueGetterType::ReturnType>(valueGetter));
 
-        connect(sender, attributeSignal, prop, [prop](const QtIVIPropertyAttribute<T> &attribute) {prop->updateAttribute(attribute);});
+        connect(sender, attributeSignal, prop, [prop](const QIviPropertyAttribute<T> &attribute) {prop->updateAttribute(attribute);});
         connect(sender, valueSignal, prop, [prop](const T &value) {prop->valueChanged(QVariant::fromValue(value));});
 
         return prop;
@@ -157,8 +157,8 @@ public:
     }
 
 private:
-    QtIVIPropertyFactory(int userType, const QObject *receiver, QtPrivate::QSlotObjectBase *attGetter, QtPrivate::QSlotObjectBase *valGetter)
-        : QtIVIProperty(userType, receiver, attGetter, valGetter)
+    QIviPropertyFactory(int userType, const QObject *receiver, QtPrivate::QSlotObjectBase *attGetter, QtPrivate::QSlotObjectBase *valGetter)
+        : QIviProperty(userType, receiver, attGetter, valGetter)
     {
         registerConverters();
     }
@@ -166,14 +166,14 @@ private:
     //We need to know the exact type here to allocate it before calling the getter.
     //The call function will just use the operator=() function to assign it to our local instance,
     //but will not create a new one.
-    QtIVIPropertyAttribute<T> callAttributeGetter() const {
-        QtIVIPropertyAttribute<T> attribute;
+    QIviPropertyAttribute<T> callAttributeGetter() const {
+        QIviPropertyAttribute<T> attribute;
         void *args[] = { reinterpret_cast<void*>(&attribute), QVariant().data() };
         attributeGetter()->call(parent(), args);
         return attribute;
     }
 
-    void updateAttribute(const QtIVIPropertyAttribute<T> &attribute)
+    void updateAttribute(const QIviPropertyAttribute<T> &attribute)
     {
         Q_EMIT availableChanged(attribute.isAvailable());
         Q_EMIT minimumValueChanged(QVariant::fromValue<T>(attribute.minimumValue()));
@@ -204,4 +204,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QTIVIPROPERTYFACTORY_H
+#endif // QIVIPROPERTYFACTORY_H
diff --git a/src/ivicore/qtivipropertytester_p.h b/src/ivicore/qtivipropertytester_p.h
index 8265de5..8c2f5e2 100644
--- a/src/ivicore/qtivipropertytester_p.h
+++ b/src/ivicore/qtivipropertytester_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIPROPERTYTESTER_P_H
-#define QTIVIPROPERTYTESTER_P_H
+#ifndef QIVIPROPERTYTESTER_P_H
+#define QIVIPROPERTYTESTER_P_H
 
 //
 //  W A R N I N G
@@ -53,24 +53,24 @@
 // We mean it.
 //
 
-#include <QtIVICore/QtIVIProperty>
-#include <QtIVICore/QtIVIPropertyFactory>
-#include <QtIVICore/qtiviqmlconversion_helper.h>
+#include <QtIviCore/QIviProperty>
+#include <QtIviCore/QIviPropertyFactory>
+#include <QtIviCore/qtiviqmlconversion_helper.h>
 #include <QVariant>
 
 QT_BEGIN_NAMESPACE
 
-template <typename Feature, typename Backend, typename T> struct QtIVIPropertyTestData
+template <typename Feature, typename Backend, typename T> struct QIviPropertyTestData
 {
     typedef void (Feature::*setter_func)(T);
     typedef T (Feature::*getter_func)() const;
     typedef void (Backend::*backend_setter_func)(T, const QString &);
-    typedef QtIVIPropertyAttribute<T> (Feature::*attribute_getter_func)() const;
-    typedef void (Backend::*backend_attribute_setter_func)(QtIVIPropertyAttribute<T>, const QString &);
+    typedef QIviPropertyAttribute<T> (Feature::*attribute_getter_func)() const;
+    typedef void (Backend::*backend_attribute_setter_func)(QIviPropertyAttribute<T>, const QString &);
 
-    QtIVIPropertyTestData(const QString &pName, const QList<T> &vList, backend_setter_func setValueInBackend_func,
+    QIviPropertyTestData(const QString &pName, const QList<T> &vList, backend_setter_func setValueInBackend_func,
                      const QString &propChangedSignal, const QString &attChangedSignal,
-                     setter_func set, getter_func get, const QList<QtIVIPropertyAttribute<T>> &attList,
+                     setter_func set, getter_func get, const QList<QIviPropertyAttribute<T>> &attList,
                      attribute_getter_func attGet, backend_attribute_setter_func attSet)
         : propertyName(pName)
         , valueList(vList)
@@ -84,7 +84,7 @@ template <typename Feature, typename Backend, typename T> struct QtIVIPropertyTe
         , backend_attribute_setter(attSet)
     {}
 
-    QtIVIPropertyTestData() {}
+    QIviPropertyTestData() {}
 
     QString propertyName;
     QList<T> valueList;
@@ -93,20 +93,20 @@ template <typename Feature, typename Backend, typename T> struct QtIVIPropertyTe
     QString attributeChangedSignal;
     setter_func setter;
     getter_func getter;
-    QList<QtIVIPropertyAttribute<T>> attributeList;
+    QList<QIviPropertyAttribute<T>> attributeList;
     attribute_getter_func attribute_getter;
     backend_attribute_setter_func backend_attribute_setter;
 };
 
 template <typename Feature, typename Backend, typename T>
-void testIVIProperty(const QtIVIPropertyTestData<Feature, Backend, T> &testData, Feature* feature, Backend* backend, const QString &zone = QString())
+void testIVIProperty(const QIviPropertyTestData<Feature, Backend, T> &testData, Feature* feature, Backend* backend, const QString &zone = QString())
 {
     int valueIndex = 0;
     (backend->*testData.backend_setter)(testData.valueList.at(valueIndex), zone);
 
     //WTF need to split these two lines ?
     QVariant var = feature->property(testData.propertyName.toLocal8Bit());
-    QtIVIProperty *property = var.value<QtIVIProperty*>();
+    QIviProperty *property = var.value<QIviProperty*>();
 
     QVERIFY(property);
     QSignalSpy valueSpy(feature, testData.propertyChangedSignal.toLocal8Bit());
@@ -138,7 +138,7 @@ void testIVIProperty(const QtIVIPropertyTestData<Feature, Backend, T> &testData,
     //Test Setter IVIPROPERTY
     if (testData.setter) {
         property->setProperty("value", QVariant::fromValue(testData.valueList.at(valueIndex)));
-        QVERIFY2(valueSpy.count() == 1, "property change signal was not sent, after calling the QtIVIProperty setter");
+        QVERIFY2(valueSpy.count() == 1, "property change signal was not sent, after calling the QIviProperty setter");
         QCOMPARE(valueSpy.takeFirst().at(0).value<T>(), testData.valueList.at(valueIndex));
         QCOMPARE((feature->*testData.getter)(), testData.valueList.at(valueIndex));
         QCOMPARE(property->property("value"), qtivi_convertValue(testData.valueList.at(valueIndex)));
@@ -157,7 +157,7 @@ void testIVIProperty(const QtIVIPropertyTestData<Feature, Backend, T> &testData,
     //Test attribute change notification
     (backend->*testData.backend_attribute_setter)(testData.attributeList.at(1), zone);
     QVERIFY2(attributeSpy.count() == 1, "property change signal was not sent, after changing the value in the backend");
-    QCOMPARE(attributeSpy.takeFirst().at(0).value<QtIVIPropertyAttribute<T>>(), testData.attributeList.at(1));
+    QCOMPARE(attributeSpy.takeFirst().at(0).value<QIviPropertyAttribute<T>>(), testData.attributeList.at(1));
     QCOMPARE((feature->*testData.attribute_getter)(), testData.attributeList.at(1));
     QCOMPARE(property->property("available").toBool(), testData.attributeList.at(1).isAvailable());
     QCOMPARE(property->property("minimumValue").value<T>(), testData.attributeList.at(1).minimumValue());
@@ -167,11 +167,11 @@ void testIVIProperty(const QtIVIPropertyTestData<Feature, Backend, T> &testData,
 }
 
 #define PROPERTY_TEST_DATA_IMPL(_feature_, _backend_, _type_, _prop_, _capitalProp_, _valueList_, _attributeList_, _getter_, _setter_, _signal_, _backSetter_) \
-QtIVIPropertyTestData<_feature_, _backend_, _type_>(#_prop_, \
+QIviPropertyTestData<_feature_, _backend_, _type_>(#_prop_, \
                                                 _valueList_, \
                                                 _backSetter_, \
                                                 SIGNAL(_signal_), \
-                                                SIGNAL(_prop_##AttributeChanged(QtIVIPropertyAttribute<_type_>)), \
+                                                SIGNAL(_prop_##AttributeChanged(QIviPropertyAttribute<_type_>)), \
                                                 _setter_, \
                                                 _getter_, \
                                                 _attributeList_, \
@@ -196,4 +196,4 @@ QtIVIPropertyTestData<_feature_, _backend_, _type_>(#_prop_, \
 
 QT_END_NAMESPACE
 
-#endif // QTIVIPROPERTYTESTER_P_H
+#endif // QIVIPROPERTYTESTER_P_H
diff --git a/src/ivicore/qtiviproxyserviceobject_p.cpp b/src/ivicore/qtiviproxyserviceobject_p.cpp
index 1776459..230859a 100644
--- a/src/ivicore/qtiviproxyserviceobject_p.cpp
+++ b/src/ivicore/qtiviproxyserviceobject_p.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -41,24 +41,24 @@
 
 #include "qtiviproxyserviceobject_p.h"
 
-QtIVIProxyServiceObject::QtIVIProxyServiceObject(QtIVIServiceInterface *interface)
-    : QtIVIServiceObject()
+QIviProxyServiceObject::QIviProxyServiceObject(QIviServiceInterface *interface)
+    : QIviServiceObject()
     , m_interface(interface)
 {
 
 }
 
-QtIVIProxyServiceObject::~QtIVIProxyServiceObject()
+QIviProxyServiceObject::~QIviProxyServiceObject()
 {
 
 }
 
-QStringList QtIVIProxyServiceObject::interfaces() const
+QStringList QIviProxyServiceObject::interfaces() const
 {
     return m_interface->interfaces();
 }
 
-QObject *QtIVIProxyServiceObject::interfaceInstance(const QString &interface) const
+QObject *QIviProxyServiceObject::interfaceInstance(const QString &interface) const
 {
     return m_interface->interfaceInstance(interface);
 }
diff --git a/src/ivicore/qtiviproxyserviceobject_p.h b/src/ivicore/qtiviproxyserviceobject_p.h
index 9a7fcae..8de9e5c 100644
--- a/src/ivicore/qtiviproxyserviceobject_p.h
+++ b/src/ivicore/qtiviproxyserviceobject_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIPROXYSERVICEOBJECT_H
-#define QTIVIPROXYSERVICEOBJECT_H
+#ifndef QIVIPROXYSERVICEOBJECT_H
+#define QIVIPROXYSERVICEOBJECT_H
 
 //
 //  W A R N I N G
@@ -53,24 +53,24 @@
 // We mean it.
 //
 
-#include <QtIVICore/QtIVIServiceObject>
+#include <QtIviCore/QIviServiceObject>
 
 QT_BEGIN_NAMESPACE
 
-class QtIVIProxyServiceObject : public QtIVIServiceObject
+class QIviProxyServiceObject : public QIviServiceObject
 {
 public:
-    QtIVIProxyServiceObject(QtIVIServiceInterface* interface);
-    virtual ~QtIVIProxyServiceObject();
+    QIviProxyServiceObject(QIviServiceInterface* interface);
+    virtual ~QIviProxyServiceObject();
 
     virtual QStringList interfaces() const;
     virtual QObject* interfaceInstance(const QString& interface) const;
 
 private:
 
-    QtIVIServiceInterface* m_interface;
+    QIviServiceInterface* m_interface;
 };
 
 QT_END_NAMESPACE
 
-#endif // QTIVIPROXYSERVICEOBJECT_H
+#endif // QIVIPROXYSERVICEOBJECT_H
diff --git a/src/ivicore/qtiviqmlconversion_helper.h b/src/ivicore/qtiviqmlconversion_helper.h
index 48ae6fa..7d8ff78 100644
--- a/src/ivicore/qtiviqmlconversion_helper.h
+++ b/src/ivicore/qtiviqmlconversion_helper.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIQMLCONVERSION_HELPER_H
-#define QTIVIQMLCONVERSION_HELPER_H
+#ifndef QIVIQMLCONVERSION_HELPER_H
+#define QIVIQMLCONVERSION_HELPER_H
 
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
@@ -80,4 +80,4 @@ template <typename T> QVariantList qtivi_convertAvailableValues(const QVector<T>
 
 QT_END_NAMESPACE
 
-#endif // QTIVIQMLCONVERSION_HELPER_H
+#endif // QIVIQMLCONVERSION_HELPER_H
diff --git a/src/ivicore/qtiviserviceinterface.h b/src/ivicore/qtiviserviceinterface.h
index afac09b..436b9ae 100644
--- a/src/ivicore/qtiviserviceinterface.h
+++ b/src/ivicore/qtiviserviceinterface.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,27 +39,27 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVISERVICEINTERFACE_H
-#define QTIVISERVICEINTERFACE_H
+#ifndef QIVISERVICEINTERFACE_H
+#define QIVISERVICEINTERFACE_H
 
 #include <QtCore/QtPlugin>
 
 QT_BEGIN_NAMESPACE
 
-class QtIVIServiceInterface {
+class QIviServiceInterface {
 
 public:
-    virtual ~QtIVIServiceInterface() {}
+    virtual ~QIviServiceInterface() {}
 
     virtual QStringList interfaces() const = 0;
     virtual QObject* interfaceInstance(const QString& interface) const = 0;
 };
 
-Q_DECLARE_INTERFACE(QtIVIServiceInterface, "com.pelagicore.QtIVIServiceInterface")
+Q_DECLARE_INTERFACE(QIviServiceInterface, "com.pelagicore.QIviServiceInterface")
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QtIVIServiceInterface*)
+Q_DECLARE_METATYPE(QIviServiceInterface*)
 
-#endif // QTIVISERVICEINTERFACE_H
+#endif // QIVISERVICEINTERFACE_H
 
diff --git a/src/ivicore/qtiviservicemanager.cpp b/src/ivicore/qtiviservicemanager.cpp
index b941158..681dd4a 100644
--- a/src/ivicore/qtiviservicemanager.cpp
+++ b/src/ivicore/qtiviservicemanager.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -53,32 +53,32 @@
 #include <QDebug>
 #include <QLibrary>
 
-#define QTIVI_PLUGIN_DIRECTORY "qtivi"
+#define QIVI_PLUGIN_DIRECTORY "qtivi"
 
-QtIVIServiceManagerPrivate::QtIVIServiceManagerPrivate(QtIVIServiceManager *parent) : QObject(parent), q_ptr(parent)
+QIviServiceManagerPrivate::QIviServiceManagerPrivate(QIviServiceManager *parent) : QObject(parent), q_ptr(parent)
 {
 }
 
-QtIVIServiceManagerPrivate *QtIVIServiceManagerPrivate::get(QtIVIServiceManager *serviceManager)
+QIviServiceManagerPrivate *QIviServiceManagerPrivate::get(QIviServiceManager *serviceManager)
 {
     Q_ASSERT(serviceManager);
     return serviceManager->d_ptr;
 }
 
-QList<QtIVIServiceObject *> QtIVIServiceManagerPrivate::findServiceByInterface(const QString &interface, QtIVIServiceManager::SearchFlags searchFlags)
+QList<QIviServiceObject *> QIviServiceManagerPrivate::findServiceByInterface(const QString &interface, QIviServiceManager::SearchFlags searchFlags)
 {
-    QList<QtIVIServiceObject*> list;
+    QList<QIviServiceObject*> list;
 
     foreach (Backend *backend, m_backends) {
 
         if (backend->metaData[QLatin1String("interfaces")].toStringList().contains(interface)) {
             bool isSimulation = backend->metaData[QLatin1String("fileName")].toString().contains(QLatin1String("_simulation."));
-            if ((searchFlags & QtIVIServiceManager::IncludeSimulationBackends && isSimulation) ||
-                (searchFlags & QtIVIServiceManager::IncludeProductionBackends && !isSimulation)) {
+            if ((searchFlags & QIviServiceManager::IncludeSimulationBackends && isSimulation) ||
+                (searchFlags & QIviServiceManager::IncludeProductionBackends && !isSimulation)) {
                 if (!backend->proxyServiceObject) {
-                    QtIVIServiceInterface *backendInterface = loadServiceBackendInterface(backend);
+                    QIviServiceInterface *backendInterface = loadServiceBackendInterface(backend);
                     if (backendInterface)
-                        backend->proxyServiceObject = new QtIVIProxyServiceObject(backendInterface);
+                        backend->proxyServiceObject = new QIviProxyServiceObject(backendInterface);
                 }
                 if (backend->proxyServiceObject)
                     list.append(backend->proxyServiceObject);
@@ -89,13 +89,13 @@ QList<QtIVIServiceObject *> QtIVIServiceManagerPrivate::findServiceByInterface(c
     return list;
 }
 
-void QtIVIServiceManagerPrivate::searchPlugins()
+void QIviServiceManagerPrivate::searchPlugins()
 {
     bool found = false;
     foreach (const QString &pluginDir, QCoreApplication::libraryPaths()) {
 
         QDir dir(pluginDir);
-        QString path = pluginDir + QDir::separator() + QLatin1Literal(QTIVI_PLUGIN_DIRECTORY);
+        QString path = pluginDir + QDir::separator() + QLatin1Literal(QIVI_PLUGIN_DIRECTORY);
         //Check whether the directory exists
         if (!QDir(path).exists(QStringLiteral(".")))
             continue;
@@ -116,7 +116,7 @@ void QtIVIServiceManagerPrivate::searchPlugins()
     }
 }
 
-void QtIVIServiceManagerPrivate::registerBackend(const QString &fileName, const QJsonObject &metaData)
+void QIviServiceManagerPrivate::registerBackend(const QString &fileName, const QJsonObject &metaData)
 {
     QVariantMap backendMetaData = metaData.value(QLatin1String("MetaData")).toVariant().toMap();
 
@@ -138,14 +138,14 @@ void QtIVIServiceManagerPrivate::registerBackend(const QString &fileName, const
     addBackend(backend);
 }
 
-bool QtIVIServiceManagerPrivate::registerBackend(QObject *serviceBackendInterface, const QStringList &interfaces, QtIVIServiceManager::BackendType backendType)
+bool QIviServiceManagerPrivate::registerBackend(QObject *serviceBackendInterface, const QStringList &interfaces, QIviServiceManager::BackendType backendType)
 {
     if (interfaces.isEmpty()) {
         return false;
     }
 
     // Verify that the object implements the ServiceBackendInterface
-    QtIVIServiceInterface *interface = qobject_cast<QtIVIServiceInterface*>(serviceBackendInterface);
+    QIviServiceInterface *interface = qobject_cast<QIviServiceInterface*>(serviceBackendInterface);
     if (!interface) {
         return false;
     }
@@ -153,7 +153,7 @@ bool QtIVIServiceManagerPrivate::registerBackend(QObject *serviceBackendInterfac
     QVariantMap metaData = QVariantMap();
 
     metaData.insert(QLatin1String("interfaces"), interfaces);
-    if (backendType == QtIVIServiceManager::SimulationBackend) //fake a simulation filename
+    if (backendType == QIviServiceManager::SimulationBackend) //fake a simulation filename
         metaData.insert(QLatin1String("fileName"), QLatin1String("_simulation."));
 
     Backend *backend = new Backend;
@@ -167,9 +167,9 @@ bool QtIVIServiceManagerPrivate::registerBackend(QObject *serviceBackendInterfac
     return true;
 }
 
-void QtIVIServiceManagerPrivate::unloadAllBackends()
+void QIviServiceManagerPrivate::unloadAllBackends()
 {
-    Q_Q(QtIVIServiceManager);
+    Q_Q(QIviServiceManager);
 
     q->beginResetModel();
     QMutableListIterator<Backend*> i(m_backends);
@@ -195,9 +195,9 @@ void QtIVIServiceManagerPrivate::unloadAllBackends()
     m_interfaceNames.clear();
 }
 
-void QtIVIServiceManagerPrivate::addBackend(Backend *backend)
+void QIviServiceManagerPrivate::addBackend(Backend *backend)
 {
-    Q_Q(QtIVIServiceManager);
+    Q_Q(QIviServiceManager);
 
     q->beginInsertRows(QModelIndex(), m_backends.count(), m_backends.count());
     m_backends.append(backend);
@@ -208,7 +208,7 @@ void QtIVIServiceManagerPrivate::addBackend(Backend *backend)
     }
 }
 
-QtIVIServiceInterface *QtIVIServiceManagerPrivate::loadServiceBackendInterface(struct Backend *backend)
+QIviServiceInterface *QIviServiceManagerPrivate::loadServiceBackendInterface(struct Backend *backend)
 {
     if (backend->interface) {
         return backend->interface;
@@ -218,7 +218,7 @@ QtIVIServiceInterface *QtIVIServiceManagerPrivate::loadServiceBackendInterface(s
     QObject *plugin = loader->instance();
     if (plugin) {
 
-        QtIVIServiceInterface *backendInterface = qobject_cast<QtIVIServiceInterface*>(plugin);
+        QIviServiceInterface *backendInterface = qobject_cast<QIviServiceInterface*>(plugin);
         if (backendInterface) {
             backend->interface = backendInterface;
             backend->loader = loader;
@@ -238,14 +238,14 @@ QtIVIServiceInterface *QtIVIServiceManagerPrivate::loadServiceBackendInterface(s
 }
 
 /*!
- * \class QtIVIServiceManager
- * \inmodule QtIVICore
- * \brief QtIVIServiceManager provides the Backends to QtIVIAbstractFeature
+ * \class QIviServiceManager
+ * \inmodule QtIviCore
+ * \brief QIviServiceManager provides the Backends to QIviAbstractFeature
  *
- * QtIVIServiceManager is the heart of QtIVI and provides you with an easy way to detect which
+ * QIviServiceManager is the heart of QtIvi and provides you with an easy way to detect which
  * backends and interfaces are available.
  *
- * By default QtIVIServiceManager reads the metaData of all plugins within the "qtivi" folder
+ * By default QIviServiceManager reads the metaData of all plugins within the "qtivi" folder
  * of your plugin path. The plugin itself will be loaded once it's explictly requested by
  * the developer by using findServiceByInterface().
  *
@@ -256,7 +256,7 @@ QtIVIServiceInterface *QtIVIServiceManagerPrivate::loadServiceBackendInterface(s
  */
 
 /*!
- * \enum QtIVIServiceManager::SearchFlag
+ * \enum QIviServiceManager::SearchFlag
  *
  * \value IncludeProductionBackends
  *        Include production backends in the search result. \sa ProductionBackend
@@ -267,7 +267,7 @@ QtIVIServiceInterface *QtIVIServiceManagerPrivate::loadServiceBackendInterface(s
  */
 
 /*!
- * \enum QtIVIServiceManager::BackendType
+ * \enum QIviServiceManager::BackendType
  *
  * \value ProductionBackend
  *        A backend controlling a real automotive interface (e.g. a climate control connected over the CAN bus)
@@ -275,9 +275,9 @@ QtIVIServiceInterface *QtIVIServiceManagerPrivate::loadServiceBackendInterface(s
  *        A backend used for development as it's only returning simulation values and won't be deployed to the final hardware
  */
 
-QtIVIServiceManager::QtIVIServiceManager()
+QIviServiceManager::QIviServiceManager()
     : QAbstractListModel(0)
-    , d_ptr(new QtIVIServiceManagerPrivate(this))
+    , d_ptr(new QIviServiceManagerPrivate(this))
 {
     d_ptr->searchPlugins();
 }
@@ -285,16 +285,16 @@ QtIVIServiceManager::QtIVIServiceManager()
 /*!
  * Returns the global service manager instance.
  */
-QtIVIServiceManager *QtIVIServiceManager::instance()
+QIviServiceManager *QIviServiceManager::instance()
 {
-    static QtIVIServiceManager* instance = new QtIVIServiceManager();
+    static QIviServiceManager* instance = new QIviServiceManager();
     return instance;
 }
 
 /*!
  * Destructor.
  */
-QtIVIServiceManager::~QtIVIServiceManager()
+QIviServiceManager::~QIviServiceManager()
 {
 
 }
@@ -304,26 +304,26 @@ QtIVIServiceManager::~QtIVIServiceManager()
  *
  * The \a searchFlags argument can be used to control which type of backends are included in the search result.
  */
-QList<QtIVIServiceObject *> QtIVIServiceManager::findServiceByInterface(const QString &interface, SearchFlags searchFlags)
+QList<QIviServiceObject *> QIviServiceManager::findServiceByInterface(const QString &interface, SearchFlags searchFlags)
 {
-    Q_D(QtIVIServiceManager);
+    Q_D(QIviServiceManager);
     return d->findServiceByInterface(interface, searchFlags);
 }
 
 /*!
  * Register a backend. The provided \a serviceBackendInterface must implement the
- * QtIVIServiceInterface else the registration will fail. \a interfaces is a list
+ * QIviServiceInterface else the registration will fail. \a interfaces is a list
  * with interfaces (at least one) supported by the backend. The \a backendType
  * indicates the type of the backend and has influence on whether the backend is
  * found by the auto discovery of the Feature.
  *
  * Returns true if the backend was successfully registered else false.
  *
- * \sa QtIVIServiceInterface
+ * \sa QIviServiceInterface
  */
-bool QtIVIServiceManager::registerService(QObject *serviceBackendInterface, const QStringList &interfaces, BackendType backendType)
+bool QIviServiceManager::registerService(QObject *serviceBackendInterface, const QStringList &interfaces, BackendType backendType)
 {
-    Q_D(QtIVIServiceManager);
+    Q_D(QIviServiceManager);
     return d->registerBackend(serviceBackendInterface, interfaces, backendType);
 }
 
@@ -332,18 +332,18 @@ bool QtIVIServiceManager::registerService(QObject *serviceBackendInterface, cons
  *
  * Unloads all currently loaded backends. Commonly only used for unit testing.
  */
-void QtIVIServiceManager::unloadAllBackends()
+void QIviServiceManager::unloadAllBackends()
 {
-    Q_D(QtIVIServiceManager);
+    Q_D(QIviServiceManager);
     return d->unloadAllBackends();
 }
 
 /*!
  * Returns true if the specified \a interface has been registered.
  */
-bool QtIVIServiceManager::hasInterface(const QString &interface) const
+bool QIviServiceManager::hasInterface(const QString &interface) const
 {
-    Q_D(const QtIVIServiceManager);
+    Q_D(const QIviServiceManager);
     return d->m_interfaceNames.contains(interface);
 }
 
@@ -352,9 +352,9 @@ bool QtIVIServiceManager::hasInterface(const QString &interface) const
  *
  * \sa QAbstractListModel::data()
  */
-int QtIVIServiceManager::rowCount(const QModelIndex &parent) const
+int QIviServiceManager::rowCount(const QModelIndex &parent) const
 {
-    Q_D(const QtIVIServiceManager);
+    Q_D(const QIviServiceManager);
     return parent.isValid() ? 0 : d->m_backends.count();
 }
 
@@ -363,9 +363,9 @@ int QtIVIServiceManager::rowCount(const QModelIndex &parent) const
  *
  * \sa QAbstractListModel::data()
  */
-QVariant QtIVIServiceManager::data(const QModelIndex &index, int role) const
+QVariant QIviServiceManager::data(const QModelIndex &index, int role) const
 {
-    Q_D(const QtIVIServiceManager);
+    Q_D(const QIviServiceManager);
 
     if (!index.isValid())
         return QVariant();
@@ -373,7 +373,7 @@ QVariant QtIVIServiceManager::data(const QModelIndex &index, int role) const
     int row = index.row();
 
     if (row >= 0 && row < d->m_backends.count() && role == Qt::DisplayRole) {
-        return QVariant::fromValue<QtIVIServiceInterface*>(d->m_backends.at(index.row())->interface);
+        return QVariant::fromValue<QIviServiceInterface*>(d->m_backends.at(index.row())->interface);
     }
 
     return QVariant();
diff --git a/src/ivicore/qtiviservicemanager.h b/src/ivicore/qtiviservicemanager.h
index 6e61c16..ebe3833 100644
--- a/src/ivicore/qtiviservicemanager.h
+++ b/src/ivicore/qtiviservicemanager.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,18 +39,18 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVISERVICEMANAGER_H
-#define QTIVISERVICEMANAGER_H
+#ifndef QIVISERVICEMANAGER_H
+#define QIVISERVICEMANAGER_H
 
 #include <QtCore/QAbstractListModel>
-#include <QtIVICore/qtiviglobal.h>
+#include <QtIviCore/qtiviglobal.h>
 
 QT_BEGIN_NAMESPACE
 
-class QtIVIServiceObject;
-class QtIVIServiceManagerPrivate;
+class QIviServiceObject;
+class QIviServiceManagerPrivate;
 
-class Q_QTIVICORE_EXPORT QtIVIServiceManager : public QAbstractListModel
+class Q_QTIVICORE_EXPORT QIviServiceManager : public QAbstractListModel
 {
     Q_OBJECT
 public:
@@ -68,10 +68,10 @@ public:
     };
     Q_ENUM(BackendType)
 
-    static QtIVIServiceManager *instance();
-    virtual ~QtIVIServiceManager();
+    static QIviServiceManager *instance();
+    virtual ~QIviServiceManager();
 
-    QList<QtIVIServiceObject*> findServiceByInterface(const QString &interface, SearchFlags searchFlags = IncludeAll);
+    QList<QIviServiceObject*> findServiceByInterface(const QString &interface, SearchFlags searchFlags = IncludeAll);
     bool hasInterface(const QString &interface) const;
 
     bool registerService(QObject *serviceBackendInterface, const QStringList &interfaces, BackendType backendType = ProductionBackend);
@@ -82,11 +82,11 @@ public:
 Q_SIGNALS:
 
 private:
-    explicit QtIVIServiceManager();
-    QtIVIServiceManagerPrivate * const d_ptr;
-    Q_DECLARE_PRIVATE(QtIVIServiceManager)
+    explicit QIviServiceManager();
+    QIviServiceManagerPrivate * const d_ptr;
+    Q_DECLARE_PRIVATE(QIviServiceManager)
 };
 
 QT_END_NAMESPACE
 
-#endif // QTIVISERVICEMANAGER_H
+#endif // QIVISERVICEMANAGER_H
diff --git a/src/ivicore/qtiviservicemanager_p.h b/src/ivicore/qtiviservicemanager_p.h
index 2bb3c9f..b4616e9 100644
--- a/src/ivicore/qtiviservicemanager_p.h
+++ b/src/ivicore/qtiviservicemanager_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVISERVICEMANAGER_P_H
-#define QTIVISERVICEMANAGER_P_H
+#ifndef QIVISERVICEMANAGER_P_H
+#define QIVISERVICEMANAGER_P_H
 
 //
 //  W A R N I N G
@@ -59,49 +59,49 @@
 #include <QtCore/QMap>
 #include <QtCore/QSet>
 
-#include <QtIVICore/qtiviglobal.h>
-#include <QtIVICore/qtiviservicemanager.h>
+#include <QtIviCore/qtiviglobal.h>
+#include <QtIviCore/qtiviservicemanager.h>
 
 QT_BEGIN_NAMESPACE
 
 class QPluginLoader;
-class QtIVIServiceInterface;
-class QtIVIServiceObject;
-class QtIVIProxyServiceObject;
+class QIviServiceInterface;
+class QIviServiceObject;
+class QIviProxyServiceObject;
 
 struct Backend{
     QVariantMap metaData;
-    QtIVIServiceInterface *interface;
+    QIviServiceInterface *interface;
     QObject *interfaceObject;
-    QtIVIProxyServiceObject *proxyServiceObject;
+    QIviProxyServiceObject *proxyServiceObject;
     QPluginLoader *loader;
 };
 
-class Q_QTIVICORE_EXPORT QtIVIServiceManagerPrivate : public QObject
+class Q_QTIVICORE_EXPORT QIviServiceManagerPrivate : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit QtIVIServiceManagerPrivate(QtIVIServiceManager *parent);
+    explicit QIviServiceManagerPrivate(QIviServiceManager *parent);
 
-    static QtIVIServiceManagerPrivate* get(QtIVIServiceManager *serviceManager);
+    static QIviServiceManagerPrivate* get(QIviServiceManager *serviceManager);
 
-    QList<QtIVIServiceObject*> findServiceByInterface(const QString &interface, QtIVIServiceManager::SearchFlags searchFlags);
+    QList<QIviServiceObject*> findServiceByInterface(const QString &interface, QIviServiceManager::SearchFlags searchFlags);
 
     void searchPlugins();
     void registerBackend(const QString &fileName, const QJsonObject &metaData);
-    bool registerBackend(QObject *serviceBackendInterface, const QStringList &interfaces, QtIVIServiceManager::BackendType backendType);
+    bool registerBackend(QObject *serviceBackendInterface, const QStringList &interfaces, QIviServiceManager::BackendType backendType);
     void addBackend(struct Backend *backend);
 
     void unloadAllBackends();
 
-    QtIVIServiceInterface *loadServiceBackendInterface(struct Backend *backend);
+    QIviServiceInterface *loadServiceBackendInterface(struct Backend *backend);
 
     QList<Backend*> m_backends;
     QSet<QString> m_interfaceNames;
 
-    QtIVIServiceManager * const q_ptr;
-    Q_DECLARE_PUBLIC(QtIVIServiceManager)
+    QIviServiceManager * const q_ptr;
+    Q_DECLARE_PUBLIC(QIviServiceManager)
 
 Q_SIGNALS:
     void beginInsertRows(const QModelIndex &index, int start, int end);
@@ -111,5 +111,5 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-#endif // QTIVISERVICEMANAGER_P_H
+#endif // QIVISERVICEMANAGER_P_H
 
diff --git a/src/ivicore/qtiviserviceobject.cpp b/src/ivicore/qtiviserviceobject.cpp
index 1cc1f22..f1300dc 100644
--- a/src/ivicore/qtiviserviceobject.cpp
+++ b/src/ivicore/qtiviserviceobject.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -44,17 +44,17 @@
 #include <QUuid>
 
 /*!
- * \class QtIVIServiceObject
- * \inmodule QtIVICore
- * \brief QtIVIServiceObject is the connection point to a Backend Service.
+ * \class QIviServiceObject
+ * \inmodule QtIviCore
+ * \brief QIviServiceObject is the connection point to a Backend Service.
  *
- * QtIVIServiceObject provides you with a list of interfaces the Backend implements.
+ * QIviServiceObject provides you with a list of interfaces the Backend implements.
  *
  * By using interfaceInstance() a QObject implementing this interface will be returned.
  * The returned interface can contain signals that need to be connected to by the Feature
  * implementing this interface.
  *
- * \sa QtIVIAbstractFeature
+ * \sa QIviAbstractFeature
  */
 
 
@@ -63,7 +63,7 @@
  *
  * \a parent is passed on to \l QObject.
  */
-QtIVIServiceObject::QtIVIServiceObject(QObject *parent)
+QIviServiceObject::QIviServiceObject(QObject *parent)
     : QObject(parent)
 {
 
@@ -72,13 +72,13 @@ QtIVIServiceObject::QtIVIServiceObject(QObject *parent)
 /*!
  * Destructor.
  */
-QtIVIServiceObject::~QtIVIServiceObject()
+QIviServiceObject::~QIviServiceObject()
 {
 
 }
 
 /*!
- * \property QtIVIServiceObject::id
+ * \property QIviServiceObject::id
  * \brief A unique ID for the service object instance.
  *
  * Each service object has a unique ID. When subclassing, the id()
@@ -91,38 +91,38 @@ QtIVIServiceObject::~QtIVIServiceObject()
  *
  * By default, QUuid::createUuid() is used.
  */
-QString QtIVIServiceObject::id() const
+QString QIviServiceObject::id() const
 {
     static QUuid id = QUuid::createUuid();
     return id.toString();
 }
 
 /*!
- * \class QtIVIServiceInterface
- * \inmodule QtIVICore
+ * \class QIviServiceInterface
+ * \inmodule QtIviCore
  * \brief Interface class for services.
  *
- * The QtIVIServiceInterface class defines the interface of services registered with QtIVIServiceManager.
+ * The QIviServiceInterface class defines the interface of services registered with QIviServiceManager.
  *
- * Commonly, service objects inherit the concrete class QtIVIServiceObject instead of using QtIVIServiceInterface directly.
+ * Commonly, service objects inherit the concrete class QIviServiceObject instead of using QIviServiceInterface directly.
  *
- * \sa QtIVIServiceObject
+ * \sa QIviServiceObject
  */
 
 /*!
- * \fn QtIVIServiceInterface::~QtIVIServiceInterface()
+ * \fn QIviServiceInterface::~QIviServiceInterface()
  *
- * Destructs the QtIVIServiceInterface instance.
+ * Destructs the QIviServiceInterface instance.
  */
 
 /*!
- * \fn QStringList QtIVIServiceInterface::interfaces() const
+ * \fn QStringList QIviServiceInterface::interfaces() const
  *
  * Returns a list of service interface names supported by the service object instance.
  */
 
 /*!
- * \fn QObject* QtIVIServiceInterface::interfaceInstance(const QString& interface) const
+ * \fn QObject* QIviServiceInterface::interfaceInstance(const QString& interface) const
  *
  * Returns an object implementing the service interface requested through \a interface.
  */
diff --git a/src/ivicore/qtiviserviceobject.h b/src/ivicore/qtiviserviceobject.h
index 32e8749..8cdd3af 100644
--- a/src/ivicore/qtiviserviceobject.h
+++ b/src/ivicore/qtiviserviceobject.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,25 +39,25 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVISERVICEOBJECT_H
-#define QTIVISERVICEOBJECT_H
+#ifndef QIVISERVICEOBJECT_H
+#define QIVISERVICEOBJECT_H
 
 #include <QtCore/QObject>
-#include <QtIVICore/QtIVIServiceInterface>
-#include <QtIVICore/qtiviglobal.h>
+#include <QtIviCore/QIviServiceInterface>
+#include <QtIviCore/qtiviglobal.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QTIVICORE_EXPORT QtIVIServiceObject : public QObject, public QtIVIServiceInterface
+class Q_QTIVICORE_EXPORT QIviServiceObject : public QObject, public QIviServiceInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QtIVIServiceInterface)
+    Q_INTERFACES(QIviServiceInterface)
 
     Q_PROPERTY(QString id READ id CONSTANT)
 
 public:
-    explicit QtIVIServiceObject(QObject *parent = 0);
-    virtual ~QtIVIServiceObject();
+    explicit QIviServiceObject(QObject *parent = Q_NULLPTR);
+    virtual ~QIviServiceObject();
 
     virtual QString id() const;
 
@@ -66,4 +66,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QTIVISERVICEOBJECT_H
+#endif // QIVISERVICEOBJECT_H
diff --git a/src/ivicore/qtivitypetraits.h b/src/ivicore/qtivitypetraits.h
index f0f5295..c32bdb3 100644
--- a/src/ivicore/qtivitypetraits.h
+++ b/src/ivicore/qtivitypetraits.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVITYPETRAITS_H
-#define QTIVITYPETRAITS_H
+#ifndef QIVITYPETRAITS_H
+#define QIVITYPETRAITS_H
 
 #include <QtCore/qtypetraits.h>
 
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 namespace QtPrivate {
     // This functions checks whether the type has a implicit cast operator to int
     template <typename From, typename To>
-    struct QtIVIConvertHelper {
+    struct QIviConvertHelper {
       static small_ Test(To);
       static big_ Test(...);
       static From Create();
@@ -63,8 +63,8 @@ namespace QtPrivate {
     template <typename From, typename To>
     struct qtivi_is_convertible
         : integral_constant<bool,
-                            sizeof(QtIVIConvertHelper<From, To>::Test(
-                                      QtIVIConvertHelper<From, To>::Create()))
+                            sizeof(QIviConvertHelper<From, To>::Test(
+                                      QIviConvertHelper<From, To>::Create()))
                             == sizeof(small_)> {
     };
 
@@ -124,4 +124,4 @@ namespace QtPrivate {
 
 QT_END_NAMESPACE
 
-#endif // QTIVITYPETRAITS_H
+#endif // QIVITYPETRAITS_H
diff --git a/src/ivicore/qtivizonedfeatureinterface.cpp b/src/ivicore/qtivizonedfeatureinterface.cpp
index ce21552..c6e4d9d 100644
--- a/src/ivicore/qtivizonedfeatureinterface.cpp
+++ b/src/ivicore/qtivizonedfeatureinterface.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -42,11 +42,11 @@
 #include "qtivizonedfeatureinterface.h"
 
 /*!
-   \class QtIVIZonedFeatureInterface
-   \inmodule QtIVICore
+   \class QIviZonedFeatureInterface
+   \inmodule QtIviCore
    \ingroup backends
 
-   \brief QtIVIZonedFeatureInterface defines the base interface for the
+   \brief QIviZonedFeatureInterface defines the base interface for the
    feature backend classes.
 
    Vehicle feature can be zoned or be just generic depending of the vehicle.
@@ -68,7 +68,7 @@
    and "Rear".
 
    The backend must return all available zones via
-   \l {QtIVIZonedFeatureInterface::}{availableZones}:
+   \l {QIviZonedFeatureInterface::}{availableZones}:
    \code
    QStringList backend::availableZones() const {
         QStringList zones;
@@ -85,7 +85,7 @@
    zone as a parameter. Zone is not needed if attribute is generic.
 
    Initialization signals are emitted in the
-   \l {QtIVIZonedFeatureInterface::}{initializeAttributes}:
+   \l {QIviZonedFeatureInterface::}{initializeAttributes}:
    \code
    void backend::initializeAttributes() {
         emit fanSpeedLevelChanged(2, "Front");
@@ -102,7 +102,7 @@
    \code
    void backend::setFanSpeedLevel(int value, const QString &zone) {
         if (!m_fanSpeedZones.contains(zone)) {
-            emit errorChanged(QtIVIAbstractFeature::InvalidZone);
+            emit errorChanged(QIviAbstractFeature::InvalidZone);
         } else {
             // Set specified zone fan to value
             ...
@@ -112,7 +112,7 @@
 
    int backend::fanSpeedLevel(const QString &zone) {
         if (!m_fanSpeedZones.contains(zone)) {
-            emit errorChanged(QtIVIAbstractFeature::InvalidZone);
+            emit errorChanged(QIviAbstractFeature::InvalidZone);
             return -1;
         } else {
             int value = ... // Get vehicle's zone fan Speed
@@ -128,7 +128,7 @@
    \code
    void backend::setSteeringWheelHeater(int value, const QString &zone) {
         if (!zone.isEmpty()) {  // zone must be empty for a generic attribute
-            emit errorChanged(QtIVIAbstractFeature::InvalidZone);
+            emit errorChanged(QIviAbstractFeature::InvalidZone);
             return;
         } else {
             // Set vehicle's steering wheel heater value
@@ -139,7 +139,7 @@
 
    int backend::steeringWheelHeater(const QString &zone) {
         if (!zone.isEmpty()) {  // zone must be empty for a generic attribute
-            emit errorChanged(QtIVIAbstractFeature::InvalidZone);
+            emit errorChanged(QIviAbstractFeature::InvalidZone);
             return -1;
         } else {
             int value = ... // Get vehicle's steering wheel heater value
@@ -148,26 +148,26 @@
    }
    \endcode
 
-   To implement a backend plugin you need also to implement QtIVIServiceInterface from the QtIVICore module.
+   To implement a backend plugin you need also to implement QIviServiceInterface from the QtIviCore module.
 
    See the full example backend implementation from \c {src/plugins/ivivehiclefunctions/climate_simulator}.
-   \sa QtIVIAbstractZonedFeature, QtIVIServiceInterface
+   \sa QIviAbstractZonedFeature, QIviServiceInterface
  */
 
 /*!
- * \fn QtIVIZonedFeatureInterface::QtIVIZonedFeatureInterface(QObject *parent=0)
+ * \fn QIviZonedFeatureInterface::QIviZonedFeatureInterface(QObject *parent=0)
  *
  * Constructs a backend base interface.
  *
  * The \a parent is sent to the QObject constructor.
  */
-QtIVIZonedFeatureInterface::QtIVIZonedFeatureInterface(QObject *parent)
+QIviZonedFeatureInterface::QIviZonedFeatureInterface(QObject *parent)
     : QObject(parent)
 {
 }
 
 /*!
- * \fn QStringList QtIVIZonedFeatureInterface::availableZones() const
+ * \fn QStringList QIviZonedFeatureInterface::availableZones() const
  *
  * Returns a list of supported zone names. This is called from the client
  * after having connected.
@@ -178,7 +178,7 @@ QtIVIZonedFeatureInterface::QtIVIZonedFeatureInterface(QObject *parent)
  */
 
 /*!
- * \fn void QtIVIZonedFeatureInterface::initializeAttributes()
+ * \fn void QIviZonedFeatureInterface::initializeAttributes()
  *
  * Called from the client to initialize attributes. This is called after
  * client is connected and available zones are fetched.
@@ -190,7 +190,7 @@ QtIVIZonedFeatureInterface::QtIVIZonedFeatureInterface(QObject *parent)
  */
 
 /*!
- * \fn void errorChanged(QtIVIAbstractFeature::Error error, const QString &message = QString())
+ * \fn void errorChanged(QIviAbstractFeature::Error error, const QString &message = QString())
  *
  * The signal is emitted when \a error occurs in the backend.
  * Error \a message is optional.
diff --git a/src/ivicore/qtivizonedfeatureinterface.h b/src/ivicore/qtivizonedfeatureinterface.h
index 5fa589d..5df18db 100644
--- a/src/ivicore/qtivizonedfeatureinterface.h
+++ b/src/ivicore/qtivizonedfeatureinterface.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,29 +39,29 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIZONEDFEATUREINTERFACE_H
-#define QTIVIZONEDFEATUREINTERFACE_H
+#ifndef QIVIZONEDFEATUREINTERFACE_H
+#define QIVIZONEDFEATUREINTERFACE_H
 
-#include <QtIVICore/QtIVIAbstractZonedFeature>
+#include <QtIviCore/QIviAbstractZonedFeature>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QTIVICORE_EXPORT QtIVIZonedFeatureInterface : public QObject
+class Q_QTIVICORE_EXPORT QIviZonedFeatureInterface : public QObject
 {
     Q_OBJECT
 
 public:
-    QtIVIZonedFeatureInterface(QObject *parent = 0);
+    QIviZonedFeatureInterface(QObject *parent = Q_NULLPTR);
 
     virtual QStringList availableZones() const = 0;
 
     virtual void initializeAttributes() = 0;
 
 Q_SIGNALS:
-    void errorChanged(QtIVIAbstractFeature::Error error, const QString &message = QString());
+    void errorChanged(QIviAbstractFeature::Error error, const QString &message = QString());
 };
 
 QT_END_NAMESPACE
 
-#endif // QTIVIZONEDFEATUREINTERFACE_H
+#endif // QIVIZONEDFEATUREINTERFACE_H
 
diff --git a/src/ivicore/queryparser/README b/src/ivicore/queryparser/README
index 88331ef..840712e 100644
--- a/src/ivicore/queryparser/README
+++ b/src/ivicore/queryparser/README
@@ -1,5 +1,5 @@
 This Directory contains all the files needed to generate
-a Parser for the QtIVI Query Language.
+a Parser for the QtIvi Query Language.
 
 The Grammer is defined by using flex (*.l) and QLALR (*.g)
 
diff --git a/src/ivicore/queryparser/qtiviqueryparser.g b/src/ivicore/queryparser/qtiviqueryparser.g
index f7547e8..1964793 100644
--- a/src/ivicore/queryparser/qtiviqueryparser.g
+++ b/src/ivicore/queryparser/qtiviqueryparser.g
@@ -3,7 +3,7 @@
 -- Copyright (C) 2016 Pelagicore AG
 -- Contact: https://www.qt.io/licensing/
 --
--- This file is part of the QtIVI module of the Qt Toolkit.
+-- This file is part of the QtIvi module of the Qt Toolkit.
 --
 -- $QT_BEGIN_LICENSE:LGPL-QTAS$
 -- Commercial License Usage
@@ -50,7 +50,7 @@
 -- We mean it.
 --
 
-%parser QtIVIQueryParserTable
+%parser QIviQueryParserTable
 %merged_output qtiviqueryparser_p.h
 
 %token AND_OP2 "&"
@@ -85,8 +85,8 @@
 /:
 
 #include <QtCore>
-#include <QtIVICore/QtIVIAbstractQueryTerm>
-#include <QtIVICore/private/qtiviqueryterm_p.h>
+#include <QtIviCore/QIviAbstractQueryTerm>
+#include <QtIviCore/private/qtiviqueryterm_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -115,7 +115,7 @@ void readQueryBuffer(char *buffer, unsigned int &numBytesRead,int maxBytesToRead
     *currentOffset += numBytesToRead;
 }
 
-class QtIVIQueryParser: protected $table
+class QIviQueryParser: protected $table
 {
 public:
     union Value {
@@ -125,10 +125,10 @@ public:
     };
 
 public:
-    QtIVIQueryParser();
-    virtual ~QtIVIQueryParser();
+    QIviQueryParser();
+    virtual ~QIviQueryParser();
 
-    QtIVIAbstractQueryTerm *parse();
+    QIviAbstractQueryTerm *parse();
 
     void setQuery(const QString& query)
     {
@@ -144,7 +144,7 @@ public:
         m_identifierList = list;
     }
 
-    QList<QtIVIOrderTerm> orderTerms() const
+    QList<QIviOrderTerm> orderTerms() const
     {
         return m_orderList;
     }
@@ -172,7 +172,7 @@ protected:
     void handleConjunction(bool bangOperator);
     void handleScope(bool bang);
 
-    void negateLeftMostTerm(QtIVIAbstractQueryTerm *term);
+    void negateLeftMostTerm(QIviAbstractQueryTerm *term);
 
     bool checkIdentifier(const QString &identifer);
 
@@ -188,13 +188,13 @@ protected:
     QVector<int> state_stack;
     QVariant yylval;
 
-    QStack<QtIVIAbstractQueryTerm*> m_termStack;
-    QStack<QtIVIFilterTerm::Operator> m_operatorStack;
-    QStack<QtIVIConjunctionTerm::Conjunction> m_conjunctionStack;
-    QList<QtIVIOrderTerm> m_orderList;
+    QStack<QIviAbstractQueryTerm*> m_termStack;
+    QStack<QIviFilterTerm::Operator> m_operatorStack;
+    QStack<QIviConjunctionTerm::Conjunction> m_conjunctionStack;
+    QList<QIviOrderTerm> m_orderList;
 };
 
-inline void QtIVIQueryParser::reallocateStack()
+inline void QIviQueryParser::reallocateStack()
 {
     int size = state_stack.size();
     if (size == 0)
@@ -211,7 +211,7 @@ inline void QtIVIQueryParser::reallocateStack()
 
 /.
 
-QtIVIQueryParser::QtIVIQueryParser():
+QIviQueryParser::QIviQueryParser():
     m_offset(0),
     column(0),
     tos(0)
@@ -221,7 +221,7 @@ QtIVIQueryParser::QtIVIQueryParser():
 
 #include "qtiviqueryparser_flex_p.h"
 
-QtIVIQueryParser::~QtIVIQueryParser()
+QIviQueryParser::~QIviQueryParser()
 {
     currentOffset = 0;
     currentQuery = 0;
@@ -233,21 +233,21 @@ QtIVIQueryParser::~QtIVIQueryParser()
     if (0)
         yyunput(0, 0);}
 
-void QtIVIQueryParser::calcCurrentColumn()
+void QIviQueryParser::calcCurrentColumn()
 {
     column += yyleng;
 }
 
-void QtIVIQueryParser::negateLeftMostTerm(QtIVIAbstractQueryTerm *term)
+void QIviQueryParser::negateLeftMostTerm(QIviAbstractQueryTerm *term)
 {
-    if (term->type() == QtIVIAbstractQueryTerm::ConjunctionTerm) {
-        QtIVIConjunctionTerm* conjunction = static_cast<QtIVIConjunctionTerm*>(term);
+    if (term->type() == QIviAbstractQueryTerm::ConjunctionTerm) {
+        QIviConjunctionTerm* conjunction = static_cast<QIviConjunctionTerm*>(term);
         negateLeftMostTerm(conjunction->terms().at(0));
-    } else if (term->type() == QtIVIAbstractQueryTerm::ScopeTerm) {
-        QtIVIScopeTerm* scopeTerm = static_cast<QtIVIScopeTerm*>(term);
+    } else if (term->type() == QIviAbstractQueryTerm::ScopeTerm) {
+        QIviScopeTerm* scopeTerm = static_cast<QIviScopeTerm*>(term);
         scopeTerm->d_func()->m_negated = true;
-    } else if (term->type() == QtIVIAbstractQueryTerm::FilterTerm) {
-        QtIVIFilterTerm* filterTerm = static_cast<QtIVIFilterTerm*>(term);
+    } else if (term->type() == QIviAbstractQueryTerm::FilterTerm) {
+        QIviFilterTerm* filterTerm = static_cast<QIviFilterTerm*>(term);
         filterTerm->d_func()->m_negated = true;
     } else {
         qCritical() << "New Term type added but not handled in" << Q_FUNC_INFO;
@@ -256,18 +256,18 @@ void QtIVIQueryParser::negateLeftMostTerm(QtIVIAbstractQueryTerm *term)
     return;
 }
 
-void QtIVIQueryParser::handleConjunction(bool bangOperator)
+void QIviQueryParser::handleConjunction(bool bangOperator)
 {
-    QList<QtIVIAbstractQueryTerm*> list;
+    QList<QIviAbstractQueryTerm*> list;
     list.prepend(m_termStack.pop());
     list.prepend(m_termStack.pop());
 
-    QtIVIConjunctionTerm *conjunction1 = 0;
-    QtIVIConjunctionTerm *conjunction2 = 0;
+    QIviConjunctionTerm *conjunction1 = 0;
+    QIviConjunctionTerm *conjunction2 = 0;
     int i = 0;
-    for (QtIVIAbstractQueryTerm *term : list) {
-        if (term->type() == QtIVIAbstractQueryTerm::ConjunctionTerm) {
-            QtIVIConjunctionTerm *conj = static_cast<QtIVIConjunctionTerm*>(term);
+    for (QIviAbstractQueryTerm *term : list) {
+        if (term->type() == QIviAbstractQueryTerm::ConjunctionTerm) {
+            QIviConjunctionTerm *conj = static_cast<QIviConjunctionTerm*>(term);
             if (conj->conjunction() == m_conjunctionStack.top()) {
                 if (i == 0)
                     conjunction1 = conj;
@@ -282,7 +282,7 @@ void QtIVIQueryParser::handleConjunction(bool bangOperator)
     if (bangOperator)
         negateLeftMostTerm(list.at(1));
 
-    QtIVIConjunctionTerm::Conjunction conjunction = m_conjunctionStack.pop();
+    QIviConjunctionTerm::Conjunction conjunction = m_conjunctionStack.pop();
     //Both are conjunctions, we can sum it together into one.
     if (conjunction1 && conjunction2) {
         conjunction1->d_func()->m_terms += conjunction2->d_func()->m_terms;
@@ -296,26 +296,26 @@ void QtIVIQueryParser::handleConjunction(bool bangOperator)
         conjunction2->d_func()->m_terms.prepend(list.at(0));
         m_termStack.push(conjunction2);
     } else {
-        QtIVIConjunctionTerm *term = new QtIVIConjunctionTerm();
+        QIviConjunctionTerm *term = new QIviConjunctionTerm();
         term->d_func()->m_conjunction = conjunction;
         term->d_func()->m_terms = list;
         m_termStack.push(term);
     }
 }
 
-void QtIVIQueryParser::handleScope(bool bangOperator)
+void QIviQueryParser::handleScope(bool bangOperator)
 {
-    QtIVIAbstractQueryTerm *term = m_termStack.pop();
+    QIviAbstractQueryTerm *term = m_termStack.pop();
 
     if (bangOperator)
         negateLeftMostTerm(term);
 
-    QtIVIScopeTerm *scopeTerm = new QtIVIScopeTerm();
+    QIviScopeTerm *scopeTerm = new QIviScopeTerm();
     scopeTerm->d_func()->m_term = term;
     m_termStack.push(scopeTerm);
 }
 
-bool QtIVIQueryParser::checkIdentifier(const QString &identifer)
+bool QIviQueryParser::checkIdentifier(const QString &identifer)
 {
     if (!m_identifierList.isEmpty() && !m_identifierList.contains(identifer)) {
         QString errorMessage = QString(QLatin1String("Got %1 but expected on of the following identifiers:\n")).arg(identifer);
@@ -332,7 +332,7 @@ bool QtIVIQueryParser::checkIdentifier(const QString &identifer)
     return true;
 }
 
-QtIVIAbstractQueryTerm *QtIVIQueryParser::parse()
+QIviAbstractQueryTerm *QIviQueryParser::parse()
 {
     const int INITIAL_STATE = 0;
 
@@ -411,7 +411,7 @@ order_clauses ::= order_clause order_clauses;
 order_clause ::= ASCENDING IDENTIFIER;
 /.
               case $rule_number: {
-                    QtIVIOrderTerm order;
+                    QIviOrderTerm order;
                     order.d_func()->m_ascending = true;
                     order.d_func()->m_propertyName = sym(2).toString();
                     m_orderList.append(order);
@@ -420,7 +420,7 @@ order_clause ::= ASCENDING IDENTIFIER;
 order_clause ::= DESCENDING IDENTIFIER;
 /.
               case $rule_number: {
-                    QtIVIOrderTerm order;
+                    QIviOrderTerm order;
                     order.d_func()->m_ascending = false;
                     order.d_func()->m_propertyName = sym(2).toString();
                     m_orderList.append(order);
@@ -430,7 +430,7 @@ order_clause ::= DESCENDING IDENTIFIER;
 bang_clause ::= BANG complex_clause ;
 /.
               case $rule_number: {
-                QtIVIAbstractQueryTerm *term = m_termStack.top();
+                QIviAbstractQueryTerm *term = m_termStack.top();
 
                 negateLeftMostTerm(term);
               } break;
@@ -468,25 +468,25 @@ parenthesed_clause ::= clause ;
 complex_operator ::= OR_OP ;
 /.
               case $rule_number: {
-                  m_conjunctionStack.push(QtIVIConjunctionTerm::Or);
+                  m_conjunctionStack.push(QIviConjunctionTerm::Or);
               } break;
 ./
 complex_operator ::= OR_OP2 ;
 /.
               case $rule_number: {
-                  m_conjunctionStack.push(QtIVIConjunctionTerm::Or);
+                  m_conjunctionStack.push(QIviConjunctionTerm::Or);
               } break;
 ./
 complex_operator ::= AND_OP ;
 /.
               case $rule_number: {
-                  m_conjunctionStack.push(QtIVIConjunctionTerm::And);
+                  m_conjunctionStack.push(QIviConjunctionTerm::And);
               } break;
 ./
 complex_operator ::= AND_OP2 ;
 /.
               case $rule_number: {
-                  m_conjunctionStack.push(QtIVIConjunctionTerm::And);
+                  m_conjunctionStack.push(QIviConjunctionTerm::And);
               } break;
 ./
 
@@ -495,7 +495,7 @@ clause ::= IDENTIFIER number_operator literal ;
               case $rule_number: {
                     if (!checkIdentifier(sym(1).toString()))
                         return 0;
-                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    QIviFilterTerm *term = new QIviFilterTerm();
                     term->d_func()->m_property = sym(1).toString();
                     term->d_func()->m_operator = m_operatorStack.pop();
                     term->d_func()->m_value = sym(3);
@@ -507,7 +507,7 @@ clause ::= IDENTIFIER string_operator STRING ;
               case $rule_number: {
                     if (!checkIdentifier(sym(1).toString()))
                         return 0;
-                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    QIviFilterTerm *term = new QIviFilterTerm();
                     term->d_func()->m_property = sym(1).toString();
                     term->d_func()->m_operator = m_operatorStack.pop();
                     term->d_func()->m_value = sym(3);
@@ -519,7 +519,7 @@ clause ::= STRING string_operator IDENTIFIER ;
               case $rule_number: {
                     if (!checkIdentifier(sym(3).toString()))
                         return 0;
-                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    QIviFilterTerm *term = new QIviFilterTerm();
                     term->d_func()->m_property = sym(3).toString();
                     term->d_func()->m_operator = m_operatorStack.pop();
                     term->d_func()->m_value = sym(1);
@@ -532,17 +532,17 @@ clause ::= literal number_operator IDENTIFIER ;
                     if (!checkIdentifier(sym(3).toString()))
                         return 0;
 
-                    QtIVIFilterTerm::Operator op = m_operatorStack.pop();
+                    QIviFilterTerm::Operator op = m_operatorStack.pop();
 
                     switch (op) {
-                        case QtIVIFilterTerm::GreaterEquals: op = QtIVIFilterTerm::LowerEquals; break;
-                        case QtIVIFilterTerm::GreaterThan: op = QtIVIFilterTerm::LowerThan; break;
-                        case QtIVIFilterTerm::LowerEquals: op = QtIVIFilterTerm::GreaterEquals; break;
-                        case QtIVIFilterTerm::LowerThan: op = QtIVIFilterTerm::GreaterThan; break;
+                        case QIviFilterTerm::GreaterEquals: op = QIviFilterTerm::LowerEquals; break;
+                        case QIviFilterTerm::GreaterThan: op = QIviFilterTerm::LowerThan; break;
+                        case QIviFilterTerm::LowerEquals: op = QIviFilterTerm::GreaterEquals; break;
+                        case QIviFilterTerm::LowerThan: op = QIviFilterTerm::GreaterThan; break;
                         default: qFatal("The Grammer was changed but not all logic was ported properly");
                     }
 
-                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    QIviFilterTerm *term = new QIviFilterTerm();
                     term->d_func()->m_property = sym(3).toString();
                     term->d_func()->m_operator = op;
                     term->d_func()->m_value = sym(1);
@@ -556,25 +556,25 @@ literal ::= FLOATCONSTANT ;
 number_operator ::= GE_OP ;
 /.
               case $rule_number: {
-                  m_operatorStack.push(QtIVIFilterTerm::GreaterEquals);
+                  m_operatorStack.push(QIviFilterTerm::GreaterEquals);
               } break;
 ./
 number_operator ::= GT_OP ;
 /.
               case $rule_number: {
-                  m_operatorStack.push(QtIVIFilterTerm::GreaterThan);
+                  m_operatorStack.push(QIviFilterTerm::GreaterThan);
               } break;
 ./
 number_operator ::= LE_OP ;
 /.
               case $rule_number: {
-                  m_operatorStack.push(QtIVIFilterTerm::LowerEquals);
+                  m_operatorStack.push(QIviFilterTerm::LowerEquals);
               } break;
 ./
 number_operator ::= LT_OP ;
 /.
               case $rule_number: {
-                  m_operatorStack.push(QtIVIFilterTerm::LowerThan);
+                  m_operatorStack.push(QIviFilterTerm::LowerThan);
               } break;
 ./
 number_operator ::= multi_operator ;
@@ -583,26 +583,26 @@ string_operator ::= multi_operator ;
 string_operator ::= IC_EQ_OP ;
 /.
               case $rule_number: {
-                  m_operatorStack.push(QtIVIFilterTerm::EqualsCaseInsensitive);
+                  m_operatorStack.push(QIviFilterTerm::EqualsCaseInsensitive);
               } break;
 ./
 
 multi_operator ::= EQ_OP ;
 /.
               case $rule_number: {
-                  m_operatorStack.push(QtIVIFilterTerm::Equals);
+                  m_operatorStack.push(QIviFilterTerm::Equals);
               } break;
 ./
 multi_operator ::= EQ_OP2 ;
 /.
               case $rule_number: {
-                  m_operatorStack.push(QtIVIFilterTerm::Equals);
+                  m_operatorStack.push(QIviFilterTerm::Equals);
               } break;
 ./
 multi_operator ::= NE_OP ;
 /.
               case $rule_number: {
-                  m_operatorStack.push(QtIVIFilterTerm::Unequals);
+                  m_operatorStack.push(QIviFilterTerm::Unequals);
               } break;
 ./
 
@@ -646,7 +646,7 @@ multi_operator ::= NE_OP ;
     return 0;
 }
 
-void QtIVIQueryParser::setErrorString(const QString &error)
+void QIviQueryParser::setErrorString(const QString &error)
 {
     int err_col = column - yyleng;
 
diff --git a/src/ivicore/queryparser/qtiviqueryparser.l b/src/ivicore/queryparser/qtiviqueryparser.l
index b5faa65..b364c2b 100644
--- a/src/ivicore/queryparser/qtiviqueryparser.l
+++ b/src/ivicore/queryparser/qtiviqueryparser.l
@@ -13,7 +13,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -72,7 +72,7 @@
 #endif  // #if __cplusplus > 199711L
 
 #define YY_NO_INPUT
-#define YY_DECL int QtIVIQueryParser::nextToken()
+#define YY_DECL int QIviQueryParser::nextToken()
 #define YY_USER_INIT initBuffer()
 #define YY_USER_ACTION calcCurrentColumn();
 extern void readQueryBuffer(char* buffer,unsigned int& numBytesRead,int maxBytesToRead);
diff --git a/src/ivicore/queryparser/qtiviqueryparser_flex_p.h b/src/ivicore/queryparser/qtiviqueryparser_flex_p.h
index 8a4690d..3eb0f55 100644
--- a/src/ivicore/queryparser/qtiviqueryparser_flex_p.h
+++ b/src/ivicore/queryparser/qtiviqueryparser_flex_p.h
@@ -4,7 +4,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -63,7 +63,7 @@
 #endif  // #if __cplusplus > 199711L
 
 #define YY_NO_INPUT
-#define YY_DECL int QtIVIQueryParser::nextToken()
+#define YY_DECL int QIviQueryParser::nextToken()
 #define YY_USER_INIT initBuffer()
 #define YY_USER_ACTION calcCurrentColumn();
 extern void readQueryBuffer(char* buffer,unsigned int& numBytesRead,int maxBytesToRead);
diff --git a/src/ivicore/queryparser/qtiviqueryparser_p.h b/src/ivicore/queryparser/qtiviqueryparser_p.h
index f9691e2..905e940 100644
--- a/src/ivicore/queryparser/qtiviqueryparser_p.h
+++ b/src/ivicore/queryparser/qtiviqueryparser_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -52,14 +52,14 @@
 // We mean it.
 //
 
-#ifndef QTIVIQUERYPARSER_P_H
-#define QTIVIQUERYPARSER_P_H
+#ifndef QIVIQUERYPARSER_P_H
+#define QIVIQUERYPARSER_P_H
 
 #if defined(ERROR)
 #  undef ERROR
 #endif
 
-class QtIVIQueryParserTable
+class QIviQueryParserTable
 {
 public:
   enum VariousConstants {
@@ -131,24 +131,24 @@ public:
 };
 
 
-const char *const QtIVIQueryParserTable::spell [] = {
+const char *const QIviQueryParserTable::spell [] = {
   "end of file", "&", "&&", "|", "||", "!", "==", "=", "~=", ">=", 
   ">", "<=", "<", "!=", "(", ")", "/", "\\", "[", "]", 
   "integer", "float", "identifier", "string", 0, 0};
 
-const short QtIVIQueryParserTable::lhs [] = {
+const short QIviQueryParserTable::lhs [] = {
   26, 26, 28, 29, 29, 30, 30, 27, 27, 31, 
   31, 31, 32, 32, 32, 33, 33, 33, 33, 34, 
   34, 34, 34, 36, 36, 35, 35, 35, 35, 35, 
   37, 37, 38, 38, 38, 39};
 
-const short QtIVIQueryParserTable::rhs [] = {
+const short QIviQueryParserTable::rhs [] = {
   2, 1, 3, 1, 2, 2, 2, 2, 1, 3, 
   4, 1, 4, 3, 1, 1, 1, 1, 1, 3, 
   3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 
   1, 1, 1, 1, 1, 2};
 
-const short QtIVIQueryParserTable::action_default [] = {
+const short QIviQueryParserTable::action_default [] = {
   0, 0, 25, 0, 24, 0, 0, 2, 15, 9, 
   0, 12, 0, 8, 33, 34, 26, 27, 32, 28, 
   29, 35, 30, 0, 0, 20, 21, 0, 0, 0, 
@@ -156,11 +156,11 @@ const short QtIVIQueryParserTable::action_default [] = {
   0, 6, 7, 5, 3, 30, 0, 23, 18, 19, 
   16, 17, 0, 0, 10, 11, 36};
 
-const short QtIVIQueryParserTable::goto_default [] = {
+const short QIviQueryParserTable::goto_default [] = {
   12, 7, 36, 40, 39, 9, 11, 52, 8, 23, 
   10, 24, 22, 0};
 
-const short QtIVIQueryParserTable::action_index [] = {
+const short QIviQueryParserTable::action_index [] = {
   33, 19, -26, 88, -26, 68, 13, -13, -26, -26, 
   56, 47, 22, -26, -26, -26, -26, -26, -26, -26, 
   -26, -26, -16, -5, -14, -26, -26, 9, -4, -9, 
@@ -175,7 +175,7 @@ const short QtIVIQueryParserTable::action_index [] = {
   -14, -14, -14, -14, -14, -14, -14, -14, -14, -14, 
   -14, -14, -2, -3, -14, -14, -14};
 
-const short QtIVIQueryParserTable::action_info [] = {
+const short QIviQueryParserTable::action_info [] = {
   47, 42, 41, 34, 44, 35, 30, -31, 0, 26, 
   0, 31, 0, 37, 38, 4, 2, 37, 38, 14, 
   15, 18, 56, 5, 0, 0, 21, 0, 5, 4, 
@@ -192,7 +192,7 @@ const short QtIVIQueryParserTable::action_info [] = {
   13, 29, 55, 54, 28, 33, 32, 0, 0, 43, 
   25, 46, 0, 0, 45, 0, 0, 0, 0, 0};
 
-const short QtIVIQueryParserTable::action_check [] = {
+const short QIviQueryParserTable::action_check [] = {
   22, 22, 22, 22, 19, 18, 15, 23, -1, 23, 
   -1, 15, -1, 16, 17, 20, 21, 16, 17, 6, 
   7, 8, 0, 14, -1, -1, 13, -1, 14, 20, 
@@ -212,8 +212,8 @@ const short QtIVIQueryParserTable::action_check [] = {
 
 
 #include <QtCore>
-#include <QtIVICore/QtIVIAbstractQueryTerm>
-#include <QtIVICore/private/qtiviqueryterm_p.h>
+#include <QtIviCore/QIviAbstractQueryTerm>
+#include <QtIviCore/private/qtiviqueryterm_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -242,7 +242,7 @@ void readQueryBuffer(char *buffer, unsigned int &numBytesRead,int maxBytesToRead
     *currentOffset += numBytesToRead;
 }
 
-class QtIVIQueryParser: protected QtIVIQueryParserTable
+class QIviQueryParser: protected QIviQueryParserTable
 {
 public:
     union Value {
@@ -252,10 +252,10 @@ public:
     };
 
 public:
-    QtIVIQueryParser();
-    virtual ~QtIVIQueryParser();
+    QIviQueryParser();
+    virtual ~QIviQueryParser();
 
-    QtIVIAbstractQueryTerm *parse();
+    QIviAbstractQueryTerm *parse();
 
     void setQuery(const QString& query)
     {
@@ -271,7 +271,7 @@ public:
         m_identifierList = list;
     }
 
-    QList<QtIVIOrderTerm> orderTerms() const
+    QList<QIviOrderTerm> orderTerms() const
     {
         return m_orderList;
     }
@@ -299,7 +299,7 @@ protected:
     void handleConjunction(bool bangOperator);
     void handleScope(bool bang);
 
-    void negateLeftMostTerm(QtIVIAbstractQueryTerm *term);
+    void negateLeftMostTerm(QIviAbstractQueryTerm *term);
 
     bool checkIdentifier(const QString &identifer);
 
@@ -315,13 +315,13 @@ protected:
     QVector<int> state_stack;
     QVariant yylval;
 
-    QStack<QtIVIAbstractQueryTerm*> m_termStack;
-    QStack<QtIVIFilterTerm::Operator> m_operatorStack;
-    QStack<QtIVIConjunctionTerm::Conjunction> m_conjunctionStack;
-    QList<QtIVIOrderTerm> m_orderList;
+    QStack<QIviAbstractQueryTerm*> m_termStack;
+    QStack<QIviFilterTerm::Operator> m_operatorStack;
+    QStack<QIviConjunctionTerm::Conjunction> m_conjunctionStack;
+    QList<QIviOrderTerm> m_orderList;
 };
 
-inline void QtIVIQueryParser::reallocateStack()
+inline void QIviQueryParser::reallocateStack()
 {
     int size = state_stack.size();
     if (size == 0)
@@ -335,7 +335,7 @@ inline void QtIVIQueryParser::reallocateStack()
 
 
 
-QtIVIQueryParser::QtIVIQueryParser():
+QIviQueryParser::QIviQueryParser():
     m_offset(0),
     column(0),
     tos(0)
@@ -345,7 +345,7 @@ QtIVIQueryParser::QtIVIQueryParser():
 
 #include "qtiviqueryparser_flex_p.h"
 
-QtIVIQueryParser::~QtIVIQueryParser()
+QIviQueryParser::~QIviQueryParser()
 {
     currentOffset = 0;
     currentQuery = 0;
@@ -357,21 +357,21 @@ QtIVIQueryParser::~QtIVIQueryParser()
     if (0)
         yyunput(0, 0);}
 
-void QtIVIQueryParser::calcCurrentColumn()
+void QIviQueryParser::calcCurrentColumn()
 {
     column += yyleng;
 }
 
-void QtIVIQueryParser::negateLeftMostTerm(QtIVIAbstractQueryTerm *term)
+void QIviQueryParser::negateLeftMostTerm(QIviAbstractQueryTerm *term)
 {
-    if (term->type() == QtIVIAbstractQueryTerm::ConjunctionTerm) {
-        QtIVIConjunctionTerm* conjunction = static_cast<QtIVIConjunctionTerm*>(term);
+    if (term->type() == QIviAbstractQueryTerm::ConjunctionTerm) {
+        QIviConjunctionTerm* conjunction = static_cast<QIviConjunctionTerm*>(term);
         negateLeftMostTerm(conjunction->terms().at(0));
-    } else if (term->type() == QtIVIAbstractQueryTerm::ScopeTerm) {
-        QtIVIScopeTerm* scopeTerm = static_cast<QtIVIScopeTerm*>(term);
+    } else if (term->type() == QIviAbstractQueryTerm::ScopeTerm) {
+        QIviScopeTerm* scopeTerm = static_cast<QIviScopeTerm*>(term);
         scopeTerm->d_func()->m_negated = true;
-    } else if (term->type() == QtIVIAbstractQueryTerm::FilterTerm) {
-        QtIVIFilterTerm* filterTerm = static_cast<QtIVIFilterTerm*>(term);
+    } else if (term->type() == QIviAbstractQueryTerm::FilterTerm) {
+        QIviFilterTerm* filterTerm = static_cast<QIviFilterTerm*>(term);
         filterTerm->d_func()->m_negated = true;
     } else {
         qCritical() << "New Term type added but not handled in" << Q_FUNC_INFO;
@@ -380,18 +380,18 @@ void QtIVIQueryParser::negateLeftMostTerm(QtIVIAbstractQueryTerm *term)
     return;
 }
 
-void QtIVIQueryParser::handleConjunction(bool bangOperator)
+void QIviQueryParser::handleConjunction(bool bangOperator)
 {
-    QList<QtIVIAbstractQueryTerm*> list;
+    QList<QIviAbstractQueryTerm*> list;
     list.prepend(m_termStack.pop());
     list.prepend(m_termStack.pop());
 
-    QtIVIConjunctionTerm *conjunction1 = 0;
-    QtIVIConjunctionTerm *conjunction2 = 0;
+    QIviConjunctionTerm *conjunction1 = 0;
+    QIviConjunctionTerm *conjunction2 = 0;
     int i = 0;
-    for (QtIVIAbstractQueryTerm *term : list) {
-        if (term->type() == QtIVIAbstractQueryTerm::ConjunctionTerm) {
-            QtIVIConjunctionTerm *conj = static_cast<QtIVIConjunctionTerm*>(term);
+    for (QIviAbstractQueryTerm *term : list) {
+        if (term->type() == QIviAbstractQueryTerm::ConjunctionTerm) {
+            QIviConjunctionTerm *conj = static_cast<QIviConjunctionTerm*>(term);
             if (conj->conjunction() == m_conjunctionStack.top()) {
                 if (i == 0)
                     conjunction1 = conj;
@@ -406,7 +406,7 @@ void QtIVIQueryParser::handleConjunction(bool bangOperator)
     if (bangOperator)
         negateLeftMostTerm(list.at(1));
 
-    QtIVIConjunctionTerm::Conjunction conjunction = m_conjunctionStack.pop();
+    QIviConjunctionTerm::Conjunction conjunction = m_conjunctionStack.pop();
     //Both are conjunctions, we can sum it together into one.
     if (conjunction1 && conjunction2) {
         conjunction1->d_func()->m_terms += conjunction2->d_func()->m_terms;
@@ -420,26 +420,26 @@ void QtIVIQueryParser::handleConjunction(bool bangOperator)
         conjunction2->d_func()->m_terms.prepend(list.at(0));
         m_termStack.push(conjunction2);
     } else {
-        QtIVIConjunctionTerm *term = new QtIVIConjunctionTerm();
+        QIviConjunctionTerm *term = new QIviConjunctionTerm();
         term->d_func()->m_conjunction = conjunction;
         term->d_func()->m_terms = list;
         m_termStack.push(term);
     }
 }
 
-void QtIVIQueryParser::handleScope(bool bangOperator)
+void QIviQueryParser::handleScope(bool bangOperator)
 {
-    QtIVIAbstractQueryTerm *term = m_termStack.pop();
+    QIviAbstractQueryTerm *term = m_termStack.pop();
 
     if (bangOperator)
         negateLeftMostTerm(term);
 
-    QtIVIScopeTerm *scopeTerm = new QtIVIScopeTerm();
+    QIviScopeTerm *scopeTerm = new QIviScopeTerm();
     scopeTerm->d_func()->m_term = term;
     m_termStack.push(scopeTerm);
 }
 
-bool QtIVIQueryParser::checkIdentifier(const QString &identifer)
+bool QIviQueryParser::checkIdentifier(const QString &identifer)
 {
     if (!m_identifierList.isEmpty() && !m_identifierList.contains(identifer)) {
         QString errorMessage = QString(QLatin1String("Got %1 but expected on of the following identifiers:\n")).arg(identifer);
@@ -456,7 +456,7 @@ bool QtIVIQueryParser::checkIdentifier(const QString &identifer)
     return true;
 }
 
-QtIVIAbstractQueryTerm *QtIVIQueryParser::parse()
+QIviAbstractQueryTerm *QIviQueryParser::parse()
 {
     const int INITIAL_STATE = 0;
 
@@ -523,21 +523,21 @@ QtIVIAbstractQueryTerm *QtIVIQueryParser::parse()
             switch (r) {
 
               case 5: {
-                    QtIVIOrderTerm order;
+                    QIviOrderTerm order;
                     order.d_func()->m_ascending = true;
                     order.d_func()->m_propertyName = sym(2).toString();
                     m_orderList.append(order);
               } break;
 
               case 6: {
-                    QtIVIOrderTerm order;
+                    QIviOrderTerm order;
                     order.d_func()->m_ascending = false;
                     order.d_func()->m_propertyName = sym(2).toString();
                     m_orderList.append(order);
               } break;
 
               case 7: {
-                QtIVIAbstractQueryTerm *term = m_termStack.top();
+                QIviAbstractQueryTerm *term = m_termStack.top();
 
                 negateLeftMostTerm(term);
               } break;
@@ -559,25 +559,25 @@ QtIVIAbstractQueryTerm *QtIVIQueryParser::parse()
               } break;
 
               case 15: {
-                  m_conjunctionStack.push(QtIVIConjunctionTerm::Or);
+                  m_conjunctionStack.push(QIviConjunctionTerm::Or);
               } break;
 
               case 16: {
-                  m_conjunctionStack.push(QtIVIConjunctionTerm::Or);
+                  m_conjunctionStack.push(QIviConjunctionTerm::Or);
               } break;
 
               case 17: {
-                  m_conjunctionStack.push(QtIVIConjunctionTerm::And);
+                  m_conjunctionStack.push(QIviConjunctionTerm::And);
               } break;
 
               case 18: {
-                  m_conjunctionStack.push(QtIVIConjunctionTerm::And);
+                  m_conjunctionStack.push(QIviConjunctionTerm::And);
               } break;
 
               case 19: {
                     if (!checkIdentifier(sym(1).toString()))
                         return 0;
-                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    QIviFilterTerm *term = new QIviFilterTerm();
                     term->d_func()->m_property = sym(1).toString();
                     term->d_func()->m_operator = m_operatorStack.pop();
                     term->d_func()->m_value = sym(3);
@@ -587,7 +587,7 @@ QtIVIAbstractQueryTerm *QtIVIQueryParser::parse()
               case 20: {
                     if (!checkIdentifier(sym(1).toString()))
                         return 0;
-                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    QIviFilterTerm *term = new QIviFilterTerm();
                     term->d_func()->m_property = sym(1).toString();
                     term->d_func()->m_operator = m_operatorStack.pop();
                     term->d_func()->m_value = sym(3);
@@ -597,7 +597,7 @@ QtIVIAbstractQueryTerm *QtIVIQueryParser::parse()
               case 21: {
                     if (!checkIdentifier(sym(3).toString()))
                         return 0;
-                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    QIviFilterTerm *term = new QIviFilterTerm();
                     term->d_func()->m_property = sym(3).toString();
                     term->d_func()->m_operator = m_operatorStack.pop();
                     term->d_func()->m_value = sym(1);
@@ -608,17 +608,17 @@ QtIVIAbstractQueryTerm *QtIVIQueryParser::parse()
                     if (!checkIdentifier(sym(3).toString()))
                         return 0;
 
-                    QtIVIFilterTerm::Operator op = m_operatorStack.pop();
+                    QIviFilterTerm::Operator op = m_operatorStack.pop();
 
                     switch (op) {
-                        case QtIVIFilterTerm::GreaterEquals: op = QtIVIFilterTerm::LowerEquals; break;
-                        case QtIVIFilterTerm::GreaterThan: op = QtIVIFilterTerm::LowerThan; break;
-                        case QtIVIFilterTerm::LowerEquals: op = QtIVIFilterTerm::GreaterEquals; break;
-                        case QtIVIFilterTerm::LowerThan: op = QtIVIFilterTerm::GreaterThan; break;
+                        case QIviFilterTerm::GreaterEquals: op = QIviFilterTerm::LowerEquals; break;
+                        case QIviFilterTerm::GreaterThan: op = QIviFilterTerm::LowerThan; break;
+                        case QIviFilterTerm::LowerEquals: op = QIviFilterTerm::GreaterEquals; break;
+                        case QIviFilterTerm::LowerThan: op = QIviFilterTerm::GreaterThan; break;
                         default: qFatal("The Grammer was changed but not all logic was ported properly");
                     }
 
-                    QtIVIFilterTerm *term = new QtIVIFilterTerm();
+                    QIviFilterTerm *term = new QIviFilterTerm();
                     term->d_func()->m_property = sym(3).toString();
                     term->d_func()->m_operator = op;
                     term->d_func()->m_value = sym(1);
@@ -626,35 +626,35 @@ QtIVIAbstractQueryTerm *QtIVIQueryParser::parse()
               } break;
 
               case 25: {
-                  m_operatorStack.push(QtIVIFilterTerm::GreaterEquals);
+                  m_operatorStack.push(QIviFilterTerm::GreaterEquals);
               } break;
 
               case 26: {
-                  m_operatorStack.push(QtIVIFilterTerm::GreaterThan);
+                  m_operatorStack.push(QIviFilterTerm::GreaterThan);
               } break;
 
               case 27: {
-                  m_operatorStack.push(QtIVIFilterTerm::LowerEquals);
+                  m_operatorStack.push(QIviFilterTerm::LowerEquals);
               } break;
 
               case 28: {
-                  m_operatorStack.push(QtIVIFilterTerm::LowerThan);
+                  m_operatorStack.push(QIviFilterTerm::LowerThan);
               } break;
 
               case 31: {
-                  m_operatorStack.push(QtIVIFilterTerm::EqualsCaseInsensitive);
+                  m_operatorStack.push(QIviFilterTerm::EqualsCaseInsensitive);
               } break;
 
               case 32: {
-                  m_operatorStack.push(QtIVIFilterTerm::Equals);
+                  m_operatorStack.push(QIviFilterTerm::Equals);
               } break;
 
               case 33: {
-                  m_operatorStack.push(QtIVIFilterTerm::Equals);
+                  m_operatorStack.push(QIviFilterTerm::Equals);
               } break;
 
               case 34: {
-                  m_operatorStack.push(QtIVIFilterTerm::Unequals);
+                  m_operatorStack.push(QIviFilterTerm::Unequals);
               } break;
 
             } // switch
@@ -696,7 +696,7 @@ QtIVIAbstractQueryTerm *QtIVIQueryParser::parse()
     return 0;
 }
 
-void QtIVIQueryParser::setErrorString(const QString &error)
+void QIviQueryParser::setErrorString(const QString &error)
 {
     int err_col = column - yyleng;
 
@@ -717,5 +717,5 @@ void QtIVIQueryParser::setErrorString(const QString &error)
 QT_END_NAMESPACE
 
 
-#endif // QTIVIQUERYPARSER_P_H
+#endif // QIVIQUERYPARSER_P_H
 
diff --git a/src/ivicore/queryparser/qtiviqueryterm.cpp b/src/ivicore/queryparser/qtiviqueryterm.cpp
index 2022ae1..15f1fd8 100644
--- a/src/ivicore/queryparser/qtiviqueryterm.cpp
+++ b/src/ivicore/queryparser/qtiviqueryterm.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -42,72 +42,72 @@
 #include "qtiviqueryterm.h"
 #include "qtiviqueryterm_p.h"
 
-QtIVIConjunctionTermPrivate::QtIVIConjunctionTermPrivate()
-    : m_conjunction(QtIVIConjunctionTerm::And)
+QIviConjunctionTermPrivate::QIviConjunctionTermPrivate()
+    : m_conjunction(QIviConjunctionTerm::And)
 {
 }
 
-QtIVIScopeTermPrivate::QtIVIScopeTermPrivate()
+QIviScopeTermPrivate::QIviScopeTermPrivate()
     : m_term(nullptr)
     , m_negated(false)
 {
 }
 
-QtIVIFilterTermPrivate::QtIVIFilterTermPrivate()
+QIviFilterTermPrivate::QIviFilterTermPrivate()
     : m_negated(false)
 {
 }
 
-QString QtIVIFilterTermPrivate::operatorToString() const
+QString QIviFilterTermPrivate::operatorToString() const
 {
     switch (m_operator){
-    case QtIVIFilterTerm::Equals: return QLatin1String("=");
-    case QtIVIFilterTerm::EqualsCaseInsensitive: return QLatin1String("~=");
-    case QtIVIFilterTerm::Unequals: return QLatin1String("!=");
-    case QtIVIFilterTerm::GreaterThan: return QLatin1String(">");
-    case QtIVIFilterTerm::GreaterEquals: return QLatin1String(">=");
-    case QtIVIFilterTerm::LowerThan: return QLatin1String("<");
-    case QtIVIFilterTerm::LowerEquals: return QLatin1String("<=");
+    case QIviFilterTerm::Equals: return QLatin1String("=");
+    case QIviFilterTerm::EqualsCaseInsensitive: return QLatin1String("~=");
+    case QIviFilterTerm::Unequals: return QLatin1String("!=");
+    case QIviFilterTerm::GreaterThan: return QLatin1String(">");
+    case QIviFilterTerm::GreaterEquals: return QLatin1String(">=");
+    case QIviFilterTerm::LowerThan: return QLatin1String("<");
+    case QIviFilterTerm::LowerEquals: return QLatin1String("<=");
     }
 
     return QLatin1String("unknown type");
 }
 
-QtIVIOrderTermPrivate::QtIVIOrderTermPrivate()
+QIviOrderTermPrivate::QIviOrderTermPrivate()
     : m_ascending(false)
 {
 }
 
-QtIVIAbstractQueryTerm::~QtIVIAbstractQueryTerm()
+QIviAbstractQueryTerm::~QIviAbstractQueryTerm()
 {
 }
 
-QtIVIConjunctionTerm::QtIVIConjunctionTerm()
-    : d_ptr(new QtIVIConjunctionTermPrivate)
+QIviConjunctionTerm::QIviConjunctionTerm()
+    : d_ptr(new QIviConjunctionTermPrivate)
 {
 }
 
-QtIVIConjunctionTerm::~QtIVIConjunctionTerm()
+QIviConjunctionTerm::~QIviConjunctionTerm()
 {
-    Q_D(QtIVIConjunctionTerm);
+    Q_D(QIviConjunctionTerm);
     qDeleteAll(d->m_terms);
     delete d_ptr;
 }
 
-QtIVIAbstractQueryTerm::Type QtIVIConjunctionTerm::type() const
+QIviAbstractQueryTerm::Type QIviConjunctionTerm::type() const
 {
-    return QtIVIAbstractQueryTerm::ConjunctionTerm;
+    return QIviAbstractQueryTerm::ConjunctionTerm;
 }
 
-QString QtIVIConjunctionTerm::toString() const
+QString QIviConjunctionTerm::toString() const
 {
-    Q_D(const QtIVIConjunctionTerm);
+    Q_D(const QIviConjunctionTerm);
     QString conjunction = QLatin1String("&");
     if (d->m_conjunction == Or)
         conjunction = QLatin1String("|");
 
     QString string;
-    QListIterator<QtIVIAbstractQueryTerm*> it(d->m_terms);
+    QListIterator<QIviAbstractQueryTerm*> it(d->m_terms);
     while (it.hasNext()) {
         string += it.next()->toString();
         if (it.hasNext())
@@ -117,38 +117,38 @@ QString QtIVIConjunctionTerm::toString() const
     return string;
 }
 
-QtIVIConjunctionTerm::Conjunction QtIVIConjunctionTerm::conjunction() const
+QIviConjunctionTerm::Conjunction QIviConjunctionTerm::conjunction() const
 {
-    Q_D(const QtIVIConjunctionTerm);
+    Q_D(const QIviConjunctionTerm);
     return d->m_conjunction;
 }
 
-QList<QtIVIAbstractQueryTerm *> QtIVIConjunctionTerm::terms() const
+QList<QIviAbstractQueryTerm *> QIviConjunctionTerm::terms() const
 {
-    Q_D(const QtIVIConjunctionTerm);
+    Q_D(const QIviConjunctionTerm);
     return d->m_terms;
 }
 
-QtIVIScopeTerm::QtIVIScopeTerm()
-    : d_ptr(new QtIVIScopeTermPrivate)
+QIviScopeTerm::QIviScopeTerm()
+    : d_ptr(new QIviScopeTermPrivate)
 {
 }
 
-QtIVIScopeTerm::~QtIVIScopeTerm()
+QIviScopeTerm::~QIviScopeTerm()
 {
-    Q_D(QtIVIScopeTerm);
+    Q_D(QIviScopeTerm);
     delete d->m_term;
     delete d_ptr;
 }
 
-QtIVIAbstractQueryTerm::Type QtIVIScopeTerm::type() const
+QIviAbstractQueryTerm::Type QIviScopeTerm::type() const
 {
-    return QtIVIAbstractQueryTerm::ScopeTerm;
+    return QIviAbstractQueryTerm::ScopeTerm;
 }
 
-QString QtIVIScopeTerm::toString() const
+QString QIviScopeTerm::toString() const
 {
-    Q_D(const QtIVIScopeTerm);
+    Q_D(const QIviScopeTerm);
     QString string = QLatin1Literal("(") + d->m_term->toString() + QLatin1Literal(")");
     if (d->m_negated)
         string.prepend(QLatin1String("!"));
@@ -156,36 +156,36 @@ QString QtIVIScopeTerm::toString() const
     return string;
 }
 
-bool QtIVIScopeTerm::isNegated() const
+bool QIviScopeTerm::isNegated() const
 {
-    Q_D(const QtIVIScopeTerm);
+    Q_D(const QIviScopeTerm);
     return d->m_negated;
 }
 
-QtIVIAbstractQueryTerm *QtIVIScopeTerm::term() const
+QIviAbstractQueryTerm *QIviScopeTerm::term() const
 {
-    Q_D(const QtIVIScopeTerm);
+    Q_D(const QIviScopeTerm);
     return d->m_term;
 }
 
-QtIVIFilterTerm::QtIVIFilterTerm()
-    : d_ptr(new QtIVIFilterTermPrivate)
+QIviFilterTerm::QIviFilterTerm()
+    : d_ptr(new QIviFilterTermPrivate)
 {
 }
 
-QtIVIFilterTerm::~QtIVIFilterTerm()
+QIviFilterTerm::~QIviFilterTerm()
 {
     delete d_ptr;
 }
 
-QtIVIAbstractQueryTerm::Type QtIVIFilterTerm::type() const
+QIviAbstractQueryTerm::Type QIviFilterTerm::type() const
 {
-    return QtIVIAbstractQueryTerm::FilterTerm;
+    return QIviAbstractQueryTerm::FilterTerm;
 }
 
-QString QtIVIFilterTerm::toString() const
+QString QIviFilterTerm::toString() const
 {
-    Q_D(const QtIVIFilterTerm);
+    Q_D(const QIviFilterTerm);
     QString string;
 
     string = d->m_property + d->operatorToString() + d->m_value.toString();
@@ -196,48 +196,48 @@ QString QtIVIFilterTerm::toString() const
     return string;
 }
 
-QtIVIFilterTerm::Operator QtIVIFilterTerm::operatorType() const
+QIviFilterTerm::Operator QIviFilterTerm::operatorType() const
 {
-    Q_D(const QtIVIFilterTerm);
+    Q_D(const QIviFilterTerm);
     return d->m_operator;
 }
 
-QVariant QtIVIFilterTerm::value() const
+QVariant QIviFilterTerm::value() const
 {
-    Q_D(const QtIVIFilterTerm);
+    Q_D(const QIviFilterTerm);
     return d->m_value;
 }
 
-QString QtIVIFilterTerm::propertyName() const
+QString QIviFilterTerm::propertyName() const
 {
-    Q_D(const QtIVIFilterTerm);
+    Q_D(const QIviFilterTerm);
     return d->m_property;
 }
 
-bool QtIVIFilterTerm::isNegated() const
+bool QIviFilterTerm::isNegated() const
 {
-    Q_D(const QtIVIFilterTerm);
+    Q_D(const QIviFilterTerm);
     return d->m_negated;
 }
 
-QtIVIOrderTerm::QtIVIOrderTerm()
-    : d_ptr(new QtIVIOrderTermPrivate)
+QIviOrderTerm::QIviOrderTerm()
+    : d_ptr(new QIviOrderTermPrivate)
 {
 }
 
-QtIVIOrderTerm::~QtIVIOrderTerm()
+QIviOrderTerm::~QIviOrderTerm()
 {
     delete d_ptr;
 }
 
-bool QtIVIOrderTerm::isAscending() const
+bool QIviOrderTerm::isAscending() const
 {
-    Q_D(const QtIVIOrderTerm);
+    Q_D(const QIviOrderTerm);
     return d->m_ascending;
 }
 
-QString QtIVIOrderTerm::propertyName() const
+QString QIviOrderTerm::propertyName() const
 {
-    Q_D(const QtIVIOrderTerm);
+    Q_D(const QIviOrderTerm);
     return d->m_propertyName;
 }
diff --git a/src/ivicore/queryparser/qtiviqueryterm.h b/src/ivicore/queryparser/qtiviqueryterm.h
index 49e67f4..8aa9499 100644
--- a/src/ivicore/queryparser/qtiviqueryterm.h
+++ b/src/ivicore/queryparser/qtiviqueryterm.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -45,11 +45,11 @@
 #include <QObject>
 #include <QVariant>
 
-#include <QtIVICore/qtiviglobal.h>
+#include <QtIviCore/qtiviglobal.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QTIVICORE_EXPORT QtIVIAbstractQueryTerm
+class Q_QTIVICORE_EXPORT QIviAbstractQueryTerm
 {
 public:
     enum Type {
@@ -58,14 +58,14 @@ public:
         ScopeTerm
     };
 
-    virtual ~QtIVIAbstractQueryTerm();
+    virtual ~QIviAbstractQueryTerm();
 
     virtual QString toString() const = 0;
-    virtual QtIVIAbstractQueryTerm::Type type() const = 0;
+    virtual QIviAbstractQueryTerm::Type type() const = 0;
 };
 
-class QtIVIConjunctionTermPrivate;
-class Q_QTIVICORE_EXPORT QtIVIConjunctionTerm : public QtIVIAbstractQueryTerm
+class QIviConjunctionTermPrivate;
+class Q_QTIVICORE_EXPORT QIviConjunctionTerm : public QIviAbstractQueryTerm
 {
 public:
     enum Conjunction {
@@ -73,41 +73,41 @@ public:
         Or
     };
 
-    QtIVIConjunctionTerm();
-    virtual ~QtIVIConjunctionTerm();
+    QIviConjunctionTerm();
+    virtual ~QIviConjunctionTerm();
 
-    QtIVIAbstractQueryTerm::Type type() const;
+    QIviAbstractQueryTerm::Type type() const;
     QString toString() const;
     Conjunction conjunction() const;
-    QList<QtIVIAbstractQueryTerm*> terms() const;
+    QList<QIviAbstractQueryTerm*> terms() const;
 
 private:
-    QtIVIConjunctionTermPrivate * d_ptr;
-    Q_DECLARE_PRIVATE(QtIVIConjunctionTerm)
-    friend class QtIVIQueryParser;
+    QIviConjunctionTermPrivate * d_ptr;
+    Q_DECLARE_PRIVATE(QIviConjunctionTerm)
+    friend class QIviQueryParser;
 };
 
-class QtIVIScopeTermPrivate;
-class Q_QTIVICORE_EXPORT QtIVIScopeTerm : public QtIVIAbstractQueryTerm
+class QIviScopeTermPrivate;
+class Q_QTIVICORE_EXPORT QIviScopeTerm : public QIviAbstractQueryTerm
 {
 public:
 
-    explicit QtIVIScopeTerm();
-    virtual ~QtIVIScopeTerm();
+    explicit QIviScopeTerm();
+    virtual ~QIviScopeTerm();
 
-    QtIVIAbstractQueryTerm::Type type() const;
+    QIviAbstractQueryTerm::Type type() const;
     QString toString() const;
     bool isNegated() const;
-    QtIVIAbstractQueryTerm* term() const;
+    QIviAbstractQueryTerm* term() const;
 
 private:
-    QtIVIScopeTermPrivate * d_ptr;
-    Q_DECLARE_PRIVATE(QtIVIScopeTerm)
-    friend class QtIVIQueryParser;
+    QIviScopeTermPrivate * d_ptr;
+    Q_DECLARE_PRIVATE(QIviScopeTerm)
+    friend class QIviQueryParser;
 };
 
-class QtIVIFilterTermPrivate;
-class Q_QTIVICORE_EXPORT QtIVIFilterTerm : public QtIVIAbstractQueryTerm
+class QIviFilterTermPrivate;
+class Q_QTIVICORE_EXPORT QIviFilterTerm : public QIviAbstractQueryTerm
 {
 public:
     enum Operator {
@@ -120,10 +120,10 @@ public:
         LowerEquals
     };
 
-    explicit QtIVIFilterTerm();
-    virtual ~QtIVIFilterTerm();
+    explicit QIviFilterTerm();
+    virtual ~QIviFilterTerm();
 
-    QtIVIAbstractQueryTerm::Type type() const;
+    QIviAbstractQueryTerm::Type type() const;
     QString toString() const;
     Operator operatorType() const;
     QVariant value() const;
@@ -131,25 +131,25 @@ public:
     bool isNegated() const;
 
 private:
-    QtIVIFilterTermPrivate * d_ptr;
-    Q_DECLARE_PRIVATE(QtIVIFilterTerm)
-    friend class QtIVIQueryParser;
+    QIviFilterTermPrivate * d_ptr;
+    Q_DECLARE_PRIVATE(QIviFilterTerm)
+    friend class QIviQueryParser;
 };
 
-class QtIVIOrderTermPrivate;
-class Q_QTIVICORE_EXPORT QtIVIOrderTerm
+class QIviOrderTermPrivate;
+class Q_QTIVICORE_EXPORT QIviOrderTerm
 {
 public:
-    QtIVIOrderTerm();
-    virtual ~QtIVIOrderTerm();
+    QIviOrderTerm();
+    virtual ~QIviOrderTerm();
 
     bool isAscending() const;
     QString propertyName() const;
 
 private:
-    QtIVIOrderTermPrivate * d_ptr;
-    Q_DECLARE_PRIVATE(QtIVIOrderTerm)
-    friend class QtIVIQueryParser;
+    QIviOrderTermPrivate * d_ptr;
+    Q_DECLARE_PRIVATE(QIviOrderTerm)
+    friend class QIviQueryParser;
 };
 
 QT_END_NAMESPACE
diff --git a/src/ivicore/queryparser/qtiviqueryterm_p.h b/src/ivicore/queryparser/qtiviqueryterm_p.h
index ab3e4f8..b7744a5 100644
--- a/src/ivicore/queryparser/qtiviqueryterm_p.h
+++ b/src/ivicore/queryparser/qtiviqueryterm_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIQUERYTERM_P_H
-#define QTIVIQUERYTERM_P_H
+#ifndef QIVIQUERYTERM_P_H
+#define QIVIQUERYTERM_P_H
 
 //
 //  W A R N I N G
@@ -57,41 +57,41 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QTIVICORE_EXPORT QtIVIConjunctionTermPrivate
+class Q_QTIVICORE_EXPORT QIviConjunctionTermPrivate
 {
 public:
-    QtIVIConjunctionTermPrivate();
+    QIviConjunctionTermPrivate();
 
-    QList<QtIVIAbstractQueryTerm*> m_terms;
-    QtIVIConjunctionTerm::Conjunction m_conjunction;
+    QList<QIviAbstractQueryTerm*> m_terms;
+    QIviConjunctionTerm::Conjunction m_conjunction;
 };
 
-class Q_QTIVICORE_EXPORT QtIVIScopeTermPrivate
+class Q_QTIVICORE_EXPORT QIviScopeTermPrivate
 {
 public:
-    QtIVIScopeTermPrivate();
+    QIviScopeTermPrivate();
 
-    QtIVIAbstractQueryTerm* m_term;
+    QIviAbstractQueryTerm* m_term;
     bool m_negated;
 };
 
-class Q_QTIVICORE_EXPORT QtIVIFilterTermPrivate
+class Q_QTIVICORE_EXPORT QIviFilterTermPrivate
 {
 public:
-    QtIVIFilterTermPrivate();
+    QIviFilterTermPrivate();
 
     QString operatorToString() const;
 
     QString m_property;
-    QtIVIFilterTerm::Operator m_operator;
+    QIviFilterTerm::Operator m_operator;
     QVariant m_value;
     bool m_negated;
 };
 
-class Q_QTIVICORE_EXPORT QtIVIOrderTermPrivate
+class Q_QTIVICORE_EXPORT QIviOrderTermPrivate
 {
 public:
-    QtIVIOrderTermPrivate();
+    QIviOrderTermPrivate();
 
     bool m_ascending;
     QString m_propertyName;
@@ -99,4 +99,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QTIVIQUERYTERM_P_H
+#endif // QIVIQUERYTERM_P_H
diff --git a/src/ivivehiclefunctions/doc/snippets/doc_src_qmlivivehiclefunctions.cpp b/src/ivivehiclefunctions/doc/snippets/doc_src_qmlivivehiclefunctions.cpp
index 621355c..f18d9ca 100644
--- a/src/ivivehiclefunctions/doc/snippets/doc_src_qmlivivehiclefunctions.cpp
+++ b/src/ivivehiclefunctions/doc/snippets/doc_src_qmlivivehiclefunctions.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -40,5 +40,5 @@
 ****************************************************************************/
 
 //! [0]
-import QtIVIVehicleFunctions 1.0
+import QtIvi.VehicleFunctions 1.0
 //! [0]
diff --git a/src/ivivehiclefunctions/doc/snippets/doc_src_qtivivehiclefunctions.cpp b/src/ivivehiclefunctions/doc/snippets/doc_src_qtivivehiclefunctions.cpp
index 0c92274..1c53f1f 100644
--- a/src/ivivehiclefunctions/doc/snippets/doc_src_qtivivehiclefunctions.cpp
+++ b/src/ivivehiclefunctions/doc/snippets/doc_src_qtivivehiclefunctions.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -40,5 +40,5 @@
 ****************************************************************************/
 
 //! [0]
-#include <QtIVIVehicleFunctions>
+#include <QtIviVehicleFunctions>
 //! [0]
diff --git a/src/ivivehiclefunctions/doc/src/examples-climate_qml.qdoc b/src/ivivehiclefunctions/doc/src/examples-climate_qml.qdoc
index aa9a585..780eef0 100644
--- a/src/ivivehiclefunctions/doc/src/examples-climate_qml.qdoc
+++ b/src/ivivehiclefunctions/doc/src/examples-climate_qml.qdoc
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
@@ -62,7 +62,7 @@
 
      In the example, ClimateControl is created and autoDiscovery enabled.
      When autoDiscovery is enabled, the module starts searching for the presence
-     of a plugin that implements QtIVIClimateControlBackendInterface.
+     of a plugin that implements QIviClimateControlBackendInterface.
      \snippet climate_qml/main.qml 1
 
      If discovery fails, a message dialog is shown:
diff --git a/src/ivivehiclefunctions/doc/src/examples-climate_widget.qdoc b/src/ivivehiclefunctions/doc/src/examples-climate_widget.qdoc
index 509451e..26b62e4 100644
--- a/src/ivivehiclefunctions/doc/src/examples-climate_widget.qdoc
+++ b/src/ivivehiclefunctions/doc/src/examples-climate_widget.qdoc
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
@@ -60,13 +60,13 @@
 
      This example shows how to access the climate control from the C++.
 
-     The first thing to do is to create a QtIVIClimateControl instance in our
+     The first thing to do is to create a QIviClimateControl instance in our
      MainWindow constructor. As we only have one Climate backend and don't want
-     to choose which one to use, we call \l {QtIVIAbstractFeature::}{startAutoDiscovery()}
+     to choose which one to use, we call \l {QIviAbstractFeature::}{startAutoDiscovery()}
      to start searching for a suitable backend right away and pick the first one
      that matches.
 
-     \l {QtIVIClimateControl::}{isValid()} is used for verifying that the
+     \l {QIviClimateControl::}{isValid()} is used for verifying that the
      autoDiscovery found a backend:
      \snippet climate_widget/mainwindow.cpp 1
 
diff --git a/src/ivivehiclefunctions/doc/src/qtivivehiclefunctions.qdoc b/src/ivivehiclefunctions/doc/src/qtivivehiclefunctions.qdoc
index 4f28bbd..4d69846 100644
--- a/src/ivivehiclefunctions/doc/src/qtivivehiclefunctions.qdoc
+++ b/src/ivivehiclefunctions/doc/src/qtivivehiclefunctions.qdoc
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the documentation of the QtIVI module of the Qt Toolkit.
+** This file is part of the documentation of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL-QTAS$
 ** Commercial License Usage
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \module QtIVIVehicleFunctions
+    \module QtIviVehicleFunctions
     \title Qt IVI Vehicle Functions C++ Classes
     \ingroup modules
     \ingroup qtivi_modules
@@ -56,10 +56,10 @@
     the element:
 
    \code
-   #include <QtIVIVehicleFunctions/QtIVIClimateControl>
+   #include <QtIviVehicleFunctions/QIviClimateControl>
    ...
-   QtIVIClimateControl* m_climateControl;
-   m_climateControl = new QtIVIClimateControl(this);
+   QIviClimateControl* m_climateControl;
+   m_climateControl = new QIviClimateControl(this);
    \endcode
 
    In order to trigger the auto discovery mechanism, call the startAutoDiscovery method. This will
@@ -86,19 +86,19 @@
    \endcode
 
    Some features, like climate control, are divided into several climate zones. The names
-   of the available zones can be checked using QtIVIAbstractZonedFeature::availableZones():
+   of the available zones can be checked using QIviAbstractZonedFeature::availableZones():
 
    \code
    QStringList zones = m_climateControl->availableZones();
    \endcode
 
-   You can use QtIVIAbstractZonedFeature::zoneAt() to access zone functions:
+   You can use QIviAbstractZonedFeature::zoneAt() to access zone functions:
 
    \code
    m_climateControl->zoneAt("FrontSeat")->setSeatHeater(false);
    \endcode
 
-   Looping zones is done with QtIVIAbstractZonedFeature::zones():
+   Looping zones is done with QIviAbstractZonedFeature::zones():
 
    \code
     foreach (QClimateControl* z, m_climateControl->zones())
@@ -108,7 +108,7 @@
 */
 
 /*!
-    \qmlmodule QtIVIVehicleFunctions 1.0
+    \qmlmodule QtIvi.VehicleFunctions 1.0
     \title Qt IVI Vehicle Functions QML Types
     \ingroup qmlmodules
     \ingroup qtivi_qmlmodules
diff --git a/src/ivivehiclefunctions/ivivehiclefunctions.pro b/src/ivivehiclefunctions/ivivehiclefunctions.pro
index 6fe3262..dd0908a 100644
--- a/src/ivivehiclefunctions/ivivehiclefunctions.pro
+++ b/src/ivivehiclefunctions/ivivehiclefunctions.pro
@@ -1,4 +1,4 @@
-TARGET = QtIVIVehicleFunctions
+TARGET = QtIviVehicleFunctions
 QT = core core-private ivicore ivicore-private
 CONFIG += c++11
 VERSION = 1.0.0
diff --git a/src/ivivehiclefunctions/qtiviclimatecontrol.cpp b/src/ivivehiclefunctions/qtiviclimatecontrol.cpp
index 2f7ebf1..f3f5564 100644
--- a/src/ivivehiclefunctions/qtiviclimatecontrol.cpp
+++ b/src/ivivehiclefunctions/qtiviclimatecontrol.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -42,11 +42,11 @@
 #include "qtiviclimatecontrol.h"
 #include "qtiviclimatecontrol_p.h"
 #include "qtiviclimatecontrolbackendinterface.h"
-#include <QtIVICore/QtIVIServiceObject>
-#include <QtIVICore/QtIVIPropertyFactory>
+#include <QtIviCore/QIviServiceObject>
+#include <QtIviCore/QIviPropertyFactory>
 
-QtIVIClimateControlPrivate::QtIVIClimateControlPrivate(const QString &interface, const QString &zone, QtIVIClimateControl *parent)
-    : QtIVIAbstractZonedFeaturePrivate(interface, zone, parent)
+QIviClimateControlPrivate::QIviClimateControlPrivate(const QString &interface, const QString &zone, QIviClimateControl *parent)
+    : QIviAbstractZonedFeaturePrivate(interface, zone, parent)
     , m_airflowDirections(0)
     , m_airConditioning(false)
     , m_heater(false)
@@ -58,122 +58,122 @@ QtIVIClimateControlPrivate::QtIVIClimateControlPrivate(const QString &interface,
     , m_outsideTemperature(0)
     , m_zoneSynchronization(false)
     , m_defrost(false)
-    , m_recirculationMode(QtIVIClimateControl::RecirculationOff)
+    , m_recirculationMode(QIviClimateControl::RecirculationOff)
     , m_recirculation(false)
     , m_recirculationSensitivityLevel(-1)
-    , m_climateMode(QtIVIClimateControl::ClimateOff)
+    , m_climateMode(QIviClimateControl::ClimateOff)
     , m_automaticClimateFanIntensityLevel(0)
     , q_ptr(parent)
 {
 }
 
-void QtIVIClimateControlPrivate::init()
-{
-    Q_Q(QtIVIClimateControl);
-    m_airFlowDirectionProperty = QtIVIPropertyFactory<QtIVIClimateControl::AirflowDirections>::create(q,
-                                                                                                     &QtIVIClimateControl::airflowDirectionsAttribute,
-                                                                                                     &QtIVIClimateControl::airflowDirectionsAttributeChanged,
-                                                                                                     &QtIVIClimateControl::airflowDirections,
-                                                                                                     &QtIVIClimateControl::airflowDirectionsChanged,
-                                                                                                     &QtIVIClimateControl::setAirflowDirections);
-    m_airConditioningProperty = QtIVIPropertyFactory<bool>::create(q,
-                                                                   &QtIVIClimateControl::airConditioningAttribute,
-                                                                   &QtIVIClimateControl::airConditioningAttributeChanged,
-                                                                   &QtIVIClimateControl::isAirConditioningEnabled,
-                                                                   &QtIVIClimateControl::airConditioningEnabledChanged,
-                                                                   &QtIVIClimateControl::setAirConditioningEnabled);
-    m_heaterProperty = QtIVIPropertyFactory<bool>::create(q,
-                                                          &QtIVIClimateControl::heaterAttribute,
-                                                          &QtIVIClimateControl::heaterAttributeChanged,
-                                                          &QtIVIClimateControl::isHeaterEnabled,
-                                                          &QtIVIClimateControl::heaterEnabledChanged,
-                                                          &QtIVIClimateControl::setHeaterEnabled);
-    m_targetTemperatureProperty = QtIVIPropertyFactory<int>::create(q,
-                                                                    &QtIVIClimateControl::targetTemperatureAttribute,
-                                                                    &QtIVIClimateControl::targetTemperatureAttributeChanged,
-                                                                    &QtIVIClimateControl::targetTemperature,
-                                                                    &QtIVIClimateControl::targetTemperatureChanged,
-                                                                    &QtIVIClimateControl::setTargetTemperature);
-    m_seatCoolerProperty = QtIVIPropertyFactory<int>::create(q,
-                                                             &QtIVIClimateControl::seatCoolerAttribute,
-                                                             &QtIVIClimateControl::seatCoolerAttributeChanged,
-                                                             &QtIVIClimateControl::seatCooler,
-                                                             &QtIVIClimateControl::seatCoolerChanged,
-                                                             &QtIVIClimateControl::setSeatCooler);
-    m_seatHeaterProperty = QtIVIPropertyFactory<int>::create(q,
-                                                             &QtIVIClimateControl::seatHeaterAttribute,
-                                                             &QtIVIClimateControl::seatHeaterAttributeChanged,
-                                                             &QtIVIClimateControl::seatHeater,
-                                                             &QtIVIClimateControl::seatHeaterChanged,
-                                                             &QtIVIClimateControl::setSeatHeater);
-    m_steeringWheelHeaterProperty = QtIVIPropertyFactory<int>::create(q,
-                                                                      &QtIVIClimateControl::steeringWheelHeaterAttribute,
-                                                                      &QtIVIClimateControl::steeringWheelHeaterAttributeChanged,
-                                                                      &QtIVIClimateControl::steeringWheelHeater,
-                                                                      &QtIVIClimateControl::steeringWheelHeaterChanged,
-                                                                      &QtIVIClimateControl::setSteeringWheelHeater);
-    m_fanSpeedLevelProperty = QtIVIPropertyFactory<int>::create(q,
-                                                                &QtIVIClimateControl::fanSpeedLevelAttribute,
-                                                                &QtIVIClimateControl::fanSpeedLevelAttributeChanged,
-                                                                &QtIVIClimateControl::fanSpeedLevel,
-                                                                &QtIVIClimateControl::fanSpeedLevelChanged,
-                                                                &QtIVIClimateControl::setFanSpeedLevel);
-    m_outsideTemperatureProperty = QtIVIPropertyFactory<int>::create(q,
-                                                                     &QtIVIClimateControl::outsideTemperatureAttribute,
-                                                                     &QtIVIClimateControl::outsideTemperatureAttributeChanged,
-                                                                     &QtIVIClimateControl::outsideTemperature,
-                                                                     &QtIVIClimateControl::outsideTemperatureChanged);
-
-    m_zoneSynchronizationProperty = QtIVIPropertyFactory<bool>::create(q,
-                                                                       &QtIVIClimateControl::zoneSynchronizationAttribute,
-                                                                       &QtIVIClimateControl::zoneSynchronizationAttributeChanged,
-                                                                       &QtIVIClimateControl::isZoneSynchronizationEnabled,
-                                                                       &QtIVIClimateControl::zoneSynchronizationEnabledChanged,
-                                                                       &QtIVIClimateControl::setZoneSynchronizationEnabled);
-
-    m_defrostProperty = QtIVIPropertyFactory<bool>::create(q,
-                                                           &QtIVIClimateControl::defrostAttribute,
-                                                           &QtIVIClimateControl::defrostAttributeChanged,
-                                                           &QtIVIClimateControl::isDefrostEnabled,
-                                                           &QtIVIClimateControl::defrostEnabledChanged,
-                                                           &QtIVIClimateControl::setDefrostEnabled);
-
-    m_recirculationModeProperty = QtIVIPropertyFactory<QtIVIClimateControl::RecirculationMode>::create(q,
-                                                                                                       &QtIVIClimateControl::recirculationModeAttribute,
-                                                                                                       &QtIVIClimateControl::recirculationModeAttributeChanged,
-                                                                                                       &QtIVIClimateControl::recirculationMode,
-                                                                                                       &QtIVIClimateControl::recirculationModeChanged,
-                                                                                                       &QtIVIClimateControl::setRecirculationMode);
-
-    m_recirculationProperty = QtIVIPropertyFactory<bool>::create(q,
-                                                                 &QtIVIClimateControl::recirculationAttribute,
-                                                                 &QtIVIClimateControl::recirculationAttributeChanged,
-                                                                 &QtIVIClimateControl::isRecirculationEnabled,
-                                                                 &QtIVIClimateControl::recirculationEnabledChanged);
-
-    m_recirculationSensitivityLevelProperty = QtIVIPropertyFactory<int>::create(q,
-                                                                                &QtIVIClimateControl::recirculationSensitivityLevelAttribute,
-                                                                                &QtIVIClimateControl::recirculationSensitivityLevelAttributeChanged,
-                                                                                &QtIVIClimateControl::recirculationSensitivityLevel,
-                                                                                &QtIVIClimateControl::recirculationSensitivityLevelChanged,
-                                                                                &QtIVIClimateControl::setRecirculationSensitivityLevel);
-
-    m_climateModeProperty = QtIVIPropertyFactory<QtIVIClimateControl::ClimateMode>::create(q,
-                                                                                           &QtIVIClimateControl::climateModeAttribute,
-                                                                                           &QtIVIClimateControl::climateModeAttributeChanged,
-                                                                                           &QtIVIClimateControl::climateMode,
-                                                                                           &QtIVIClimateControl::climateModeChanged,
-                                                                                           &QtIVIClimateControl::setClimateMode);
-
-    m_automaticClimateFanIntensityLevelProperty = QtIVIPropertyFactory<int>::create(q,
-                                                                                    &QtIVIClimateControl::automaticClimateFanIntensityLevelAttribute,
-                                                                                    &QtIVIClimateControl::automaticClimateFanIntensityLevelAttributeChanged,
-                                                                                    &QtIVIClimateControl::automaticClimateFanIntensityLevel,
-                                                                                    &QtIVIClimateControl::automaticClimateFanIntensityLevelChanged,
-                                                                                    &QtIVIClimateControl::setAutomaticClimateFanIntensityLevel);
-}
-
-void QtIVIClimateControlPrivate::clearToDefaults()
+void QIviClimateControlPrivate::init()
+{
+    Q_Q(QIviClimateControl);
+    m_airFlowDirectionProperty = QIviPropertyFactory<QIviClimateControl::AirflowDirections>::create(q,
+                                                                                                     &QIviClimateControl::airflowDirectionsAttribute,
+                                                                                                     &QIviClimateControl::airflowDirectionsAttributeChanged,
+                                                                                                     &QIviClimateControl::airflowDirections,
+                                                                                                     &QIviClimateControl::airflowDirectionsChanged,
+                                                                                                     &QIviClimateControl::setAirflowDirections);
+    m_airConditioningProperty = QIviPropertyFactory<bool>::create(q,
+                                                                   &QIviClimateControl::airConditioningAttribute,
+                                                                   &QIviClimateControl::airConditioningAttributeChanged,
+                                                                   &QIviClimateControl::isAirConditioningEnabled,
+                                                                   &QIviClimateControl::airConditioningEnabledChanged,
+                                                                   &QIviClimateControl::setAirConditioningEnabled);
+    m_heaterProperty = QIviPropertyFactory<bool>::create(q,
+                                                          &QIviClimateControl::heaterAttribute,
+                                                          &QIviClimateControl::heaterAttributeChanged,
+                                                          &QIviClimateControl::isHeaterEnabled,
+                                                          &QIviClimateControl::heaterEnabledChanged,
+                                                          &QIviClimateControl::setHeaterEnabled);
+    m_targetTemperatureProperty = QIviPropertyFactory<int>::create(q,
+                                                                    &QIviClimateControl::targetTemperatureAttribute,
+                                                                    &QIviClimateControl::targetTemperatureAttributeChanged,
+                                                                    &QIviClimateControl::targetTemperature,
+                                                                    &QIviClimateControl::targetTemperatureChanged,
+                                                                    &QIviClimateControl::setTargetTemperature);
+    m_seatCoolerProperty = QIviPropertyFactory<int>::create(q,
+                                                             &QIviClimateControl::seatCoolerAttribute,
+                                                             &QIviClimateControl::seatCoolerAttributeChanged,
+                                                             &QIviClimateControl::seatCooler,
+                                                             &QIviClimateControl::seatCoolerChanged,
+                                                             &QIviClimateControl::setSeatCooler);
+    m_seatHeaterProperty = QIviPropertyFactory<int>::create(q,
+                                                             &QIviClimateControl::seatHeaterAttribute,
+                                                             &QIviClimateControl::seatHeaterAttributeChanged,
+                                                             &QIviClimateControl::seatHeater,
+                                                             &QIviClimateControl::seatHeaterChanged,
+                                                             &QIviClimateControl::setSeatHeater);
+    m_steeringWheelHeaterProperty = QIviPropertyFactory<int>::create(q,
+                                                                      &QIviClimateControl::steeringWheelHeaterAttribute,
+                                                                      &QIviClimateControl::steeringWheelHeaterAttributeChanged,
+                                                                      &QIviClimateControl::steeringWheelHeater,
+                                                                      &QIviClimateControl::steeringWheelHeaterChanged,
+                                                                      &QIviClimateControl::setSteeringWheelHeater);
+    m_fanSpeedLevelProperty = QIviPropertyFactory<int>::create(q,
+                                                                &QIviClimateControl::fanSpeedLevelAttribute,
+                                                                &QIviClimateControl::fanSpeedLevelAttributeChanged,
+                                                                &QIviClimateControl::fanSpeedLevel,
+                                                                &QIviClimateControl::fanSpeedLevelChanged,
+                                                                &QIviClimateControl::setFanSpeedLevel);
+    m_outsideTemperatureProperty = QIviPropertyFactory<int>::create(q,
+                                                                     &QIviClimateControl::outsideTemperatureAttribute,
+                                                                     &QIviClimateControl::outsideTemperatureAttributeChanged,
+                                                                     &QIviClimateControl::outsideTemperature,
+                                                                     &QIviClimateControl::outsideTemperatureChanged);
+
+    m_zoneSynchronizationProperty = QIviPropertyFactory<bool>::create(q,
+                                                                       &QIviClimateControl::zoneSynchronizationAttribute,
+                                                                       &QIviClimateControl::zoneSynchronizationAttributeChanged,
+                                                                       &QIviClimateControl::isZoneSynchronizationEnabled,
+                                                                       &QIviClimateControl::zoneSynchronizationEnabledChanged,
+                                                                       &QIviClimateControl::setZoneSynchronizationEnabled);
+
+    m_defrostProperty = QIviPropertyFactory<bool>::create(q,
+                                                           &QIviClimateControl::defrostAttribute,
+                                                           &QIviClimateControl::defrostAttributeChanged,
+                                                           &QIviClimateControl::isDefrostEnabled,
+                                                           &QIviClimateControl::defrostEnabledChanged,
+                                                           &QIviClimateControl::setDefrostEnabled);
+
+    m_recirculationModeProperty = QIviPropertyFactory<QIviClimateControl::RecirculationMode>::create(q,
+                                                                                                       &QIviClimateControl::recirculationModeAttribute,
+                                                                                                       &QIviClimateControl::recirculationModeAttributeChanged,
+                                                                                                       &QIviClimateControl::recirculationMode,
+                                                                                                       &QIviClimateControl::recirculationModeChanged,
+                                                                                                       &QIviClimateControl::setRecirculationMode);
+
+    m_recirculationProperty = QIviPropertyFactory<bool>::create(q,
+                                                                 &QIviClimateControl::recirculationAttribute,
+                                                                 &QIviClimateControl::recirculationAttributeChanged,
+                                                                 &QIviClimateControl::isRecirculationEnabled,
+                                                                 &QIviClimateControl::recirculationEnabledChanged);
+
+    m_recirculationSensitivityLevelProperty = QIviPropertyFactory<int>::create(q,
+                                                                                &QIviClimateControl::recirculationSensitivityLevelAttribute,
+                                                                                &QIviClimateControl::recirculationSensitivityLevelAttributeChanged,
+                                                                                &QIviClimateControl::recirculationSensitivityLevel,
+                                                                                &QIviClimateControl::recirculationSensitivityLevelChanged,
+                                                                                &QIviClimateControl::setRecirculationSensitivityLevel);
+
+    m_climateModeProperty = QIviPropertyFactory<QIviClimateControl::ClimateMode>::create(q,
+                                                                                           &QIviClimateControl::climateModeAttribute,
+                                                                                           &QIviClimateControl::climateModeAttributeChanged,
+                                                                                           &QIviClimateControl::climateMode,
+                                                                                           &QIviClimateControl::climateModeChanged,
+                                                                                           &QIviClimateControl::setClimateMode);
+
+    m_automaticClimateFanIntensityLevelProperty = QIviPropertyFactory<int>::create(q,
+                                                                                    &QIviClimateControl::automaticClimateFanIntensityLevelAttribute,
+                                                                                    &QIviClimateControl::automaticClimateFanIntensityLevelAttributeChanged,
+                                                                                    &QIviClimateControl::automaticClimateFanIntensityLevel,
+                                                                                    &QIviClimateControl::automaticClimateFanIntensityLevelChanged,
+                                                                                    &QIviClimateControl::setAutomaticClimateFanIntensityLevel);
+}
+
+void QIviClimateControlPrivate::clearToDefaults()
 {
     m_airConditioning = false;
     m_heater = false;
@@ -185,17 +185,17 @@ void QtIVIClimateControlPrivate::clearToDefaults()
     m_outsideTemperature = 0;
     m_zoneSynchronization = false;
     m_defrost = false;
-    m_recirculationMode = QtIVIClimateControl::RecirculationOff;
+    m_recirculationMode = QIviClimateControl::RecirculationOff;
     m_recirculation = false;
     m_recirculationSensitivityLevel = -1;
-    m_climateMode = QtIVIClimateControl::ClimateOff;
+    m_climateMode = QIviClimateControl::ClimateOff;
     m_automaticClimateFanIntensityLevel = 0;
 }
 
-void QtIVIClimateControlPrivate::onAirflowDirectionsChanged(QtIVIClimateControl::AirflowDirections value, const QString &zone)
+void QIviClimateControlPrivate::onAirflowDirectionsChanged(QIviClimateControl::AirflowDirections value, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -204,10 +204,10 @@ void QtIVIClimateControlPrivate::onAirflowDirectionsChanged(QtIVIClimateControl:
     emit f->airflowDirectionsChanged(value);
 }
 
-void QtIVIClimateControlPrivate::onAirflowDirectionsAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> &airflowDirectionsAttribute, const QString &zone)
+void QIviClimateControlPrivate::onAirflowDirectionsAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::AirflowDirections> &airflowDirectionsAttribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -216,10 +216,10 @@ void QtIVIClimateControlPrivate::onAirflowDirectionsAttributeChanged(const QtIVI
     emit f->airflowDirectionsAttributeChanged(airflowDirectionsAttribute);
 }
 
-void QtIVIClimateControlPrivate::onAirConditioningEnabledChanged(bool enabled, const QString &zone)
+void QIviClimateControlPrivate::onAirConditioningEnabledChanged(bool enabled, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -228,10 +228,10 @@ void QtIVIClimateControlPrivate::onAirConditioningEnabledChanged(bool enabled, c
     emit f->airConditioningEnabledChanged(enabled);
 }
 
-void QtIVIClimateControlPrivate::onAirConditioningAttributeChanged(const QtIVIPropertyAttribute<bool> &airConditioningEnabledAttribute, const QString &zone)
+void QIviClimateControlPrivate::onAirConditioningAttributeChanged(const QIviPropertyAttribute<bool> &airConditioningEnabledAttribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -240,10 +240,10 @@ void QtIVIClimateControlPrivate::onAirConditioningAttributeChanged(const QtIVIPr
     emit f->airConditioningAttributeChanged(airConditioningEnabledAttribute);
 }
 
-void QtIVIClimateControlPrivate::onHeaterEnabledChanged(bool enabled, const QString &zone)
+void QIviClimateControlPrivate::onHeaterEnabledChanged(bool enabled, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -252,10 +252,10 @@ void QtIVIClimateControlPrivate::onHeaterEnabledChanged(bool enabled, const QStr
     emit f->heaterEnabledChanged(enabled);
 }
 
-void QtIVIClimateControlPrivate::onHeaterAttributeChanged(const QtIVIPropertyAttribute<bool> &heaterEnabledAttribute, const QString &zone)
+void QIviClimateControlPrivate::onHeaterAttributeChanged(const QIviPropertyAttribute<bool> &heaterEnabledAttribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -264,10 +264,10 @@ void QtIVIClimateControlPrivate::onHeaterAttributeChanged(const QtIVIPropertyAtt
     emit f->heaterAttributeChanged(heaterEnabledAttribute);
 }
 
-void QtIVIClimateControlPrivate::onSteeringWheelHeaterChanged(int value, const QString &zone)
+void QIviClimateControlPrivate::onSteeringWheelHeaterChanged(int value, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -276,10 +276,10 @@ void QtIVIClimateControlPrivate::onSteeringWheelHeaterChanged(int value, const Q
     emit f->steeringWheelHeaterChanged(value);
 }
 
-void QtIVIClimateControlPrivate::onSteeringWheelHeaterAttributeChanged(const QtIVIPropertyAttribute<int> &steeringWheelHeaterAttribute, const QString &zone)
+void QIviClimateControlPrivate::onSteeringWheelHeaterAttributeChanged(const QIviPropertyAttribute<int> &steeringWheelHeaterAttribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -288,10 +288,10 @@ void QtIVIClimateControlPrivate::onSteeringWheelHeaterAttributeChanged(const QtI
     emit f->steeringWheelHeaterAttributeChanged(steeringWheelHeaterAttribute);
 }
 
-void QtIVIClimateControlPrivate::onFanSpeedLevelChanged(int value, const QString &zone)
+void QIviClimateControlPrivate::onFanSpeedLevelChanged(int value, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -300,10 +300,10 @@ void QtIVIClimateControlPrivate::onFanSpeedLevelChanged(int value, const QString
     emit f->fanSpeedLevelChanged(value);
 }
 
-void QtIVIClimateControlPrivate::onFanSpeedLevelAttributeChanged(const QtIVIPropertyAttribute<int> &fanSpeedAttribute, const QString &zone)
+void QIviClimateControlPrivate::onFanSpeedLevelAttributeChanged(const QIviPropertyAttribute<int> &fanSpeedAttribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -312,10 +312,10 @@ void QtIVIClimateControlPrivate::onFanSpeedLevelAttributeChanged(const QtIVIProp
     emit f->fanSpeedLevelAttributeChanged(fanSpeedAttribute);
 }
 
-void QtIVIClimateControlPrivate::onTargetTemperatureChanged(int temperature, const QString &zone)
+void QIviClimateControlPrivate::onTargetTemperatureChanged(int temperature, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -324,10 +324,10 @@ void QtIVIClimateControlPrivate::onTargetTemperatureChanged(int temperature, con
     emit f->targetTemperatureChanged(temperature);
 }
 
-void QtIVIClimateControlPrivate::onTargetTemperatureAttributeChanged(const QtIVIPropertyAttribute<int> &temperatureAttribute, const QString &zone)
+void QIviClimateControlPrivate::onTargetTemperatureAttributeChanged(const QIviPropertyAttribute<int> &temperatureAttribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -336,10 +336,10 @@ void QtIVIClimateControlPrivate::onTargetTemperatureAttributeChanged(const QtIVI
     emit f->targetTemperatureAttributeChanged(temperatureAttribute);
 }
 
-void QtIVIClimateControlPrivate::onSeatCoolerChanged(int value, const QString &zone)
+void QIviClimateControlPrivate::onSeatCoolerChanged(int value, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -348,10 +348,10 @@ void QtIVIClimateControlPrivate::onSeatCoolerChanged(int value, const QString &z
     emit f->seatCoolerChanged(value);
 }
 
-void QtIVIClimateControlPrivate::onSeatCoolerAttributeChanged(const QtIVIPropertyAttribute<int> &seatCoolerAttribute, const QString &zone)
+void QIviClimateControlPrivate::onSeatCoolerAttributeChanged(const QIviPropertyAttribute<int> &seatCoolerAttribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -360,10 +360,10 @@ void QtIVIClimateControlPrivate::onSeatCoolerAttributeChanged(const QtIVIPropert
     emit f->seatCoolerAttributeChanged(seatCoolerAttribute);
 }
 
-void QtIVIClimateControlPrivate::onSeatHeaterChanged(int value, const QString &zone)
+void QIviClimateControlPrivate::onSeatHeaterChanged(int value, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -372,10 +372,10 @@ void QtIVIClimateControlPrivate::onSeatHeaterChanged(int value, const QString &z
     emit f->seatHeaterChanged(value);
 }
 
-void QtIVIClimateControlPrivate::onSeatHeaterAttributeChanged(const QtIVIPropertyAttribute<int> &seatHeaterAttribute, const QString &zone)
+void QIviClimateControlPrivate::onSeatHeaterAttributeChanged(const QIviPropertyAttribute<int> &seatHeaterAttribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -384,10 +384,10 @@ void QtIVIClimateControlPrivate::onSeatHeaterAttributeChanged(const QtIVIPropert
     emit f->seatHeaterAttributeChanged(seatHeaterAttribute);
 }
 
-void QtIVIClimateControlPrivate::onOutsideTemperatureChanged(int outsideTemperature, const QString &zone)
+void QIviClimateControlPrivate::onOutsideTemperatureChanged(int outsideTemperature, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -396,10 +396,10 @@ void QtIVIClimateControlPrivate::onOutsideTemperatureChanged(int outsideTemperat
     emit f->outsideTemperatureChanged(outsideTemperature);
 }
 
-void QtIVIClimateControlPrivate::onOutsideTemperatureAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone)
+void QIviClimateControlPrivate::onOutsideTemperatureAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -408,10 +408,10 @@ void QtIVIClimateControlPrivate::onOutsideTemperatureAttributeChanged(const QtIV
     emit f->outsideTemperatureAttributeChanged(attribute);
 }
 
-void QtIVIClimateControlPrivate::onZoneSynchronizationChanged(bool zoneSynchronization, const QString &zone)
+void QIviClimateControlPrivate::onZoneSynchronizationChanged(bool zoneSynchronization, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -420,10 +420,10 @@ void QtIVIClimateControlPrivate::onZoneSynchronizationChanged(bool zoneSynchroni
     emit f->zoneSynchronizationEnabledChanged(zoneSynchronization);
 }
 
-void QtIVIClimateControlPrivate::onZoneSynchronizationAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone)
+void QIviClimateControlPrivate::onZoneSynchronizationAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -432,10 +432,10 @@ void QtIVIClimateControlPrivate::onZoneSynchronizationAttributeChanged(const QtI
     emit f->zoneSynchronizationAttributeChanged(attribute);
 }
 
-void QtIVIClimateControlPrivate::onDefrostChanged(bool defrost, const QString &zone)
+void QIviClimateControlPrivate::onDefrostChanged(bool defrost, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -444,10 +444,10 @@ void QtIVIClimateControlPrivate::onDefrostChanged(bool defrost, const QString &z
     emit f->defrostEnabledChanged(defrost);
 }
 
-void QtIVIClimateControlPrivate::onDefrostAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone)
+void QIviClimateControlPrivate::onDefrostAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -456,10 +456,10 @@ void QtIVIClimateControlPrivate::onDefrostAttributeChanged(const QtIVIPropertyAt
     emit f->defrostAttributeChanged(attribute);
 }
 
-void QtIVIClimateControlPrivate::onRecirculationModeChanged(QtIVIClimateControl::RecirculationMode recirculationMode, const QString &zone)
+void QIviClimateControlPrivate::onRecirculationModeChanged(QIviClimateControl::RecirculationMode recirculationMode, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -468,10 +468,10 @@ void QtIVIClimateControlPrivate::onRecirculationModeChanged(QtIVIClimateControl:
     emit f->recirculationModeChanged(recirculationMode);
 }
 
-void QtIVIClimateControlPrivate::onRecirculationModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> &attribute, const QString &zone)
+void QIviClimateControlPrivate::onRecirculationModeAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::RecirculationMode> &attribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -480,10 +480,10 @@ void QtIVIClimateControlPrivate::onRecirculationModeAttributeChanged(const QtIVI
     emit f->recirculationModeAttributeChanged(attribute);
 }
 
-void QtIVIClimateControlPrivate::onRecirculationChanged(bool recirculation, const QString &zone)
+void QIviClimateControlPrivate::onRecirculationChanged(bool recirculation, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -492,10 +492,10 @@ void QtIVIClimateControlPrivate::onRecirculationChanged(bool recirculation, cons
     emit f->recirculationEnabledChanged(recirculation);
 }
 
-void QtIVIClimateControlPrivate::onRecirculationAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone)
+void QIviClimateControlPrivate::onRecirculationAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -504,10 +504,10 @@ void QtIVIClimateControlPrivate::onRecirculationAttributeChanged(const QtIVIProp
     emit f->recirculationAttributeChanged(attribute);
 }
 
-void QtIVIClimateControlPrivate::onRecirculationSensitivityLevelChanged(int recirculationSensitivityLevel, const QString &zone)
+void QIviClimateControlPrivate::onRecirculationSensitivityLevelChanged(int recirculationSensitivityLevel, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -516,10 +516,10 @@ void QtIVIClimateControlPrivate::onRecirculationSensitivityLevelChanged(int reci
     emit f->recirculationSensitivityLevelChanged(recirculationSensitivityLevel);
 }
 
-void QtIVIClimateControlPrivate::onRecirculationSensitivityLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone)
+void QIviClimateControlPrivate::onRecirculationSensitivityLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -528,10 +528,10 @@ void QtIVIClimateControlPrivate::onRecirculationSensitivityLevelAttributeChanged
     emit f->recirculationSensitivityLevelAttributeChanged(attribute);
 }
 
-void QtIVIClimateControlPrivate::onClimateModeChanged(QtIVIClimateControl::ClimateMode climateMode, const QString &zone)
+void QIviClimateControlPrivate::onClimateModeChanged(QIviClimateControl::ClimateMode climateMode, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -540,10 +540,10 @@ void QtIVIClimateControlPrivate::onClimateModeChanged(QtIVIClimateControl::Clima
     emit f->climateModeChanged(climateMode);
 }
 
-void QtIVIClimateControlPrivate::onClimateModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode> &attribute, const QString &zone)
+void QIviClimateControlPrivate::onClimateModeAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::ClimateMode> &attribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -552,10 +552,10 @@ void QtIVIClimateControlPrivate::onClimateModeAttributeChanged(const QtIVIProper
     emit f->climateModeAttributeChanged(attribute);
 }
 
-void QtIVIClimateControlPrivate::onAutomaticClimateFanIntensityLevelChanged(int automaticClimateFanIntensityLevel, const QString &zone)
+void QIviClimateControlPrivate::onAutomaticClimateFanIntensityLevelChanged(int automaticClimateFanIntensityLevel, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -564,10 +564,10 @@ void QtIVIClimateControlPrivate::onAutomaticClimateFanIntensityLevelChanged(int
     emit f->automaticClimateFanIntensityLevelChanged(automaticClimateFanIntensityLevel);
 }
 
-void QtIVIClimateControlPrivate::onAutomaticClimateFanIntensityLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone)
+void QIviClimateControlPrivate::onAutomaticClimateFanIntensityLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone)
 {
-    Q_Q(QtIVIClimateControl);
-    QtIVIClimateControl *f = qobject_cast<QtIVIClimateControl*>(q->zoneAt(zone));
+    Q_Q(QIviClimateControl);
+    QIviClimateControl *f = qobject_cast<QIviClimateControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -576,37 +576,37 @@ void QtIVIClimateControlPrivate::onAutomaticClimateFanIntensityLevelAttributeCha
     emit f->automaticClimateFanIntensityLevelAttributeChanged(attribute);
 }
 
-QtIVIClimateControlBackendInterface *QtIVIClimateControlPrivate::climateControlBackend()
+QIviClimateControlBackendInterface *QIviClimateControlPrivate::climateControlBackend()
 {
-    Q_Q(QtIVIClimateControl);
-    return qobject_cast<QtIVIClimateControlBackendInterface*>(q->backend());
+    Q_Q(QIviClimateControl);
+    return qobject_cast<QIviClimateControlBackendInterface*>(q->backend());
 }
 
 /*!
-   \class QtIVIClimateControl
-   \inmodule QtIVIVehicleFunctions
+   \class QIviClimateControl
+   \inmodule QtIviVehicleFunctions
    \brief Provides an interface to the climate control.
 
-   The QtIVIClimateControl provides an interface to the climate control of the vehicle.
+   The QIviClimateControl provides an interface to the climate control of the vehicle.
 
    The climate control properties are divided into two categories: central or zoned. The central
-   properties are exposed directly through the QtIVIClimateControl and the zoned properties are
+   properties are exposed directly through the QIviClimateControl and the zoned properties are
    exposed through zone objects. The zones are retrieved using the \l zoneAt method.
 
-   The QtIVIClimateControl expects a single backend to be available. It is recommended to use it
-   with \l {QtIVIAbstractFeature::}{discoveryMode} set to \l AutoDiscovery.
+   The QIviClimateControl expects a single backend to be available. It is recommended to use it
+   with \l {QIviAbstractFeature::}{discoveryMode} set to \l AutoDiscovery.
 */
 
 /*!
     \qmltype ClimateControl
-    \instantiates QtIVIClimateControl
-    \inqmlmodule QtIVIVehicleFunctions
+    \instantiates QIviClimateControl
+    \inqmlmodule QtIvi.VehicleFunctions
     \inherits AbstractZonedFeature
     \brief The ClimateControl provides a QML interface to the climate control of the vehicle.
 */
 
 /*!
-   \enum QtIVIClimateControl::AirflowDirection
+   \enum QIviClimateControl::AirflowDirection
    \value Windshield
           Direct airflow along the windshield.
    \value Dashboard
@@ -616,7 +616,7 @@ QtIVIClimateControlBackendInterface *QtIVIClimateControlPrivate::climateControlB
 */
 
 /*!
-   \enum QtIVIClimateControl::RecirculationMode
+   \enum QIviClimateControl::RecirculationMode
    \value RecirculationOff
           The recirculation is turned off.
    \value RecirculationOn
@@ -626,7 +626,7 @@ QtIVIClimateControlBackendInterface *QtIVIClimateControlPrivate::climateControlB
 */
 
 /*!
-   \enum QtIVIClimateControl::ClimateMode
+   \enum QIviClimateControl::ClimateMode
    \value ClimateOff
           The climate system is turned off.
    \value ClimateOn
@@ -640,98 +640,98 @@ QtIVIClimateControlBackendInterface *QtIVIClimateControlPrivate::climateControlB
 
    If \a zone is not provided the General zone will be created.
 
-   The \a parent argument is passed on to the \l QtIVIAbstractZonedFeature base class.
+   The \a parent argument is passed on to the \l QIviAbstractZonedFeature base class.
 */
-QtIVIClimateControl::QtIVIClimateControl(const QString &zone, QObject* parent)
-    : QtIVIAbstractZonedFeature(*new QtIVIClimateControlPrivate(QtIVIStringClimateControlInterfaceName, zone, this), parent)
+QIviClimateControl::QIviClimateControl(const QString &zone, QObject* parent)
+    : QIviAbstractZonedFeature(*new QIviClimateControlPrivate(QIviStringClimateControlInterfaceName, zone, this), parent)
 {
-    Q_D(QtIVIClimateControl);
+    Q_D(QIviClimateControl);
     d->init();
-    qRegisterMetaType<QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections>>();
-    qRegisterMetaType<QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode>>();
-    qRegisterMetaType<QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode>>();
+    qRegisterMetaType<QIviPropertyAttribute<QIviClimateControl::AirflowDirections>>();
+    qRegisterMetaType<QIviPropertyAttribute<QIviClimateControl::RecirculationMode>>();
+    qRegisterMetaType<QIviPropertyAttribute<QIviClimateControl::ClimateMode>>();
 }
 
-QtIVIClimateControl::~QtIVIClimateControl()
+QIviClimateControl::~QIviClimateControl()
 {
 }
 
 /*!
    \reimp
 */
-void QtIVIClimateControl::connectToServiceObject(QtIVIServiceObject *serviceObject)
+void QIviClimateControl::connectToServiceObject(QIviServiceObject *serviceObject)
 {
-    Q_D(QtIVIClimateControl);
-    QtIVIAbstractZonedFeature::connectToServiceObject(serviceObject);
+    Q_D(QIviClimateControl);
+    QIviAbstractZonedFeature::connectToServiceObject(serviceObject);
 
-    QtIVIClimateControlBackendInterface* backend = d->climateControlBackend();
+    QIviClimateControlBackendInterface* backend = d->climateControlBackend();
     if (!backend)
         return;
 
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::targetTemperatureChanged,
-            d, &QtIVIClimateControlPrivate::onTargetTemperatureChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::targetTemperatureAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onTargetTemperatureAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::seatCoolerChanged,
-            d, &QtIVIClimateControlPrivate::onSeatCoolerChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::seatCoolerAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onSeatCoolerAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::seatHeaterChanged,
-            d, &QtIVIClimateControlPrivate::onSeatHeaterChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::seatHeaterAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onSeatHeaterAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::steeringWheelHeaterChanged,
-            d, &QtIVIClimateControlPrivate::onSteeringWheelHeaterChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::steeringWheelHeaterAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onSteeringWheelHeaterAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::fanSpeedLevelChanged,
-            d, &QtIVIClimateControlPrivate::onFanSpeedLevelChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::fanSpeedLevelAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onFanSpeedLevelAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::airflowDirectionsChanged,
-            d, &QtIVIClimateControlPrivate::onAirflowDirectionsChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::airflowDirectionsAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onAirflowDirectionsAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::airConditioningEnabledChanged,
-            d, &QtIVIClimateControlPrivate::onAirConditioningEnabledChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::airConditioningAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onAirConditioningAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::heaterEnabledChanged,
-            d, &QtIVIClimateControlPrivate::onHeaterEnabledChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::heaterAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onHeaterAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::outsideTemperatureChanged,
-            d, &QtIVIClimateControlPrivate::onOutsideTemperatureChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::outsideTemperatureAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onOutsideTemperatureAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::zoneSynchronizationEnabledChanged,
-            d, &QtIVIClimateControlPrivate::onZoneSynchronizationChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::zoneSynchronizationAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onZoneSynchronizationAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::defrostEnabledChanged,
-            d, &QtIVIClimateControlPrivate::onDefrostChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::defrostAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onDefrostAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::recirculationModeChanged,
-            d, &QtIVIClimateControlPrivate::onRecirculationModeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::recirculationModeAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onRecirculationModeAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::recirculationEnabledChanged,
-            d, &QtIVIClimateControlPrivate::onRecirculationChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::recirculationAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onRecirculationAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::recirculationSensitivityLevelChanged,
-            d, &QtIVIClimateControlPrivate::onRecirculationSensitivityLevelChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::recirculationSensitivityLevelAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onRecirculationSensitivityLevelAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::climateModeChanged,
-            d, &QtIVIClimateControlPrivate::onClimateModeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::climateModeAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onClimateModeAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::automaticClimateFanIntensityLevelChanged,
-            d, &QtIVIClimateControlPrivate::onAutomaticClimateFanIntensityLevelChanged);
-    QObjectPrivate::connect(backend, &QtIVIClimateControlBackendInterface::automaticClimateFanIntensityLevelAttributeChanged,
-            d, &QtIVIClimateControlPrivate::onAutomaticClimateFanIntensityLevelAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::targetTemperatureChanged,
+            d, &QIviClimateControlPrivate::onTargetTemperatureChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::targetTemperatureAttributeChanged,
+            d, &QIviClimateControlPrivate::onTargetTemperatureAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::seatCoolerChanged,
+            d, &QIviClimateControlPrivate::onSeatCoolerChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::seatCoolerAttributeChanged,
+            d, &QIviClimateControlPrivate::onSeatCoolerAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::seatHeaterChanged,
+            d, &QIviClimateControlPrivate::onSeatHeaterChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::seatHeaterAttributeChanged,
+            d, &QIviClimateControlPrivate::onSeatHeaterAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::steeringWheelHeaterChanged,
+            d, &QIviClimateControlPrivate::onSteeringWheelHeaterChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::steeringWheelHeaterAttributeChanged,
+            d, &QIviClimateControlPrivate::onSteeringWheelHeaterAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::fanSpeedLevelChanged,
+            d, &QIviClimateControlPrivate::onFanSpeedLevelChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::fanSpeedLevelAttributeChanged,
+            d, &QIviClimateControlPrivate::onFanSpeedLevelAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::airflowDirectionsChanged,
+            d, &QIviClimateControlPrivate::onAirflowDirectionsChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::airflowDirectionsAttributeChanged,
+            d, &QIviClimateControlPrivate::onAirflowDirectionsAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::airConditioningEnabledChanged,
+            d, &QIviClimateControlPrivate::onAirConditioningEnabledChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::airConditioningAttributeChanged,
+            d, &QIviClimateControlPrivate::onAirConditioningAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::heaterEnabledChanged,
+            d, &QIviClimateControlPrivate::onHeaterEnabledChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::heaterAttributeChanged,
+            d, &QIviClimateControlPrivate::onHeaterAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::outsideTemperatureChanged,
+            d, &QIviClimateControlPrivate::onOutsideTemperatureChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::outsideTemperatureAttributeChanged,
+            d, &QIviClimateControlPrivate::onOutsideTemperatureAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::zoneSynchronizationEnabledChanged,
+            d, &QIviClimateControlPrivate::onZoneSynchronizationChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::zoneSynchronizationAttributeChanged,
+            d, &QIviClimateControlPrivate::onZoneSynchronizationAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::defrostEnabledChanged,
+            d, &QIviClimateControlPrivate::onDefrostChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::defrostAttributeChanged,
+            d, &QIviClimateControlPrivate::onDefrostAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::recirculationModeChanged,
+            d, &QIviClimateControlPrivate::onRecirculationModeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::recirculationModeAttributeChanged,
+            d, &QIviClimateControlPrivate::onRecirculationModeAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::recirculationEnabledChanged,
+            d, &QIviClimateControlPrivate::onRecirculationChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::recirculationAttributeChanged,
+            d, &QIviClimateControlPrivate::onRecirculationAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::recirculationSensitivityLevelChanged,
+            d, &QIviClimateControlPrivate::onRecirculationSensitivityLevelChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::recirculationSensitivityLevelAttributeChanged,
+            d, &QIviClimateControlPrivate::onRecirculationSensitivityLevelAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::climateModeChanged,
+            d, &QIviClimateControlPrivate::onClimateModeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::climateModeAttributeChanged,
+            d, &QIviClimateControlPrivate::onClimateModeAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::automaticClimateFanIntensityLevelChanged,
+            d, &QIviClimateControlPrivate::onAutomaticClimateFanIntensityLevelChanged);
+    QObjectPrivate::connect(backend, &QIviClimateControlBackendInterface::automaticClimateFanIntensityLevelAttributeChanged,
+            d, &QIviClimateControlPrivate::onAutomaticClimateFanIntensityLevelAttributeChanged);
 
     backend->initializeAttributes();
 }
@@ -739,9 +739,9 @@ void QtIVIClimateControl::connectToServiceObject(QtIVIServiceObject *serviceObje
 /*!
    \reimp
 */
-void QtIVIClimateControl::disconnectFromServiceObject(QtIVIServiceObject *serviceObject)
+void QIviClimateControl::disconnectFromServiceObject(QIviServiceObject *serviceObject)
 {
-    QtIVIClimateControlBackendInterface *backend = qobject_cast<QtIVIClimateControlBackendInterface*>(serviceObject->interfaceInstance(QtIVIStringClimateControlInterfaceName));
+    QIviClimateControlBackendInterface *backend = qobject_cast<QIviClimateControlBackendInterface*>(serviceObject->interfaceInstance(QIviStringClimateControlInterfaceName));
 
     if (backend)
         disconnect(backend, 0, this, 0);
@@ -750,36 +750,36 @@ void QtIVIClimateControl::disconnectFromServiceObject(QtIVIServiceObject *servic
 /*!
    \reimp
 */
-void QtIVIClimateControl::clearServiceObject()
+void QIviClimateControl::clearServiceObject()
 {
-    Q_D(QtIVIClimateControl);
+    Q_D(QIviClimateControl);
     d->clearToDefaults();
-    QtIVIAbstractZonedFeature::clearServiceObject();
+    QIviAbstractZonedFeature::clearServiceObject();
 }
 
-QtIVIClimateControl::QtIVIClimateControl(QtIVIClimateControlPrivate &dd, QObject *parent)
-    : QtIVIAbstractZonedFeature(dd, parent)
+QIviClimateControl::QIviClimateControl(QIviClimateControlPrivate &dd, QObject *parent)
+    : QIviAbstractZonedFeature(dd, parent)
 {
-    Q_D(QtIVIClimateControl);
+    Q_D(QIviClimateControl);
     d->init();
 }
 
 /*!
    \reimp
 */
-QtIVIAbstractZonedFeature *QtIVIClimateControl::createZoneFeature(const QString &zone)
+QIviAbstractZonedFeature *QIviClimateControl::createZoneFeature(const QString &zone)
 {
-    return new QtIVIClimateControl(zone, this);
+    return new QIviClimateControl(zone, this);
 }
 /*!
-   \qmlqtivipropertyBool {QtIVIVehicleFunctions::ClimateControl::airConditioning}
+   \qmlqtivipropertyBool {QtIvi.VehicleFunctions::ClimateControl::airConditioning}
 
    \e value is true if the air conditioning is enabled.
 */
 /*!
-   \property QtIVIClimateControl::airConditioning
+   \property QIviClimateControl::airConditioning
 
-   Holds a QtIVIProperty of type \e bool where the QtIVIProperty::value() function indicates if air conditioning is enabled.
+   Holds a QIviProperty of type \e bool where the QIviProperty::value() function indicates if air conditioning is enabled.
 
    \sa AttributeSystem
    \sa isAirConditioningEnabled() setAirConditioningEnabled() airConditioningAttribute()
@@ -789,9 +789,9 @@ QtIVIAbstractZonedFeature *QtIVIClimateControl::createZoneFeature(const QString
  *
  * \sa setAirConditioningEnabled() airConditioningEnabledChanged() airConditioningAttribute()
  */
-bool QtIVIClimateControl::isAirConditioningEnabled() const
+bool QIviClimateControl::isAirConditioningEnabled() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_airConditioning;
 }
 
@@ -800,20 +800,20 @@ bool QtIVIClimateControl::isAirConditioningEnabled() const
  *
  * \sa setAirConditioningEnabled() isAirConditioningEnabled() airConditioningEnabledChanged()
  */
-QtIVIPropertyAttribute<bool> QtIVIClimateControl::airConditioningAttribute() const
+QIviPropertyAttribute<bool> QIviClimateControl::airConditioningAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_airConditioningAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::airConditioningProperty() const
+QIviProperty *QIviClimateControl::airConditioningProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_airConditioningProperty;
 }
 
 /*!
-   \qmlqtivipropertyEnum {QtIVIVehicleFunctions::ClimateControl::airflowDirections}
+   \qmlqtivipropertyEnum {QtIvi.VehicleFunctions::ClimateControl::airflowDirections}
 
    \e value holds the airflow directions.
    Available values are:
@@ -825,9 +825,9 @@ QtIVIProperty *QtIVIClimateControl::airConditioningProperty() const
           Direct airflow to the floor.
  */
 /*!
-   \property QtIVIClimateControl::airflowDirections
+   \property QIviClimateControl::airflowDirections
 
-   Holds a QtIVIProperty of type \e QtIVIClimateControl::AirflowDirections where the QtIVIProperty::value() function returns the current air flow directions.
+   Holds a QIviProperty of type \e QIviClimateControl::AirflowDirections where the QIviProperty::value() function returns the current air flow directions.
 
    \sa AttributeSystem
    \sa airflowDirections() setAirflowDirections() airflowDirectionsAttribute()
@@ -837,9 +837,9 @@ QtIVIProperty *QtIVIClimateControl::airConditioningProperty() const
  *
  * \sa setAirflowDirections() airflowDirectionsChanged() airflowDirectionsAttribute()
  */
-QtIVIClimateControl::AirflowDirections QtIVIClimateControl::airflowDirections() const
+QIviClimateControl::AirflowDirections QIviClimateControl::airflowDirections() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_airflowDirections;
 }
 
@@ -848,27 +848,27 @@ QtIVIClimateControl::AirflowDirections QtIVIClimateControl::airflowDirections()
  *
  * \sa setAirflowDirections() airflowDirections() airflowDirectionsChanged()
  */
-QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> QtIVIClimateControl::airflowDirectionsAttribute() const
+QIviPropertyAttribute<QIviClimateControl::AirflowDirections> QIviClimateControl::airflowDirectionsAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_airflowDirectionsAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::airflowDirectionsProperty() const
+QIviProperty *QIviClimateControl::airflowDirectionsProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_airFlowDirectionProperty;
 }
 
 /*!
-   \qmlqtivipropertyBool {QtIVIVehicleFunctions::ClimateControl::heater}
+   \qmlqtivipropertyBool {QtIvi.VehicleFunctions::ClimateControl::heater}
 
    \e value is true if the heater is enabled.
 */
 /*!
-   \property QtIVIClimateControl::heater
+   \property QIviClimateControl::heater
 
-   Holds a QtIVIProperty of type \e bool where the QtIVIProperty::value() function indicates if the heater is enabled.
+   Holds a QIviProperty of type \e bool where the QIviProperty::value() function indicates if the heater is enabled.
 
    \sa AttributeSystem
    \sa isHeaterEnabled() setHeaterEnabled() heaterAttribute()
@@ -879,9 +879,9 @@ QtIVIProperty *QtIVIClimateControl::airflowDirectionsProperty() const
  *
  * \sa setHeaterEnabled() heaterEnabledChanged() heaterAttribute()
  */
-bool QtIVIClimateControl::isHeaterEnabled() const
+bool QIviClimateControl::isHeaterEnabled() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_heater;
 }
 
@@ -890,28 +890,28 @@ bool QtIVIClimateControl::isHeaterEnabled() const
  *
  * \sa setHeaterEnabled() isHeaterEnabled() heaterEnabledChanged()
  */
-QtIVIPropertyAttribute<bool> QtIVIClimateControl::heaterAttribute() const
+QIviPropertyAttribute<bool> QIviClimateControl::heaterAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_heaterAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::heaterProperty() const
+QIviProperty *QIviClimateControl::heaterProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_heaterProperty;
 }
 
 /*!
-   \qmlqtiviproperty {int} {QtIVIVehicleFunctions::ClimateControl::steeringWheelHeater}
+   \qmlqtiviproperty {int} {QtIvi.VehicleFunctions::ClimateControl::steeringWheelHeater}
 
     \e value holds the steering wheel heater level, where the level can be between \c minimumValue(off)
     to \c maximumValue (warmest).
  */
 /*!
-   \property QtIVIClimateControl::steeringWheelHeater
+   \property QIviClimateControl::steeringWheelHeater
 
-   Holds a QtIVIProperty of type \e int where the QtIVIProperty::value() function returns the current steering wheel heater level.
+   Holds a QIviProperty of type \e int where the QIviProperty::value() function returns the current steering wheel heater level.
 
    \sa AttributeSystem
    \sa steeringWheelHeater() setSteeringWheelHeater() steeringWheelHeaterAttribute()
@@ -921,9 +921,9 @@ QtIVIProperty *QtIVIClimateControl::heaterProperty() const
  *
  * \sa setSteeringWheelHeater() steeringWheelHeaterChanged() steeringWheelHeaterAttribute()
  */
-int QtIVIClimateControl::steeringWheelHeater() const
+int QIviClimateControl::steeringWheelHeater() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_steeringWheelHeater;
 }
 
@@ -932,28 +932,28 @@ int QtIVIClimateControl::steeringWheelHeater() const
  *
  * \sa setSteeringWheelHeater() steeringWheelHeater() steeringWheelHeaterChanged()
  */
-QtIVIPropertyAttribute<int> QtIVIClimateControl::steeringWheelHeaterAttribute() const
+QIviPropertyAttribute<int> QIviClimateControl::steeringWheelHeaterAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_steeringWheelHeaterAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::steeringWheelHeaterProperty() const
+QIviProperty *QIviClimateControl::steeringWheelHeaterProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_steeringWheelHeaterProperty;
 }
 
 /*!
-   \qmlqtiviproperty {int} {QtIVIVehicleFunctions::ClimateControl::fanSpeedLevel}
+   \qmlqtiviproperty {int} {QtIvi.VehicleFunctions::ClimateControl::fanSpeedLevel}
 
     \e value holds the fan speed level, where the level can be between \c minimumValue(off)
     to \c maximumValue (strongest).
  */
 /*!
-   \property QtIVIClimateControl::fanSpeedLevel
+   \property QIviClimateControl::fanSpeedLevel
 
-   Holds a QtIVIProperty of type \e int where the QtIVIProperty::value() function returns the current fan speed level.
+   Holds a QIviProperty of type \e int where the QIviProperty::value() function returns the current fan speed level.
 
    \sa AttributeSystem
    \sa fanSpeedLevel() setFanSpeedLevel() fanSpeedLevelAttribute()
@@ -963,9 +963,9 @@ QtIVIProperty *QtIVIClimateControl::steeringWheelHeaterProperty() const
  *
  * \sa setFanSpeedLevel() fanSpeedLevelChanged() fanSpeedLevelAttribute()
  */
-int QtIVIClimateControl::fanSpeedLevel() const
+int QIviClimateControl::fanSpeedLevel() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_fanSpeedLevel;
 }
 
@@ -974,28 +974,28 @@ int QtIVIClimateControl::fanSpeedLevel() const
  *
  * \sa setFanSpeedLevel() fanSpeedLevel() fanSpeedLevelChanged()
  */
-QtIVIPropertyAttribute<int> QtIVIClimateControl::fanSpeedLevelAttribute() const
+QIviPropertyAttribute<int> QIviClimateControl::fanSpeedLevelAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_fanSpeedLevelAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::fanSpeedLevelProperty() const
+QIviProperty *QIviClimateControl::fanSpeedLevelProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_fanSpeedLevelProperty;
 }
 
 /*!
-   \qmlqtiviproperty {int} {QtIVIVehicleFunctions::ClimateControl::targetTemperature}
+   \qmlqtiviproperty {int} {QtIvi.VehicleFunctions::ClimateControl::targetTemperature}
 
    \e value holds the target temperature of the zone expressed in centigrades, where the temperature can be between \c minimumValue(coolest)
    to \c maximumValue (warmest).
  */
 /*!
-   \property QtIVIClimateControl::targetTemperature
+   \property QIviClimateControl::targetTemperature
 
-   Holds a QtIVIProperty of type \e int where the QtIVIProperty::value() function returns the current target temperature.
+   Holds a QIviProperty of type \e int where the QIviProperty::value() function returns the current target temperature.
 
    \sa AttributeSystem
    \sa targetTemperature() setTargetTemperature() targetTemperatureAttribute()
@@ -1005,9 +1005,9 @@ QtIVIProperty *QtIVIClimateControl::fanSpeedLevelProperty() const
  *
  * \sa setTargetTemperature() targetTemperatureChanged() targetTemperatureAttribute()
  */
-int QtIVIClimateControl::targetTemperature() const
+int QIviClimateControl::targetTemperature() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_targetTemperature;
 }
 
@@ -1016,28 +1016,28 @@ int QtIVIClimateControl::targetTemperature() const
  *
  * \sa setTargetTemperature() targetTemperature() targetTemperatureChanged()
  */
-QtIVIPropertyAttribute<int> QtIVIClimateControl::targetTemperatureAttribute() const
+QIviPropertyAttribute<int> QIviClimateControl::targetTemperatureAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_targetTemperatureAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::targetTemperatureProperty() const
+QIviProperty *QIviClimateControl::targetTemperatureProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_targetTemperatureProperty;
 }
 
 /*!
-   \qmlqtiviproperty {int} {QtIVIVehicleFunctions::ClimateControl::seatCooler}
+   \qmlqtiviproperty {int} {QtIvi.VehicleFunctions::ClimateControl::seatCooler}
 
     \e value holds the seat cooler level, where the level can be between \c minimumValue(off)
     to \c maximumValue (coolest).
  */
 /*!
-   \property QtIVIClimateControl::seatCooler
+   \property QIviClimateControl::seatCooler
 
-   Holds a QtIVIProperty of type \e int where the QtIVIProperty::value() function returns the current seat cooler level.
+   Holds a QIviProperty of type \e int where the QIviProperty::value() function returns the current seat cooler level.
 
    \sa AttributeSystem
    \sa seatCooler() setSeatCooler() seatCoolerAttribute()
@@ -1047,9 +1047,9 @@ QtIVIProperty *QtIVIClimateControl::targetTemperatureProperty() const
  *
  * \sa seatCooler() seatCoolerChanged() seatCoolerAttribute()
  */
-int QtIVIClimateControl::seatCooler() const
+int QIviClimateControl::seatCooler() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_seatCooler;
 }
 
@@ -1058,28 +1058,28 @@ int QtIVIClimateControl::seatCooler() const
  *
  * \sa setSeatCooler() seatCooler() seatCoolerChanged()
  */
-QtIVIPropertyAttribute<int> QtIVIClimateControl::seatCoolerAttribute() const
+QIviPropertyAttribute<int> QIviClimateControl::seatCoolerAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_seatCoolerAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::seatCoolerProperty() const
+QIviProperty *QIviClimateControl::seatCoolerProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_seatCoolerProperty;
 }
 
 /*!
-   \qmlqtiviproperty {int} {QtIVIVehicleFunctions::ClimateControl::seatHeater}
+   \qmlqtiviproperty {int} {QtIvi.VehicleFunctions::ClimateControl::seatHeater}
 
     \e value holds the seat heater level, where the level can be between \c minimumValue(off)
     to \c maximumValue (warmest).
  */
 /*!
-   \property QtIVIClimateControl::seatHeater
+   \property QIviClimateControl::seatHeater
 
-   Holds a QtIVIProperty of type \e int where the QtIVIProperty::value() function returns the current seat heater level.
+   Holds a QIviProperty of type \e int where the QIviProperty::value() function returns the current seat heater level.
 
    \sa AttributeSystem
    \sa seatHeater() setSeatHeater() seatHeaterAttribute()
@@ -1089,9 +1089,9 @@ QtIVIProperty *QtIVIClimateControl::seatCoolerProperty() const
  *
  * \sa seatHeater() seatHeaterChanged() seatHeaterAttribute()
  */
-int QtIVIClimateControl::seatHeater() const
+int QIviClimateControl::seatHeater() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_seatHeater;
 }
 
@@ -1100,28 +1100,28 @@ int QtIVIClimateControl::seatHeater() const
  *
  * \sa setSeatHeater() seatHeater() seatHeaterChanged()
  */
-QtIVIPropertyAttribute<int> QtIVIClimateControl::seatHeaterAttribute() const
+QIviPropertyAttribute<int> QIviClimateControl::seatHeaterAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_seatHeaterAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::seatHeaterProperty() const
+QIviProperty *QIviClimateControl::seatHeaterProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_seatHeaterProperty;
 }
 
 /*!
-   \qmlqtiviproperty {int} {QtIVIVehicleFunctions::ClimateControl::outsideTemperature}
+   \qmlqtiviproperty {int} {QtIvi.VehicleFunctions::ClimateControl::outsideTemperature}
 
    \e value holds the outside temperature of the zone expressed in centigrades, where the temperature can be between \c minimumValue(coolest)
    to \c maximumValue (warmest).
  */
 /*!
-   \property QtIVIClimateControl::outsideTemperature
+   \property QIviClimateControl::outsideTemperature
 
-   Holds a QtIVIProperty of type \e int where the QtIVIProperty::value() function returns the current outside temperature.
+   Holds a QIviProperty of type \e int where the QIviProperty::value() function returns the current outside temperature.
 
    \sa AttributeSystem
    \sa outsideTemperature() outsideTemperatureAttribute()
@@ -1131,9 +1131,9 @@ QtIVIProperty *QtIVIClimateControl::seatHeaterProperty() const
  *
  * \sa outsideTemperatureChanged() outsideTemperatureAttribute()
  */
-int QtIVIClimateControl::outsideTemperature() const
+int QIviClimateControl::outsideTemperature() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_outsideTemperature;
 }
 
@@ -1142,29 +1142,29 @@ int QtIVIClimateControl::outsideTemperature() const
  *
  * \sa outsideTemperature() outsideTemperatureChanged()
  */
-QtIVIPropertyAttribute<int> QtIVIClimateControl::outsideTemperatureAttribute() const
+QIviPropertyAttribute<int> QIviClimateControl::outsideTemperatureAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_outsideTemperatureAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::outsideTemperatureProperty() const
+QIviProperty *QIviClimateControl::outsideTemperatureProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_outsideTemperatureProperty;
 }
 
 /*!
-   \qmlqtivipropertyBool {QtIVIVehicleFunctions::ClimateControl::zoneSynchronization}
+   \qmlqtivipropertyBool {QtIvi.VehicleFunctions::ClimateControl::zoneSynchronization}
 
    \e value is true if the zone synchronization is enabled.
 
    Which zones and properties are synchronized is controlled by the backend implementing it.
 */
 /*!
-   \property QtIVIClimateControl::zoneSynchronization
+   \property QIviClimateControl::zoneSynchronization
 
-   Holds a QtIVIProperty of type \e bool where the QtIVIProperty::value() function indicates if zone synchronization is enabled.
+   Holds a QIviProperty of type \e bool where the QIviProperty::value() function indicates if zone synchronization is enabled.
 
    Which zones and properties are synchronized is controlled by the backend implementing it.
 
@@ -1176,9 +1176,9 @@ QtIVIProperty *QtIVIClimateControl::outsideTemperatureProperty() const
  *
  * \sa setZoneSynchronizationEnabled() zoneSynchronizationEnabledChanged() zoneSynchronizationAttribute()
  */
-bool QtIVIClimateControl::isZoneSynchronizationEnabled() const
+bool QIviClimateControl::isZoneSynchronizationEnabled() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_zoneSynchronization;
 }
 
@@ -1187,27 +1187,27 @@ bool QtIVIClimateControl::isZoneSynchronizationEnabled() const
  *
  * \sa setZoneSynchronizationEnabled() isZoneSynchronizationEnabled() zoneSynchronizationEnabledChanged()
  */
-QtIVIPropertyAttribute<bool> QtIVIClimateControl::zoneSynchronizationAttribute() const
+QIviPropertyAttribute<bool> QIviClimateControl::zoneSynchronizationAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_zoneSynchronizationAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::zoneSynchronizationProperty() const
+QIviProperty *QIviClimateControl::zoneSynchronizationProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_zoneSynchronizationProperty;
 }
 
 /*!
-   \qmlqtivipropertyBool {QtIVIVehicleFunctions::ClimateControl::defrost}
+   \qmlqtivipropertyBool {QtIvi.VehicleFunctions::ClimateControl::defrost}
 
    \e value is true if defrost is enabled. Usually that means that the fans are on the highest level to remove ice from the windshield.
 */
 /*!
-   \property QtIVIClimateControl::defrost
+   \property QIviClimateControl::defrost
 
-   Holds a QtIVIProperty of type \e bool where the QtIVIProperty::value() function indicates if defrost is enabled.
+   Holds a QIviProperty of type \e bool where the QIviProperty::value() function indicates if defrost is enabled.
 
    \sa AttributeSystem
    \sa isDefrostEnabled() setDefrostEnabled() defrostAttribute()
@@ -1217,9 +1217,9 @@ QtIVIProperty *QtIVIClimateControl::zoneSynchronizationProperty() const
  *
  * \sa setDefrostEnabled() defrostEnabledChanged() defrostAttribute()
  */
-bool QtIVIClimateControl::isDefrostEnabled() const
+bool QIviClimateControl::isDefrostEnabled() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_defrost;
 }
 
@@ -1228,20 +1228,20 @@ bool QtIVIClimateControl::isDefrostEnabled() const
  *
  * \sa setDefrostEnabled() isDefrostEnabled() defrostEnabledChanged()
  */
-QtIVIPropertyAttribute<bool> QtIVIClimateControl::defrostAttribute() const
+QIviPropertyAttribute<bool> QIviClimateControl::defrostAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_defrostAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::defrostProperty() const
+QIviProperty *QIviClimateControl::defrostProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_defrostProperty;
 }
 
 /*!
-   \qmlqtivipropertyEnum {QtIVIVehicleFunctions::ClimateControl::recirculationMode}
+   \qmlqtivipropertyEnum {QtIvi.VehicleFunctions::ClimateControl::recirculationMode}
 
    \e value holds the recirculation mode.
    Available values are:
@@ -1253,9 +1253,9 @@ QtIVIProperty *QtIVIClimateControl::defrostProperty() const
           The recirculation is turning off and on automatically depending on the air quality.
  */
 /*!
-   \property QtIVIClimateControl::recirculationMode
+   \property QIviClimateControl::recirculationMode
 
-   Holds a QtIVIProperty of type \e QtIVIClimateControl::RecirculationMode where the QtIVIProperty::value() function returns the current recirculation mode.
+   Holds a QIviProperty of type \e QIviClimateControl::RecirculationMode where the QIviProperty::value() function returns the current recirculation mode.
 
    \sa AttributeSystem
    \sa recirculationMode() setRecirculationMode() recirculationModeAttribute()
@@ -1265,9 +1265,9 @@ QtIVIProperty *QtIVIClimateControl::defrostProperty() const
  *
  * \sa setRecirculationMode() recirculationModeChanged() recirculationModeAttribute()
  */
-QtIVIClimateControl::RecirculationMode QtIVIClimateControl::recirculationMode() const
+QIviClimateControl::RecirculationMode QIviClimateControl::recirculationMode() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_recirculationMode;
 }
 
@@ -1276,27 +1276,27 @@ QtIVIClimateControl::RecirculationMode QtIVIClimateControl::recirculationMode()
  *
  * \sa setRecirculationMode() recirculationMode() recirculationModeChanged()
  */
-QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> QtIVIClimateControl::recirculationModeAttribute() const
+QIviPropertyAttribute<QIviClimateControl::RecirculationMode> QIviClimateControl::recirculationModeAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_recirculationModeAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::recirculationModeProperty() const
+QIviProperty *QIviClimateControl::recirculationModeProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_recirculationModeProperty;
 }
 
 /*!
-   \qmlqtivipropertyBool {QtIVIVehicleFunctions::ClimateControl::recirculation}
+   \qmlqtivipropertyBool {QtIvi.VehicleFunctions::ClimateControl::recirculation}
 
    \e value is true if the recirculation is currently running.
 */
 /*!
-   \property QtIVIClimateControl::recirculation
+   \property QIviClimateControl::recirculation
 
-   Holds a QtIVIProperty of type \e bool where the QtIVIProperty::value() function indicates if recirculation is running.
+   Holds a QIviProperty of type \e bool where the QIviProperty::value() function indicates if recirculation is running.
 
    \sa AttributeSystem
    \sa isRecirculationEnabled() recirculationAttribute()
@@ -1306,9 +1306,9 @@ QtIVIProperty *QtIVIClimateControl::recirculationModeProperty() const
  *
  * \sa recirculationEnabledChanged() recirculationAttribute()
  */
-bool QtIVIClimateControl::isRecirculationEnabled() const
+bool QIviClimateControl::isRecirculationEnabled() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_recirculation;
 }
 
@@ -1317,28 +1317,28 @@ bool QtIVIClimateControl::isRecirculationEnabled() const
  *
  * \sa isRecirculationEnabled() recirculationEnabledChanged()
  */
-QtIVIPropertyAttribute<bool> QtIVIClimateControl::recirculationAttribute() const
+QIviPropertyAttribute<bool> QIviClimateControl::recirculationAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_recirculationAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::recirculationProperty() const
+QIviProperty *QIviClimateControl::recirculationProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_recirculationProperty;
 }
 
 /*!
-   \qmlqtiviproperty {int} {QtIVIVehicleFunctions::ClimateControl::recirculationSensitivityLevel}
+   \qmlqtiviproperty {int} {QtIvi.VehicleFunctions::ClimateControl::recirculationSensitivityLevel}
 
     \e value holds the sensitivity level of the recirculation system when the recirculationMode is set to AutoRecirculation, where the level can be between \c minimumValue(least sensitive)
     to \c maximumValue(most sensitive).
  */
 /*!
-   \property QtIVIClimateControl::recirculationSensitivityLevel
+   \property QIviClimateControl::recirculationSensitivityLevel
 
-   Holds a QtIVIProperty of type \e int where the QtIVIProperty::value() function returns the current sensitivity level of the recicurlcation system when the recirculationMode is set to AutoRecirculation.
+   Holds a QIviProperty of type \e int where the QIviProperty::value() function returns the current sensitivity level of the recicurlcation system when the recirculationMode is set to AutoRecirculation.
 
    \sa AttributeSystem
    \sa recirculationSensitivityLevel() setRecirculationSensitivityLevel() recirculationSensitivityLevelAttribute()
@@ -1348,9 +1348,9 @@ QtIVIProperty *QtIVIClimateControl::recirculationProperty() const
  *
  * \sa setRecirculationSensitivityLevel() recirculationSensitivityLevelChanged() recirculationSensitivityLevelAttribute()
  */
-int QtIVIClimateControl::recirculationSensitivityLevel() const
+int QIviClimateControl::recirculationSensitivityLevel() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_recirculationSensitivityLevel;
 }
 
@@ -1359,20 +1359,20 @@ int QtIVIClimateControl::recirculationSensitivityLevel() const
  *
  * \sa setRecirculationSensitivityLevel() recirculationSensitivityLevel() recirculationSensitivityLevelChanged()
  */
-QtIVIPropertyAttribute<int> QtIVIClimateControl::recirculationSensitivityLevelAttribute() const
+QIviPropertyAttribute<int> QIviClimateControl::recirculationSensitivityLevelAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_recirculationSensitivityLevelAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::recirculationSensitivityLevelProperty() const
+QIviProperty *QIviClimateControl::recirculationSensitivityLevelProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_recirculationSensitivityLevelProperty;
 }
 
 /*!
-   \qmlqtivipropertyEnum {QtIVIVehicleFunctions::ClimateControl::climateMode}
+   \qmlqtivipropertyEnum {QtIvi.VehicleFunctions::ClimateControl::climateMode}
 
    \e value holds the climate mode.
    Available values are:
@@ -1384,9 +1384,9 @@ QtIVIProperty *QtIVIClimateControl::recirculationSensitivityLevelProperty() cons
           The climate system is in automatic mode and is adjusting some parts of the system automatically. e.g. lower the fan speed when the targetTemperature is reached.
  */
 /*!
-   \property QtIVIClimateControl::climateMode
+   \property QIviClimateControl::climateMode
 
-   Holds a QtIVIProperty of type \e QtIVIClimateControl::ClimateMode where the QtIVIProperty::value() function returns the current climate mode.
+   Holds a QIviProperty of type \e QIviClimateControl::ClimateMode where the QIviProperty::value() function returns the current climate mode.
 
    \sa AttributeSystem
    \sa climateMode() setClimateMode() climateModeAttribute()
@@ -1396,9 +1396,9 @@ QtIVIProperty *QtIVIClimateControl::recirculationSensitivityLevelProperty() cons
  *
  * \sa setClimateMode() climateModeChanged() climateModeAttribute()
  */
-QtIVIClimateControl::ClimateMode QtIVIClimateControl::climateMode() const
+QIviClimateControl::ClimateMode QIviClimateControl::climateMode() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_climateMode;
 }
 
@@ -1407,28 +1407,28 @@ QtIVIClimateControl::ClimateMode QtIVIClimateControl::climateMode() const
  *
  * \sa isRecirculationEnabled() recirculationEnabledChanged()
  */
-QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode> QtIVIClimateControl::climateModeAttribute() const
+QIviPropertyAttribute<QIviClimateControl::ClimateMode> QIviClimateControl::climateModeAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_climateModeAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::climateModeProperty() const
+QIviProperty *QIviClimateControl::climateModeProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_climateModeProperty;
 }
 
 /*!
-   \qmlqtiviproperty {int} {QtIVIVehicleFunctions::ClimateControl::automaticClimateFanIntensityLevel}
+   \qmlqtiviproperty {int} {QtIvi.VehicleFunctions::ClimateControl::automaticClimateFanIntensityLevel}
 
     \e value holds the intensity level of the fan when the climateMode is set to AutoClimate, where the level can be between \c minimumValue(least intensity)
     to \c maximumValue(most intensity).
  */
 /*!
-   \property QtIVIClimateControl::automaticClimateFanIntensityLevel
+   \property QIviClimateControl::automaticClimateFanIntensityLevel
 
-   Holds a QtIVIProperty of type \e int where the QtIVIProperty::value() function returns the current intensity level of the fan when the climateMode is set to AutoClimate.
+   Holds a QIviProperty of type \e int where the QIviProperty::value() function returns the current intensity level of the fan when the climateMode is set to AutoClimate.
 
    \sa AttributeSystem
    \sa automaticClimateFanIntensityLevel() setAutomaticClimateFanIntensityLevel() automaticClimateFanIntensityLevelAttribute()
@@ -1438,9 +1438,9 @@ QtIVIProperty *QtIVIClimateControl::climateModeProperty() const
  *
  * \sa setAutomaticClimateFanIntensityLevel() automaticClimateFanIntensityLevelChanged() automaticClimateFanIntensityLevelAttribute()
  */
-int QtIVIClimateControl::automaticClimateFanIntensityLevel() const
+int QIviClimateControl::automaticClimateFanIntensityLevel() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_automaticClimateFanIntensityLevel;
 }
 
@@ -1449,15 +1449,15 @@ int QtIVIClimateControl::automaticClimateFanIntensityLevel() const
  *
  * \sa setAutomaticClimateFanIntensityLevel() automaticClimateFanIntensityLevel() automaticClimateFanIntensityLevelChanged()
  */
-QtIVIPropertyAttribute<int> QtIVIClimateControl::automaticClimateFanIntensityLevelAttribute() const
+QIviPropertyAttribute<int> QIviClimateControl::automaticClimateFanIntensityLevelAttribute() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_automaticClimateFanIntensityLevelAttribute;
 }
 
-QtIVIProperty *QtIVIClimateControl::automaticClimateFanIntensityLevelProperty() const
+QIviProperty *QIviClimateControl::automaticClimateFanIntensityLevelProperty() const
 {
-    Q_D(const QtIVIClimateControl);
+    Q_D(const QIviClimateControl);
     return d->m_automaticClimateFanIntensityLevelProperty;
 }
 
@@ -1466,10 +1466,10 @@ QtIVIProperty *QtIVIClimateControl::automaticClimateFanIntensityLevelProperty()
  *
  * \sa isAirConditioningEnabled() airConditioningEnabledChanged() airConditioningAttribute()
  */
-void QtIVIClimateControl::setAirConditioningEnabled(bool enabled)
+void QIviClimateControl::setAirConditioningEnabled(bool enabled)
 {
-    Q_D(QtIVIClimateControl);
-    if (QtIVIClimateControlBackendInterface* backend = d->climateControlBackend())
+    Q_D(QIviClimateControl);
+    if (QIviClimateControlBackendInterface* backend = d->climateControlBackend())
         backend->setAirConditioningEnabled(enabled, zone());
 }
 
@@ -1478,10 +1478,10 @@ void QtIVIClimateControl::setAirConditioningEnabled(bool enabled)
  *
  * \sa airflowDirections() airflowDirectionsChanged() airflowDirectionsAttribute()
  */
-void QtIVIClimateControl::setAirflowDirections(QtIVIClimateControl::AirflowDirections direction)
+void QIviClimateControl::setAirflowDirections(QIviClimateControl::AirflowDirections direction)
 {
-    Q_D(QtIVIClimateControl);
-    if (QtIVIClimateControlBackendInterface* backend = d->climateControlBackend())
+    Q_D(QIviClimateControl);
+    if (QIviClimateControlBackendInterface* backend = d->climateControlBackend())
         backend->setAirflowDirections(direction, zone());
 }
 
@@ -1490,10 +1490,10 @@ void QtIVIClimateControl::setAirflowDirections(QtIVIClimateControl::AirflowDirec
  *
  * \sa isHeaterEnabled() heaterEnabledChanged() heaterAttribute()
  */
-void QtIVIClimateControl::setHeaterEnabled(bool enabled)
+void QIviClimateControl::setHeaterEnabled(bool enabled)
 {
-    Q_D(QtIVIClimateControl);
-    if (QtIVIClimateControlBackendInterface* backend = d->climateControlBackend())
+    Q_D(QIviClimateControl);
+    if (QIviClimateControlBackendInterface* backend = d->climateControlBackend())
         backend->setHeaterEnabled(enabled, zone());
 }
 
@@ -1502,10 +1502,10 @@ void QtIVIClimateControl::setHeaterEnabled(bool enabled)
  *
  * \sa steeringWheelHeater() steeringWheelHeaterChanged() steeringWheelHeaterAttribute()
  */
-void QtIVIClimateControl::setSteeringWheelHeater(int value)
+void QIviClimateControl::setSteeringWheelHeater(int value)
 {
-    Q_D(QtIVIClimateControl);
-    if (QtIVIClimateControlBackendInterface* backend = d->climateControlBackend())
+    Q_D(QIviClimateControl);
+    if (QIviClimateControlBackendInterface* backend = d->climateControlBackend())
         backend->setSteeringWheelHeater(value, zone());
 }
 
@@ -1514,10 +1514,10 @@ void QtIVIClimateControl::setSteeringWheelHeater(int value)
  *
  * \sa fanSpeedLevel() fanSpeedLevelChanged() fanSpeedLevelAttribute()
  */
-void QtIVIClimateControl::setFanSpeedLevel(int value)
+void QIviClimateControl::setFanSpeedLevel(int value)
 {
-    Q_D(QtIVIClimateControl);
-    if (QtIVIClimateControlBackendInterface* backend = d->climateControlBackend())
+    Q_D(QIviClimateControl);
+    if (QIviClimateControlBackendInterface* backend = d->climateControlBackend())
         backend->setFanSpeedLevel(value, zone());
 }
 
@@ -1526,10 +1526,10 @@ void QtIVIClimateControl::setFanSpeedLevel(int value)
  *
  * \sa targetTemperature() targetTemperatureChanged() targetTemperatureAttribute()
  */
-void QtIVIClimateControl::setTargetTemperature(int temperature)
+void QIviClimateControl::setTargetTemperature(int temperature)
 {
-    Q_D(QtIVIClimateControl);
-    if (QtIVIClimateControlBackendInterface* backend = d->climateControlBackend())
+    Q_D(QIviClimateControl);
+    if (QIviClimateControlBackendInterface* backend = d->climateControlBackend())
         backend->setTargetTemperature(temperature, zone());
 }
 
@@ -1538,10 +1538,10 @@ void QtIVIClimateControl::setTargetTemperature(int temperature)
  *
  * \sa seatCooler() seatCoolerChanged() seatCoolerAttribute()
  */
-void QtIVIClimateControl::setSeatCooler(int value)
+void QIviClimateControl::setSeatCooler(int value)
 {
-    Q_D(QtIVIClimateControl);
-    if (QtIVIClimateControlBackendInterface* backend = d->climateControlBackend())
+    Q_D(QIviClimateControl);
+    if (QIviClimateControlBackendInterface* backend = d->climateControlBackend())
         backend->setSeatCooler(value, zone());
 }
 
@@ -1550,10 +1550,10 @@ void QtIVIClimateControl::setSeatCooler(int value)
  *
  * \sa seatHeater() seatHeaterChanged() seatHeaterAttribute()
  */
-void QtIVIClimateControl::setSeatHeater(int value)
+void QIviClimateControl::setSeatHeater(int value)
 {
-    Q_D(QtIVIClimateControl);
-    if (QtIVIClimateControlBackendInterface* backend = d->climateControlBackend())
+    Q_D(QIviClimateControl);
+    if (QIviClimateControlBackendInterface* backend = d->climateControlBackend())
         backend->setSeatHeater(value, zone());
 }
 
@@ -1562,10 +1562,10 @@ void QtIVIClimateControl::setSeatHeater(int value)
  *
  * \sa isZoneSynchronizationEnabled() zoneSynchronizationEnabledChanged() zoneSynchronizationAttribute()
  */
-void QtIVIClimateControl::setZoneSynchronizationEnabled(bool enabled)
+void QIviClimateControl::setZoneSynchronizationEnabled(bool enabled)
 {
-    Q_D(QtIVIClimateControl);
-    if (QtIVIClimateControlBackendInterface* backend = d->climateControlBackend())
+    Q_D(QIviClimateControl);
+    if (QIviClimateControlBackendInterface* backend = d->climateControlBackend())
         backend->setZoneSynchronizationEnabled(enabled, zone());
 }
 
@@ -1574,10 +1574,10 @@ void QtIVIClimateControl::setZoneSynchronizationEnabled(bool enabled)
  *
  * \sa isDefrostEnabled() defrostEnabledChanged() defrostAttribute()
  */
-void QtIVIClimateControl::setDefrostEnabled(bool enabled)
+void QIviClimateControl::setDefrostEnabled(bool enabled)
 {
-    Q_D(QtIVIClimateControl);
-    if (QtIVIClimateControlBackendInterface* backend = d->climateControlBackend())
+    Q_D(QIviClimateControl);
+    if (QIviClimateControlBackendInterface* backend = d->climateControlBackend())
         backend->setDefrostEnabled(enabled, zone());
 }
 
@@ -1586,10 +1586,10 @@ void QtIVIClimateControl::setDefrostEnabled(bool enabled)
  *
  * \sa recirculationMode() recirculationModeChanged() recirculationModeAttribute()
  */
-void QtIVIClimateControl::setRecirculationMode(QtIVIClimateControl::RecirculationMode recirculationMode)
+void QIviClimateControl::setRecirculationMode(QIviClimateControl::RecirculationMode recirculationMode)
 {
-    Q_D(QtIVIClimateControl);
-    if (QtIVIClimateControlBackendInterface* backend = d->climateControlBackend())
+    Q_D(QIviClimateControl);
+    if (QIviClimateControlBackendInterface* backend = d->climateControlBackend())
         backend->setRecirculationMode(recirculationMode, zone());
 }
 
@@ -1598,10 +1598,10 @@ void QtIVIClimateControl::setRecirculationMode(QtIVIClimateControl::Recirculatio
  *
  * \sa recirculationSensitivityLevel() recirculationSensitivityLevelChanged() recirculationSensitivityLevelAttribute()
  */
-void QtIVIClimateControl::setRecirculationSensitivityLevel(int value)
+void QIviClimateControl::setRecirculationSensitivityLevel(int value)
 {
-    Q_D(QtIVIClimateControl);
-    if (QtIVIClimateControlBackendInterface* backend = d->climateControlBackend())
+    Q_D(QIviClimateControl);
+    if (QIviClimateControlBackendInterface* backend = d->climateControlBackend())
         backend->setRecirculationSensitivityLevel(value, zone());
 }
 
@@ -1610,10 +1610,10 @@ void QtIVIClimateControl::setRecirculationSensitivityLevel(int value)
  *
  * \sa climateMode() climateModeChanged() climateModeAttribute()
  */
-void QtIVIClimateControl::setClimateMode(QtIVIClimateControl::ClimateMode climateMode)
+void QIviClimateControl::setClimateMode(QIviClimateControl::ClimateMode climateMode)
 {
-    Q_D(QtIVIClimateControl);
-    if (QtIVIClimateControlBackendInterface* backend = d->climateControlBackend())
+    Q_D(QIviClimateControl);
+    if (QIviClimateControlBackendInterface* backend = d->climateControlBackend())
         backend->setClimateMode(climateMode, zone());
 }
 
@@ -1622,232 +1622,232 @@ void QtIVIClimateControl::setClimateMode(QtIVIClimateControl::ClimateMode climat
  *
  * \sa automaticClimateFanIntensityLevel() automaticClimateFanIntensityLevelChanged() automaticClimateFanIntensityLevelAttribute()
  */
-void QtIVIClimateControl::setAutomaticClimateFanIntensityLevel(int value)
+void QIviClimateControl::setAutomaticClimateFanIntensityLevel(int value)
 {
-    Q_D(QtIVIClimateControl);
-    if (QtIVIClimateControlBackendInterface* backend = d->climateControlBackend())
+    Q_D(QIviClimateControl);
+    if (QIviClimateControlBackendInterface* backend = d->climateControlBackend())
         backend->setAutomaticClimateFanIntensityLevel(value, zone());
 }
 
 /*!
- * \fn void QtIVIClimateControl::airflowDirectionsChanged(QtIVIClimateControl::AirflowDirections value)
+ * \fn void QIviClimateControl::airflowDirectionsChanged(QIviClimateControl::AirflowDirections value)
  *
  * This signal is emitted whenever the air flow directions change. The new flow directions are passed as \a value.
  *
  * \sa airflowDirections() setAirflowDirections() airflowDirectionsAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::airflowDirectionsAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> &attribute);
+ * \fn void QIviClimateControl::airflowDirectionsAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::AirflowDirections> &attribute);
  *
  * This signal is emitted whenever the attribute for the airflowDirections property changes. The new attribute is passed as \a attribute.
  *
  * \sa airflowDirectionsAttribute() airflowDirections()
  */
 /*!
- * \fn void QtIVIClimateControl::airConditioningEnabledChanged(bool enabled);
+ * \fn void QIviClimateControl::airConditioningEnabledChanged(bool enabled);
  *
  * This signal is emitted whenever the air conditioning system is turned \e on or \e off. The new value is passed as \a enabled.
  *
  * \sa isAirConditioningEnabled() setAirConditioningEnabled() airConditioningAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::airConditioningAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
+ * \fn void QIviClimateControl::airConditioningAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
  *
  * This signal is emitted whenever the attribute for the airConditioning property changes. The new attribute is passed as \a attribute.
  *
  * \sa airConditioningAttribute() isAirConditioningEnabled()
  */
 /*!
- * \fn void QtIVIClimateControl::heaterEnabledChanged(bool enabled);
+ * \fn void QIviClimateControl::heaterEnabledChanged(bool enabled);
  *
  * This signal is emitted whenever the heater is turned \e on or \e off. The new value is passed as \a enabled.
  *
  * \sa isHeaterEnabled() setHeaterEnabled() heaterAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::heaterAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
+ * \fn void QIviClimateControl::heaterAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
  *
  * This signal is emitted whenever the attribute for the heater property changes. The new attribute is passed as \a attribute.
  *
  * \sa heaterAttribute() isHeaterEnabled()
  */
 /*!
- * \fn void QtIVIClimateControl::steeringWheelHeaterChanged(int value);
+ * \fn void QIviClimateControl::steeringWheelHeaterChanged(int value);
  *
  * This signal is emitted whenever the steering wheel heater level changed. The new level is passed as \a value.
  *
  * \sa steeringWheelHeater() setSteeringWheelHeater() steeringWheelHeaterAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::steeringWheelHeaterAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+ * \fn void QIviClimateControl::steeringWheelHeaterAttributeChanged(const QIviPropertyAttribute<int> &attribute);
  *
  * This signal is emitted whenever the attribute for the steeringWheelHeater property changes. The new attribute is passed as \a attribute.
  *
  * \sa steeringWheelHeaterAttribute() steeringWheelHeater()
  */
 /*!
- * \fn void QtIVIClimateControl::fanSpeedLevelChanged(int value);
+ * \fn void QIviClimateControl::fanSpeedLevelChanged(int value);
  *
  * This signal is emitted whenever the fan speed level changed. The new level is passed as \a value.
  *
  * \sa fanSpeedLevel() setFanSpeedLevel() fanSpeedLevelAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::fanSpeedLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+ * \fn void QIviClimateControl::fanSpeedLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute);
  *
  * This signal is emitted whenever the attribute for the fanSpeedLevel property changes. The new attribute is passed as \a attribute.
  *
  * \sa fanSpeedLevelAttribute() fanSpeedLevel()
  */
 /*!
- * \fn void QtIVIClimateControl::targetTemperatureChanged(int temperature);
+ * \fn void QIviClimateControl::targetTemperatureChanged(int temperature);
  *
  * This signal is emitted whenever the target temperature changed. The new temperature is passed as \a temperature.
  *
  * \sa targetTemperature() setTargetTemperature() targetTemperatureAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::targetTemperatureAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+ * \fn void QIviClimateControl::targetTemperatureAttributeChanged(const QIviPropertyAttribute<int> &attribute);
  *
  * This signal is emitted whenever the attribute for the targetTemperature property changes. The new attribute is passed as \a attribute.
  *
  * \sa targetTemperatureAttribute() targetTemperature()
  */
 /*!
- * \fn void QtIVIClimateControl::seatCoolerChanged(int value);
+ * \fn void QIviClimateControl::seatCoolerChanged(int value);
  *
  * This signal is emitted whenever the seat cooler level changed. The new level is passed as \a value.
  *
  * \sa seatCooler() setSeatCooler() seatCoolerAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::seatCoolerAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+ * \fn void QIviClimateControl::seatCoolerAttributeChanged(const QIviPropertyAttribute<int> &attribute);
  *
  * This signal is emitted whenever the attribute for the seatCooler property changes. The new attribute is passed as \a attribute.
  *
  * \sa seatCoolerAttribute() seatCooler()
  */
 /*!
- * \fn void QtIVIClimateControl::seatHeaterChanged(int value);
+ * \fn void QIviClimateControl::seatHeaterChanged(int value);
  *
  * This signal is emitted whenever the seat heater level changed. The new level is passed as \a value.
  *
  * \sa seatHeater() setSeatHeater() seatHeaterAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::seatHeaterAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+ * \fn void QIviClimateControl::seatHeaterAttributeChanged(const QIviPropertyAttribute<int> &attribute);
  *
  * This signal is emitted whenever the attribute for the heater property changes. The new attribute is passed as \a attribute.
  *
  * \sa heaterAttribute() isHeaterEnabled()
  */
 /*!
- * \fn void QtIVIClimateControl::outsideTemperatureChanged(int value);
+ * \fn void QIviClimateControl::outsideTemperatureChanged(int value);
  *
  * This signal is emitted whenever the outside temperature changes. The new temperature is passed as \a value.
  *
  * \sa outsideTemperature() outsideTemperatureAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::outsideTemperatureAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+ * \fn void QIviClimateControl::outsideTemperatureAttributeChanged(const QIviPropertyAttribute<int> &attribute);
  *
  * This signal is emitted whenever the attribute for the outsideTemperature property changes. The new attribute is passed as \a attribute.
  *
  * \sa outsideTemperatureAttribute() outsideTemperature()
  */
 /*!
- * \fn void QtIVIClimateControl::zoneSynchronizationEnabledChanged(bool enabled);
+ * \fn void QIviClimateControl::zoneSynchronizationEnabledChanged(bool enabled);
  *
  * This signal is emitted whenever the zone synchronization is turned \e on or \e off. The new value is passed as \a enabled.
  *
  * \sa isZoneSynchronizationEnabled() setZoneSynchronizationEnabled() zoneSynchronizationAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::zoneSynchronizationAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
+ * \fn void QIviClimateControl::zoneSynchronizationAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
  *
  * This signal is emitted whenever the attribute for the zoneSynchronization property changes. The new attribute is passed as \a attribute.
  *
  * \sa zoneSynchronizationAttribute() isZoneSynchronizationEnabled()
  */
 /*!
- * \fn void QtIVIClimateControl::defrostEnabledChanged(bool enabled);
+ * \fn void QIviClimateControl::defrostEnabledChanged(bool enabled);
  *
  * This signal is emitted whenever the defrost is turned \e on or \e off. The new value is passed as \a enabled.
  *
  * \sa isDefrostEnabled() setDefrostEnabled() defrostAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::defrostAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
+ * \fn void QIviClimateControl::defrostAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
  *
  * This signal is emitted whenever the attribute for the defrost property changes. The new attribute is passed as \a attribute.
  *
  * \sa defrostAttribute() isDefrostEnabled()
  */
 /*!
- * \fn void QtIVIClimateControl::recirculationEnabledChanged(bool enabled);
+ * \fn void QIviClimateControl::recirculationEnabledChanged(bool enabled);
  *
  * This signal is emitted whenever the recirculation is turned \e on or \e off. The new value is passed as \a enabled.
  *
  * \sa isRecirculationEnabled() recirculationAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::recirculationAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
+ * \fn void QIviClimateControl::recirculationAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
  *
  * This signal is emitted whenever the attribute for the heater property changes. The new attribute is passed as \a attribute.
  *
  * \sa recirculationAttribute() isRecirculationEnabled()
  */
 /*!
- * \fn void QtIVIClimateControl::recirculationModeChanged(QtIVIClimateControl::RecirculationMode value)
+ * \fn void QIviClimateControl::recirculationModeChanged(QIviClimateControl::RecirculationMode value)
  *
  * This signal is emitted whenever the recirculation mode changes. The new recirculation mode is passed as \a value.
  *
  * \sa recirculationMode() setRecirculationMode() recirculationModeAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::recirculationModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> &attribute);
+ * \fn void QIviClimateControl::recirculationModeAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::RecirculationMode> &attribute);
  *
  * This signal is emitted whenever the attribute for the recirculationMode property changes. The new attribute is passed as \a attribute.
  *
  * \sa recirculationModeAttribute() recirculationMode()
  */
 /*!
- * \fn void QtIVIClimateControl::recirculationSensitivityLevelChanged(int value);
+ * \fn void QIviClimateControl::recirculationSensitivityLevelChanged(int value);
  *
  * This signal is emitted whenever the recirculation sensitivity level level changes. The new level is passed as \a value.
  *
  * \sa recirculationSensitivityLevel() setRecirculationSensitivityLevel() recirculationSensitivityLevelAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::recirculationSensitivityLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+ * \fn void QIviClimateControl::recirculationSensitivityLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute);
  *
  * This signal is emitted whenever the attribute for the recirculationSensitivityLevel property changes. The new attribute is passed as \a attribute.
  *
  * \sa recirculationSensitivityLevelAttribute() recirculationSensitivityLevel()
  */
 /*!
- * \fn void QtIVIClimateControl::climateModeChanged(QtIVIClimateControl::ClimateMode value)
+ * \fn void QIviClimateControl::climateModeChanged(QIviClimateControl::ClimateMode value)
  *
  * This signal is emitted whenever the climate mode changes. The new climate mode is passed as \a value.
  *
  * \sa climateMode() setClimateMode() climateModeAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::climateModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode> &attribute);
+ * \fn void QIviClimateControl::climateModeAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::ClimateMode> &attribute);
  *
  * This signal is emitted whenever the attribute for the climateMode property changes. The new attribute is passed as \a attribute.
  *
  * \sa climateModeAttribute() climateMode()
  */
 /*!
- * \fn void QtIVIClimateControl::automaticClimateFanIntensityLevelChanged(int value);
+ * \fn void QIviClimateControl::automaticClimateFanIntensityLevelChanged(int value);
  *
  * This signal is emitted whenever the fan intensity level changes. The new level is passed as \a value.
  *
  * \sa automaticClimateFanIntensityLevel() setAutomaticClimateFanIntensityLevel() automaticClimateFanIntensityLevelAttribute()
  */
 /*!
- * \fn void QtIVIClimateControl::automaticClimateFanIntensityLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+ * \fn void QIviClimateControl::automaticClimateFanIntensityLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute);
  *
  * This signal is emitted whenever the attribute for the automaticClimateFanIntensityLevel property changes. The new attribute is passed as \a attribute.
  *
diff --git a/src/ivivehiclefunctions/qtiviclimatecontrol.h b/src/ivivehiclefunctions/qtiviclimatecontrol.h
index 7166582..8010fd3 100644
--- a/src/ivivehiclefunctions/qtiviclimatecontrol.h
+++ b/src/ivivehiclefunctions/qtiviclimatecontrol.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -42,36 +42,36 @@
 #ifndef CLIMATECONTROL_H
 #define CLIMATECONTROL_H
 
-#include <QtIVICore/QtIVIAbstractZonedFeature>
-#include <QtIVICore/QtIVIProperty>
-#include <QtIVIVehicleFunctions/qtivivehiclefunctionsglobal.h>
+#include <QtIviCore/QIviAbstractZonedFeature>
+#include <QtIviCore/QIviProperty>
+#include <QtIviVehicleFunctions/qtivivehiclefunctionsglobal.h>
 
 QT_BEGIN_NAMESPACE
 
-class QtIVIClimateControlBackendInterface;
-class QtIVIClimateControlPrivate;
+class QIviClimateControlBackendInterface;
+class QIviClimateControlPrivate;
 
-static const QLatin1String QtIVIStringClimateControlInterfaceName("com.qt-project.qtivi.ClimateControl");
+static const QLatin1String QIviStringClimateControlInterfaceName("com.qt-project.qtivi.ClimateControl");
 
-class Q_QTIVIVEHICLEFUNCTIONS_EXPORT QtIVIClimateControl : public QtIVIAbstractZonedFeature
+class Q_QTIVIVEHICLEFUNCTIONS_EXPORT QIviClimateControl : public QIviAbstractZonedFeature
 {
     Q_OBJECT
-    Q_PROPERTY(QtIVIProperty* airConditioning READ airConditioningProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* airflowDirections READ airflowDirectionsProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* heater READ heaterProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* fanSpeedLevel READ fanSpeedLevelProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* steeringWheelHeater READ steeringWheelHeaterProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* targetTemperature READ targetTemperatureProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* seatCooler READ seatCoolerProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* seatHeater READ seatHeaterProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* outsideTemperature READ outsideTemperatureProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* zoneSynchronization READ zoneSynchronizationProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* defrost READ defrostProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* recirculationMode READ recirculationModeProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* recirculation READ recirculationProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* recirculationSensitivityLevel READ recirculationSensitivityLevelProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* climateMode READ climateModeProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty* automaticClimateFanIntensityLevel READ automaticClimateFanIntensityLevelProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* airConditioning READ airConditioningProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* airflowDirections READ airflowDirectionsProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* heater READ heaterProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* fanSpeedLevel READ fanSpeedLevelProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* steeringWheelHeater READ steeringWheelHeaterProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* targetTemperature READ targetTemperatureProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* seatCooler READ seatCoolerProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* seatHeater READ seatHeaterProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* outsideTemperature READ outsideTemperatureProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* zoneSynchronization READ zoneSynchronizationProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* defrost READ defrostProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* recirculationMode READ recirculationModeProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* recirculation READ recirculationProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* recirculationSensitivityLevel READ recirculationSensitivityLevelProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* climateMode READ climateModeProperty CONSTANT)
+    Q_PROPERTY(QIviProperty* automaticClimateFanIntensityLevel READ automaticClimateFanIntensityLevelProperty CONSTANT)
 
 public:
     enum AirflowDirection {
@@ -96,61 +96,61 @@ public:
     };
     Q_ENUM(ClimateMode)
 
-    QtIVIClimateControl(const QString &zone=QString(), QObject* parent=0);
-    ~QtIVIClimateControl();
+    QIviClimateControl(const QString &zone=QString(), QObject* parent=Q_NULLPTR);
+    ~QIviClimateControl();
 
     bool isAirConditioningEnabled() const;
-    QtIVIPropertyAttribute<bool> airConditioningAttribute() const;
-    QtIVIProperty* airConditioningProperty() const;
-    QtIVIClimateControl::AirflowDirections airflowDirections() const;
-    QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> airflowDirectionsAttribute() const;
-    QtIVIProperty* airflowDirectionsProperty() const;
+    QIviPropertyAttribute<bool> airConditioningAttribute() const;
+    QIviProperty* airConditioningProperty() const;
+    QIviClimateControl::AirflowDirections airflowDirections() const;
+    QIviPropertyAttribute<QIviClimateControl::AirflowDirections> airflowDirectionsAttribute() const;
+    QIviProperty* airflowDirectionsProperty() const;
     bool isHeaterEnabled() const;
-    QtIVIPropertyAttribute<bool> heaterAttribute() const;
-    QtIVIProperty* heaterProperty() const;
+    QIviPropertyAttribute<bool> heaterAttribute() const;
+    QIviProperty* heaterProperty() const;
     int steeringWheelHeater() const;
-    QtIVIPropertyAttribute<int> steeringWheelHeaterAttribute() const;
-    QtIVIProperty* steeringWheelHeaterProperty() const;
+    QIviPropertyAttribute<int> steeringWheelHeaterAttribute() const;
+    QIviProperty* steeringWheelHeaterProperty() const;
     int fanSpeedLevel() const;
-    QtIVIPropertyAttribute<int> fanSpeedLevelAttribute() const;
-    QtIVIProperty* fanSpeedLevelProperty() const;
+    QIviPropertyAttribute<int> fanSpeedLevelAttribute() const;
+    QIviProperty* fanSpeedLevelProperty() const;
     int targetTemperature() const;
-    QtIVIPropertyAttribute<int> targetTemperatureAttribute() const;
-    QtIVIProperty* targetTemperatureProperty() const;
+    QIviPropertyAttribute<int> targetTemperatureAttribute() const;
+    QIviProperty* targetTemperatureProperty() const;
     int seatCooler() const;
-    QtIVIPropertyAttribute<int> seatCoolerAttribute() const;
-    QtIVIProperty* seatCoolerProperty() const;
+    QIviPropertyAttribute<int> seatCoolerAttribute() const;
+    QIviProperty* seatCoolerProperty() const;
     int seatHeater() const;
-    QtIVIPropertyAttribute<int> seatHeaterAttribute() const;
-    QtIVIProperty* seatHeaterProperty() const;
+    QIviPropertyAttribute<int> seatHeaterAttribute() const;
+    QIviProperty* seatHeaterProperty() const;
     int outsideTemperature() const;
-    QtIVIPropertyAttribute<int> outsideTemperatureAttribute() const;
-    QtIVIProperty* outsideTemperatureProperty() const;
+    QIviPropertyAttribute<int> outsideTemperatureAttribute() const;
+    QIviProperty* outsideTemperatureProperty() const;
     bool isZoneSynchronizationEnabled() const;
-    QtIVIPropertyAttribute<bool> zoneSynchronizationAttribute() const;
-    QtIVIProperty* zoneSynchronizationProperty() const;
+    QIviPropertyAttribute<bool> zoneSynchronizationAttribute() const;
+    QIviProperty* zoneSynchronizationProperty() const;
     bool isDefrostEnabled() const;
-    QtIVIPropertyAttribute<bool> defrostAttribute() const;
-    QtIVIProperty* defrostProperty() const;
-    QtIVIClimateControl::RecirculationMode recirculationMode() const;
-    QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> recirculationModeAttribute() const;
-    QtIVIProperty* recirculationModeProperty() const;
+    QIviPropertyAttribute<bool> defrostAttribute() const;
+    QIviProperty* defrostProperty() const;
+    QIviClimateControl::RecirculationMode recirculationMode() const;
+    QIviPropertyAttribute<QIviClimateControl::RecirculationMode> recirculationModeAttribute() const;
+    QIviProperty* recirculationModeProperty() const;
     bool isRecirculationEnabled() const;
-    QtIVIPropertyAttribute<bool> recirculationAttribute() const;
-    QtIVIProperty* recirculationProperty() const;
+    QIviPropertyAttribute<bool> recirculationAttribute() const;
+    QIviProperty* recirculationProperty() const;
     int recirculationSensitivityLevel() const;
-    QtIVIPropertyAttribute<int> recirculationSensitivityLevelAttribute() const;
-    QtIVIProperty* recirculationSensitivityLevelProperty() const;
-    QtIVIClimateControl::ClimateMode climateMode() const;
-    QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode> climateModeAttribute() const;
-    QtIVIProperty* climateModeProperty() const;
+    QIviPropertyAttribute<int> recirculationSensitivityLevelAttribute() const;
+    QIviProperty* recirculationSensitivityLevelProperty() const;
+    QIviClimateControl::ClimateMode climateMode() const;
+    QIviPropertyAttribute<QIviClimateControl::ClimateMode> climateModeAttribute() const;
+    QIviProperty* climateModeProperty() const;
     int automaticClimateFanIntensityLevel() const;
-    QtIVIPropertyAttribute<int> automaticClimateFanIntensityLevelAttribute() const;
-    QtIVIProperty* automaticClimateFanIntensityLevelProperty() const;
+    QIviPropertyAttribute<int> automaticClimateFanIntensityLevelAttribute() const;
+    QIviProperty* automaticClimateFanIntensityLevelProperty() const;
 
 public Q_SLOTS:
     void setAirConditioningEnabled(bool enabled);
-    void setAirflowDirections(QtIVIClimateControl::AirflowDirections value);
+    void setAirflowDirections(QIviClimateControl::AirflowDirections value);
     void setHeaterEnabled(bool enabled);
     void setSteeringWheelHeater(int value);
     void setFanSpeedLevel(int value);
@@ -159,94 +159,94 @@ public Q_SLOTS:
     void setSeatHeater(int seatHeater);
     void setZoneSynchronizationEnabled(bool enabled);
     void setDefrostEnabled(bool enabled);
-    void setRecirculationMode(QtIVIClimateControl::RecirculationMode recirculationMode);
+    void setRecirculationMode(QIviClimateControl::RecirculationMode recirculationMode);
     void setRecirculationSensitivityLevel(int value);
-    void setClimateMode(QtIVIClimateControl::ClimateMode climateMode);
+    void setClimateMode(QIviClimateControl::ClimateMode climateMode);
     void setAutomaticClimateFanIntensityLevel(int value);
 
 Q_SIGNALS:
-    void airflowDirectionsChanged(QtIVIClimateControl::AirflowDirections value);
-    void airflowDirectionsAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> &attribute);
+    void airflowDirectionsChanged(QIviClimateControl::AirflowDirections value);
+    void airflowDirectionsAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::AirflowDirections> &attribute);
     void airConditioningEnabledChanged(bool enabled);
-    void airConditioningAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
+    void airConditioningAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
     void heaterEnabledChanged(bool enabled);
-    void heaterAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
+    void heaterAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
     void steeringWheelHeaterChanged(int value);
-    void steeringWheelHeaterAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+    void steeringWheelHeaterAttributeChanged(const QIviPropertyAttribute<int> &attribute);
     void fanSpeedLevelChanged(int value);
-    void fanSpeedLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+    void fanSpeedLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute);
     void targetTemperatureChanged(int temperature);
-    void targetTemperatureAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+    void targetTemperatureAttributeChanged(const QIviPropertyAttribute<int> &attribute);
     void seatCoolerChanged(int value);
-    void seatCoolerAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+    void seatCoolerAttributeChanged(const QIviPropertyAttribute<int> &attribute);
     void seatHeaterChanged(int value);
-    void seatHeaterAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+    void seatHeaterAttributeChanged(const QIviPropertyAttribute<int> &attribute);
     void outsideTemperatureChanged(int value);
-    void outsideTemperatureAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+    void outsideTemperatureAttributeChanged(const QIviPropertyAttribute<int> &attribute);
     void zoneSynchronizationEnabledChanged(bool enabled);
-    void zoneSynchronizationAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
+    void zoneSynchronizationAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
     void defrostEnabledChanged(bool enabled);
-    void defrostAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
-    void recirculationModeChanged(QtIVIClimateControl::RecirculationMode value);
-    void recirculationModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> &attribute);
+    void defrostAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
+    void recirculationModeChanged(QIviClimateControl::RecirculationMode value);
+    void recirculationModeAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::RecirculationMode> &attribute);
     void recirculationEnabledChanged(bool enabled);
-    void recirculationAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
+    void recirculationAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
     void recirculationSensitivityLevelChanged(int value);
-    void recirculationSensitivityLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
-    void climateModeChanged(QtIVIClimateControl::ClimateMode value);
-    void climateModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode> &attribute);
+    void recirculationSensitivityLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute);
+    void climateModeChanged(QIviClimateControl::ClimateMode value);
+    void climateModeAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::ClimateMode> &attribute);
     void automaticClimateFanIntensityLevelChanged(int value);
-    void automaticClimateFanIntensityLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute);
+    void automaticClimateFanIntensityLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute);
 
 protected:
-    QtIVIClimateControl(QtIVIClimateControlPrivate &dd, QObject *parent = Q_NULLPTR);
-    virtual QtIVIAbstractZonedFeature* createZoneFeature(const QString &zone) Q_DECL_OVERRIDE;
+    QIviClimateControl(QIviClimateControlPrivate &dd, QObject *parent = Q_NULLPTR);
+    virtual QIviAbstractZonedFeature* createZoneFeature(const QString &zone) Q_DECL_OVERRIDE;
 
-    virtual void connectToServiceObject(QtIVIServiceObject *serviceObject) Q_DECL_OVERRIDE;
-    virtual void disconnectFromServiceObject(QtIVIServiceObject *serviceObject) Q_DECL_OVERRIDE;
+    virtual void connectToServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
+    virtual void disconnectFromServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
     virtual void clearServiceObject() Q_DECL_OVERRIDE;
 
 private:
-    Q_DECLARE_PRIVATE(QtIVIClimateControl)
-    Q_PRIVATE_SLOT(d_func(), void onAirflowDirectionsChanged(QtIVIClimateControl::AirflowDirections value, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onAirflowDirectionsAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> &airflowDirectionsAttribute, const QString &zone))
+    Q_DECLARE_PRIVATE(QIviClimateControl)
+    Q_PRIVATE_SLOT(d_func(), void onAirflowDirectionsChanged(QIviClimateControl::AirflowDirections value, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onAirflowDirectionsAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::AirflowDirections> &airflowDirectionsAttribute, const QString &zone))
     Q_PRIVATE_SLOT(d_func(), void onAirConditioningEnabledChanged(bool enabled, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onAirConditioningAttributeChanged(const QtIVIPropertyAttribute<bool> &airConditioningEnabledAttribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onAirConditioningAttributeChanged(const QIviPropertyAttribute<bool> &airConditioningEnabledAttribute, const QString &zone))
     Q_PRIVATE_SLOT(d_func(), void onHeaterEnabledChanged(bool enabled, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onHeaterAttributeChanged(const QtIVIPropertyAttribute<bool> &heaterEnabledAttribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onHeaterAttributeChanged(const QIviPropertyAttribute<bool> &heaterEnabledAttribute, const QString &zone))
     Q_PRIVATE_SLOT(d_func(), void onSteeringWheelHeaterChanged(int value, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onSteeringWheelHeaterAttributeChanged(const QtIVIPropertyAttribute<int> &steeringWheelHeaterAttribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onSteeringWheelHeaterAttributeChanged(const QIviPropertyAttribute<int> &steeringWheelHeaterAttribute, const QString &zone))
     Q_PRIVATE_SLOT(d_func(), void onFanSpeedLevelChanged(int value, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onFanSpeedLevelAttributeChanged(const QtIVIPropertyAttribute<int> &fanSpeedAttribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onFanSpeedLevelAttributeChanged(const QIviPropertyAttribute<int> &fanSpeedAttribute, const QString &zone))
     Q_PRIVATE_SLOT(d_func(), void onTargetTemperatureChanged(int temperature, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onTargetTemperatureAttributeChanged(const QtIVIPropertyAttribute<int> &temperatureAttribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onTargetTemperatureAttributeChanged(const QIviPropertyAttribute<int> &temperatureAttribute, const QString &zone))
     Q_PRIVATE_SLOT(d_func(), void onSeatCoolerChanged(int value, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onSeatCoolerAttributeChanged(const QtIVIPropertyAttribute<int> &seatCoolerAttribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onSeatCoolerAttributeChanged(const QIviPropertyAttribute<int> &seatCoolerAttribute, const QString &zone))
     Q_PRIVATE_SLOT(d_func(), void onSeatHeaterChanged(int value, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onSeatHeaterAttributeChanged(const QtIVIPropertyAttribute<int> &seatHeaterAttribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onSeatHeaterAttributeChanged(const QIviPropertyAttribute<int> &seatHeaterAttribute, const QString &zone))
     Q_PRIVATE_SLOT(d_func(), void onOutsideTemperatureChanged(int outsideTemperature, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onOutsideTemperatureAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onOutsideTemperatureAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone))
     Q_PRIVATE_SLOT(d_func(), void onZoneSynchronizationChanged(bool isZoneSynchronizationEnabled, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onZoneSynchronizationAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onZoneSynchronizationAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone))
     Q_PRIVATE_SLOT(d_func(), void onDefrostChanged(bool isDefrostEnabled, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onDefrostAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onRecirculationModeChanged(QtIVIClimateControl::RecirculationMode recirculationMode, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onRecirculationModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> &attribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onDefrostAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onRecirculationModeChanged(QIviClimateControl::RecirculationMode recirculationMode, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onRecirculationModeAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::RecirculationMode> &attribute, const QString &zone))
     Q_PRIVATE_SLOT(d_func(), void onRecirculationChanged(bool isRecirculationEnabled, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onRecirculationAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onRecirculationAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone))
     Q_PRIVATE_SLOT(d_func(), void onRecirculationSensitivityLevelChanged(int recirculationSensitivityLevel, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onRecirculationSensitivityLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onClimateModeChanged(QtIVIClimateControl::ClimateMode climateMode, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onClimateModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode> &attribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onRecirculationSensitivityLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onClimateModeChanged(QIviClimateControl::ClimateMode climateMode, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onClimateModeAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::ClimateMode> &attribute, const QString &zone))
     Q_PRIVATE_SLOT(d_func(), void onAutomaticClimateFanIntensityLevelChanged(int automaticClimateFanIntensityLevel, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onAutomaticClimateFanIntensityLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onAutomaticClimateFanIntensityLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone))
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections>)
-Q_DECLARE_METATYPE(QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode>)
-Q_DECLARE_METATYPE(QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode>)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QtIVIClimateControl::AirflowDirections)
+Q_DECLARE_METATYPE(QIviPropertyAttribute<QIviClimateControl::AirflowDirections>)
+Q_DECLARE_METATYPE(QIviPropertyAttribute<QIviClimateControl::RecirculationMode>)
+Q_DECLARE_METATYPE(QIviPropertyAttribute<QIviClimateControl::ClimateMode>)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QIviClimateControl::AirflowDirections)
 
 #endif // CLIMATECONTROL_H
diff --git a/src/ivivehiclefunctions/qtiviclimatecontrol_p.h b/src/ivivehiclefunctions/qtiviclimatecontrol_p.h
index 784b094..f38c13f 100644
--- a/src/ivivehiclefunctions/qtiviclimatecontrol_p.h
+++ b/src/ivivehiclefunctions/qtiviclimatecontrol_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVICLIMATECONTROL_P_H
-#define QTIVICLIMATECONTROL_P_H
+#ifndef QIVICLIMATECONTROL_P_H
+#define QIVICLIMATECONTROL_P_H
 
 //
 //  W A R N I N G
@@ -53,109 +53,109 @@
 // We mean it.
 //
 
-#include <QtIVICore/QtIVIProperty>
+#include <QtIviCore/QIviProperty>
 #include "private/qtiviabstractzonedfeature_p.h"
 
 #include "qtiviclimatecontrol.h"
 
 QT_BEGIN_NAMESPACE
 
-class QtIVIClimateControlPrivate : public QtIVIAbstractZonedFeaturePrivate
+class QIviClimateControlPrivate : public QIviAbstractZonedFeaturePrivate
 {
 public:
-    QtIVIClimateControlPrivate(const QString &interface, const QString &zone, QtIVIClimateControl *parent);
+    QIviClimateControlPrivate(const QString &interface, const QString &zone, QIviClimateControl *parent);
 
     void init();
     void clearToDefaults();
 
-    void onAirflowDirectionsChanged(QtIVIClimateControl::AirflowDirections value, const QString &zone);
-    void onAirflowDirectionsAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> &airflowDirectionsAttribute, const QString &zone);
+    void onAirflowDirectionsChanged(QIviClimateControl::AirflowDirections value, const QString &zone);
+    void onAirflowDirectionsAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::AirflowDirections> &airflowDirectionsAttribute, const QString &zone);
     void onAirConditioningEnabledChanged(bool enabled, const QString &zone);
-    void onAirConditioningAttributeChanged(const QtIVIPropertyAttribute<bool> &airConditioningEnabledAttribute, const QString &zone);
+    void onAirConditioningAttributeChanged(const QIviPropertyAttribute<bool> &airConditioningEnabledAttribute, const QString &zone);
     void onHeaterEnabledChanged(bool enabled, const QString &zone);
-    void onHeaterAttributeChanged(const QtIVIPropertyAttribute<bool> &heaterEnabledAttribute, const QString &zone);
+    void onHeaterAttributeChanged(const QIviPropertyAttribute<bool> &heaterEnabledAttribute, const QString &zone);
     void onSteeringWheelHeaterChanged(int value, const QString &zone);
-    void onSteeringWheelHeaterAttributeChanged(const QtIVIPropertyAttribute<int> &steeringWheelHeaterAttribute, const QString &zone);
+    void onSteeringWheelHeaterAttributeChanged(const QIviPropertyAttribute<int> &steeringWheelHeaterAttribute, const QString &zone);
     void onFanSpeedLevelChanged(int value, const QString &zone);
-    void onFanSpeedLevelAttributeChanged(const QtIVIPropertyAttribute<int> &fanSpeedAttribute, const QString &zone);
+    void onFanSpeedLevelAttributeChanged(const QIviPropertyAttribute<int> &fanSpeedAttribute, const QString &zone);
     void onTargetTemperatureChanged(int temperature, const QString &zone);
-    void onTargetTemperatureAttributeChanged(const QtIVIPropertyAttribute<int> &temperatureAttribute, const QString &zone);
+    void onTargetTemperatureAttributeChanged(const QIviPropertyAttribute<int> &temperatureAttribute, const QString &zone);
     void onSeatCoolerChanged(int value, const QString &zone);
-    void onSeatCoolerAttributeChanged(const QtIVIPropertyAttribute<int> &seatCoolerAttribute, const QString &zone);
+    void onSeatCoolerAttributeChanged(const QIviPropertyAttribute<int> &seatCoolerAttribute, const QString &zone);
     void onSeatHeaterChanged(int value, const QString &zone);
-    void onSeatHeaterAttributeChanged(const QtIVIPropertyAttribute<int> &seatHeaterAttribute, const QString &zone);
+    void onSeatHeaterAttributeChanged(const QIviPropertyAttribute<int> &seatHeaterAttribute, const QString &zone);
     void onOutsideTemperatureChanged(int outsideTemperature, const QString &zone);
-    void onOutsideTemperatureAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone);
+    void onOutsideTemperatureAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone);
     void onZoneSynchronizationChanged(bool zoneSynchronization, const QString &zone);
-    void onZoneSynchronizationAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone);
+    void onZoneSynchronizationAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone);
     void onDefrostChanged(bool defrost, const QString &zone);
-    void onDefrostAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone);
-    void onRecirculationModeChanged(QtIVIClimateControl::RecirculationMode recirculationMode, const QString &zone);
-    void onRecirculationModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> &attribute, const QString &zone);
+    void onDefrostAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone);
+    void onRecirculationModeChanged(QIviClimateControl::RecirculationMode recirculationMode, const QString &zone);
+    void onRecirculationModeAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::RecirculationMode> &attribute, const QString &zone);
     void onRecirculationChanged(bool recirculation, const QString &zone);
-    void onRecirculationAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone);
+    void onRecirculationAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone);
     void onRecirculationSensitivityLevelChanged(int recirculationSensitivityLevel, const QString &zone);
-    void onRecirculationSensitivityLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone);
-    void onClimateModeChanged(QtIVIClimateControl::ClimateMode climateMode, const QString &zone);
-    void onClimateModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode> &attribute, const QString &zone);
+    void onRecirculationSensitivityLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone);
+    void onClimateModeChanged(QIviClimateControl::ClimateMode climateMode, const QString &zone);
+    void onClimateModeAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::ClimateMode> &attribute, const QString &zone);
     void onAutomaticClimateFanIntensityLevelChanged(int automaticClimateFanIntensityLevel, const QString &zone);
-    void onAutomaticClimateFanIntensityLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone);
+    void onAutomaticClimateFanIntensityLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone);
 
-    QtIVIClimateControlBackendInterface* climateControlBackend();
+    QIviClimateControlBackendInterface* climateControlBackend();
 
-    QtIVIClimateControl::AirflowDirections m_airflowDirections;
-    QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> m_airflowDirectionsAttribute;
-    QtIVIProperty *m_airFlowDirectionProperty;
+    QIviClimateControl::AirflowDirections m_airflowDirections;
+    QIviPropertyAttribute<QIviClimateControl::AirflowDirections> m_airflowDirectionsAttribute;
+    QIviProperty *m_airFlowDirectionProperty;
     bool m_airConditioning;
-    QtIVIPropertyAttribute<bool> m_airConditioningAttribute;
-    QtIVIProperty *m_airConditioningProperty;
+    QIviPropertyAttribute<bool> m_airConditioningAttribute;
+    QIviProperty *m_airConditioningProperty;
     bool m_heater;
-    QtIVIPropertyAttribute<bool> m_heaterAttribute;
-    QtIVIProperty *m_heaterProperty;
+    QIviPropertyAttribute<bool> m_heaterAttribute;
+    QIviProperty *m_heaterProperty;
     int m_targetTemperature;
-    QtIVIPropertyAttribute<int> m_targetTemperatureAttribute;
-    QtIVIProperty *m_targetTemperatureProperty;
+    QIviPropertyAttribute<int> m_targetTemperatureAttribute;
+    QIviProperty *m_targetTemperatureProperty;
     int m_seatCooler;
-    QtIVIPropertyAttribute<int> m_seatCoolerAttribute;
-    QtIVIProperty *m_seatCoolerProperty;
+    QIviPropertyAttribute<int> m_seatCoolerAttribute;
+    QIviProperty *m_seatCoolerProperty;
     int m_seatHeater;
-    QtIVIPropertyAttribute<int> m_seatHeaterAttribute;
-    QtIVIProperty *m_seatHeaterProperty;
+    QIviPropertyAttribute<int> m_seatHeaterAttribute;
+    QIviProperty *m_seatHeaterProperty;
     int m_steeringWheelHeater;
-    QtIVIPropertyAttribute<int> m_steeringWheelHeaterAttribute;
-    QtIVIProperty *m_steeringWheelHeaterProperty;
+    QIviPropertyAttribute<int> m_steeringWheelHeaterAttribute;
+    QIviProperty *m_steeringWheelHeaterProperty;
     int m_fanSpeedLevel;
-    QtIVIPropertyAttribute<int> m_fanSpeedLevelAttribute;
-    QtIVIProperty *m_fanSpeedLevelProperty;
+    QIviPropertyAttribute<int> m_fanSpeedLevelAttribute;
+    QIviProperty *m_fanSpeedLevelProperty;
     int m_outsideTemperature;
-    QtIVIPropertyAttribute<int> m_outsideTemperatureAttribute;
-    QtIVIProperty *m_outsideTemperatureProperty;
+    QIviPropertyAttribute<int> m_outsideTemperatureAttribute;
+    QIviProperty *m_outsideTemperatureProperty;
     bool m_zoneSynchronization;
-    QtIVIPropertyAttribute<bool> m_zoneSynchronizationAttribute;
-    QtIVIProperty *m_zoneSynchronizationProperty;
+    QIviPropertyAttribute<bool> m_zoneSynchronizationAttribute;
+    QIviProperty *m_zoneSynchronizationProperty;
     bool m_defrost;
-    QtIVIPropertyAttribute<bool> m_defrostAttribute;
-    QtIVIProperty *m_defrostProperty;
-    QtIVIClimateControl::RecirculationMode m_recirculationMode;
-    QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> m_recirculationModeAttribute;
-    QtIVIProperty *m_recirculationModeProperty;
+    QIviPropertyAttribute<bool> m_defrostAttribute;
+    QIviProperty *m_defrostProperty;
+    QIviClimateControl::RecirculationMode m_recirculationMode;
+    QIviPropertyAttribute<QIviClimateControl::RecirculationMode> m_recirculationModeAttribute;
+    QIviProperty *m_recirculationModeProperty;
     bool m_recirculation;
-    QtIVIPropertyAttribute<bool> m_recirculationAttribute;
-    QtIVIProperty *m_recirculationProperty;
+    QIviPropertyAttribute<bool> m_recirculationAttribute;
+    QIviProperty *m_recirculationProperty;
     int m_recirculationSensitivityLevel;
-    QtIVIPropertyAttribute<int> m_recirculationSensitivityLevelAttribute;
-    QtIVIProperty *m_recirculationSensitivityLevelProperty;
-    QtIVIClimateControl::ClimateMode m_climateMode;
-    QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode> m_climateModeAttribute;
-    QtIVIProperty *m_climateModeProperty;
+    QIviPropertyAttribute<int> m_recirculationSensitivityLevelAttribute;
+    QIviProperty *m_recirculationSensitivityLevelProperty;
+    QIviClimateControl::ClimateMode m_climateMode;
+    QIviPropertyAttribute<QIviClimateControl::ClimateMode> m_climateModeAttribute;
+    QIviProperty *m_climateModeProperty;
     int m_automaticClimateFanIntensityLevel;
-    QtIVIPropertyAttribute<int> m_automaticClimateFanIntensityLevelAttribute;
-    QtIVIProperty *m_automaticClimateFanIntensityLevelProperty;
+    QIviPropertyAttribute<int> m_automaticClimateFanIntensityLevelAttribute;
+    QIviProperty *m_automaticClimateFanIntensityLevelProperty;
 
-    QtIVIClimateControl * const q_ptr;
-    Q_DECLARE_PUBLIC(QtIVIClimateControl)
+    QIviClimateControl * const q_ptr;
+    Q_DECLARE_PUBLIC(QIviClimateControl)
 };
 
 QT_END_NAMESPACE
 
-#endif // QTIVICLIMATECONTROL_P_H
+#endif // QIVICLIMATECONTROL_P_H
diff --git a/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.cpp b/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.cpp
index 39bdb15..8247e16 100644
--- a/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.cpp
+++ b/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -42,35 +42,35 @@
 #include "qtiviclimatecontrolbackendinterface.h"
 
 /*!
- * \class QtIVIClimateControlBackendInterface
- * \inmodule QtIVIVehicleFunctions
+ * \class QIviClimateControlBackendInterface
+ * \inmodule QtIviVehicleFunctions
  * \ingroup backends
- * \inherits QtIVIZonedFeatureInterface
- * \brief The QtIVIClimateControlBackendInterface defines the interface for backends to the
- * QtIVIClimateControl feature class.
+ * \inherits QIviZonedFeatureInterface
+ * \brief The QIviClimateControlBackendInterface defines the interface for backends to the
+ * QIviClimateControl feature class.
  *
- * The QtIVIClimateControlBackendInterface is the interface used by \l QtIVIClimateControl
+ * The QIviClimateControlBackendInterface is the interface used by \l QIviClimateControl
  *
- * The interface is discovered by a \l QtIVIClimateControl object, which connects to it and sets up
+ * The interface is discovered by a \l QIviClimateControl object, which connects to it and sets up
  * the connections to it.
  *
- * \sa QtIVIClimateControl
+ * \sa QIviClimateControl
  */
 
 /*!
- * \fn QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject *parent=0)
+ * \fn QIviClimateControlBackendInterface::QIviClimateControlBackendInterface(QObject *parent=0)
  *
  * Constructs a backend interface.
  *
  * The \a parent is sent to the QObject constructor.
  */
-QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject *parent)
-    : QtIVIZonedFeatureInterface(parent)
+QIviClimateControlBackendInterface::QIviClimateControlBackendInterface(QObject *parent)
+    : QIviZonedFeatureInterface(parent)
 {
 }
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setTargetTemperature(int value, const QString &zone) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::setTargetTemperature(int value, const QString &zone) = 0
  *
  * Sets the target temperature of \a zone to \a value, where the \a value is expressed in
  * centigrades and may be range limited by the backend.
@@ -83,7 +83,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setSeatCooler(int value, const QString &zone) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::setSeatCooler(int value, const QString &zone) = 0
  *
  * Sets the seat ventilation level of \a zone to \a value. The range can be defined using the attribute system.
  *
@@ -95,7 +95,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setSeatHeater(int value, const QString &zone) = 0;
+ * \fn virtual void QIviClimateControlBackendInterface::setSeatHeater(int value, const QString &zone) = 0;
  *
  * Sets the seat heater level of \a zone to \a value. The range can be defined using the attribute system.
  *
@@ -107,7 +107,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setAirflowDirections(QtIVIClimateControl::AirflowDirections, const QString &zone) = 0;
+ * \fn virtual void QIviClimateControlBackendInterface::setAirflowDirections(QIviClimateControl::AirflowDirections, const QString &zone) = 0;
  *
  * Sets the \a zone air flow directions to \a airflowDirections.
  *
@@ -118,7 +118,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setAirConditioningEnabled(bool enabled, const QString &zone) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::setAirConditioningEnabled(bool enabled, const QString &zone) = 0
  *
  * Enables or disables the \a zone air conditioning based on \a enabled.
  *
@@ -129,7 +129,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setHeaterEnabled(bool enabled, const QString &zone) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::setHeaterEnabled(bool enabled, const QString &zone) = 0
  *
  * Enables or disables the \a zone heater based on \a enabled.
  *
@@ -140,7 +140,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setAirRecirculationEnabled(bool enabled, const QString &zone) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::setAirRecirculationEnabled(bool enabled, const QString &zone) = 0
  *
  * Enables or disables the \a zone air recirculation based on \a enabled.
  *
@@ -151,7 +151,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setSteeringWheelHeater(int value, const QString &zone) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::setSteeringWheelHeater(int value, const QString &zone) = 0
  *
  * Sets the steering wheel heater level of \a zone to \a value. The range can be defined using the attribute system.
  *
@@ -163,7 +163,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setFanSpeedLevel(int value, const QString &zone) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::setFanSpeedLevel(int value, const QString &zone) = 0
  *
  * Sets the fan speed level of \a zone to \a value. The range can be defined using the attribute system.
  *
@@ -175,7 +175,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setZoneSynchronizationEnabled(bool enabled, const QString &zone) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::setZoneSynchronizationEnabled(bool enabled, const QString &zone) = 0
  *
  * Enables or disables the \a zone synchronization based on \a enabled.
  *
@@ -186,7 +186,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setDefrostEnabled(bool enabled, const QString &zone) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::setDefrostEnabled(bool enabled, const QString &zone) = 0
  *
  * Enables or disables the \a zone defrost mode based on \a enabled.
  *
@@ -197,7 +197,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setRecirculationMode(QtIVIClimateControl::RecirculationMode, const QString &zone) = 0;
+ * \fn virtual void QIviClimateControlBackendInterface::setRecirculationMode(QIviClimateControl::RecirculationMode, const QString &zone) = 0;
  *
  * Sets the \a zone recirculation mode to \a recirculationMode.
  *
@@ -208,7 +208,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setRecirculationSensitivityLevel(int value, const QString &zone) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::setRecirculationSensitivityLevel(int value, const QString &zone) = 0
  *
  * Sets the recirculation sensitivity level of \a zone to \a value. The range can be defined using the attribute system.
  *
@@ -220,7 +220,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setClimateMode(QtIVIClimateControl::ClimateMode, const QString &zone) = 0;
+ * \fn virtual void QIviClimateControlBackendInterface::setClimateMode(QIviClimateControl::ClimateMode, const QString &zone) = 0;
  *
  * Sets the \a zone climate mode to \a climateMode.
  *
@@ -231,7 +231,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::setAutomaticClimateFanIntensityLevel(int value, const QString &zone) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::setAutomaticClimateFanIntensityLevel(int value, const QString &zone) = 0
  *
  * Sets the fan intensity level for the AutomaticClimate mode of \a zone to \a value. The range can be defined using the attribute system.
  *
@@ -243,7 +243,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::targetTemperatureChanged(int value, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::targetTemperatureChanged(int value, const QString &zone = QString()) = 0
  *
  * The signal is emitted when the target temperature for \a zone is changed to \a value, where
  * value is expressed in centigrades.
@@ -252,13 +252,13 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::targetTemperatureAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::targetTemperatureAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the target temperature attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::seatCoolerChanged(int value, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::seatCoolerChanged(int value, const QString &zone = QString()) = 0
  *
  * The signal is emitted when the seat cooler level is changed for \a zone to \a value. The range can be defined using the attribute system.
  *
@@ -266,13 +266,13 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::seatCoolerAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::seatCoolerAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the seat cooler level attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::seatHeaterChanged(int value, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::seatHeaterChanged(int value, const QString &zone = QString()) = 0
  *
  * The signal is emitted when the seat heater level is changed for \a zone to \a value. The range can be defined using the attribute system.
  *
@@ -280,13 +280,13 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::seatHeaterAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::seatHeaterAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the seat heater attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::airflowDirectionsChanged(QtIVIClimateControl::AirflowDirections airflowDirections, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::airflowDirectionsChanged(QIviClimateControl::AirflowDirections airflowDirections, const QString &zone = QString()) = 0
  *
  * The signal is emitted when the \a zone airflow directions changed to \a airflowDirections.
  *
@@ -294,13 +294,13 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::airflowDirectionsAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::airflowDirectionsAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::AirflowDirections> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the zone airflow direction attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::airConditioningEnabledChanged(bool enabled, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::airConditioningEnabledChanged(bool enabled, const QString &zone = QString()) = 0
  *
  * The signal is emitted when the \a zone air conditioning state is changed to \a enabled.
  *
@@ -308,13 +308,13 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::airConditioningAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::airConditioningAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the air conditioning state attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::heaterEnabledChanged(bool enabled, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::heaterEnabledChanged(bool enabled, const QString &zone = QString()) = 0
  *
  * The signal is emitted when the \a zone heater state is changed to \a enabled.
  *
@@ -322,13 +322,13 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::heaterAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::heaterAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the heater state attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::steeringWheelHeaterChanged(int level, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::steeringWheelHeaterChanged(int level, const QString &zone = QString()) = 0
  *
  * The signals is emitted when the steering wheel heater level of \a zone is changed to \a level. The range can be defined using the attribute system.
  *
@@ -336,13 +336,13 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::steeringWheelHeaterAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::steeringWheelHeaterAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the steering wheel heater level attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::fanSpeedLevelChanged(int level, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::fanSpeedLevelChanged(int level, const QString &zone = QString()) = 0
  *
  * The signals is emitted when the fan speel level of \a zone is changed to \a level. The range can be defined using the attribute system.
  *
@@ -350,26 +350,26 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::fanSpeedLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::fanSpeedLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the recirculation sensitivity level for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::outsideTemperatureChanged(int value, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::outsideTemperatureChanged(int value, const QString &zone = QString()) = 0
  *
  * The signal is emitted when the outside temperature for \a zone is changed to \a value, where
  * value is expressed in centigrades.
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::outsideTemperatureAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::outsideTemperatureAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the outside temperature attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::zoneSynchronizationEnabledChanged(bool enabled, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::zoneSynchronizationEnabledChanged(bool enabled, const QString &zone = QString()) = 0
  *
  * The signal is emitted when the \a zone synchronization state is changed to \a enabled.
  *
@@ -377,14 +377,14 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::zoneSynchronizationAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::zoneSynchronizationAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the zone synchronization state attribute for \a zone is changed to \a attribute.
  */
 
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::defrostEnabledChanged(bool enabled, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::defrostEnabledChanged(bool enabled, const QString &zone = QString()) = 0
  *
  * The signal is emitted when the \a zone defrost state is changed to \a enabled.
  *
@@ -392,14 +392,14 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::defrostAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::defrostAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the defrost state attribute for \a zone is changed to \a attribute.
  */
 
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::recirculationModeChanged(QtIVIClimateControl::RecirculationMode recirculationMode, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::recirculationModeChanged(QIviClimateControl::RecirculationMode recirculationMode, const QString &zone = QString()) = 0
  *
  * The signal is emitted when the \a zone recirculation mode changed to \a recirculationMode.
  *
@@ -407,25 +407,25 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::recirculationModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::recirculationModeAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::RecirculationMode> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the recirculation mode attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::recirculationEnabledChanged(bool enabled, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::recirculationEnabledChanged(bool enabled, const QString &zone = QString()) = 0
  *
  * The signal is emitted when the \a zone recirculation state is changed to \a enabled.
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::recirculationAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::recirculationAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the recirculation state attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::recirculationSensitivityLevelChanged(int level, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::recirculationSensitivityLevelChanged(int level, const QString &zone = QString()) = 0
  *
  * The signals is emitted when the recirculation sensitivity level for \a zone is changed to \a level. The range can be defined using the attribute system.
  *
@@ -433,13 +433,13 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::recirculationSensitivityLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::recirculationSensitivityLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the fan intensity level for the AutomaticClimate mode for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::climateModeChanged(QtIVIClimateControl::ClimateMode climateMode, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::climateModeChanged(QIviClimateControl::ClimateMode climateMode, const QString &zone = QString()) = 0
  *
  * The signal is emitted when the \a zone climate mode changed to \a climateMode.
  *
@@ -447,13 +447,13 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::climateModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::climateModeAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::ClimateMode> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the climate mode attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIClimateControlBackendInterface::automaticClimateFanIntensityLevelChanged(int level, const QString &zone = QString()) = 0
+ * \fn virtual void QIviClimateControlBackendInterface::automaticClimateFanIntensityLevelChanged(int level, const QString &zone = QString()) = 0
  *
  * The signals is emitted when the fan intensity level for the AutomaticClimate mode for \a zone is changed to \a level. The range can be defined using the attribute system.
  *
@@ -461,7 +461,7 @@ QtIVIClimateControlBackendInterface::QtIVIClimateControlBackendInterface(QObject
  */
 
 /*!
- * \fn void QtIVIClimateControlBackendInterface::automaticClimateFanIntensityLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone = QString());
+ * \fn void QIviClimateControlBackendInterface::automaticClimateFanIntensityLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone = QString());
  *
  * The signal is emitted when the fan intensity level for the AutomaticClimate mode for \a zone is changed to \a attribute.
  */
diff --git a/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.h b/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.h
index 58b5fed..65fc7f0 100644
--- a/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.h
+++ b/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,75 +39,75 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVICLIMATECONTROLBACKENDINTERFACE_H
-#define QTIVICLIMATECONTROLBACKENDINTERFACE_H
+#ifndef QIVICLIMATECONTROLBACKENDINTERFACE_H
+#define QIVICLIMATECONTROLBACKENDINTERFACE_H
 
 #include <QtCore/QObject>
 
-#include <QtIVICore/qtivizonedfeatureinterface.h>
-#include <QtIVICore/qtivipropertyattribute.h>
-#include <QtIVIVehicleFunctions/qtiviclimatecontrol.h>
+#include <QtIviCore/qtivizonedfeatureinterface.h>
+#include <QtIviCore/qtivipropertyattribute.h>
+#include <QtIviVehicleFunctions/qtiviclimatecontrol.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QTIVIVEHICLEFUNCTIONS_EXPORT QtIVIClimateControlBackendInterface : public QtIVIZonedFeatureInterface
+class Q_QTIVIVEHICLEFUNCTIONS_EXPORT QIviClimateControlBackendInterface : public QIviZonedFeatureInterface
 {
     Q_OBJECT
 
 public:
-    QtIVIClimateControlBackendInterface(QObject *parent = 0);
+    QIviClimateControlBackendInterface(QObject *parent = Q_NULLPTR);
 
     virtual void setTargetTemperature(int value, const QString &zone) = 0;
     virtual void setSeatCooler(int value, const QString &zone) = 0;
     virtual void setSeatHeater(int value, const QString &zone) = 0;
     virtual void setSteeringWheelHeater(int value, const QString &zone) = 0;
     virtual void setFanSpeedLevel(int value, const QString &zone) = 0;
-    virtual void setAirflowDirections(QtIVIClimateControl::AirflowDirections airflowDirections, const QString &zone) = 0;
+    virtual void setAirflowDirections(QIviClimateControl::AirflowDirections airflowDirections, const QString &zone) = 0;
     virtual void setAirConditioningEnabled(bool enabled, const QString &zone) = 0;
     virtual void setHeaterEnabled(bool enabled, const QString &zone) = 0;
     virtual void setZoneSynchronizationEnabled(bool zoneSynchronization, const QString &zone) = 0;
     virtual void setDefrostEnabled(bool defrost, const QString &zone) = 0;
-    virtual void setRecirculationMode(QtIVIClimateControl::RecirculationMode recirculationMode, const QString &zone) = 0;
+    virtual void setRecirculationMode(QIviClimateControl::RecirculationMode recirculationMode, const QString &zone) = 0;
     virtual void setRecirculationSensitivityLevel(int recirculationSensitivityLevel, const QString &zone) = 0;
-    virtual void setClimateMode(QtIVIClimateControl::ClimateMode climateMode, const QString &zone) = 0;
+    virtual void setClimateMode(QIviClimateControl::ClimateMode climateMode, const QString &zone) = 0;
     virtual void setAutomaticClimateFanIntensityLevel(int automaticClimateFanIntensityLevel, const QString &zone) = 0;
 
 Q_SIGNALS:
     void targetTemperatureChanged(int value, const QString &zone = QString());
-    void targetTemperatureAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone = QString());
+    void targetTemperatureAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone = QString());
     void seatCoolerChanged(int value, const QString &zone = QString());
-    void seatCoolerAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone = QString());
+    void seatCoolerAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone = QString());
     void seatHeaterChanged(int value, const QString &zone = QString());
-    void seatHeaterAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone = QString());
+    void seatHeaterAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone = QString());
     void steeringWheelHeaterChanged(int value, const QString &zone = QString());
-    void steeringWheelHeaterAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone = QString());
+    void steeringWheelHeaterAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone = QString());
     void fanSpeedLevelChanged(int value, const QString &zone = QString());
-    void fanSpeedLevelAttributeChanged(const QtIVIPropertyAttribute<int> &attribute, const QString &zone = QString());
-    void airflowDirectionsChanged(QtIVIClimateControl::AirflowDirections value, const QString &zone = QString());
-    void airflowDirectionsAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> &attribute, const QString &zone = QString());
+    void fanSpeedLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone = QString());
+    void airflowDirectionsChanged(QIviClimateControl::AirflowDirections value, const QString &zone = QString());
+    void airflowDirectionsAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::AirflowDirections> &attribute, const QString &zone = QString());
     void airConditioningEnabledChanged(bool value, const QString &zone = QString());
-    void airConditioningAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone = QString());
+    void airConditioningAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone = QString());
     void heaterEnabledChanged(bool value, const QString &zone = QString());
-    void heaterAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone = QString());
+    void heaterAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone = QString());
     void outsideTemperatureChanged(int outsideTemperature, const QString &zone = QString());
-    void outsideTemperatureAttributeChanged(const QtIVIPropertyAttribute<int> &outsideTemperature, const QString &zone = QString());
+    void outsideTemperatureAttributeChanged(const QIviPropertyAttribute<int> &outsideTemperature, const QString &zone = QString());
     void zoneSynchronizationEnabledChanged(bool zoneSynchronization, const QString &zone = QString());
-    void zoneSynchronizationAttributeChanged(const QtIVIPropertyAttribute<bool> &zoneSynchronization, const QString &zone = QString());
+    void zoneSynchronizationAttributeChanged(const QIviPropertyAttribute<bool> &zoneSynchronization, const QString &zone = QString());
     void defrostEnabledChanged(bool defrost, const QString &zone = QString());
-    void defrostAttributeChanged(const QtIVIPropertyAttribute<bool> &defrost, const QString &zone = QString());
-    void recirculationModeChanged(QtIVIClimateControl::RecirculationMode recirculationMode, const QString &zone = QString());
-    void recirculationModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> &recirculationMode, const QString &zone = QString());
+    void defrostAttributeChanged(const QIviPropertyAttribute<bool> &defrost, const QString &zone = QString());
+    void recirculationModeChanged(QIviClimateControl::RecirculationMode recirculationMode, const QString &zone = QString());
+    void recirculationModeAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::RecirculationMode> &recirculationMode, const QString &zone = QString());
     void recirculationEnabledChanged(bool recirculation, const QString &zone = QString());
-    void recirculationAttributeChanged(const QtIVIPropertyAttribute<bool> &recirculation, const QString &zone = QString());
+    void recirculationAttributeChanged(const QIviPropertyAttribute<bool> &recirculation, const QString &zone = QString());
     void recirculationSensitivityLevelChanged(int recirculationSensitivityLevel, const QString &zone = QString());
-    void recirculationSensitivityLevelAttributeChanged(const QtIVIPropertyAttribute<int> &recirculationSensitivityLevel, const QString &zone = QString());
-    void climateModeChanged(QtIVIClimateControl::ClimateMode climateMode, const QString &zone = QString());
-    void climateModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode> &climateMode, const QString &zone = QString());
+    void recirculationSensitivityLevelAttributeChanged(const QIviPropertyAttribute<int> &recirculationSensitivityLevel, const QString &zone = QString());
+    void climateModeChanged(QIviClimateControl::ClimateMode climateMode, const QString &zone = QString());
+    void climateModeAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::ClimateMode> &climateMode, const QString &zone = QString());
     void automaticClimateFanIntensityLevelChanged(int automaticClimateFanIntensityLevel, const QString &zone = QString());
-    void automaticClimateFanIntensityLevelAttributeChanged(const QtIVIPropertyAttribute<int> &automaticClimateFanIntensityLevel, const QString &zone = QString());
+    void automaticClimateFanIntensityLevelAttributeChanged(const QIviPropertyAttribute<int> &automaticClimateFanIntensityLevel, const QString &zone = QString());
 };
 
 QT_END_NAMESPACE
 
-#endif // QTIVICLIMATECONTROLBACKENDINTERFACE_H
+#endif // QIVICLIMATECONTROLBACKENDINTERFACE_H
 
diff --git a/src/ivivehiclefunctions/qtivivehiclefunctionsglobal.h b/src/ivivehiclefunctions/qtivivehiclefunctionsglobal.h
index df84d81..ac68f78 100644
--- a/src/ivivehiclefunctions/qtivivehiclefunctionsglobal.h
+++ b/src/ivivehiclefunctions/qtivivehiclefunctionsglobal.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIVEHICLEFUNCTIONSGLOBAL_H
-#define QTIVIVEHICLEFUNCTIONSGLOBAL_H
+#ifndef QIVIVEHICLEFUNCTIONSGLOBAL_H
+#define QIVIVEHICLEFUNCTIONSGLOBAL_H
 
 #include <QtCore/qglobal.h>
 
@@ -58,5 +58,5 @@ QT_BEGIN_NAMESPACE
 
 QT_END_NAMESPACE
 
-#endif // QTIVIVEHICLEFUNCTIONSGLOBAL_H
+#endif // QIVIVEHICLEFUNCTIONSGLOBAL_H
 
diff --git a/src/ivivehiclefunctions/qtiviwindowcontrol.cpp b/src/ivivehiclefunctions/qtiviwindowcontrol.cpp
index f1aa637..f1d50a1 100644
--- a/src/ivivehiclefunctions/qtiviwindowcontrol.cpp
+++ b/src/ivivehiclefunctions/qtiviwindowcontrol.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -42,70 +42,70 @@
 #include "qtiviwindowcontrol.h"
 #include "qtiviwindowcontrol_p.h"
 #include "qtiviwindowcontrolbackendinterface.h"
-#include <QtIVICore/QtIVIPropertyFactory>
-#include <QtIVICore/QtIVIServiceObject>
+#include <QtIviCore/QIviPropertyFactory>
+#include <QtIviCore/QIviServiceObject>
 
-QtIVIWindowControlPrivate::QtIVIWindowControlPrivate(const QString &interface, const QString &zone, QtIVIWindowControl *parent)
-    : QtIVIAbstractZonedFeaturePrivate(interface, zone, parent)
-    , m_heaterMode(QtIVIWindowControl::HeaterOff)
+QIviWindowControlPrivate::QIviWindowControlPrivate(const QString &interface, const QString &zone, QIviWindowControl *parent)
+    : QIviAbstractZonedFeaturePrivate(interface, zone, parent)
+    , m_heaterMode(QIviWindowControl::HeaterOff)
     , m_heater(false)
-    , m_blindMode(QtIVIWindowControl::BlindClosed)
-    , m_blindState(QtIVIWindowControl::Closed)
-    , m_state(QtIVIWindowControl::Closed)
+    , m_blindMode(QIviWindowControl::BlindClosed)
+    , m_blindState(QIviWindowControl::Closed)
+    , m_state(QIviWindowControl::Closed)
     , q_ptr(parent)
 {}
 
-void QtIVIWindowControlPrivate::init()
+void QIviWindowControlPrivate::init()
 {
-    Q_Q(QtIVIWindowControl);
+    Q_Q(QIviWindowControl);
 
-    m_heaterModeProperty = QtIVIPropertyFactory<QtIVIWindowControl::HeaterMode>::create(q,
-                                                                                        &QtIVIWindowControl::heaterModeAttribute,
-                                                                                        &QtIVIWindowControl::heaterModeAttributeChanged,
-                                                                                        &QtIVIWindowControl::heaterMode,
-                                                                                        &QtIVIWindowControl::heaterModeChanged,
-                                                                                        &QtIVIWindowControl::setHeaterMode);
+    m_heaterModeProperty = QIviPropertyFactory<QIviWindowControl::HeaterMode>::create(q,
+                                                                                        &QIviWindowControl::heaterModeAttribute,
+                                                                                        &QIviWindowControl::heaterModeAttributeChanged,
+                                                                                        &QIviWindowControl::heaterMode,
+                                                                                        &QIviWindowControl::heaterModeChanged,
+                                                                                        &QIviWindowControl::setHeaterMode);
 
-    m_heaterProperty = QtIVIPropertyFactory<bool>::create(q,
-                                                          &QtIVIWindowControl::heaterAttribute,
-                                                          &QtIVIWindowControl::heaterAttributeChanged,
-                                                          &QtIVIWindowControl::isHeaterEnabled,
-                                                          &QtIVIWindowControl::heaterEnabledChanged);
+    m_heaterProperty = QIviPropertyFactory<bool>::create(q,
+                                                          &QIviWindowControl::heaterAttribute,
+                                                          &QIviWindowControl::heaterAttributeChanged,
+                                                          &QIviWindowControl::isHeaterEnabled,
+                                                          &QIviWindowControl::heaterEnabledChanged);
 
-    m_blindModeProperty = QtIVIPropertyFactory<QtIVIWindowControl::BlindMode>::create(q,
-                                                                                      &QtIVIWindowControl::blindModeAttribute,
-                                                                                      &QtIVIWindowControl::blindModeAttributeChanged,
-                                                                                      &QtIVIWindowControl::blindMode,
-                                                                                      &QtIVIWindowControl::blindModeChanged,
-                                                                                      &QtIVIWindowControl::setBlindMode);
+    m_blindModeProperty = QIviPropertyFactory<QIviWindowControl::BlindMode>::create(q,
+                                                                                      &QIviWindowControl::blindModeAttribute,
+                                                                                      &QIviWindowControl::blindModeAttributeChanged,
+                                                                                      &QIviWindowControl::blindMode,
+                                                                                      &QIviWindowControl::blindModeChanged,
+                                                                                      &QIviWindowControl::setBlindMode);
 
-    m_blindStateProperty = QtIVIPropertyFactory<QtIVIWindowControl::State>::create(q,
-                                                                                   &QtIVIWindowControl::blindStateAttribute,
-                                                                                   &QtIVIWindowControl::blindStateAttributeChanged,
-                                                                                   &QtIVIWindowControl::blindState,
-                                                                                   &QtIVIWindowControl::blindStateChanged);
+    m_blindStateProperty = QIviPropertyFactory<QIviWindowControl::State>::create(q,
+                                                                                   &QIviWindowControl::blindStateAttribute,
+                                                                                   &QIviWindowControl::blindStateAttributeChanged,
+                                                                                   &QIviWindowControl::blindState,
+                                                                                   &QIviWindowControl::blindStateChanged);
 
-    m_stateProperty = QtIVIPropertyFactory<QtIVIWindowControl::State>::create(q,
-                                                                              &QtIVIWindowControl::stateAttribute,
-                                                                              &QtIVIWindowControl::stateAttributeChanged,
-                                                                              &QtIVIWindowControl::state,
-                                                                              &QtIVIWindowControl::stateChanged);
+    m_stateProperty = QIviPropertyFactory<QIviWindowControl::State>::create(q,
+                                                                              &QIviWindowControl::stateAttribute,
+                                                                              &QIviWindowControl::stateAttributeChanged,
+                                                                              &QIviWindowControl::state,
+                                                                              &QIviWindowControl::stateChanged);
 
 }
 
-void QtIVIWindowControlPrivate::clearToDefaults()
+void QIviWindowControlPrivate::clearToDefaults()
 {
-    m_heaterMode = QtIVIWindowControl::HeaterOff;
+    m_heaterMode = QIviWindowControl::HeaterOff;
     m_heater = false;
-    m_blindMode = QtIVIWindowControl::BlindClosed;
-    m_blindState = QtIVIWindowControl::Closed;
-    m_state = QtIVIWindowControl::Closed;
+    m_blindMode = QIviWindowControl::BlindClosed;
+    m_blindState = QIviWindowControl::Closed;
+    m_state = QIviWindowControl::Closed;
 }
 
-void QtIVIWindowControlPrivate::onHeaterModeChanged(QtIVIWindowControl::HeaterMode value, const QString &zone)
+void QIviWindowControlPrivate::onHeaterModeChanged(QIviWindowControl::HeaterMode value, const QString &zone)
 {
-    Q_Q(QtIVIWindowControl);
-    QtIVIWindowControl *f = qobject_cast<QtIVIWindowControl*>(q->zoneAt(zone));
+    Q_Q(QIviWindowControl);
+    QIviWindowControl *f = qobject_cast<QIviWindowControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -115,10 +115,10 @@ void QtIVIWindowControlPrivate::onHeaterModeChanged(QtIVIWindowControl::HeaterMo
     emit f->heaterModeChanged(value);
 }
 
-void QtIVIWindowControlPrivate::onHeaterModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode> &attribute, const QString &zone)
+void QIviWindowControlPrivate::onHeaterModeAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::HeaterMode> &attribute, const QString &zone)
 {
-    Q_Q(QtIVIWindowControl);
-    QtIVIWindowControl *f = qobject_cast<QtIVIWindowControl*>(q->zoneAt(zone));
+    Q_Q(QIviWindowControl);
+    QIviWindowControl *f = qobject_cast<QIviWindowControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -128,10 +128,10 @@ void QtIVIWindowControlPrivate::onHeaterModeAttributeChanged(const QtIVIProperty
 }
 
 
-void QtIVIWindowControlPrivate::onHeaterEnabledChanged(bool enabled, const QString &zone)
+void QIviWindowControlPrivate::onHeaterEnabledChanged(bool enabled, const QString &zone)
 {
-    Q_Q(QtIVIWindowControl);
-    QtIVIWindowControl *f = qobject_cast<QtIVIWindowControl*>(q->zoneAt(zone));
+    Q_Q(QIviWindowControl);
+    QIviWindowControl *f = qobject_cast<QIviWindowControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -141,10 +141,10 @@ void QtIVIWindowControlPrivate::onHeaterEnabledChanged(bool enabled, const QStri
     emit f->heaterEnabledChanged(enabled);
 }
 
-void QtIVIWindowControlPrivate::onHeaterAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone)
+void QIviWindowControlPrivate::onHeaterAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone)
 {
-    Q_Q(QtIVIWindowControl);
-    QtIVIWindowControl *f = qobject_cast<QtIVIWindowControl*>(q->zoneAt(zone));
+    Q_Q(QIviWindowControl);
+    QIviWindowControl *f = qobject_cast<QIviWindowControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -154,10 +154,10 @@ void QtIVIWindowControlPrivate::onHeaterAttributeChanged(const QtIVIPropertyAttr
 }
 
 
-void QtIVIWindowControlPrivate::onBlindModeChanged(QtIVIWindowControl::BlindMode value, const QString &zone)
+void QIviWindowControlPrivate::onBlindModeChanged(QIviWindowControl::BlindMode value, const QString &zone)
 {
-    Q_Q(QtIVIWindowControl);
-    QtIVIWindowControl *f = qobject_cast<QtIVIWindowControl*>(q->zoneAt(zone));
+    Q_Q(QIviWindowControl);
+    QIviWindowControl *f = qobject_cast<QIviWindowControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -167,10 +167,10 @@ void QtIVIWindowControlPrivate::onBlindModeChanged(QtIVIWindowControl::BlindMode
     emit f->blindModeChanged(value);
 }
 
-void QtIVIWindowControlPrivate::onBlindModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode> &attribute, const QString &zone)
+void QIviWindowControlPrivate::onBlindModeAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::BlindMode> &attribute, const QString &zone)
 {
-    Q_Q(QtIVIWindowControl);
-    QtIVIWindowControl *f = qobject_cast<QtIVIWindowControl*>(q->zoneAt(zone));
+    Q_Q(QIviWindowControl);
+    QIviWindowControl *f = qobject_cast<QIviWindowControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -180,10 +180,10 @@ void QtIVIWindowControlPrivate::onBlindModeAttributeChanged(const QtIVIPropertyA
 }
 
 
-void QtIVIWindowControlPrivate::onBlindStateChanged(QtIVIWindowControl::State value, const QString &zone)
+void QIviWindowControlPrivate::onBlindStateChanged(QIviWindowControl::State value, const QString &zone)
 {
-    Q_Q(QtIVIWindowControl);
-    QtIVIWindowControl *f = qobject_cast<QtIVIWindowControl*>(q->zoneAt(zone));
+    Q_Q(QIviWindowControl);
+    QIviWindowControl *f = qobject_cast<QIviWindowControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -193,10 +193,10 @@ void QtIVIWindowControlPrivate::onBlindStateChanged(QtIVIWindowControl::State va
     emit f->blindStateChanged(value);
 }
 
-void QtIVIWindowControlPrivate::onBlindStateAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::State> &attribute, const QString &zone)
+void QIviWindowControlPrivate::onBlindStateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &attribute, const QString &zone)
 {
-    Q_Q(QtIVIWindowControl);
-    QtIVIWindowControl *f = qobject_cast<QtIVIWindowControl*>(q->zoneAt(zone));
+    Q_Q(QIviWindowControl);
+    QIviWindowControl *f = qobject_cast<QIviWindowControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -206,10 +206,10 @@ void QtIVIWindowControlPrivate::onBlindStateAttributeChanged(const QtIVIProperty
 }
 
 
-void QtIVIWindowControlPrivate::onStateChanged(QtIVIWindowControl::State value, const QString &zone)
+void QIviWindowControlPrivate::onStateChanged(QIviWindowControl::State value, const QString &zone)
 {
-    Q_Q(QtIVIWindowControl);
-    QtIVIWindowControl *f = qobject_cast<QtIVIWindowControl*>(q->zoneAt(zone));
+    Q_Q(QIviWindowControl);
+    QIviWindowControl *f = qobject_cast<QIviWindowControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -219,10 +219,10 @@ void QtIVIWindowControlPrivate::onStateChanged(QtIVIWindowControl::State value,
     emit f->stateChanged(value);
 }
 
-void QtIVIWindowControlPrivate::onStateAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::State> &attribute, const QString &zone)
+void QIviWindowControlPrivate::onStateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &attribute, const QString &zone)
 {
-    Q_Q(QtIVIWindowControl);
-    QtIVIWindowControl *f = qobject_cast<QtIVIWindowControl*>(q->zoneAt(zone));
+    Q_Q(QIviWindowControl);
+    QIviWindowControl *f = qobject_cast<QIviWindowControl*>(q->zoneAt(zone));
     if (!f)
         f = q;
     if (f->zone() != zone)
@@ -231,35 +231,35 @@ void QtIVIWindowControlPrivate::onStateAttributeChanged(const QtIVIPropertyAttri
     emit f->stateAttributeChanged(attribute);
 }
 
-QtIVIWindowControlBackendInterface *QtIVIWindowControlPrivate::windowControlBackend()
+QIviWindowControlBackendInterface *QIviWindowControlPrivate::windowControlBackend()
 {
-    Q_Q(QtIVIWindowControl);
-    return qobject_cast<QtIVIWindowControlBackendInterface*>(q->backend());
+    Q_Q(QIviWindowControl);
+    return qobject_cast<QIviWindowControlBackendInterface*>(q->backend());
 }
 
 /*!
-   \class QtIVIWindowControl
-   \inmodule QtIVIVehicleFunctions
+   \class QIviWindowControl
+   \inmodule QtIviVehicleFunctions
    \brief Provides an interface to the window control.
 
-   The QtIVIWindowControl provides an interface to control the physical windows of the vehicle.
+   The QIviWindowControl provides an interface to control the physical windows of the vehicle.
 
    All properties are exposed through zone objects. The zones are retrieved using the \l zoneAt method.
 
-   The QtIVIWindowControl expects a single backend to be available. It is recommended to use it
-   with \l {QtIVIAbstractFeature::}{discoveryMode} set to \l AutoDiscovery.
+   The QIviWindowControl expects a single backend to be available. It is recommended to use it
+   with \l {QIviAbstractFeature::}{discoveryMode} set to \l AutoDiscovery.
 */
 
 /*!
     \qmltype WindowControl
-    \instantiates QtIVIWindowControl
-    \inqmlmodule QtIVIVehicleFunctions
+    \instantiates QIviWindowControl
+    \inqmlmodule QtIvi.VehicleFunctions
     \inherits AbstractZonedFeature
     \brief The WindowControl provides a QML interface to control the physical windows of the vehicle.
 */
 
 /*!
-   \enum QtIVIWindowControl::HeaterMode
+   \enum QIviWindowControl::HeaterMode
    \value HeaterOn
           The window heater is turned on.
    \value HeaterOff
@@ -269,7 +269,7 @@ QtIVIWindowControlBackendInterface *QtIVIWindowControlPrivate::windowControlBack
 */
 
 /*!
-   \enum QtIVIWindowControl::BlindMode
+   \enum QIviWindowControl::BlindMode
    \value BlindOpen
           The blind will be opened.
    \value BlindClosed
@@ -279,7 +279,7 @@ QtIVIWindowControlBackendInterface *QtIVIWindowControlPrivate::windowControlBack
 */
 
 /*!
-   \enum QtIVIWindowControl::State
+   \enum QIviWindowControl::State
    \value FullyOpen
           The object is fully open.
    \value Open
@@ -291,55 +291,55 @@ QtIVIWindowControlBackendInterface *QtIVIWindowControlPrivate::windowControlBack
 /*!
    Constructs a window control object to the given \a zone.
 
-   The \a parent argument is passed on to the \l QtIVIAbstractZonedFeature base class.
+   The \a parent argument is passed on to the \l QIviAbstractZonedFeature base class.
 */
-QtIVIWindowControl::QtIVIWindowControl(const QString &zone, QObject *parent)
-    : QtIVIAbstractZonedFeature(*new QtIVIWindowControlPrivate(QtIVIStringWindowControlInterfaceName, zone, this), parent)
+QIviWindowControl::QIviWindowControl(const QString &zone, QObject *parent)
+    : QIviAbstractZonedFeature(*new QIviWindowControlPrivate(QIviStringWindowControlInterfaceName, zone, this), parent)
 {
-    Q_D(QtIVIWindowControl);
+    Q_D(QIviWindowControl);
     d->init();
 
-    qRegisterMetaType<QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode>>();
-    qRegisterMetaType<QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode>>();
-    qRegisterMetaType<QtIVIPropertyAttribute<QtIVIWindowControl::State>>();
+    qRegisterMetaType<QIviPropertyAttribute<QIviWindowControl::HeaterMode>>();
+    qRegisterMetaType<QIviPropertyAttribute<QIviWindowControl::BlindMode>>();
+    qRegisterMetaType<QIviPropertyAttribute<QIviWindowControl::State>>();
 }
 
-QtIVIWindowControl::~QtIVIWindowControl()
+QIviWindowControl::~QIviWindowControl()
 {
 }
 
 /*!
    \reimp
 */
-void QtIVIWindowControl::connectToServiceObject(QtIVIServiceObject *serviceObject)
+void QIviWindowControl::connectToServiceObject(QIviServiceObject *serviceObject)
 {
-    Q_D(QtIVIWindowControl);
-    QtIVIAbstractZonedFeature::connectToServiceObject(serviceObject);
+    Q_D(QIviWindowControl);
+    QIviAbstractZonedFeature::connectToServiceObject(serviceObject);
 
-    QtIVIWindowControlBackendInterface* backend = d->windowControlBackend();
+    QIviWindowControlBackendInterface* backend = d->windowControlBackend();
     if (!backend)
         return;
 
-    QObjectPrivate::connect(backend, &QtIVIWindowControlBackendInterface::heaterModeChanged,
-                            d, &QtIVIWindowControlPrivate::onHeaterModeChanged);
-    QObjectPrivate::connect(backend, &QtIVIWindowControlBackendInterface::heaterModeAttributeChanged,
-                            d, &QtIVIWindowControlPrivate::onHeaterModeAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIWindowControlBackendInterface::heaterEnabledChanged,
-                            d, &QtIVIWindowControlPrivate::onHeaterEnabledChanged);
-    QObjectPrivate::connect(backend, &QtIVIWindowControlBackendInterface::heaterAttributeChanged,
-                            d, &QtIVIWindowControlPrivate::onHeaterAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIWindowControlBackendInterface::blindModeChanged,
-                            d, &QtIVIWindowControlPrivate::onBlindModeChanged);
-    QObjectPrivate::connect(backend, &QtIVIWindowControlBackendInterface::blindModeAttributeChanged,
-                            d, &QtIVIWindowControlPrivate::onBlindModeAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIWindowControlBackendInterface::blindStateChanged,
-                            d, &QtIVIWindowControlPrivate::onBlindStateChanged);
-    QObjectPrivate::connect(backend, &QtIVIWindowControlBackendInterface::blindStateAttributeChanged,
-                            d, &QtIVIWindowControlPrivate::onBlindStateAttributeChanged);
-    QObjectPrivate::connect(backend, &QtIVIWindowControlBackendInterface::stateChanged,
-                            d, &QtIVIWindowControlPrivate::onStateChanged);
-    QObjectPrivate::connect(backend, &QtIVIWindowControlBackendInterface::stateAttributeChanged,
-                            d, &QtIVIWindowControlPrivate::onStateAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviWindowControlBackendInterface::heaterModeChanged,
+                            d, &QIviWindowControlPrivate::onHeaterModeChanged);
+    QObjectPrivate::connect(backend, &QIviWindowControlBackendInterface::heaterModeAttributeChanged,
+                            d, &QIviWindowControlPrivate::onHeaterModeAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviWindowControlBackendInterface::heaterEnabledChanged,
+                            d, &QIviWindowControlPrivate::onHeaterEnabledChanged);
+    QObjectPrivate::connect(backend, &QIviWindowControlBackendInterface::heaterAttributeChanged,
+                            d, &QIviWindowControlPrivate::onHeaterAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviWindowControlBackendInterface::blindModeChanged,
+                            d, &QIviWindowControlPrivate::onBlindModeChanged);
+    QObjectPrivate::connect(backend, &QIviWindowControlBackendInterface::blindModeAttributeChanged,
+                            d, &QIviWindowControlPrivate::onBlindModeAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviWindowControlBackendInterface::blindStateChanged,
+                            d, &QIviWindowControlPrivate::onBlindStateChanged);
+    QObjectPrivate::connect(backend, &QIviWindowControlBackendInterface::blindStateAttributeChanged,
+                            d, &QIviWindowControlPrivate::onBlindStateAttributeChanged);
+    QObjectPrivate::connect(backend, &QIviWindowControlBackendInterface::stateChanged,
+                            d, &QIviWindowControlPrivate::onStateChanged);
+    QObjectPrivate::connect(backend, &QIviWindowControlBackendInterface::stateAttributeChanged,
+                            d, &QIviWindowControlPrivate::onStateAttributeChanged);
 
     backend->initializeAttributes();
 }
@@ -347,9 +347,9 @@ void QtIVIWindowControl::connectToServiceObject(QtIVIServiceObject *serviceObjec
 /*!
    \reimp
 */
-void QtIVIWindowControl::disconnectFromServiceObject(QtIVIServiceObject *serviceObject)
+void QIviWindowControl::disconnectFromServiceObject(QIviServiceObject *serviceObject)
 {
-    QtIVIWindowControlBackendInterface *backend = qobject_cast<QtIVIWindowControlBackendInterface*>(serviceObject->interfaceInstance(QtIVIStringWindowControlInterfaceName));
+    QIviWindowControlBackendInterface *backend = qobject_cast<QIviWindowControlBackendInterface*>(serviceObject->interfaceInstance(QIviStringWindowControlInterfaceName));
 
     if (backend)
         disconnect(backend, 0, this, 0);
@@ -358,30 +358,30 @@ void QtIVIWindowControl::disconnectFromServiceObject(QtIVIServiceObject *service
 /*!
    \reimp
 */
-void QtIVIWindowControl::clearServiceObject()
+void QIviWindowControl::clearServiceObject()
 {
-    Q_D(QtIVIWindowControl);
+    Q_D(QIviWindowControl);
     d->clearToDefaults();
-    QtIVIAbstractZonedFeature::clearServiceObject();
+    QIviAbstractZonedFeature::clearServiceObject();
 }
 
-QtIVIWindowControl::QtIVIWindowControl(QtIVIWindowControlPrivate &dd, QObject *parent)
-    : QtIVIAbstractZonedFeature(dd, parent)
+QIviWindowControl::QIviWindowControl(QIviWindowControlPrivate &dd, QObject *parent)
+    : QIviAbstractZonedFeature(dd, parent)
 {
-    Q_D(QtIVIWindowControl);
+    Q_D(QIviWindowControl);
     d->init();
 }
 
 /*!
    \reimp
 */
-QtIVIAbstractZonedFeature *QtIVIWindowControl::createZoneFeature(const QString &zone)
+QIviAbstractZonedFeature *QIviWindowControl::createZoneFeature(const QString &zone)
 {
-    return new QtIVIWindowControl(zone, this);
+    return new QIviWindowControl(zone, this);
 }
 
 /*!
-   \qmlqtivipropertyEnum {QtIVIVehicleFunctions::WindowControl::heaterMode}
+   \qmlqtivipropertyEnum {QtIvi.VehicleFunctions::WindowControl::heaterMode}
 
    \e value holds the heater mode.
    Available values are:
@@ -393,9 +393,9 @@ QtIVIAbstractZonedFeature *QtIVIWindowControl::createZoneFeature(const QString &
           The window heater is turning off and on automatically.
  */
 /*!
-   \property QtIVIWindowControl::heaterMode
+   \property QIviWindowControl::heaterMode
 
-   Holds a QtIVIProperty of type \e QtIVIWindowControl::HeaterMode where the QtIVIProperty::value() function returns the current heaterMode.
+   Holds a QIviProperty of type \e QIviWindowControl::HeaterMode where the QIviProperty::value() function returns the current heaterMode.
 
    \sa AttributeSystem
    \sa heaterMode() setHeaterMode() heaterModeAttribute()
@@ -405,10 +405,10 @@ QtIVIAbstractZonedFeature *QtIVIWindowControl::createZoneFeature(const QString &
  *
  * \sa setHeaterMode() heaterModeChanged() heaterModeAttribute()
  */
-QtIVIWindowControl::HeaterMode QtIVIWindowControl::heaterMode() const
+QIviWindowControl::HeaterMode QIviWindowControl::heaterMode() const
 
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_heaterMode;
 }
 /*!
@@ -416,27 +416,27 @@ QtIVIWindowControl::HeaterMode QtIVIWindowControl::heaterMode() const
  *
  * \sa setHeaterMode() heaterMode() heaterModeChanged()
  */
-QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode> QtIVIWindowControl::heaterModeAttribute() const
+QIviPropertyAttribute<QIviWindowControl::HeaterMode> QIviWindowControl::heaterModeAttribute() const
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_heaterModeAttribute;
 }
 
-QtIVIProperty *QtIVIWindowControl::heaterModeProperty() const
+QIviProperty *QIviWindowControl::heaterModeProperty() const
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_heaterModeProperty;
 }
 
 /*!
-   \qmlqtivipropertyBool {QtIVIVehicleFunctions::WindowControl::heater}
+   \qmlqtivipropertyBool {QtIvi.VehicleFunctions::WindowControl::heater}
 
    \e value is true if the heater is currently running.
  */
 /*!
-   \property QtIVIWindowControl::heater
+   \property QIviWindowControl::heater
 
-   Holds a QtIVIProperty of type \e bool where the QtIVIProperty::value() function indicates if the heater is running.
+   Holds a QIviProperty of type \e bool where the QIviProperty::value() function indicates if the heater is running.
 
    \sa AttributeSystem
    \sa isHeaterEnabled() heaterAttribute()
@@ -446,10 +446,10 @@ QtIVIProperty *QtIVIWindowControl::heaterModeProperty() const
  *
  * \sa heaterEnabledChanged() heaterAttribute()
  */
-bool QtIVIWindowControl::isHeaterEnabled() const
+bool QIviWindowControl::isHeaterEnabled() const
 
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_heater;
 }
 /*!
@@ -457,20 +457,20 @@ bool QtIVIWindowControl::isHeaterEnabled() const
  *
  * \sa isHeaterEnabled() heaterEnabledChanged()
  */
-QtIVIPropertyAttribute<bool> QtIVIWindowControl::heaterAttribute() const
+QIviPropertyAttribute<bool> QIviWindowControl::heaterAttribute() const
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_heaterAttribute;
 }
 
-QtIVIProperty *QtIVIWindowControl::heaterProperty() const
+QIviProperty *QIviWindowControl::heaterProperty() const
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_heaterProperty;
 }
 
 /*!
-   \qmlqtivipropertyEnum {QtIVIVehicleFunctions::WindowControl::blindMode}
+   \qmlqtivipropertyEnum {QtIvi.VehicleFunctions::WindowControl::blindMode}
 
    \e value holds the blind mode.
    Available values are:
@@ -482,9 +482,9 @@ QtIVIProperty *QtIVIWindowControl::heaterProperty() const
           The blind is opened or closed automatically.
  */
 /*!
-   \property QtIVIWindowControl::blindMode
+   \property QIviWindowControl::blindMode
 
-   Holds a QtIVIProperty of type \e QtIVIWindowControl::BlindMode where the QtIVIProperty::value() function returns the current blind mode.
+   Holds a QIviProperty of type \e QIviWindowControl::BlindMode where the QIviProperty::value() function returns the current blind mode.
 
    \sa AttributeSystem
    \sa blindMode() setBlindMode() blindModeAttribute()
@@ -494,10 +494,10 @@ QtIVIProperty *QtIVIWindowControl::heaterProperty() const
  *
  * \sa setBlindMode() blindModeChanged() blindModeAttribute()
  */
-QtIVIWindowControl::BlindMode QtIVIWindowControl::blindMode() const
+QIviWindowControl::BlindMode QIviWindowControl::blindMode() const
 
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_blindMode;
 }
 /*!
@@ -505,20 +505,20 @@ QtIVIWindowControl::BlindMode QtIVIWindowControl::blindMode() const
  *
  * \sa setBlindMode() blindMode() blindModeChanged()
  */
-QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode> QtIVIWindowControl::blindModeAttribute() const
+QIviPropertyAttribute<QIviWindowControl::BlindMode> QIviWindowControl::blindModeAttribute() const
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_blindModeAttribute;
 }
 
-QtIVIProperty *QtIVIWindowControl::blindModeProperty() const
+QIviProperty *QIviWindowControl::blindModeProperty() const
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_blindModeProperty;
 }
 
 /*!
-   \qmlqtivipropertyEnum {QtIVIVehicleFunctions::WindowControl::blindState}
+   \qmlqtivipropertyEnum {QtIvi.VehicleFunctions::WindowControl::blindState}
 
    \e value holds the current blind state.
    Available values are:
@@ -530,9 +530,9 @@ QtIVIProperty *QtIVIWindowControl::blindModeProperty() const
           The object is closed.
  */
 /*!
-   \property QtIVIWindowControl::blindState
+   \property QIviWindowControl::blindState
 
-   Holds a QtIVIProperty of type \e QtIVIWindowControl::State where the QtIVIProperty::value() function returns the current blind state.
+   Holds a QIviProperty of type \e QIviWindowControl::State where the QIviProperty::value() function returns the current blind state.
 
    \sa AttributeSystem
    \sa blindState() blindStateAttribute()
@@ -542,10 +542,10 @@ QtIVIProperty *QtIVIWindowControl::blindModeProperty() const
  *
  * \sa blindStateChanged() blindStateAttribute()
  */
-QtIVIWindowControl::State QtIVIWindowControl::blindState() const
+QIviWindowControl::State QIviWindowControl::blindState() const
 
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_blindState;
 }
 /*!
@@ -553,20 +553,20 @@ QtIVIWindowControl::State QtIVIWindowControl::blindState() const
  *
  * \sa blindState() blindStateChanged()
  */
-QtIVIPropertyAttribute<QtIVIWindowControl::State> QtIVIWindowControl::blindStateAttribute() const
+QIviPropertyAttribute<QIviWindowControl::State> QIviWindowControl::blindStateAttribute() const
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_blindStateAttribute;
 }
 
-QtIVIProperty *QtIVIWindowControl::blindStateProperty() const
+QIviProperty *QIviWindowControl::blindStateProperty() const
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_blindStateProperty;
 }
 
 /*!
-   \qmlqtivipropertyEnum {QtIVIVehicleFunctions::WindowControl::state}
+   \qmlqtivipropertyEnum {QtIvi.VehicleFunctions::WindowControl::state}
 
    \e value holds the current window state.
    Available values are:
@@ -580,9 +580,9 @@ QtIVIProperty *QtIVIWindowControl::blindStateProperty() const
    \sa open() close()
  */
 /*!
-   \property QtIVIWindowControl::state
+   \property QIviWindowControl::state
 
-   Holds a QtIVIProperty of type \e QtIVIWindowControl::State where the QtIVIProperty::value() function returns the current window state.
+   Holds a QIviProperty of type \e QIviWindowControl::State where the QIviProperty::value() function returns the current window state.
 
    \sa AttributeSystem
    \sa state() stateAttribute() open() close()
@@ -592,10 +592,10 @@ QtIVIProperty *QtIVIWindowControl::blindStateProperty() const
  *
  * \sa stateChanged() stateAttribute()
  */
-QtIVIWindowControl::State QtIVIWindowControl::state() const
+QIviWindowControl::State QIviWindowControl::state() const
 
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_state;
 }
 /*!
@@ -603,15 +603,15 @@ QtIVIWindowControl::State QtIVIWindowControl::state() const
  *
  * \sa state() stateChanged()
  */
-QtIVIPropertyAttribute<QtIVIWindowControl::State> QtIVIWindowControl::stateAttribute() const
+QIviPropertyAttribute<QIviWindowControl::State> QIviWindowControl::stateAttribute() const
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_stateAttribute;
 }
 
-QtIVIProperty *QtIVIWindowControl::stateProperty() const
+QIviProperty *QIviWindowControl::stateProperty() const
 {
-    Q_D(const QtIVIWindowControl);
+    Q_D(const QIviWindowControl);
     return d->m_stateProperty;
 }
 
@@ -620,10 +620,10 @@ QtIVIProperty *QtIVIWindowControl::stateProperty() const
  *
  * \sa heaterMode() heaterModeChanged() heaterModeAttribute()
  */
-void QtIVIWindowControl::setHeaterMode(QtIVIWindowControl::HeaterMode value)
+void QIviWindowControl::setHeaterMode(QIviWindowControl::HeaterMode value)
 {
-    Q_D(QtIVIWindowControl);
-    if (QtIVIWindowControlBackendInterface* backend = d->windowControlBackend())
+    Q_D(QIviWindowControl);
+    if (QIviWindowControlBackendInterface* backend = d->windowControlBackend())
         backend->setHeaterMode(value, zone());
 }
 
@@ -632,55 +632,55 @@ void QtIVIWindowControl::setHeaterMode(QtIVIWindowControl::HeaterMode value)
  *
  * \sa blindMode() blindModeChanged() blindModeAttribute()
  */
-void QtIVIWindowControl::setBlindMode(QtIVIWindowControl::BlindMode value)
+void QIviWindowControl::setBlindMode(QIviWindowControl::BlindMode value)
 {
-    Q_D(QtIVIWindowControl);
-    if (QtIVIWindowControlBackendInterface* backend = d->windowControlBackend())
+    Q_D(QIviWindowControl);
+    if (QIviWindowControlBackendInterface* backend = d->windowControlBackend())
         backend->setBlindMode(value, zone());
 }
 
 /*!
  * \qmlmethod WindowControl::open()
  *
- * Opens the window, if not already in the QtIVIWindowControl::FullyOpen state.
+ * Opens the window, if not already in the QIviWindowControl::FullyOpen state.
  *
  * \sa WindowControl::state
  */
 
 /*!
- * Opens the window, if not already in the QtIVIWindowControl::FullyOpen state.
+ * Opens the window, if not already in the QIviWindowControl::FullyOpen state.
  *
  * \sa state() close()
  */
-void QtIVIWindowControl::open()
+void QIviWindowControl::open()
 {
-    Q_D(QtIVIWindowControl);
-    if (QtIVIWindowControlBackendInterface* backend = d->windowControlBackend())
+    Q_D(QIviWindowControl);
+    if (QIviWindowControlBackendInterface* backend = d->windowControlBackend())
         backend->open(zone());
 }
 
 /*!
  * \qmlmethod WindowControl::close()
  *
- * Closes the window, if not already in the QtIVIWindowControl::Closed state.
+ * Closes the window, if not already in the QIviWindowControl::Closed state.
  *
  * \sa WindowControl::state
  */
 
 /*!
- * Closes the window, if not already in the QtIVIWindowControl::Closed state.
+ * Closes the window, if not already in the QIviWindowControl::Closed state.
  *
  * \sa state() open()
  */
-void QtIVIWindowControl::close()
+void QIviWindowControl::close()
 {
-    Q_D(QtIVIWindowControl);
-    if (QtIVIWindowControlBackendInterface* backend = d->windowControlBackend())
+    Q_D(QIviWindowControl);
+    if (QIviWindowControlBackendInterface* backend = d->windowControlBackend())
         backend->close(zone());
 }
 
 /*!
- * \fn void QtIVIWindowControl::heaterModeChanged(QtIVIWindowControl::HeaterMode value);
+ * \fn void QIviWindowControl::heaterModeChanged(QIviWindowControl::HeaterMode value);
  *
  * This signal is emitted whenever the heater mode changed. The new value is passed as \a value.
  *
@@ -688,7 +688,7 @@ void QtIVIWindowControl::close()
  */
 
 /*!
- * \fn void QtIVIWindowControl::heaterModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode> &attribute);
+ * \fn void QIviWindowControl::heaterModeAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::HeaterMode> &attribute);
  *
  * This signal is emitted whenever the attribute for the heaterMode property changes. The new attribute is passed as \a attribute.
  *
@@ -696,7 +696,7 @@ void QtIVIWindowControl::close()
  */
 
 /*!
- * \fn void QtIVIWindowControl::heaterEnabledChanged(bool enabled);
+ * \fn void QIviWindowControl::heaterEnabledChanged(bool enabled);
  *
  * This signal is emitted whenever the heater is turned \e on or \e off. The new value is passed as \a enabled.
  *
@@ -704,7 +704,7 @@ void QtIVIWindowControl::close()
  */
 
 /*!
- * \fn void QtIVIWindowControl::heaterAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
+ * \fn void QIviWindowControl::heaterAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
  *
  * This signal is emitted whenever the attribute for the heater property changes. The new attribute is passed as \a attribute.
  *
@@ -712,7 +712,7 @@ void QtIVIWindowControl::close()
  */
 
 /*!
- * \fn void QtIVIWindowControl::blindModeChanged(QtIVIWindowControl::BlindMode value);
+ * \fn void QIviWindowControl::blindModeChanged(QIviWindowControl::BlindMode value);
  *
  * This signal is emitted whenever the blind mode changed. The new value is passed as \a value.
  *
@@ -720,7 +720,7 @@ void QtIVIWindowControl::close()
  */
 
 /*!
- * \fn void QtIVIWindowControl::blindModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode> &attribute);
+ * \fn void QIviWindowControl::blindModeAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::BlindMode> &attribute);
  *
  * This signal is emitted whenever the attribute for the blindMode property changes. The new attribute is passed as \a attribute.
  *
@@ -728,7 +728,7 @@ void QtIVIWindowControl::close()
  */
 
 /*!
- * \fn void QtIVIWindowControl::blindStateChanged(QtIVIWindowControl::State value);
+ * \fn void QIviWindowControl::blindStateChanged(QIviWindowControl::State value);
  *
  * This signal is emitted whenever the blind state changed. The new value is passed as \a value.
  *
@@ -736,7 +736,7 @@ void QtIVIWindowControl::close()
  */
 
 /*!
- * \fn void QtIVIWindowControl::blindStateAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::State> &attribute);
+ * \fn void QIviWindowControl::blindStateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &attribute);
  *
  * This signal is emitted whenever the attribute for the blindState property changes. The new attribute is passed as \a attribute.
  *
@@ -744,7 +744,7 @@ void QtIVIWindowControl::close()
  */
 
 /*!
- * \fn void QtIVIWindowControl::stateChanged(QtIVIWindowControl::State value);
+ * \fn void QIviWindowControl::stateChanged(QIviWindowControl::State value);
  *
  * This signal is emitted whenever the state changed. The new value is passed as \a value.
  *
@@ -752,7 +752,7 @@ void QtIVIWindowControl::close()
  */
 
 /*!
- * \fn void QtIVIWindowControl::stateAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::State> &attribute);
+ * \fn void QIviWindowControl::stateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &attribute);
  *
  * This signal is emitted whenever the attribute for the state property changes. The new attribute is passed as \a attribute.
  *
diff --git a/src/ivivehiclefunctions/qtiviwindowcontrol.h b/src/ivivehiclefunctions/qtiviwindowcontrol.h
index 7450ae6..9844b62 100644
--- a/src/ivivehiclefunctions/qtiviwindowcontrol.h
+++ b/src/ivivehiclefunctions/qtiviwindowcontrol.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,29 +39,29 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIWINDOWCONTROL_H
-#define QTIVIWINDOWCONTROL_H
+#ifndef QIVIWINDOWCONTROL_H
+#define QIVIWINDOWCONTROL_H
 
-#include <QtIVICore/QtIVIAbstractZonedFeature>
-#include <QtIVICore/QtIVIProperty>
-#include <QtIVIVehicleFunctions/qtivivehiclefunctionsglobal.h>
+#include <QtIviCore/QIviAbstractZonedFeature>
+#include <QtIviCore/QIviProperty>
+#include <QtIviVehicleFunctions/qtivivehiclefunctionsglobal.h>
 
 QT_BEGIN_NAMESPACE
 
-class QtIVIWindowControlBackendInterface;
-class QtIVIWindowControlPrivate;
+class QIviWindowControlBackendInterface;
+class QIviWindowControlPrivate;
 
-static const QLatin1String QtIVIStringWindowControlInterfaceName("com.qt-project.qtivi.WindowControl");
+static const QLatin1String QIviStringWindowControlInterfaceName("com.qt-project.qtivi.WindowControl");
 
-class Q_QTIVIVEHICLEFUNCTIONS_EXPORT QtIVIWindowControl : public QtIVIAbstractZonedFeature
+class Q_QTIVIVEHICLEFUNCTIONS_EXPORT QIviWindowControl : public QIviAbstractZonedFeature
 {
     Q_OBJECT
 
-    Q_PROPERTY(QtIVIProperty *heaterMode READ heaterModeProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty *heater READ heaterProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty *blindMode READ blindModeProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty *blindState READ blindStateProperty CONSTANT)
-    Q_PROPERTY(QtIVIProperty *state READ stateProperty CONSTANT)
+    Q_PROPERTY(QIviProperty *heaterMode READ heaterModeProperty CONSTANT)
+    Q_PROPERTY(QIviProperty *heater READ heaterProperty CONSTANT)
+    Q_PROPERTY(QIviProperty *blindMode READ blindModeProperty CONSTANT)
+    Q_PROPERTY(QIviProperty *blindState READ blindStateProperty CONSTANT)
+    Q_PROPERTY(QIviProperty *state READ stateProperty CONSTANT)
 
 public:
 
@@ -86,69 +86,69 @@ public:
     };
     Q_ENUM(State)
 
-    QtIVIWindowControl(const QString &zone=QString(), QObject *parent=0);
-    ~QtIVIWindowControl();
+    QIviWindowControl(const QString &zone=QString(), QObject *parent = Q_NULLPTR);
+    ~QIviWindowControl();
 
-    QtIVIWindowControl::HeaterMode heaterMode() const;
-    QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode> heaterModeAttribute() const;
-    QtIVIProperty *heaterModeProperty() const;
+    QIviWindowControl::HeaterMode heaterMode() const;
+    QIviPropertyAttribute<QIviWindowControl::HeaterMode> heaterModeAttribute() const;
+    QIviProperty *heaterModeProperty() const;
     bool isHeaterEnabled() const;
-    QtIVIPropertyAttribute<bool> heaterAttribute() const;
-    QtIVIProperty *heaterProperty() const;
-    QtIVIWindowControl::BlindMode blindMode() const;
-    QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode> blindModeAttribute() const;
-    QtIVIProperty *blindModeProperty() const;
-    QtIVIWindowControl::State blindState() const;
-    QtIVIPropertyAttribute<QtIVIWindowControl::State> blindStateAttribute() const;
-    QtIVIProperty *blindStateProperty() const;
-    QtIVIWindowControl::State state() const;
-    QtIVIPropertyAttribute<QtIVIWindowControl::State> stateAttribute() const;
-    QtIVIProperty *stateProperty() const;
+    QIviPropertyAttribute<bool> heaterAttribute() const;
+    QIviProperty *heaterProperty() const;
+    QIviWindowControl::BlindMode blindMode() const;
+    QIviPropertyAttribute<QIviWindowControl::BlindMode> blindModeAttribute() const;
+    QIviProperty *blindModeProperty() const;
+    QIviWindowControl::State blindState() const;
+    QIviPropertyAttribute<QIviWindowControl::State> blindStateAttribute() const;
+    QIviProperty *blindStateProperty() const;
+    QIviWindowControl::State state() const;
+    QIviPropertyAttribute<QIviWindowControl::State> stateAttribute() const;
+    QIviProperty *stateProperty() const;
 
 public Q_SLOTS:
-    void setHeaterMode(QtIVIWindowControl::HeaterMode value);
-    void setBlindMode(QtIVIWindowControl::BlindMode value);
+    void setHeaterMode(QIviWindowControl::HeaterMode value);
+    void setBlindMode(QIviWindowControl::BlindMode value);
     void open();
     void close();
 
 Q_SIGNALS:
-    void heaterModeChanged(QtIVIWindowControl::HeaterMode value);
-    void heaterModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode> &attribute);
+    void heaterModeChanged(QIviWindowControl::HeaterMode value);
+    void heaterModeAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::HeaterMode> &attribute);
     void heaterEnabledChanged(bool enabled);
-    void heaterAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
-    void blindModeChanged(QtIVIWindowControl::BlindMode value);
-    void blindModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode> &attribute);
-    void blindStateChanged(QtIVIWindowControl::State value);
-    void blindStateAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::State> &attribute);
-    void stateChanged(QtIVIWindowControl::State value);
-    void stateAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::State> &attribute);
+    void heaterAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
+    void blindModeChanged(QIviWindowControl::BlindMode value);
+    void blindModeAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::BlindMode> &attribute);
+    void blindStateChanged(QIviWindowControl::State value);
+    void blindStateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &attribute);
+    void stateChanged(QIviWindowControl::State value);
+    void stateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &attribute);
 
 protected:
-    QtIVIWindowControl(QtIVIWindowControlPrivate &dd, QObject *parent = Q_NULLPTR);
-    virtual QtIVIAbstractZonedFeature *createZoneFeature(const QString &zone) Q_DECL_OVERRIDE;
+    QIviWindowControl(QIviWindowControlPrivate &dd, QObject *parent = Q_NULLPTR);
+    virtual QIviAbstractZonedFeature *createZoneFeature(const QString &zone) Q_DECL_OVERRIDE;
 
-    virtual void connectToServiceObject(QtIVIServiceObject *serviceObject) Q_DECL_OVERRIDE;
-    virtual void disconnectFromServiceObject(QtIVIServiceObject *serviceObject) Q_DECL_OVERRIDE;
+    virtual void connectToServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
+    virtual void disconnectFromServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE;
     virtual void clearServiceObject() Q_DECL_OVERRIDE;
 
 private:
-    Q_DECLARE_PRIVATE(QtIVIWindowControl)
-    Q_PRIVATE_SLOT(d_func(), void onHeaterModeChanged(QtIVIWindowControl::HeaterMode heaterMode, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onHeaterModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode> &attribute, const QString &zone))
+    Q_DECLARE_PRIVATE(QIviWindowControl)
+    Q_PRIVATE_SLOT(d_func(), void onHeaterModeChanged(QIviWindowControl::HeaterMode heaterMode, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onHeaterModeAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::HeaterMode> &attribute, const QString &zone))
     Q_PRIVATE_SLOT(d_func(), void onHeaterEnabledChanged(bool heater, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onHeaterAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onBlindModeChanged(QtIVIWindowControl::BlindMode blindMode, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onBlindModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode> &attribute, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onBlindStateChanged(QtIVIWindowControl::State blindState, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onBlindStateAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::State> &attribute, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onStateChanged(QtIVIWindowControl::State state, const QString &zone))
-    Q_PRIVATE_SLOT(d_func(), void onStateAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::State> &attribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onHeaterAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onBlindModeChanged(QIviWindowControl::BlindMode blindMode, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onBlindModeAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::BlindMode> &attribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onBlindStateChanged(QIviWindowControl::State blindState, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onBlindStateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &attribute, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onStateChanged(QIviWindowControl::State state, const QString &zone))
+    Q_PRIVATE_SLOT(d_func(), void onStateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &attribute, const QString &zone))
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode>)
-Q_DECLARE_METATYPE(QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode>)
-Q_DECLARE_METATYPE(QtIVIPropertyAttribute<QtIVIWindowControl::State>)
+Q_DECLARE_METATYPE(QIviPropertyAttribute<QIviWindowControl::HeaterMode>)
+Q_DECLARE_METATYPE(QIviPropertyAttribute<QIviWindowControl::BlindMode>)
+Q_DECLARE_METATYPE(QIviPropertyAttribute<QIviWindowControl::State>)
 
-#endif // QTIVIWINDOWCONTROL_H
+#endif // QIVIWINDOWCONTROL_H
diff --git a/src/ivivehiclefunctions/qtiviwindowcontrol_p.h b/src/ivivehiclefunctions/qtiviwindowcontrol_p.h
index 22a9a5b..4cf3ad7 100644
--- a/src/ivivehiclefunctions/qtiviwindowcontrol_p.h
+++ b/src/ivivehiclefunctions/qtiviwindowcontrol_p.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIWINDOWCONTROL_P_H
-#define QTIVIWINDOWCONTROL_P_H
+#ifndef QIVIWINDOWCONTROL_P_H
+#define QIVIWINDOWCONTROL_P_H
 
 //
 //  W A R N I N G
@@ -53,55 +53,55 @@
 // We mean it.
 //
 
-#include <QtIVICore/QtIVIProperty>
+#include <QtIviCore/QIviProperty>
 #include "private/qtiviabstractzonedfeature_p.h"
 
 #include "qtiviwindowcontrol.h"
 
 QT_BEGIN_NAMESPACE
 
-class QtIVIWindowControlPrivate : public QtIVIAbstractZonedFeaturePrivate
+class QIviWindowControlPrivate : public QIviAbstractZonedFeaturePrivate
 {
 public:
-    QtIVIWindowControlPrivate(const QString &interface, const QString &zone, QtIVIWindowControl *parent);
+    QIviWindowControlPrivate(const QString &interface, const QString &zone, QIviWindowControl *parent);
 
     void init();
     void clearToDefaults();
 
-    void onHeaterModeChanged(QtIVIWindowControl::HeaterMode heaterMode, const QString &zone);
-    void onHeaterModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode> &attribute, const QString &zone);
+    void onHeaterModeChanged(QIviWindowControl::HeaterMode heaterMode, const QString &zone);
+    void onHeaterModeAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::HeaterMode> &attribute, const QString &zone);
     void onHeaterEnabledChanged(bool heater, const QString &zone);
-    void onHeaterAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone);
-    void onBlindModeChanged(QtIVIWindowControl::BlindMode blindMode, const QString &zone);
-    void onBlindModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode> &attribute, const QString &zone);
-    void onBlindStateChanged(QtIVIWindowControl::State blindState, const QString &zone);
-    void onBlindStateAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::State> &attribute, const QString &zone);
-    void onStateChanged(QtIVIWindowControl::State state, const QString &zone);
-    void onStateAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::State> &attribute, const QString &zone);
+    void onHeaterAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone);
+    void onBlindModeChanged(QIviWindowControl::BlindMode blindMode, const QString &zone);
+    void onBlindModeAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::BlindMode> &attribute, const QString &zone);
+    void onBlindStateChanged(QIviWindowControl::State blindState, const QString &zone);
+    void onBlindStateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &attribute, const QString &zone);
+    void onStateChanged(QIviWindowControl::State state, const QString &zone);
+    void onStateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &attribute, const QString &zone);
 
 
-    QtIVIWindowControlBackendInterface *windowControlBackend();
+    QIviWindowControlBackendInterface *windowControlBackend();
 
-    QtIVIWindowControl::HeaterMode m_heaterMode;
-    QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode> m_heaterModeAttribute;
-    QtIVIProperty *m_heaterModeProperty;
+    QIviWindowControl::HeaterMode m_heaterMode;
+    QIviPropertyAttribute<QIviWindowControl::HeaterMode> m_heaterModeAttribute;
+    QIviProperty *m_heaterModeProperty;
     bool m_heater;
-    QtIVIPropertyAttribute<bool> m_heaterAttribute;
-    QtIVIProperty *m_heaterProperty;
-    QtIVIWindowControl::BlindMode m_blindMode;
-    QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode> m_blindModeAttribute;
-    QtIVIProperty *m_blindModeProperty;
-    QtIVIWindowControl::State m_blindState;
-    QtIVIPropertyAttribute<QtIVIWindowControl::State> m_blindStateAttribute;
-    QtIVIProperty *m_blindStateProperty;
-    QtIVIWindowControl::State m_state;
-    QtIVIPropertyAttribute<QtIVIWindowControl::State> m_stateAttribute;
-    QtIVIProperty *m_stateProperty;
+    QIviPropertyAttribute<bool> m_heaterAttribute;
+    QIviProperty *m_heaterProperty;
+    QIviWindowControl::BlindMode m_blindMode;
+    QIviPropertyAttribute<QIviWindowControl::BlindMode> m_blindModeAttribute;
+    QIviProperty *m_blindModeProperty;
+    QIviWindowControl::State m_blindState;
+    QIviPropertyAttribute<QIviWindowControl::State> m_blindStateAttribute;
+    QIviProperty *m_blindStateProperty;
+    QIviWindowControl::State m_state;
+    QIviPropertyAttribute<QIviWindowControl::State> m_stateAttribute;
+    QIviProperty *m_stateProperty;
 
-    QtIVIWindowControl * const q_ptr;
-    Q_DECLARE_PUBLIC(QtIVIWindowControl)
+    QIviWindowControl * const q_ptr;
+    Q_DECLARE_PUBLIC(QIviWindowControl)
 };
 
 QT_END_NAMESPACE
 
-#endif // QTIVIWINDOWCONTROL_P_H
+#endif // QIVIWINDOWCONTROL_P_H
diff --git a/src/ivivehiclefunctions/qtiviwindowcontrolbackendinterface.cpp b/src/ivivehiclefunctions/qtiviwindowcontrolbackendinterface.cpp
index ff5bc59..ac32b0f 100644
--- a/src/ivivehiclefunctions/qtiviwindowcontrolbackendinterface.cpp
+++ b/src/ivivehiclefunctions/qtiviwindowcontrolbackendinterface.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -42,35 +42,35 @@
 #include "qtiviwindowcontrolbackendinterface.h"
 
 /*!
- * \class QtIVIWindowControlBackendInterface
- * \inmodule QtIVIVehicleFunctions
+ * \class QIviWindowControlBackendInterface
+ * \inmodule QtIviVehicleFunctions
  * \ingroup backends
- * \inherits QtIVIZonedFeatureInterface
- * \brief The QtIVIWindowControlBackendInterface defines the interface for backends to the
- * QtIVIWindowControl feature class.
+ * \inherits QIviZonedFeatureInterface
+ * \brief The QIviWindowControlBackendInterface defines the interface for backends to the
+ * QIviWindowControl feature class.
  *
- * The QtIVIWindowControlBackendInterface is the interface used by \l QtIVIWindowControl
+ * The QIviWindowControlBackendInterface is the interface used by \l QIviWindowControl
  *
- * The interface is discovered by a \l QtIVIWindowControl object, which connects to it and sets up
+ * The interface is discovered by a \l QIviWindowControl object, which connects to it and sets up
  * the connections to it.
  *
- * \sa QtIVIWindowControl
+ * \sa QIviWindowControl
  */
 
 /*!
- * \fn QtIVIWindowControlBackendInterface::QtIVIWindowControlBackendInterface(QObject *parent=0)
+ * \fn QIviWindowControlBackendInterface::QIviWindowControlBackendInterface(QObject *parent=0)
  *
  * Constructs a backend interface.
  *
  * The \a parent is sent to the QObject constructor.
  */
-QtIVIWindowControlBackendInterface::QtIVIWindowControlBackendInterface(QObject *parent)
-    : QtIVIZonedFeatureInterface(parent)
+QIviWindowControlBackendInterface::QIviWindowControlBackendInterface(QObject *parent)
+    : QIviZonedFeatureInterface(parent)
 {
 }
 
 /*!
- * \fn virtual void QtIVIWindowControlBackendInterface::setHeaterMode(QtIVIWindowControl::HeaterMode value, const QString &zone) = 0
+ * \fn virtual void QIviWindowControlBackendInterface::setHeaterMode(QIviWindowControl::HeaterMode value, const QString &zone) = 0
  *
  * Sets the heater mode of \a zone to \a value. The available modes can be defined using the attribute system.
  *
@@ -82,7 +82,7 @@ QtIVIWindowControlBackendInterface::QtIVIWindowControlBackendInterface(QObject *
  */
 
 /*!
- * \fn virtual void QtIVIWindowControlBackendInterface::setBlindMode(QtIVIWindowControl::BlindMode value, const QString &zone) = 0
+ * \fn virtual void QIviWindowControlBackendInterface::setBlindMode(QIviWindowControl::BlindMode value, const QString &zone) = 0
  *
  * Sets the blind mode of \a zone to \a value.  The available modes can be defined using the attribute system.
  *
@@ -94,7 +94,7 @@ QtIVIWindowControlBackendInterface::QtIVIWindowControlBackendInterface(QObject *
  */
 
 /*!
- * \fn virtual void QtIVIWindowControlBackendInterface::open(const QString &zone) = 0
+ * \fn virtual void QIviWindowControlBackendInterface::open(const QString &zone) = 0
  *
  * Opens the window identified by \a zone. Whether the window can be opened is controlled by the attribute system.
  *
@@ -102,7 +102,7 @@ QtIVIWindowControlBackendInterface::QtIVIWindowControlBackendInterface(QObject *
  */
 
 /*!
- * \fn virtual void QtIVIWindowControlBackendInterface::close(const QString &zone) = 0
+ * \fn virtual void QIviWindowControlBackendInterface::close(const QString &zone) = 0
  *
  * Closes the window identified by \a zone. Whether the window can be closed is controlled by the attribute system.
  *
@@ -110,7 +110,7 @@ QtIVIWindowControlBackendInterface::QtIVIWindowControlBackendInterface(QObject *
  */
 
 /*!
- * \fn virtual void QtIVIWindowControlBackendInterface::heaterModeChanged(QtIVIWindowControl::HeaterMode value, const QString &zone = QString())
+ * \fn virtual void QIviWindowControlBackendInterface::heaterModeChanged(QIviWindowControl::HeaterMode value, const QString &zone = QString())
  *
  * The signal is emitted when the heater mode is changed for \a zone to \a value. The available modes can be defined using the attribute system.
  *
@@ -118,25 +118,25 @@ QtIVIWindowControlBackendInterface::QtIVIWindowControlBackendInterface(QObject *
  */
 
 /*!
- * \fn void QtIVIWindowControlBackendInterface::heaterModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode> &attribute, const QString &zone = QString())
+ * \fn void QIviWindowControlBackendInterface::heaterModeAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::HeaterMode> &attribute, const QString &zone = QString())
  *
  * The signal is emitted when the heater mode attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIWindowControlBackendInterface::heaterEnabledChanged(bool enabled, const QString &zone = QString())
+ * \fn virtual void QIviWindowControlBackendInterface::heaterEnabledChanged(bool enabled, const QString &zone = QString())
  *
  * The signal is emitted when the \a zone heater state is changed to \a enabled.
  */
 
 /*!
- * \fn void QtIVIWindowControlBackendInterface::heaterAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute, const QString &zone = QString())
+ * \fn void QIviWindowControlBackendInterface::heaterAttributeChanged(const QIviPropertyAttribute<bool> &attribute, const QString &zone = QString())
  *
  * The signal is emitted when the heater attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIWindowControlBackendInterface::blindModeChanged(QtIVIWindowControl::BlindMode value, const QString &zone = QString())
+ * \fn virtual void QIviWindowControlBackendInterface::blindModeChanged(QIviWindowControl::BlindMode value, const QString &zone = QString())
  *
  * The signal is emitted when the blind mode is changed for \a zone to \a value. The available modes can be defined using the attribute system.
  *
@@ -144,31 +144,31 @@ QtIVIWindowControlBackendInterface::QtIVIWindowControlBackendInterface(QObject *
  */
 
 /*!
- * \fn void QtIVIWindowControlBackendInterface::blindModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode> &attribute, const QString &zone = QString())
+ * \fn void QIviWindowControlBackendInterface::blindModeAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::BlindMode> &attribute, const QString &zone = QString())
  *
  * The signal is emitted when the blind mode attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIWindowControlBackendInterface::blindStateChanged(QtIVIWindowControl::State value, const QString &zone = QString())
+ * \fn virtual void QIviWindowControlBackendInterface::blindStateChanged(QIviWindowControl::State value, const QString &zone = QString())
  *
  * The signal is emitted when the blind state is changed for \a zone to \a value. The available states can be defined using the attribute system.
  */
 
 /*!
- * \fn void QtIVIWindowControlBackendInterface::blindStateAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::State> &attribute, const QString &zone = QString())
+ * \fn void QIviWindowControlBackendInterface::blindStateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &attribute, const QString &zone = QString())
  *
  * The signal is emitted when the blind state attribute for \a zone is changed to \a attribute.
  */
 
 /*!
- * \fn virtual void QtIVIWindowControlBackendInterface::stateChanged(QtIVIWindowControl::State value, const QString &zone = QString())
+ * \fn virtual void QIviWindowControlBackendInterface::stateChanged(QIviWindowControl::State value, const QString &zone = QString())
  *
  * The signal is emitted when the state is changed for \a zone to \a value. The available states can be defined using the attribute system.
  */
 
 /*!
- * \fn void QtIVIWindowControlBackendInterface::stateAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::State> &attribute, const QString &zone = QString())
+ * \fn void QIviWindowControlBackendInterface::stateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &attribute, const QString &zone = QString())
  *
  * The signal is emitted when the state attribute for \a zone is changed to \a attribute.
  */
diff --git a/src/ivivehiclefunctions/qtiviwindowcontrolbackendinterface.h b/src/ivivehiclefunctions/qtiviwindowcontrolbackendinterface.h
index 628da6d..7447e68 100644
--- a/src/ivivehiclefunctions/qtiviwindowcontrolbackendinterface.h
+++ b/src/ivivehiclefunctions/qtiviwindowcontrolbackendinterface.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -39,42 +39,42 @@
 **
 ****************************************************************************/
 
-#ifndef QTIVIWINDOWCONTROLBACKENDINTERFACE_H
-#define QTIVIWINDOWCONTROLBACKENDINTERFACE_H
+#ifndef QIVIWINDOWCONTROLBACKENDINTERFACE_H
+#define QIVIWINDOWCONTROLBACKENDINTERFACE_H
 
 #include <QtCore/QObject>
 
-#include <QtIVICore/qtivizonedfeatureinterface.h>
-#include <QtIVICore/qtivipropertyattribute.h>
-#include <QtIVIVehicleFunctions/qtiviwindowcontrol.h>
+#include <QtIviCore/qtivizonedfeatureinterface.h>
+#include <QtIviCore/qtivipropertyattribute.h>
+#include <QtIviVehicleFunctions/qtiviwindowcontrol.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QTIVIVEHICLEFUNCTIONS_EXPORT QtIVIWindowControlBackendInterface : public QtIVIZonedFeatureInterface
+class Q_QTIVIVEHICLEFUNCTIONS_EXPORT QIviWindowControlBackendInterface : public QIviZonedFeatureInterface
 {
     Q_OBJECT
 
 public:
-    QtIVIWindowControlBackendInterface(QObject *parent = 0);
+    QIviWindowControlBackendInterface(QObject *parent = Q_NULLPTR);
 
-    virtual void setHeaterMode(QtIVIWindowControl::HeaterMode value, const QString &zone) = 0;
-    virtual void setBlindMode(QtIVIWindowControl::BlindMode value, const QString &zone) = 0;
+    virtual void setHeaterMode(QIviWindowControl::HeaterMode value, const QString &zone) = 0;
+    virtual void setBlindMode(QIviWindowControl::BlindMode value, const QString &zone) = 0;
     virtual void open(const QString &zone) = 0;
     virtual void close(const QString &zone) = 0;
 
 Q_SIGNALS:
-    void heaterModeChanged(QtIVIWindowControl::HeaterMode value, const QString &zone = QString());
-    void heaterModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode> &heaterMode, const QString &zone = QString());
+    void heaterModeChanged(QIviWindowControl::HeaterMode value, const QString &zone = QString());
+    void heaterModeAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::HeaterMode> &heaterMode, const QString &zone = QString());
     void heaterEnabledChanged(bool enabled, const QString &zone = QString());
-    void heaterAttributeChanged(const QtIVIPropertyAttribute<bool> &heater, const QString &zone = QString());
-    void blindModeChanged(QtIVIWindowControl::BlindMode value, const QString &zone = QString());
-    void blindModeAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode> &blindMode, const QString &zone = QString());
-    void blindStateChanged(QtIVIWindowControl::State value, const QString &zone = QString());
-    void blindStateAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::State> &blindState, const QString &zone = QString());
-    void stateChanged(QtIVIWindowControl::State value, const QString &zone = QString());
-    void stateAttributeChanged(const QtIVIPropertyAttribute<QtIVIWindowControl::State> &state, const QString &zone = QString());
+    void heaterAttributeChanged(const QIviPropertyAttribute<bool> &heater, const QString &zone = QString());
+    void blindModeChanged(QIviWindowControl::BlindMode value, const QString &zone = QString());
+    void blindModeAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::BlindMode> &blindMode, const QString &zone = QString());
+    void blindStateChanged(QIviWindowControl::State value, const QString &zone = QString());
+    void blindStateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &blindState, const QString &zone = QString());
+    void stateChanged(QIviWindowControl::State value, const QString &zone = QString());
+    void stateAttributeChanged(const QIviPropertyAttribute<QIviWindowControl::State> &state, const QString &zone = QString());
 };
 
 QT_END_NAMESPACE
 
-#endif // QTIVIWINDOWCONTROLBACKENDINTERFACE_H
+#endif // QIVIWINDOWCONTROLBACKENDINTERFACE_H
diff --git a/src/plugins/ivivehiclefunctions/climate_simulator/climate_simulator.pro b/src/plugins/ivivehiclefunctions/climate_simulator/climate_simulator.pro
index 8df1fdd..1d729a9 100644
--- a/src/plugins/ivivehiclefunctions/climate_simulator/climate_simulator.pro
+++ b/src/plugins/ivivehiclefunctions/climate_simulator/climate_simulator.pro
@@ -2,7 +2,7 @@ TARGET = climate_simulation
 
 PLUGIN_TYPE = qtivi
 PLUGIN_EXTENDS = qtivi
-PLUGIN_CLASS_NAME = QtIVIClimateControlBackendInterface
+PLUGIN_CLASS_NAME = QIviClimateControlBackendInterface
 
 QT       += core ivicore ivivehiclefunctions
 
diff --git a/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.cpp b/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.cpp
index 4169c89..f3a61e5 100644
--- a/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.cpp
+++ b/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -44,8 +44,8 @@
 #include <QDebug>
 
 ClimateControlBackend::ClimateControlBackend(QObject *parent) :
-    QtIVIClimateControlBackendInterface(parent),
-    m_flowDirection(QtIVIClimateControl::Floor | QtIVIClimateControl::Dashboard),
+    QIviClimateControlBackendInterface(parent),
+    m_flowDirection(QIviClimateControl::Floor | QIviClimateControl::Dashboard),
     m_airCondition(true),
     m_heater(true),
     m_airRecirculation(false),
@@ -53,37 +53,37 @@ ClimateControlBackend::ClimateControlBackend(QObject *parent) :
     m_defrost(false),
     m_steeringWheelHeater(0),
     m_fanSpeed(2),
-    m_recirculationMode(QtIVIClimateControl::RecirculationOff),
+    m_recirculationMode(QIviClimateControl::RecirculationOff),
     m_recirculationSensitivityLevel(0),
-    m_climateMode(QtIVIClimateControl::ClimateOn),
+    m_climateMode(QIviClimateControl::ClimateOn),
     m_automaticClimateFanIntensityLevel(0)
 {
 
     ZoneBackend leftZone;
     leftZone.seatCooler = 10;
-    leftZone.seatCoolerAttribute = QtIVIPropertyAttribute<int>(0, 10);
+    leftZone.seatCoolerAttribute = QIviPropertyAttribute<int>(0, 10);
     leftZone.seatHeater = 10;
-    leftZone.seatHeaterAttribute = QtIVIPropertyAttribute<int>(0, 10);
+    leftZone.seatHeaterAttribute = QIviPropertyAttribute<int>(0, 10);
     leftZone.targetTemperature = 20;
-    leftZone.targetTemperatureAttribute = QtIVIPropertyAttribute<int>(0, 10);
+    leftZone.targetTemperatureAttribute = QIviPropertyAttribute<int>(0, 10);
     m_zoneMap.insert("FrontLeft",leftZone);
 
     ZoneBackend rightZone;
     rightZone.seatCooler = 5;
-    rightZone.seatCoolerAttribute = QtIVIPropertyAttribute<int>(0, 10);
+    rightZone.seatCoolerAttribute = QIviPropertyAttribute<int>(0, 10);
     rightZone.seatHeater = 0;
-    rightZone.seatHeaterAttribute = QtIVIPropertyAttribute<int>(0, 10);
+    rightZone.seatHeaterAttribute = QIviPropertyAttribute<int>(0, 10);
     rightZone.targetTemperature = 20;
-    rightZone.targetTemperatureAttribute = QtIVIPropertyAttribute<int>(0, 10);
+    rightZone.targetTemperatureAttribute = QIviPropertyAttribute<int>(0, 10);
     m_zoneMap.insert("FrontRight",rightZone);
 
     ZoneBackend rearZone;
     rearZone.seatCooler = 0;
-    rearZone.seatCoolerAttribute = QtIVIPropertyAttribute<int>();
+    rearZone.seatCoolerAttribute = QIviPropertyAttribute<int>();
     rearZone.seatHeater = 0;
-    rearZone.seatHeaterAttribute = QtIVIPropertyAttribute<int>();
+    rearZone.seatHeaterAttribute = QIviPropertyAttribute<int>();
     rearZone.targetTemperature = 10;
-    rearZone.targetTemperatureAttribute = QtIVIPropertyAttribute<int>(0, 10);
+    rearZone.targetTemperatureAttribute = QIviPropertyAttribute<int>(0, 10);
     m_zoneMap.insert("Rear",rearZone);
 }
 
@@ -98,38 +98,38 @@ QStringList ClimateControlBackend::availableZones() const
 
 void ClimateControlBackend::initializeAttributes()
 {
-    QVector<QtIVIClimateControl::AirflowDirections> airflow;
-    airflow << (QtIVIClimateControl::Floor | QtIVIClimateControl::Dashboard) << QtIVIClimateControl::Floor << QtIVIClimateControl::Dashboard;
-    emit airflowDirectionsAttributeChanged(QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections>(airflow));
+    QVector<QIviClimateControl::AirflowDirections> airflow;
+    airflow << (QIviClimateControl::Floor | QIviClimateControl::Dashboard) << QIviClimateControl::Floor << QIviClimateControl::Dashboard;
+    emit airflowDirectionsAttributeChanged(QIviPropertyAttribute<QIviClimateControl::AirflowDirections>(airflow));
     emit airflowDirectionsChanged(m_flowDirection);
-    emit airConditioningAttributeChanged(QtIVIPropertyAttribute<bool>(true));
+    emit airConditioningAttributeChanged(QIviPropertyAttribute<bool>(true));
     emit airConditioningEnabledChanged(m_airCondition);
-    emit heaterAttributeChanged(QtIVIPropertyAttribute<bool>(true));
+    emit heaterAttributeChanged(QIviPropertyAttribute<bool>(true));
     emit heaterEnabledChanged(m_heater);
     emit zoneSynchronizationEnabledChanged(m_zoneSynchronization);
-    emit zoneSynchronizationAttributeChanged(QtIVIPropertyAttribute<bool>(true));
+    emit zoneSynchronizationAttributeChanged(QIviPropertyAttribute<bool>(true));
     emit defrostEnabledChanged(m_defrost);
-    emit defrostAttributeChanged(QtIVIPropertyAttribute<bool>(true));
-    emit steeringWheelHeaterAttributeChanged(QtIVIPropertyAttribute<int>(false));
+    emit defrostAttributeChanged(QIviPropertyAttribute<bool>(true));
+    emit steeringWheelHeaterAttributeChanged(QIviPropertyAttribute<int>(false));
     emit steeringWheelHeaterChanged(m_steeringWheelHeater);
-    emit fanSpeedLevelAttributeChanged(QtIVIPropertyAttribute<int>(0, 10));
+    emit fanSpeedLevelAttributeChanged(QIviPropertyAttribute<int>(0, 10));
     emit fanSpeedLevelChanged(m_fanSpeed);
 
-    QVector<QtIVIClimateControl::RecirculationMode> recirculation;
-    recirculation << QtIVIClimateControl::RecirculationOff << QtIVIClimateControl::RecirculationOn;
+    QVector<QIviClimateControl::RecirculationMode> recirculation;
+    recirculation << QIviClimateControl::RecirculationOff << QIviClimateControl::RecirculationOn;
     emit recirculationModeChanged(m_recirculationMode);
-    emit recirculationModeAttributeChanged(QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode>(recirculation));
+    emit recirculationModeAttributeChanged(QIviPropertyAttribute<QIviClimateControl::RecirculationMode>(recirculation));
     emit recirculationSensitivityLevelChanged(m_recirculationSensitivityLevel);
-    emit recirculationSensitivityLevelAttributeChanged(QtIVIPropertyAttribute<int>(false));
+    emit recirculationSensitivityLevelAttributeChanged(QIviPropertyAttribute<int>(false));
     emit recirculationEnabledChanged(m_airRecirculation);
-    emit recirculationAttributeChanged(QtIVIPropertyAttribute<bool>(true));
+    emit recirculationAttributeChanged(QIviPropertyAttribute<bool>(true));
 
-    QVector<QtIVIClimateControl::ClimateMode> climate;
-    climate << QtIVIClimateControl::ClimateOff << QtIVIClimateControl::ClimateOn;
+    QVector<QIviClimateControl::ClimateMode> climate;
+    climate << QIviClimateControl::ClimateOff << QIviClimateControl::ClimateOn;
     emit climateModeChanged(m_climateMode);
-    emit climateModeAttributeChanged(QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode>(climate));
+    emit climateModeAttributeChanged(QIviPropertyAttribute<QIviClimateControl::ClimateMode>(climate));
     emit automaticClimateFanIntensityLevelChanged(m_automaticClimateFanIntensityLevel);
-    emit automaticClimateFanIntensityLevelAttributeChanged(QtIVIPropertyAttribute<int>(false));
+    emit automaticClimateFanIntensityLevelAttributeChanged(QIviPropertyAttribute<int>(false));
 
     foreach (QString zone, availableZones()) {
         emit targetTemperatureAttributeChanged(m_zoneMap[zone].targetTemperatureAttribute, zone);
@@ -217,7 +217,7 @@ void ClimateControlBackend::setFanSpeedLevel(int speed, const QString &zone)
     emit fanSpeedLevelChanged(speed, zone);
 }
 
-void ClimateControlBackend::setAirflowDirections(QtIVIClimateControl::AirflowDirections direction, const QString &zone)
+void ClimateControlBackend::setAirflowDirections(QIviClimateControl::AirflowDirections direction, const QString &zone)
 {
     if (!zone.isEmpty() || m_flowDirection == direction)
         return;
@@ -272,7 +272,7 @@ void ClimateControlBackend::setDefrostEnabled(bool defrost, const QString &zone)
     emit defrostEnabledChanged(defrost);
 }
 
-void ClimateControlBackend::setRecirculationMode(QtIVIClimateControl::RecirculationMode recirculationMode, const QString &zone)
+void ClimateControlBackend::setRecirculationMode(QIviClimateControl::RecirculationMode recirculationMode, const QString &zone)
 {
     if (!zone.isEmpty() || m_recirculationMode == recirculationMode)
         return;
@@ -282,7 +282,7 @@ void ClimateControlBackend::setRecirculationMode(QtIVIClimateControl::Recirculat
     m_recirculationMode = recirculationMode;
     emit recirculationModeChanged(recirculationMode);
 
-    bool recirculation = (m_recirculationMode == QtIVIClimateControl::RecirculationOn);
+    bool recirculation = (m_recirculationMode == QIviClimateControl::RecirculationOn);
     if (recirculation != m_airRecirculation) {
         qWarning() << "SIMULATION recirculation changed to" << recirculation;
 
@@ -298,7 +298,7 @@ void ClimateControlBackend::setRecirculationSensitivityLevel(int recirculationSe
     qWarning() << "SIMULATION Setting RecirculationSensitivityLevel is not supported!";
 }
 
-void ClimateControlBackend::setClimateMode(QtIVIClimateControl::ClimateMode climateMode, const QString &zone)
+void ClimateControlBackend::setClimateMode(QIviClimateControl::ClimateMode climateMode, const QString &zone)
 {
     if (!zone.isEmpty() || m_climateMode == climateMode)
         return;
diff --git a/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.h b/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.h
index 8ee25c1..7895f66 100644
--- a/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.h
+++ b/src/plugins/ivivehiclefunctions/climate_simulator/climatecontrolbackend.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -43,9 +43,9 @@
 #define CLIMATECONTROLBACKEND_H
 
 #include <QObject>
-#include <QtIVIVehicleFunctions/QtIVIClimateControlBackendInterface>
+#include <QtIviVehicleFunctions/QIviClimateControlBackendInterface>
 
-class ClimateControlBackend : public QtIVIClimateControlBackendInterface
+class ClimateControlBackend : public QIviClimateControlBackendInterface
 {
 public:
     ClimateControlBackend(QObject* parent = 0);
@@ -61,19 +61,19 @@ public:
     void setSeatHeater(int val, const QString &zone);
     void setSteeringWheelHeater(int val, const QString &zone);
     void setFanSpeedLevel(int, const QString &zone);
-    void setAirflowDirections(QtIVIClimateControl::AirflowDirections direction, const QString &zone);
+    void setAirflowDirections(QIviClimateControl::AirflowDirections direction, const QString &zone);
     void setAirConditioningEnabled(bool val, const QString &zone);
     void setHeaterEnabled(bool val, const QString &zone);
     void setZoneSynchronizationEnabled(bool zoneSynchronization, const QString &zone);
     void setDefrostEnabled(bool defrost, const QString &zone);
-    void setRecirculationMode(QtIVIClimateControl::RecirculationMode recirculationMode, const QString &zone);
+    void setRecirculationMode(QIviClimateControl::RecirculationMode recirculationMode, const QString &zone);
     void setRecirculationSensitivityLevel(int recirculationSensitivityLevel, const QString &zone);
-    void setClimateMode(QtIVIClimateControl::ClimateMode climateMode, const QString &zone);
+    void setClimateMode(QIviClimateControl::ClimateMode climateMode, const QString &zone);
     void setAutomaticClimateFanIntensityLevel(int automaticClimateFanIntensityLevel, const QString &zone);
 
 private:
 
-    QtIVIClimateControl::AirflowDirections m_flowDirection;
+    QIviClimateControl::AirflowDirections m_flowDirection;
     bool m_airCondition;
     bool m_heater;
     bool m_airRecirculation;
@@ -81,18 +81,18 @@ private:
     bool m_defrost;
     int m_steeringWheelHeater;
     int m_fanSpeed;
-    QtIVIClimateControl::RecirculationMode m_recirculationMode;
+    QIviClimateControl::RecirculationMode m_recirculationMode;
     int m_recirculationSensitivityLevel;
-    QtIVIClimateControl::ClimateMode m_climateMode;
+    QIviClimateControl::ClimateMode m_climateMode;
     int m_automaticClimateFanIntensityLevel;
 
     struct ZoneBackend {
         int targetTemperature;
-        QtIVIPropertyAttribute<int> targetTemperatureAttribute;
+        QIviPropertyAttribute<int> targetTemperatureAttribute;
         int seatCooler;
-        QtIVIPropertyAttribute<int> seatCoolerAttribute;
+        QIviPropertyAttribute<int> seatCoolerAttribute;
         int seatHeater;
-        QtIVIPropertyAttribute<int> seatHeaterAttribute;
+        QIviPropertyAttribute<int> seatHeaterAttribute;
     };
 
     QMap<QString,ZoneBackend> m_zoneMap;
diff --git a/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.cpp b/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.cpp
index 796aca8..ffb95e3 100644
--- a/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.cpp
+++ b/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -43,7 +43,7 @@
 #include "climatecontrolbackend.h"
 #include "windowcontrolbackend.h"
 
-#include <QtIVIVehicleFunctions/QtIVIClimateControlBackendInterface>
+#include <QtIviVehicleFunctions/QIviClimateControlBackendInterface>
 #include <QStringList>
 
 ClimatePlugin::ClimatePlugin(QObject *parent) :
@@ -56,16 +56,16 @@ ClimatePlugin::ClimatePlugin(QObject *parent) :
 QStringList ClimatePlugin::interfaces() const
 {
     QStringList list;
-    list << QtIVIStringClimateControlInterfaceName;
-    list << QtIVIStringWindowControlInterfaceName;
+    list << QIviStringClimateControlInterfaceName;
+    list << QIviStringWindowControlInterfaceName;
     return list;
 }
 
 QObject *ClimatePlugin::interfaceInstance(const QString &interface) const
 {
-    if (interface == QtIVIStringClimateControlInterfaceName)
+    if (interface == QIviStringClimateControlInterfaceName)
         return m_climate;
-    else if (interface == QtIVIStringWindowControlInterfaceName)
+    else if (interface == QIviStringWindowControlInterfaceName)
         return m_window;
 
     return 0;
diff --git a/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.h b/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.h
index 9431a47..875dba3 100644
--- a/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.h
+++ b/src/plugins/ivivehiclefunctions/climate_simulator/climateplugin.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -42,16 +42,16 @@
 #ifndef CLIMATEPLUGIN_H
 #define CLIMATEPLUGIN_H
 
-#include <QtIVICore/QtIVIServiceInterface>
+#include <QtIviCore/QIviServiceInterface>
 
 class ClimateControlBackend;
 class WindowControlBackend;
 
-class ClimatePlugin : public QObject, QtIVIServiceInterface
+class ClimatePlugin : public QObject, QIviServiceInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "com.pelagicore.QtIVIServiceInterface" FILE "climate_simulator.json")
-    Q_INTERFACES(QtIVIServiceInterface)
+    Q_PLUGIN_METADATA(IID "com.pelagicore.QIviServiceInterface" FILE "climate_simulator.json")
+    Q_INTERFACES(QIviServiceInterface)
 
 public:
     ClimatePlugin(QObject *parent = 0);
diff --git a/src/plugins/ivivehiclefunctions/climate_simulator/windowcontrolbackend.cpp b/src/plugins/ivivehiclefunctions/climate_simulator/windowcontrolbackend.cpp
index 09011f6..e79bc5b 100644
--- a/src/plugins/ivivehiclefunctions/climate_simulator/windowcontrolbackend.cpp
+++ b/src/plugins/ivivehiclefunctions/climate_simulator/windowcontrolbackend.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -79,17 +79,17 @@ void WindowTimer::checkValue()
     else
         m_currentValue--;
 
-    QtIVIWindowControl::State state = QtIVIWindowControl::Closed;
+    QIviWindowControl::State state = QIviWindowControl::Closed;
     if (m_currentValue <= 0) {
         m_currentValue = 0;
         m_timer->stop();
-        state = QtIVIWindowControl::Closed;
+        state = QIviWindowControl::Closed;
     } else if (m_currentValue >= m_interval) {
         m_currentValue = m_interval;
         m_timer->stop();
-        state = QtIVIWindowControl::FullyOpen;
+        state = QIviWindowControl::FullyOpen;
     } else {
-        state = QtIVIWindowControl::Open;
+        state = QIviWindowControl::Open;
     }
 
     if (m_blind) {
@@ -108,99 +108,99 @@ void WindowTimer::checkValue()
 }
 
 WindowControlBackend::WindowControlBackend(QObject *parent)
-    : QtIVIWindowControlBackendInterface(parent)
+    : QIviWindowControlBackendInterface(parent)
 {
     // No Blind in the front
     ZoneBackend frontLeft;
-    frontLeft.heaterMode = QtIVIWindowControl::HeaterOff;
-    frontLeft.heaterModeAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode>(QVector<QtIVIWindowControl::HeaterMode>({QtIVIWindowControl::HeaterOff, QtIVIWindowControl::HeaterOn}));
+    frontLeft.heaterMode = QIviWindowControl::HeaterOff;
+    frontLeft.heaterModeAttribute = QIviPropertyAttribute<QIviWindowControl::HeaterMode>(QVector<QIviWindowControl::HeaterMode>({QIviWindowControl::HeaterOff, QIviWindowControl::HeaterOn}));
     frontLeft.heaterEnabled = false;
-    frontLeft.heaterAttribute = QtIVIPropertyAttribute<bool>(true);
-    frontLeft.blindMode = QtIVIWindowControl::BlindClosed;
-    frontLeft.blindModeAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode>(false);
-    frontLeft.blindState = QtIVIWindowControl::Closed;
-    frontLeft.blindStateAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::State>(false);
+    frontLeft.heaterAttribute = QIviPropertyAttribute<bool>(true);
+    frontLeft.blindMode = QIviWindowControl::BlindClosed;
+    frontLeft.blindModeAttribute = QIviPropertyAttribute<QIviWindowControl::BlindMode>(false);
+    frontLeft.blindState = QIviWindowControl::Closed;
+    frontLeft.blindStateAttribute = QIviPropertyAttribute<QIviWindowControl::State>(false);
     frontLeft.blindTimer = new WindowTimer("FrontLeft", true, this);
-    frontLeft.state = QtIVIWindowControl::Closed;
-    frontLeft.stateAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::State>({QtIVIWindowControl::Closed, QtIVIWindowControl::Open, QtIVIWindowControl::FullyOpen});
+    frontLeft.state = QIviWindowControl::Closed;
+    frontLeft.stateAttribute = QIviPropertyAttribute<QIviWindowControl::State>({QIviWindowControl::Closed, QIviWindowControl::Open, QIviWindowControl::FullyOpen});
     frontLeft.stateTimer = new WindowTimer("FrontLeft", false, this);
     m_zoneMap.insert("FrontLeft", frontLeft);
 
     ZoneBackend frontRight;
-    frontRight.heaterMode = QtIVIWindowControl::HeaterOff;
-    frontRight.heaterModeAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode>(QVector<QtIVIWindowControl::HeaterMode>({QtIVIWindowControl::HeaterOff, QtIVIWindowControl::HeaterOn}));
+    frontRight.heaterMode = QIviWindowControl::HeaterOff;
+    frontRight.heaterModeAttribute = QIviPropertyAttribute<QIviWindowControl::HeaterMode>(QVector<QIviWindowControl::HeaterMode>({QIviWindowControl::HeaterOff, QIviWindowControl::HeaterOn}));
     frontRight.heaterEnabled = false;
-    frontRight.heaterAttribute = QtIVIPropertyAttribute<bool>(true);
-    frontRight.blindMode = QtIVIWindowControl::BlindClosed;
-    frontRight.blindModeAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode>(false);
-    frontRight.blindState = QtIVIWindowControl::Closed;
-    frontRight.blindStateAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::State>(false);
+    frontRight.heaterAttribute = QIviPropertyAttribute<bool>(true);
+    frontRight.blindMode = QIviWindowControl::BlindClosed;
+    frontRight.blindModeAttribute = QIviPropertyAttribute<QIviWindowControl::BlindMode>(false);
+    frontRight.blindState = QIviWindowControl::Closed;
+    frontRight.blindStateAttribute = QIviPropertyAttribute<QIviWindowControl::State>(false);
     frontRight.blindTimer = new WindowTimer("FrontRight", true, this);
-    frontRight.state = QtIVIWindowControl::Closed;
-    frontRight.stateAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::State>({QtIVIWindowControl::Closed, QtIVIWindowControl::Open, QtIVIWindowControl::FullyOpen});
+    frontRight.state = QIviWindowControl::Closed;
+    frontRight.stateAttribute = QIviPropertyAttribute<QIviWindowControl::State>({QIviWindowControl::Closed, QIviWindowControl::Open, QIviWindowControl::FullyOpen});
     frontRight.stateTimer = new WindowTimer("FrontRight", false, this);
     m_zoneMap.insert("FrontRight", frontRight);
 
     // Everything in the rear
     ZoneBackend rearLeft;
-    rearLeft.heaterMode = QtIVIWindowControl::HeaterOff;
-    rearLeft.heaterModeAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode>(QVector<QtIVIWindowControl::HeaterMode>({QtIVIWindowControl::HeaterOff, QtIVIWindowControl::HeaterOn}));
+    rearLeft.heaterMode = QIviWindowControl::HeaterOff;
+    rearLeft.heaterModeAttribute = QIviPropertyAttribute<QIviWindowControl::HeaterMode>(QVector<QIviWindowControl::HeaterMode>({QIviWindowControl::HeaterOff, QIviWindowControl::HeaterOn}));
     rearLeft.heaterEnabled = false;
-    rearLeft.heaterAttribute = QtIVIPropertyAttribute<bool>(true);
-    rearLeft.blindMode = QtIVIWindowControl::BlindClosed;
-    rearLeft.blindModeAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode>(QVector<QtIVIWindowControl::BlindMode>({QtIVIWindowControl::BlindClosed, QtIVIWindowControl::BlindOpen}));
-    rearLeft.blindState = QtIVIWindowControl::Closed;
-    rearLeft.blindStateAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::State>(false);
+    rearLeft.heaterAttribute = QIviPropertyAttribute<bool>(true);
+    rearLeft.blindMode = QIviWindowControl::BlindClosed;
+    rearLeft.blindModeAttribute = QIviPropertyAttribute<QIviWindowControl::BlindMode>(QVector<QIviWindowControl::BlindMode>({QIviWindowControl::BlindClosed, QIviWindowControl::BlindOpen}));
+    rearLeft.blindState = QIviWindowControl::Closed;
+    rearLeft.blindStateAttribute = QIviPropertyAttribute<QIviWindowControl::State>(false);
     rearLeft.blindTimer = new WindowTimer("RearLeft", true, this);
-    rearLeft.state = QtIVIWindowControl::Closed;
-    rearLeft.stateAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::State>({QtIVIWindowControl::Closed, QtIVIWindowControl::Open, QtIVIWindowControl::FullyOpen});
+    rearLeft.state = QIviWindowControl::Closed;
+    rearLeft.stateAttribute = QIviPropertyAttribute<QIviWindowControl::State>({QIviWindowControl::Closed, QIviWindowControl::Open, QIviWindowControl::FullyOpen});
     rearLeft.stateTimer = new WindowTimer("RearLeft", false, this);
     m_zoneMap.insert("RearLeft", rearLeft);
 
     ZoneBackend rearRight;
-    rearRight.heaterMode = QtIVIWindowControl::HeaterOff;
-    rearRight.heaterModeAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode>(QVector<QtIVIWindowControl::HeaterMode>({QtIVIWindowControl::HeaterOff, QtIVIWindowControl::HeaterOn}));
+    rearRight.heaterMode = QIviWindowControl::HeaterOff;
+    rearRight.heaterModeAttribute = QIviPropertyAttribute<QIviWindowControl::HeaterMode>(QVector<QIviWindowControl::HeaterMode>({QIviWindowControl::HeaterOff, QIviWindowControl::HeaterOn}));
     rearRight.heaterEnabled = false;
-    rearRight.heaterAttribute = QtIVIPropertyAttribute<bool>(true);
-    rearRight.blindMode = QtIVIWindowControl::BlindClosed;
-    rearRight.blindModeAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode>(QVector<QtIVIWindowControl::BlindMode>({QtIVIWindowControl::BlindClosed, QtIVIWindowControl::BlindOpen}));
-    rearRight.blindState = QtIVIWindowControl::Closed;
-    rearRight.blindStateAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::State>({QtIVIWindowControl::Closed, QtIVIWindowControl::Open, QtIVIWindowControl::FullyOpen});
+    rearRight.heaterAttribute = QIviPropertyAttribute<bool>(true);
+    rearRight.blindMode = QIviWindowControl::BlindClosed;
+    rearRight.blindModeAttribute = QIviPropertyAttribute<QIviWindowControl::BlindMode>(QVector<QIviWindowControl::BlindMode>({QIviWindowControl::BlindClosed, QIviWindowControl::BlindOpen}));
+    rearRight.blindState = QIviWindowControl::Closed;
+    rearRight.blindStateAttribute = QIviPropertyAttribute<QIviWindowControl::State>({QIviWindowControl::Closed, QIviWindowControl::Open, QIviWindowControl::FullyOpen});
     rearRight.blindTimer = new WindowTimer("RearRight", true, this);
-    rearRight.state = QtIVIWindowControl::Closed;
-    rearRight.stateAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::State>({QtIVIWindowControl::Closed, QtIVIWindowControl::Open, QtIVIWindowControl::FullyOpen});
+    rearRight.state = QIviWindowControl::Closed;
+    rearRight.stateAttribute = QIviPropertyAttribute<QIviWindowControl::State>({QIviWindowControl::Closed, QIviWindowControl::Open, QIviWindowControl::FullyOpen});
     rearRight.stateTimer = new WindowTimer("RearRight", false, this);
     m_zoneMap.insert("RearRight", rearRight);
 
     // Just heating in the back window
     ZoneBackend rear;
-    rear.heaterMode = QtIVIWindowControl::HeaterOff;
-    rear.heaterModeAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode>(QVector<QtIVIWindowControl::HeaterMode>({QtIVIWindowControl::HeaterOff, QtIVIWindowControl::HeaterOn}));
+    rear.heaterMode = QIviWindowControl::HeaterOff;
+    rear.heaterModeAttribute = QIviPropertyAttribute<QIviWindowControl::HeaterMode>(QVector<QIviWindowControl::HeaterMode>({QIviWindowControl::HeaterOff, QIviWindowControl::HeaterOn}));
     rear.heaterEnabled = false;
-    rear.heaterAttribute = QtIVIPropertyAttribute<bool>(true);
-    rear.blindMode = QtIVIWindowControl::BlindClosed;
-    rear.blindModeAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode>(false);
-    rear.blindState = QtIVIWindowControl::Closed;
-    rear.blindStateAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::State>(false);
+    rear.heaterAttribute = QIviPropertyAttribute<bool>(true);
+    rear.blindMode = QIviWindowControl::BlindClosed;
+    rear.blindModeAttribute = QIviPropertyAttribute<QIviWindowControl::BlindMode>(false);
+    rear.blindState = QIviWindowControl::Closed;
+    rear.blindStateAttribute = QIviPropertyAttribute<QIviWindowControl::State>(false);
     rear.blindTimer = nullptr;
-    rear.state = QtIVIWindowControl::Closed;
-    rear.stateAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::State>(false);
+    rear.state = QIviWindowControl::Closed;
+    rear.stateAttribute = QIviPropertyAttribute<QIviWindowControl::State>(false);
     rear.stateTimer = nullptr;
     m_zoneMap.insert("Rear", rear);
 
     // Just no heater in the roof
     ZoneBackend roof;
-    roof.heaterMode = QtIVIWindowControl::HeaterOff;
-    roof.heaterModeAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode>(false);
+    roof.heaterMode = QIviWindowControl::HeaterOff;
+    roof.heaterModeAttribute = QIviPropertyAttribute<QIviWindowControl::HeaterMode>(false);
     roof.heaterEnabled = false;
-    roof.heaterAttribute = QtIVIPropertyAttribute<bool>(true);
-    roof.blindMode = QtIVIWindowControl::BlindClosed;
-    roof.blindModeAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode>(QVector<QtIVIWindowControl::BlindMode>({QtIVIWindowControl::BlindClosed, QtIVIWindowControl::BlindOpen}));
-    roof.blindState = QtIVIWindowControl::Closed;
-    roof.blindStateAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::State>({QtIVIWindowControl::Closed, QtIVIWindowControl::Open, QtIVIWindowControl::FullyOpen});
+    roof.heaterAttribute = QIviPropertyAttribute<bool>(true);
+    roof.blindMode = QIviWindowControl::BlindClosed;
+    roof.blindModeAttribute = QIviPropertyAttribute<QIviWindowControl::BlindMode>(QVector<QIviWindowControl::BlindMode>({QIviWindowControl::BlindClosed, QIviWindowControl::BlindOpen}));
+    roof.blindState = QIviWindowControl::Closed;
+    roof.blindStateAttribute = QIviPropertyAttribute<QIviWindowControl::State>({QIviWindowControl::Closed, QIviWindowControl::Open, QIviWindowControl::FullyOpen});
     roof.blindTimer = new WindowTimer("Roof", true, this);
-    roof.state = QtIVIWindowControl::Closed;
-    roof.stateAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::State>({QtIVIWindowControl::Closed, QtIVIWindowControl::Open, QtIVIWindowControl::FullyOpen});
+    roof.state = QIviWindowControl::Closed;
+    roof.stateAttribute = QIviPropertyAttribute<QIviWindowControl::State>({QIviWindowControl::Closed, QIviWindowControl::Open, QIviWindowControl::FullyOpen});
     roof.stateTimer = new WindowTimer("Roof", false, this);
     m_zoneMap.insert("Roof", roof);
 }
@@ -230,7 +230,7 @@ void WindowControlBackend::initializeAttributes()
     }
 }
 
-void WindowControlBackend::setHeaterMode(QtIVIWindowControl::HeaterMode value, const QString &zone)
+void WindowControlBackend::setHeaterMode(QIviWindowControl::HeaterMode value, const QString &zone)
 {
     if (!m_zoneMap.contains(zone))
         return;
@@ -248,11 +248,11 @@ void WindowControlBackend::setHeaterMode(QtIVIWindowControl::HeaterMode value, c
     m_zoneMap[zone].heaterMode = value;
     emit heaterModeChanged(value, zone);
 
-    m_zoneMap[zone].heaterEnabled = (value == QtIVIWindowControl::HeaterOn);
+    m_zoneMap[zone].heaterEnabled = (value == QIviWindowControl::HeaterOn);
     emit heaterEnabledChanged(m_zoneMap[zone].heaterEnabled, zone);
 }
 
-void WindowControlBackend::setBlindMode(QtIVIWindowControl::BlindMode value, const QString &zone)
+void WindowControlBackend::setBlindMode(QIviWindowControl::BlindMode value, const QString &zone)
 {
     if (!m_zoneMap.contains(zone))
         return;
@@ -267,9 +267,9 @@ void WindowControlBackend::setBlindMode(QtIVIWindowControl::BlindMode value, con
 
     qWarning() << "SIMULATION BlindMode for Zone" << zone << "changed to" << value;
 
-    if (value == QtIVIWindowControl::BlindOpen)
+    if (value == QIviWindowControl::BlindOpen)
         m_zoneMap[zone].blindTimer->open();
-    else if (value == QtIVIWindowControl::BlindClosed)
+    else if (value == QIviWindowControl::BlindClosed)
         m_zoneMap[zone].blindTimer->close();
     m_zoneMap[zone].blindMode = value;
     emit blindModeChanged(value, zone);
@@ -280,7 +280,7 @@ void WindowControlBackend::open(const QString &zone)
     if (!m_zoneMap.contains(zone))
         return;
 
-    if (m_zoneMap[zone].state == QtIVIWindowControl::Open)
+    if (m_zoneMap[zone].state == QIviWindowControl::Open)
         return;
 
     if (!m_zoneMap[zone].stateAttribute.isAvailable()) {
@@ -297,7 +297,7 @@ void WindowControlBackend::close(const QString &zone)
     if (!m_zoneMap.contains(zone))
         return;
 
-    if (m_zoneMap[zone].state == QtIVIWindowControl::Closed)
+    if (m_zoneMap[zone].state == QIviWindowControl::Closed)
         return;
 
     if (!m_zoneMap[zone].stateAttribute.isAvailable()) {
diff --git a/src/plugins/ivivehiclefunctions/climate_simulator/windowcontrolbackend.h b/src/plugins/ivivehiclefunctions/climate_simulator/windowcontrolbackend.h
index c69695b..37360b8 100644
--- a/src/plugins/ivivehiclefunctions/climate_simulator/windowcontrolbackend.h
+++ b/src/plugins/ivivehiclefunctions/climate_simulator/windowcontrolbackend.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL-QTAS$
 ** Commercial License Usage
@@ -44,7 +44,7 @@
 
 #include <QObject>
 #include <QTimer>
-#include <QtIVIVehicleFunctions/QtIVIWindowControlBackendInterface>
+#include <QtIviVehicleFunctions/QIviWindowControlBackendInterface>
 
 class WindowControlBackend;
 class WindowTimer : public QObject
@@ -71,7 +71,7 @@ private:
     WindowControlBackend* m_backend;
 };
 
-class WindowControlBackend : public QtIVIWindowControlBackendInterface
+class WindowControlBackend : public QIviWindowControlBackendInterface
 {
 public:
     WindowControlBackend(QObject* parent = 0);
@@ -80,25 +80,25 @@ public:
     QStringList availableZones() const;
     void initializeAttributes();
 
-    void setHeaterMode(QtIVIWindowControl::HeaterMode value, const QString &zone);
-    void setBlindMode(QtIVIWindowControl::BlindMode value, const QString &zone);
+    void setHeaterMode(QIviWindowControl::HeaterMode value, const QString &zone);
+    void setBlindMode(QIviWindowControl::BlindMode value, const QString &zone);
     void open(const QString &zone);
     void close(const QString &zone);
 
 private:
 
     struct ZoneBackend {
-        QtIVIWindowControl::HeaterMode heaterMode;
-        QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode> heaterModeAttribute;
+        QIviWindowControl::HeaterMode heaterMode;
+        QIviPropertyAttribute<QIviWindowControl::HeaterMode> heaterModeAttribute;
         bool heaterEnabled;
-        QtIVIPropertyAttribute<bool> heaterAttribute;
-        QtIVIWindowControl::BlindMode blindMode;
-        QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode> blindModeAttribute;
-        QtIVIWindowControl::State blindState;
-        QtIVIPropertyAttribute<QtIVIWindowControl::State> blindStateAttribute;
+        QIviPropertyAttribute<bool> heaterAttribute;
+        QIviWindowControl::BlindMode blindMode;
+        QIviPropertyAttribute<QIviWindowControl::BlindMode> blindModeAttribute;
+        QIviWindowControl::State blindState;
+        QIviPropertyAttribute<QIviWindowControl::State> blindStateAttribute;
         WindowTimer *blindTimer;
-        QtIVIWindowControl::State state;
-        QtIVIPropertyAttribute<QtIVIWindowControl::State> stateAttribute;
+        QIviWindowControl::State state;
+        QIviPropertyAttribute<QIviWindowControl::State> stateAttribute;
         WindowTimer *stateTimer;
     };
 
diff --git a/sync.profile b/sync.profile
index 9f2f56a..08b3ae0 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,13 +1,13 @@
 %modules = ( # path to module name map
-    "QtIVICore" => "$basedir/src/ivicore",
-    "QtIVIVehicleFunctions" => "$basedir/src/ivivehiclefunctions",
+    "QtIviCore" => "$basedir/src/ivicore",
+    "QtIviVehicleFunctions" => "$basedir/src/ivivehiclefunctions",
     "QtGeniviExtras" => "$basedir/src/geniviextras",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
 %classnames = (
      "qdlt.h" => "QtDlt",
-     "qtiviqueryterm.h" => "QtIVIAbstractQueryTerm", "QtIVIConjunctionTerm", "QtIVIScopeTerm", "QtIVIFilterTerm", "QtIVIOrderTerm",
+     "qtiviqueryterm.h" => "QIviAbstractQueryTerm", "QIviConjunctionTerm", "QIviScopeTerm", "QIviFilterTerm", "QIviOrderTerm",
 );
 %deprecatedheaders = (
 );
diff --git a/tests/auto/core/qtiviabstractfeature/testdata/autodiscovery.qml b/tests/auto/core/qtiviabstractfeature/testdata/autodiscovery.qml
index d75fc6a..016abad 100644
--- a/tests/auto/core/qtiviabstractfeature/testdata/autodiscovery.qml
+++ b/tests/auto/core/qtiviabstractfeature/testdata/autodiscovery.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
diff --git a/tests/auto/core/qtiviabstractfeature/tst_qtiviabstractfeature.cpp b/tests/auto/core/qtiviabstractfeature/tst_qtiviabstractfeature.cpp
index ef532ce..f5e1256 100644
--- a/tests/auto/core/qtiviabstractfeature/tst_qtiviabstractfeature.cpp
+++ b/tests/auto/core/qtiviabstractfeature/tst_qtiviabstractfeature.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
@@ -31,10 +31,10 @@
 #include <QQmlEngine>
 #include <QQmlComponent>
 #include <QQmlContext>
-#include <QtIVIServiceObject>
-#include <QtIVIServiceInterface>
-#include <QtIVIAbstractFeature>
-#include <QtIVIServiceManager>
+#include <QIviServiceObject>
+#include <QIviServiceInterface>
+#include <QIviAbstractFeature>
+#include <QIviServiceManager>
 
 class TestFeatureInterface : public QObject
 {
@@ -48,25 +48,25 @@ public:
     virtual ~TestFeatureInterface() {}
 
 Q_SIGNALS:
-    void errorChanged(QtIVIAbstractFeature::Error error, const QString &message = QString());
+    void errorChanged(QIviAbstractFeature::Error error, const QString &message = QString());
 };
 
-class TestFeature : public QtIVIAbstractFeature
+class TestFeature : public QIviAbstractFeature
 {
     Q_OBJECT
 
 public:
     TestFeature(QObject *parent = 0)
-        : QtIVIAbstractFeature("testFeature", parent)
+        : QIviAbstractFeature("testFeature", parent)
         , m_acceptCounter(100)
     {}
 
     QString errorText() const
     {
-        return QtIVIAbstractFeature::errorText();
+        return QIviAbstractFeature::errorText();
     }
 
-    virtual bool acceptServiceObject(QtIVIServiceObject *serviceObject)
+    virtual bool acceptServiceObject(QIviServiceObject *serviceObject)
     {
         if (serviceObject && m_acceptCounter > 0)
             return serviceObject->interfaces().contains(interfaceName());
@@ -74,7 +74,7 @@ public:
         return false;
     }
 
-    virtual void connectToServiceObject(QtIVIServiceObject *serviceObject)
+    virtual void connectToServiceObject(QIviServiceObject *serviceObject)
     {
         if (!serviceObject)
             return;
@@ -82,7 +82,7 @@ public:
         connect(testInterface, &TestFeatureInterface::errorChanged, this, &TestFeature::onErrorChanged);
     }
 
-    virtual void disconnectFromServiceObject(QtIVIServiceObject*)
+    virtual void disconnectFromServiceObject(QIviServiceObject*)
     {
         disconnect();
     }
@@ -103,16 +103,16 @@ public:
         : TestFeatureInterface(parent)
     {}
 
-    void emitError(QtIVIAbstractFeature::Error error, const QString &message)
+    void emitError(QIviAbstractFeature::Error error, const QString &message)
     {
         emit errorChanged(error, message);
     }
 };
 
-class TestBackend : public QObject, QtIVIServiceInterface
+class TestBackend : public QObject, QIviServiceInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QtIVIServiceInterface)
+    Q_INTERFACES(QIviServiceInterface)
 
 public:
     TestBackend(QObject *parent = 0)
@@ -133,7 +133,7 @@ public:
         return 0;
     }
 
-    void emitError(QtIVIAbstractFeature::Error error, const QString &message)
+    void emitError(QIviAbstractFeature::Error error, const QString &message)
     {
         m_testBackend->emitError(error, message);
     }
@@ -142,14 +142,14 @@ private:
     TestFeatureBackend* m_testBackend;
 };
 
-class tst_QtIVIAbstractFeature : public QObject
+class tst_QIviAbstractFeature : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QtIVIAbstractFeature()
+    tst_QIviAbstractFeature()
     {
-        m_manager = QtIVIServiceManager::instance();
+        m_manager = QIviServiceManager::instance();
     }
 
 private Q_SLOTS:
@@ -166,30 +166,30 @@ private Q_SLOTS:
     void testResetServiceObject();
 
 private:
-    QtIVIServiceManager* m_manager;
+    QIviServiceManager* m_manager;
 };
 
-void tst_QtIVIAbstractFeature::cleanup()
+void tst_QIviAbstractFeature::cleanup()
 {
     m_manager->unloadAllBackends();
 }
 
-void tst_QtIVIAbstractFeature::testAutoDiscoveryFailure()
+void tst_QIviAbstractFeature::testAutoDiscoveryFailure()
 {
     TestFeature f;
     QTest::ignoreMessage(QtWarningMsg, "There is no production backend implementing \"testFeature\" .");
     QTest::ignoreMessage(QtWarningMsg, "There is no simulation backend implementing \"testFeature\" .");
-    QtIVIAbstractFeature::DiscoveryResult result = f.startAutoDiscovery();
+    QIviAbstractFeature::DiscoveryResult result = f.startAutoDiscovery();
     QVERIFY(!f.serviceObject());
     QVERIFY(!f.isValid());
-    QCOMPARE(result, QtIVIAbstractFeature::ErrorWhileLoading);
+    QCOMPARE(result, QIviAbstractFeature::ErrorWhileLoading);
 
     QTest::ignoreMessage(QtWarningMsg, "There is no production backend implementing \"testFeature\" .");
-    f.setDiscoveryMode(QtIVIAbstractFeature::LoadOnlyProductionBackends);
+    f.setDiscoveryMode(QIviAbstractFeature::LoadOnlyProductionBackends);
     result = f.startAutoDiscovery();
     QVERIFY(!f.serviceObject());
     QVERIFY(!f.isValid());
-    QCOMPARE(result, QtIVIAbstractFeature::ErrorWhileLoading);
+    QCOMPARE(result, QIviAbstractFeature::ErrorWhileLoading);
 
     TestBackend* backend1 = new TestBackend();
     m_manager->registerService(backend1, backend1->interfaces());
@@ -199,13 +199,13 @@ void tst_QtIVIAbstractFeature::testAutoDiscoveryFailure()
     QTest::ignoreMessage(QtWarningMsg, "No ServiceObject got accepted.");
     result = f.startAutoDiscovery();
     QVERIFY(!f.serviceObject());
-    QCOMPARE(result, QtIVIAbstractFeature::ErrorWhileLoading);
+    QCOMPARE(result, QIviAbstractFeature::ErrorWhileLoading);
     f.m_acceptCounter = 100;
 
     auto list = m_manager->findServiceByInterface("testFeature");
     f.setServiceObject(list.at(0));
     result = f.startAutoDiscovery();
-    QCOMPARE(result, QtIVIAbstractFeature::NoResult);
+    QCOMPARE(result, QIviAbstractFeature::NoResult);
     f.setServiceObject(0);
 
     TestBackend* backend2 = new TestBackend();
@@ -214,21 +214,21 @@ void tst_QtIVIAbstractFeature::testAutoDiscoveryFailure()
     QTest::ignoreMessage(QtWarningMsg, "There is more than one backend implementing \"testFeature\" .");
     result = f.startAutoDiscovery();
     QVERIFY(f.serviceObject());
-    QCOMPARE(result, QtIVIAbstractFeature::ProductionBackendLoaded);
+    QCOMPARE(result, QIviAbstractFeature::ProductionBackendLoaded);
 }
 
-void tst_QtIVIAbstractFeature::testAutoDiscovery_data()
+void tst_QIviAbstractFeature::testAutoDiscovery_data()
 {
-    QTest::addColumn<QtIVIAbstractFeature::DiscoveryMode>("mode");
-    QTest::addColumn<QtIVIAbstractFeature::DiscoveryResult>("result");
+    QTest::addColumn<QIviAbstractFeature::DiscoveryMode>("mode");
+    QTest::addColumn<QIviAbstractFeature::DiscoveryResult>("result");
     QTest::addColumn<bool>("registerProduction");
-    QTest::newRow("Production") << QtIVIAbstractFeature::LoadOnlyProductionBackends << QtIVIAbstractFeature::ProductionBackendLoaded << true;
-    QTest::newRow("Simulation") << QtIVIAbstractFeature::LoadOnlySimulationBackends << QtIVIAbstractFeature::SimulationBackendLoaded << true;
-    QTest::newRow("Auto") << QtIVIAbstractFeature::AutoDiscovery << QtIVIAbstractFeature::ProductionBackendLoaded << true;
-    QTest::newRow("Auto fallback") << QtIVIAbstractFeature::AutoDiscovery << QtIVIAbstractFeature::SimulationBackendLoaded << false;
+    QTest::newRow("Production") << QIviAbstractFeature::LoadOnlyProductionBackends << QIviAbstractFeature::ProductionBackendLoaded << true;
+    QTest::newRow("Simulation") << QIviAbstractFeature::LoadOnlySimulationBackends << QIviAbstractFeature::SimulationBackendLoaded << true;
+    QTest::newRow("Auto") << QIviAbstractFeature::AutoDiscovery << QIviAbstractFeature::ProductionBackendLoaded << true;
+    QTest::newRow("Auto fallback") << QIviAbstractFeature::AutoDiscovery << QIviAbstractFeature::SimulationBackendLoaded << false;
 }
 
-void tst_QtIVIAbstractFeature::testAutoDiscoveryWithMultipleBackends()
+void tst_QIviAbstractFeature::testAutoDiscoveryWithMultipleBackends()
 {
     TestBackend* backend1 = new TestBackend();
     m_manager->registerService(backend1, backend1->interfaces());
@@ -245,30 +245,30 @@ void tst_QtIVIAbstractFeature::testAutoDiscoveryWithMultipleBackends()
     QVERIFY(f.isValid());
 }
 
-void tst_QtIVIAbstractFeature::testAutoDiscovery()
+void tst_QIviAbstractFeature::testAutoDiscovery()
 {
-    QFETCH(QtIVIAbstractFeature::DiscoveryMode, mode);
-    QFETCH(QtIVIAbstractFeature::DiscoveryResult, result);
+    QFETCH(QIviAbstractFeature::DiscoveryMode, mode);
+    QFETCH(QIviAbstractFeature::DiscoveryResult, result);
     QFETCH(bool, registerProduction);
 
     TestBackend* backend = new TestBackend();
-    if (mode == QtIVIAbstractFeature::LoadOnlySimulationBackends || !registerProduction) {
-        m_manager->registerService(backend, backend->interfaces(), QtIVIServiceManager::SimulationBackend);
-    } else if (mode == QtIVIAbstractFeature::LoadOnlyProductionBackends) {
+    if (mode == QIviAbstractFeature::LoadOnlySimulationBackends || !registerProduction) {
+        m_manager->registerService(backend, backend->interfaces(), QIviServiceManager::SimulationBackend);
+    } else if (mode == QIviAbstractFeature::LoadOnlyProductionBackends) {
         m_manager->registerService(backend, backend->interfaces());
     } else {
         m_manager->registerService(backend, backend->interfaces());
         TestBackend* backend2 = new TestBackend();
-        m_manager->registerService(backend2, backend2->interfaces(), QtIVIServiceManager::SimulationBackend);
+        m_manager->registerService(backend2, backend2->interfaces(), QIviServiceManager::SimulationBackend);
     }
     TestFeature f;
     QVERIFY(!f.serviceObject());
     QVERIFY(!f.isValid());
     f.setDiscoveryMode(mode);
-    QSignalSpy validSpy(&f, &QtIVIAbstractFeature::isValidChanged);
+    QSignalSpy validSpy(&f, &QIviAbstractFeature::isValidChanged);
     if (!registerProduction)
         QTest::ignoreMessage(QtWarningMsg, "There is no production backend implementing \"testFeature\" .");
-    QtIVIAbstractFeature::DiscoveryResult res = f.startAutoDiscovery();
+    QIviAbstractFeature::DiscoveryResult res = f.startAutoDiscovery();
     QVERIFY(f.serviceObject());
     QVERIFY(f.isValid());
     QCOMPARE(f.discoveryMode(), mode);
@@ -278,7 +278,7 @@ void tst_QtIVIAbstractFeature::testAutoDiscovery()
     QCOMPARE(f.discoveryResult(), result);
 }
 
-void tst_QtIVIAbstractFeature::testAutoDiscovery_qml()
+void tst_QIviAbstractFeature::testAutoDiscovery_qml()
 {
     TestBackend* backend = new TestBackend();
     m_manager->registerService(backend, backend->interfaces());
@@ -291,38 +291,38 @@ void tst_QtIVIAbstractFeature::testAutoDiscovery_qml()
     QVERIFY2(obj, qPrintable(component.errorString()));
     TestFeature* defaultItem = obj->findChild<TestFeature*>("default");
     QVERIFY(defaultItem);
-    QCOMPARE(defaultItem->discoveryMode(), QtIVIAbstractFeature::AutoDiscovery);
+    QCOMPARE(defaultItem->discoveryMode(), QIviAbstractFeature::AutoDiscovery);
     QVERIFY(defaultItem->serviceObject());
-    QCOMPARE(defaultItem->discoveryResult(), QtIVIAbstractFeature::ProductionBackendLoaded);
+    QCOMPARE(defaultItem->discoveryResult(), QIviAbstractFeature::ProductionBackendLoaded);
 
     TestFeature* autoDiscoveryDisabledItem = obj->findChild<TestFeature*>("autoDiscoveryDisabled");
     QVERIFY(autoDiscoveryDisabledItem);
-    QSignalSpy autoDiscoveryChanged(autoDiscoveryDisabledItem, &QtIVIAbstractFeature::discoveryModeChanged);
-    QSignalSpy serviceObjectChangedSpy(autoDiscoveryDisabledItem, &QtIVIAbstractFeature::serviceObjectChanged);
-    QCOMPARE(autoDiscoveryDisabledItem->discoveryMode(), QtIVIAbstractFeature::NoAutoDiscovery);
+    QSignalSpy autoDiscoveryChanged(autoDiscoveryDisabledItem, &QIviAbstractFeature::discoveryModeChanged);
+    QSignalSpy serviceObjectChangedSpy(autoDiscoveryDisabledItem, &QIviAbstractFeature::serviceObjectChanged);
+    QCOMPARE(autoDiscoveryDisabledItem->discoveryMode(), QIviAbstractFeature::NoAutoDiscovery);
     QVERIFY(!autoDiscoveryDisabledItem->serviceObject());
-    QCOMPARE(autoDiscoveryDisabledItem->discoveryResult(), QtIVIAbstractFeature::NoResult);
+    QCOMPARE(autoDiscoveryDisabledItem->discoveryResult(), QIviAbstractFeature::NoResult);
 
     QVERIFY(QMetaObject::invokeMethod(autoDiscoveryDisabledItem, "discover"));
     QCOMPARE(autoDiscoveryChanged.count(), 1);
     QCOMPARE(serviceObjectChangedSpy.count(), 1);
-    QCOMPARE(defaultItem->discoveryResult(), QtIVIAbstractFeature::ProductionBackendLoaded);
+    QCOMPARE(defaultItem->discoveryResult(), QIviAbstractFeature::ProductionBackendLoaded);
 }
 
-void tst_QtIVIAbstractFeature::testErrors_data()
+void tst_QIviAbstractFeature::testErrors_data()
 {
-    QTest::addColumn<QtIVIAbstractFeature::Error>("errorCode");
+    QTest::addColumn<QIviAbstractFeature::Error>("errorCode");
     QTest::addColumn<QString>("message");
-    QTest::newRow("unknown") << QtIVIAbstractFeature::Unknown << "unknown";
-    QTest::newRow("permission") << QtIVIAbstractFeature::PermissionDenied << "permission";
-    QTest::newRow("invalid op") << QtIVIAbstractFeature::InvalidOperation << "invalid op";
-    QTest::newRow("invalid zone") << QtIVIAbstractFeature::InvalidZone << "invalid zone";
-    QTest::newRow("timeout") << QtIVIAbstractFeature::Timeout << "timeout";
+    QTest::newRow("unknown") << QIviAbstractFeature::Unknown << "unknown";
+    QTest::newRow("permission") << QIviAbstractFeature::PermissionDenied << "permission";
+    QTest::newRow("invalid op") << QIviAbstractFeature::InvalidOperation << "invalid op";
+    QTest::newRow("invalid zone") << QIviAbstractFeature::InvalidZone << "invalid zone";
+    QTest::newRow("timeout") << QIviAbstractFeature::Timeout << "timeout";
 }
 
-void tst_QtIVIAbstractFeature::testErrors()
+void tst_QIviAbstractFeature::testErrors()
 {
-    QFETCH(QtIVIAbstractFeature::Error, errorCode);
+    QFETCH(QIviAbstractFeature::Error, errorCode);
     QFETCH(QString, message);
 
     TestBackend* backend = new TestBackend();
@@ -331,7 +331,7 @@ void tst_QtIVIAbstractFeature::testErrors()
     TestFeature f;
     f.startAutoDiscovery();
     QVERIFY(f.serviceObject());
-    QSignalSpy errorChangedSpy(&f, &QtIVIAbstractFeature::errorChanged);
+    QSignalSpy errorChangedSpy(&f, &QIviAbstractFeature::errorChanged);
 
     backend->emitError(errorCode, message);
     QCOMPARE(errorChangedSpy.count(), 1);
@@ -339,19 +339,19 @@ void tst_QtIVIAbstractFeature::testErrors()
     QCOMPARE(f.errorMessage(), f.errorText() + " " + message);
 
     errorChangedSpy.clear();
-    backend->emitError(QtIVIAbstractFeature::NoError, QString());
+    backend->emitError(QIviAbstractFeature::NoError, QString());
     QCOMPARE(errorChangedSpy.count(), 1);
-    QCOMPARE(f.error(), QtIVIAbstractFeature::NoError);
+    QCOMPARE(f.error(), QIviAbstractFeature::NoError);
     QCOMPARE(f.errorMessage(), QString());
 }
 
-void tst_QtIVIAbstractFeature::testServiceObjectDestruction()
+void tst_QIviAbstractFeature::testServiceObjectDestruction()
 {
     TestBackend* backend = new TestBackend();
     m_manager->registerService(backend, backend->interfaces());
 
     TestFeature f;
-    QSignalSpy serviceObjectChangedSpy(&f, &QtIVIAbstractFeature::serviceObjectChanged);
+    QSignalSpy serviceObjectChangedSpy(&f, &QIviAbstractFeature::serviceObjectChanged);
     f.startAutoDiscovery();
     QVERIFY(f.serviceObject());
     QCOMPARE(serviceObjectChangedSpy.count(), 1);
@@ -363,19 +363,19 @@ void tst_QtIVIAbstractFeature::testServiceObjectDestruction()
     QVERIFY(!f.isValid());
 }
 
-void tst_QtIVIAbstractFeature::testResetServiceObject()
+void tst_QIviAbstractFeature::testResetServiceObject()
 {
     TestBackend* backend = new TestBackend();
     m_manager->registerService(backend, backend->interfaces());
 
     TestFeature f;
-    QSignalSpy serviceObjectChangedSpy(&f, &QtIVIAbstractFeature::serviceObjectChanged);
+    QSignalSpy serviceObjectChangedSpy(&f, &QIviAbstractFeature::serviceObjectChanged);
     f.startAutoDiscovery();
     QVERIFY(f.serviceObject());
     QCOMPARE(serviceObjectChangedSpy.count(), 1);
     serviceObjectChangedSpy.clear();
 
-    QtIVIServiceObject* so = f.serviceObject();
+    QIviServiceObject* so = f.serviceObject();
     QSignalSpy soDestroyedSpy(so, &QObject::destroyed);
     serviceObjectChangedSpy.clear();
 
@@ -387,7 +387,7 @@ void tst_QtIVIAbstractFeature::testResetServiceObject()
     QCOMPARE(serviceObjectChangedSpy.count(), 0);
 }
 
-QTEST_MAIN(tst_QtIVIAbstractFeature)
+QTEST_MAIN(tst_QIviAbstractFeature)
 
 #include "tst_qtiviabstractfeature.moc"
 
diff --git a/tests/auto/core/qtiviproperty/testdata/readWrite.qml b/tests/auto/core/qtiviproperty/testdata/readWrite.qml
index dbc26ff..542a283 100644
--- a/tests/auto/core/qtiviproperty/testdata/readWrite.qml
+++ b/tests/auto/core/qtiviproperty/testdata/readWrite.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
diff --git a/tests/auto/core/qtiviproperty/testdata/writeError.qml b/tests/auto/core/qtiviproperty/testdata/writeError.qml
index 224fc6d..bca2cfb 100644
--- a/tests/auto/core/qtiviproperty/testdata/writeError.qml
+++ b/tests/auto/core/qtiviproperty/testdata/writeError.qml
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
diff --git a/tests/auto/core/qtiviproperty/tst_qtiviproperty.cpp b/tests/auto/core/qtiviproperty/tst_qtiviproperty.cpp
index 7beec8e..2c1a33f 100644
--- a/tests/auto/core/qtiviproperty/tst_qtiviproperty.cpp
+++ b/tests/auto/core/qtiviproperty/tst_qtiviproperty.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
@@ -34,23 +34,23 @@
 #include <qtivipropertyattribute.h>
 #include <qtivipropertyfactory.h>
 
-#define QTIVIPROPERTY(_type_, _name_) \
-Q_PROPERTY(QtIVIProperty* _name_##Property READ _name_##Property CONSTANT)  \
-QtIVIProperty *m_##_name_##Property; \
-QtIVIPropertyAttribute<_type_> m_##_name_; \
+#define QIVIPROPERTY(_type_, _name_) \
+Q_PROPERTY(QIviProperty* _name_##Property READ _name_##Property CONSTANT)  \
+QIviProperty *m_##_name_##Property; \
+QIviPropertyAttribute<_type_> m_##_name_; \
 _type_ m_##_name_##Value; \
  \
 public: \
-QtIVIProperty *_name_##Property() const { return m_##_name_##Property; } \
-QtIVIPropertyAttribute<_type_> _name_() const { return m_##_name_; } \
-void set##_name_(QtIVIPropertyAttribute<_type_> attribute) { if (attribute == m_##_name_) return; m_##_name_ = attribute; emit _name_##Changed(attribute); } \
+QIviProperty *_name_##Property() const { return m_##_name_##Property; } \
+QIviPropertyAttribute<_type_> _name_() const { return m_##_name_; } \
+void set##_name_(QIviPropertyAttribute<_type_> attribute) { if (attribute == m_##_name_) return; m_##_name_ = attribute; emit _name_##Changed(attribute); } \
  \
 _type_ _name_##Value() const { return m_##_name_##Value; } \
 void set##_name_##Value(_type_ value) { if (value == m_##_name_##Value) return; m_##_name_##Value = value; emit _name_##ValueChanged(value); } \
  \
 Q_SIGNALS: \
 void _name_##ValueChanged(_type_ value); \
-void _name_##Changed(const QtIVIPropertyAttribute<_type_> _name_); \
+void _name_##Changed(const QIviPropertyAttribute<_type_> _name_); \
 private:
 
 class TestObject : public QObject
@@ -80,34 +80,34 @@ public:
     };
     Q_ENUMS(InvalidEnum)
 
-    QTIVIPROPERTY(int, intAttribute)
-    QTIVIPROPERTY(QString, readOnlyAttribute)
-    QTIVIPROPERTY(TestObject::TestEnum, enumAttribute)
-    QTIVIPROPERTY(TestObject::TestFlags, flagsAttribute)
+    QIVIPROPERTY(int, intAttribute)
+    QIVIPROPERTY(QString, readOnlyAttribute)
+    QIVIPROPERTY(TestObject::TestEnum, enumAttribute)
+    QIVIPROPERTY(TestObject::TestFlags, flagsAttribute)
 
 public:
     TestObject(QObject *parent = Q_NULLPTR)
       : QObject(parent)
-      , m_intAttributeProperty(QtIVIPropertyFactory<int>::create(this,
+      , m_intAttributeProperty(QIviPropertyFactory<int>::create(this,
                                                                  &TestObject::intAttribute,
                                                                  &TestObject::intAttributeChanged,
                                                                  &TestObject::intAttributeValue,
                                                                  &TestObject::intAttributeValueChanged,
                                                                  &TestObject::setintAttributeValue))
       , m_intAttributeValue(-1)
-      , m_readOnlyAttributeProperty(QtIVIPropertyFactory<QString>::create(this,
+      , m_readOnlyAttributeProperty(QIviPropertyFactory<QString>::create(this,
                                                                           &TestObject::readOnlyAttribute,
                                                                           &TestObject::readOnlyAttributeChanged,
                                                                           &TestObject::readOnlyAttributeValue,
                                                                           &TestObject::readOnlyAttributeValueChanged))
-      , m_enumAttributeProperty(QtIVIPropertyFactory<TestObject::TestEnum>::create(this,
+      , m_enumAttributeProperty(QIviPropertyFactory<TestObject::TestEnum>::create(this,
                                                                                    &TestObject::enumAttribute,
                                                                                    &TestObject::enumAttributeChanged,
                                                                                    &TestObject::enumAttributeValue,
                                                                                    &TestObject::enumAttributeValueChanged,
                                                                                    &TestObject::setenumAttributeValue))
       , m_enumAttributeValue(TestObject::TestEnum())
-      , m_flagsAttributeProperty(QtIVIPropertyFactory<TestObject::TestFlags>::create(this,
+      , m_flagsAttributeProperty(QIviPropertyFactory<TestObject::TestFlags>::create(this,
                                                                                    &TestObject::flagsAttribute,
                                                                                    &TestObject::flagsAttributeChanged,
                                                                                    &TestObject::flagsAttributeValue,
@@ -118,18 +118,18 @@ public:
 };
 
 Q_DECLARE_METATYPE(TestObject::TestEnum)
-Q_DECLARE_METATYPE(QtIVIPropertyAttribute<TestObject::TestEnum>)
+Q_DECLARE_METATYPE(QIviPropertyAttribute<TestObject::TestEnum>)
 Q_DECLARE_METATYPE(TestObject::TestFlags)
-Q_DECLARE_METATYPE(QtIVIPropertyAttribute<TestObject::TestFlags>)
+Q_DECLARE_METATYPE(QIviPropertyAttribute<TestObject::TestFlags>)
 Q_DECLARE_OPERATORS_FOR_FLAGS(TestObject::TestFlags)
 Q_DECLARE_METATYPE(QList<QQmlError>)
 
-class tst_QtIVIProperty : public QObject
+class tst_QIviProperty : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QtIVIProperty();
+    tst_QIviProperty();
 
 private Q_SLOTS:
     void selfTest();
@@ -145,7 +145,7 @@ private Q_SLOTS:
 private:
     void initializeEnumAttribute(TestObject *testObject)
     {
-        QSignalSpy propertyValueChangedSpy(testObject->enumAttributeProperty(), &QtIVIProperty::valueChanged);
+        QSignalSpy propertyValueChangedSpy(testObject->enumAttributeProperty(), &QIviProperty::valueChanged);
         QSignalSpy valueChangedSpy(testObject, &TestObject::enumAttributeValueChanged);
 
         //Initialize
@@ -159,7 +159,7 @@ private:
 
     void initializeFlagsAttribute(TestObject *testObject)
     {
-        QSignalSpy propertyValueChangedSpy(testObject->flagsAttributeProperty(), &QtIVIProperty::valueChanged);
+        QSignalSpy propertyValueChangedSpy(testObject->flagsAttributeProperty(), &QIviProperty::valueChanged);
         QSignalSpy valueChangedSpy(testObject, &TestObject::flagsAttributeValueChanged);
 
         //Initialize
@@ -173,7 +173,7 @@ private:
 
     void initializeIntAttribute(TestObject *testObject)
     {
-        QSignalSpy propertyValueChangedSpy(testObject->intAttributeProperty(), &QtIVIProperty::valueChanged);
+        QSignalSpy propertyValueChangedSpy(testObject->intAttributeProperty(), &QIviProperty::valueChanged);
         QSignalSpy valueChangedSpy(testObject, &TestObject::intAttributeValueChanged);
 
         //Initialize
@@ -186,66 +186,66 @@ private:
     }
 };
 
-tst_QtIVIProperty::tst_QtIVIProperty()
+tst_QIviProperty::tst_QIviProperty()
 {
-    qRegisterMetaType<QtIVIPropertyAttribute<int>>();
-    qRegisterMetaType<QtIVIPropertyAttribute<QString>>();
+    qRegisterMetaType<QIviPropertyAttribute<int>>();
+    qRegisterMetaType<QIviPropertyAttribute<QString>>();
     qRegisterMetaType<TestObject::TestEnum>();
-    qRegisterMetaType<QtIVIPropertyAttribute<TestObject::TestEnum>>();
+    qRegisterMetaType<QIviPropertyAttribute<TestObject::TestEnum>>();
     qRegisterMetaType<TestObject::TestFlags>();
-    qRegisterMetaType<QtIVIPropertyAttribute<TestObject::TestFlags>>();
+    qRegisterMetaType<QIviPropertyAttribute<TestObject::TestFlags>>();
     qRegisterMetaType<QList<QQmlError>>();
 }
 
-void tst_QtIVIProperty::selfTest()
+void tst_QIviProperty::selfTest()
 {
     TestObject *testObject = new TestObject();
 
     QCOMPARE(testObject->intAttributeValue(), -1);
-    QCOMPARE(testObject->intAttribute().type(), QtIVIPropertyAttributeBase::Invalid);
+    QCOMPARE(testObject->intAttribute().type(), QIviPropertyAttributeBase::Invalid);
     QVERIFY(testObject->intAttributeProperty());
 
     QCOMPARE(testObject->readOnlyAttributeValue(), QString());
-    QCOMPARE(testObject->readOnlyAttribute().type(), QtIVIPropertyAttributeBase::Invalid);
+    QCOMPARE(testObject->readOnlyAttribute().type(), QIviPropertyAttributeBase::Invalid);
     QVERIFY(testObject->readOnlyAttributeProperty());
 
     QCOMPARE(testObject->enumAttributeValue(), TestObject::TestEnum());
-    QCOMPARE(testObject->enumAttribute().type(), QtIVIPropertyAttributeBase::Invalid);
+    QCOMPARE(testObject->enumAttribute().type(), QIviPropertyAttributeBase::Invalid);
     QVERIFY(testObject->enumAttributeProperty());
 
     QCOMPARE(testObject->flagsAttributeValue(), TestObject::TestFlags());
-    QCOMPARE(testObject->flagsAttribute().type(), QtIVIPropertyAttributeBase::Invalid);
+    QCOMPARE(testObject->flagsAttribute().type(), QIviPropertyAttributeBase::Invalid);
     QVERIFY(testObject->flagsAttributeProperty());
 }
 
-void tst_QtIVIProperty::attribute_data()
+void tst_QIviProperty::attribute_data()
 {
-    QTest::addColumn<QtIVIPropertyAttribute<int>>("attribute");
+    QTest::addColumn<QIviPropertyAttribute<int>>("attribute");
     QTest::addColumn<QVariantList>("exptectedList");
-    QTest::newRow("noAttribute") << QtIVIPropertyAttribute<int>(true) << QVariantList();
-    QTest::newRow("minimumMaximum") << QtIVIPropertyAttribute<int>(0,10) << QVariantList();
+    QTest::newRow("noAttribute") << QIviPropertyAttribute<int>(true) << QVariantList();
+    QTest::newRow("minimumMaximum") << QIviPropertyAttribute<int>(0,10) << QVariantList();
     QVector<int> avValues;
     QVariantList avVariant;
     avValues << 0 << 5 << 10;
     avVariant << 0 << 5 << 10;
-    QTest::newRow("availableValues") << QtIVIPropertyAttribute<int>(avValues) << QVariantList(avVariant);
+    QTest::newRow("availableValues") << QIviPropertyAttribute<int>(avValues) << QVariantList(avVariant);
 }
 
-void tst_QtIVIProperty::attribute()
+void tst_QIviProperty::attribute()
 {
-    QFETCH(QtIVIPropertyAttribute<int>, attribute);
+    QFETCH(QIviPropertyAttribute<int>, attribute);
     QFETCH(QVariantList, exptectedList);
 
     TestObject *testObject = new TestObject();
 
-    QSignalSpy maximumChangedSpy(testObject->intAttributeProperty(), &QtIVIProperty::maximumValueChanged);
-    QSignalSpy minimumChangedSpy(testObject->intAttributeProperty(), &QtIVIProperty::minimumValueChanged);
-    QSignalSpy availableValuesChangedSpy(testObject->intAttributeProperty(), &QtIVIProperty::availableValuesChanged);
-    QSignalSpy availableChangedSpy(testObject->intAttributeProperty(), &QtIVIProperty::availableChanged);
+    QSignalSpy maximumChangedSpy(testObject->intAttributeProperty(), &QIviProperty::maximumValueChanged);
+    QSignalSpy minimumChangedSpy(testObject->intAttributeProperty(), &QIviProperty::minimumValueChanged);
+    QSignalSpy availableValuesChangedSpy(testObject->intAttributeProperty(), &QIviProperty::availableValuesChanged);
+    QSignalSpy availableChangedSpy(testObject->intAttributeProperty(), &QIviProperty::availableChanged);
     QSignalSpy noAttChangedSpy(testObject, &TestObject::intAttributeChanged);
 
     testObject->setintAttribute(attribute);
-    QVariant attributeVariant = QVariant::fromValue<QtIVIPropertyAttribute<int>>(attribute);
+    QVariant attributeVariant = QVariant::fromValue<QIviPropertyAttribute<int>>(attribute);
 
     QCOMPARE(maximumChangedSpy.count(), 1);
     QCOMPARE(maximumChangedSpy.at(0).at(0), QVariant::fromValue<int>(attribute.maximumValue()));
@@ -264,10 +264,10 @@ void tst_QtIVIProperty::attribute()
     QCOMPARE(testObject->intAttributeProperty()->availableValues(), exptectedList);
 }
 
-void tst_QtIVIProperty::setGetValue()
+void tst_QIviProperty::setGetValue()
 {
     TestObject *testObject = new TestObject();
-    QSignalSpy propertyValueChangedSpy(testObject->enumAttributeProperty(), &QtIVIProperty::valueChanged);
+    QSignalSpy propertyValueChangedSpy(testObject->enumAttributeProperty(), &QIviProperty::valueChanged);
     QSignalSpy valueChangedSpy(testObject, &TestObject::enumAttributeValueChanged);
 
     //Initialize
@@ -299,10 +299,10 @@ void tst_QtIVIProperty::setGetValue()
     QCOMPARE(testObject->enumAttributeProperty()->value(), newValueVariant);
 }
 
-void tst_QtIVIProperty::setGetValue_flags()
+void tst_QIviProperty::setGetValue_flags()
 {
     TestObject *testObject = new TestObject();
-    QSignalSpy propertyValueChangedSpy(testObject->flagsAttributeProperty(), &QtIVIProperty::valueChanged);
+    QSignalSpy propertyValueChangedSpy(testObject->flagsAttributeProperty(), &QIviProperty::valueChanged);
     QSignalSpy valueChangedSpy(testObject, &TestObject::flagsAttributeValueChanged);
 
     //Initialize
@@ -334,7 +334,7 @@ void tst_QtIVIProperty::setGetValue_flags()
     QCOMPARE(testObject->flagsAttributeProperty()->value(), newValueVariant);
 }
 
-void tst_QtIVIProperty::setGetValue_qml()
+void tst_QIviProperty::setGetValue_qml()
 {
     TestObject *testObject = new TestObject();
 
@@ -365,7 +365,7 @@ void tst_QtIVIProperty::setGetValue_qml()
     QVERIFY(!obj->property("isFlag3Set").toBool());
 }
 
-void tst_QtIVIProperty::setValueError_qml()
+void tst_QIviProperty::setValueError_qml()
 {
     TestObject *testObject = new TestObject();
 
@@ -405,10 +405,10 @@ void tst_QtIVIProperty::setValueError_qml()
     QCOMPARE(errorList.at(0).toString(), QUrl::fromLocalFile(testData).toString() + ":37: Error: Expected: int but got QString");
 }
 
-void tst_QtIVIProperty::readOnly()
+void tst_QIviProperty::readOnly()
 {
     TestObject *testObject = new TestObject();
-    QSignalSpy propertyValueChangedSpy(testObject->readOnlyAttributeProperty(), &QtIVIProperty::valueChanged);
+    QSignalSpy propertyValueChangedSpy(testObject->readOnlyAttributeProperty(), &QIviProperty::valueChanged);
     QSignalSpy valueChangedSpy(testObject, &TestObject::readOnlyAttributeValueChanged);
 
     //Initialize
@@ -442,10 +442,10 @@ void tst_QtIVIProperty::readOnly()
     QCOMPARE(testObject->readOnlyAttributeProperty()->value(), valueVariant);
 }
 
-void tst_QtIVIProperty::readOnly_qml()
+void tst_QIviProperty::readOnly_qml()
 {
     TestObject *testObject = new TestObject();
-    QSignalSpy propertyValueChangedSpy(testObject->readOnlyAttributeProperty(), &QtIVIProperty::valueChanged);
+    QSignalSpy propertyValueChangedSpy(testObject->readOnlyAttributeProperty(), &QIviProperty::valueChanged);
     QSignalSpy valueChangedSpy(testObject, &TestObject::readOnlyAttributeValueChanged);
 
     //Initialize
@@ -484,7 +484,7 @@ void tst_QtIVIProperty::readOnly_qml()
     QCOMPARE(errorList.at(0).toString(), QStringLiteral("<Unknown File>:1: Error: TypeError: Cannot assign to read-only property \"value\""));
 }
 
-QTEST_MAIN(tst_QtIVIProperty)
+QTEST_MAIN(tst_QIviProperty)
 
 #include "tst_qtiviproperty.moc"
 
diff --git a/tests/auto/core/qtivipropertyattribute/tst_qtivipropertyattribute.cpp b/tests/auto/core/qtivipropertyattribute/tst_qtivipropertyattribute.cpp
index eacbd2d..e9a6d01 100644
--- a/tests/auto/core/qtivipropertyattribute/tst_qtivipropertyattribute.cpp
+++ b/tests/auto/core/qtivipropertyattribute/tst_qtivipropertyattribute.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
@@ -47,14 +47,14 @@ struct ComplexType
     QString m_string;
 };
 Q_DECLARE_METATYPE(ComplexType)
-Q_DECLARE_METATYPE(QtIVIPropertyAttribute<ComplexType>)
+Q_DECLARE_METATYPE(QIviPropertyAttribute<ComplexType>)
 
-class tst_QtIVIPropertyAttribute : public QObject
+class tst_QIviPropertyAttribute : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QtIVIPropertyAttribute();
+    tst_QIviPropertyAttribute();
 
 private Q_SLOTS:
     void equal();
@@ -62,46 +62,46 @@ private Q_SLOTS:
     void complex();
 };
 
-tst_QtIVIPropertyAttribute::tst_QtIVIPropertyAttribute()
+tst_QIviPropertyAttribute::tst_QIviPropertyAttribute()
 {
     qRegisterMetaType<ComplexType>();
 }
 
-void tst_QtIVIPropertyAttribute::equal()
+void tst_QIviPropertyAttribute::equal()
 {
-    QtIVIPropertyAttribute<int> minMax(5, 10);
-    QtIVIPropertyAttribute<int> minMax2(5, 10);
+    QIviPropertyAttribute<int> minMax(5, 10);
+    QIviPropertyAttribute<int> minMax2(5, 10);
     QCOMPARE(minMax, minMax2);
 
-    QtIVIPropertyAttribute<int> noAtt(false);
-    QtIVIPropertyAttribute<int> noAtt2(false);
+    QIviPropertyAttribute<int> noAtt(false);
+    QIviPropertyAttribute<int> noAtt2(false);
     QCOMPARE(noAtt, noAtt2);
 
     QVector<int> list;
     list << 0 << 5 << 10 << 50;
-    QtIVIPropertyAttribute<int> avVal(list);
-    QtIVIPropertyAttribute<int> avVal2(list);
+    QIviPropertyAttribute<int> avVal(list);
+    QIviPropertyAttribute<int> avVal2(list);
     QCOMPARE(avVal, avVal2);
 }
 
-void tst_QtIVIPropertyAttribute::simple()
+void tst_QIviPropertyAttribute::simple()
 {
-    QtIVIPropertyAttribute<int> invalid;
-    QCOMPARE(invalid.type(), QtIVIPropertyAttributeBase::Invalid);
+    QIviPropertyAttribute<int> invalid;
+    QCOMPARE(invalid.type(), QIviPropertyAttributeBase::Invalid);
     QCOMPARE(invalid.isAvailable(), false);
     QCOMPARE(invalid.minimumValue(), int());
     QCOMPARE(invalid.maximumValue(), int());
     QCOMPARE(invalid.availableValues(), QVector<int>());
 
-    QtIVIPropertyAttribute<int> noAttribute(true);
-    QCOMPARE(noAttribute.type(), QtIVIPropertyAttributeBase::NoAttributes);
+    QIviPropertyAttribute<int> noAttribute(true);
+    QCOMPARE(noAttribute.type(), QIviPropertyAttributeBase::NoAttributes);
     QCOMPARE(noAttribute.isAvailable(), true);
     QCOMPARE(noAttribute.minimumValue(), int());
     QCOMPARE(noAttribute.maximumValue(), int());
     QCOMPARE(noAttribute.availableValues(), QVector<int>());
 
-    QtIVIPropertyAttribute<int> minimumMaximum(5, 10);
-    QCOMPARE(minimumMaximum.type(), QtIVIPropertyAttributeBase::MinimumMaximum);
+    QIviPropertyAttribute<int> minimumMaximum(5, 10);
+    QCOMPARE(minimumMaximum.type(), QIviPropertyAttributeBase::MinimumMaximum);
     QCOMPARE(minimumMaximum.isAvailable(), true);
     QCOMPARE(minimumMaximum.minimumValue(), 5);
     QCOMPARE(minimumMaximum.maximumValue(), 10);
@@ -109,25 +109,25 @@ void tst_QtIVIPropertyAttribute::simple()
 
     QVector<int> list;
     list << 0 << 5 << 10 << 50;
-    QtIVIPropertyAttribute<int> availableValues(list);
-    QCOMPARE(availableValues.type(), QtIVIPropertyAttributeBase::AvailableValues);
+    QIviPropertyAttribute<int> availableValues(list);
+    QCOMPARE(availableValues.type(), QIviPropertyAttributeBase::AvailableValues);
     QCOMPARE(availableValues.isAvailable(), true);
     QCOMPARE(availableValues.minimumValue(), int());
     QCOMPARE(availableValues.maximumValue(), int());
     QCOMPARE(availableValues.availableValues(), list);
 }
 
-void tst_QtIVIPropertyAttribute::complex()
+void tst_QIviPropertyAttribute::complex()
 {
-    QtIVIPropertyAttribute<ComplexType> invalid;
-    QCOMPARE(invalid.type(), QtIVIPropertyAttributeBase::Invalid);
+    QIviPropertyAttribute<ComplexType> invalid;
+    QCOMPARE(invalid.type(), QIviPropertyAttributeBase::Invalid);
     QCOMPARE(invalid.isAvailable(), false);
     QCOMPARE(invalid.minimumValue(), ComplexType());
     QCOMPARE(invalid.maximumValue(), ComplexType());
     QCOMPARE(invalid.availableValues(), QVector<ComplexType>());
 
-    QtIVIPropertyAttribute<ComplexType> noAttribute(true);
-    QCOMPARE(noAttribute.type(), QtIVIPropertyAttributeBase::NoAttributes);
+    QIviPropertyAttribute<ComplexType> noAttribute(true);
+    QCOMPARE(noAttribute.type(), QIviPropertyAttributeBase::NoAttributes);
     QCOMPARE(noAttribute.isAvailable(), true);
     QCOMPARE(noAttribute.minimumValue(), ComplexType());
     QCOMPARE(noAttribute.maximumValue(), ComplexType());
@@ -135,8 +135,8 @@ void tst_QtIVIPropertyAttribute::complex()
 
     ComplexType min(false, QStringLiteral("min"));
     ComplexType max(true, QStringLiteral("max"));
-    QtIVIPropertyAttribute<ComplexType> minimumMaximum(min, max);
-    QCOMPARE(minimumMaximum.type(), QtIVIPropertyAttributeBase::MinimumMaximum);
+    QIviPropertyAttribute<ComplexType> minimumMaximum(min, max);
+    QCOMPARE(minimumMaximum.type(), QIviPropertyAttributeBase::MinimumMaximum);
     QCOMPARE(minimumMaximum.isAvailable(), true);
     QCOMPARE(minimumMaximum.minimumValue(), min);
     QCOMPARE(minimumMaximum.maximumValue(), max);
@@ -144,15 +144,15 @@ void tst_QtIVIPropertyAttribute::complex()
 
     QVector<ComplexType> list;
     list << ComplexType(false, "1") << ComplexType(true, "2") << ComplexType(true, "3") << ComplexType(false, "4");
-    QtIVIPropertyAttribute<ComplexType> availableValues(list);
-    QCOMPARE(availableValues.type(), QtIVIPropertyAttributeBase::AvailableValues);
+    QIviPropertyAttribute<ComplexType> availableValues(list);
+    QCOMPARE(availableValues.type(), QIviPropertyAttributeBase::AvailableValues);
     QCOMPARE(availableValues.isAvailable(), true);
     QCOMPARE(availableValues.minimumValue(), ComplexType());
     QCOMPARE(availableValues.maximumValue(), ComplexType());
     QCOMPARE(availableValues.availableValues(), list);
 }
 
-QTEST_APPLESS_MAIN(tst_QtIVIPropertyAttribute)
+QTEST_APPLESS_MAIN(tst_QIviPropertyAttribute)
 
 #include "tst_qtivipropertyattribute.moc"
 
diff --git a/tests/auto/core/queryparser/tst_queryparser.cpp b/tests/auto/core/queryparser/tst_queryparser.cpp
index 565a359..de11de5 100644
--- a/tests/auto/core/queryparser/tst_queryparser.cpp
+++ b/tests/auto/core/queryparser/tst_queryparser.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
@@ -29,7 +29,7 @@
 #include <QtTest/QtTest>
 #include <QtCore/QString>
 
-#include "QtIVICore/private/qtiviqueryparser_p.h"
+#include "QtIviCore/private/qtiviqueryparser_p.h"
 
 // sadly this has to be a define for QVERIFY2() to work
 #define CHECK_ERRORSTRING(_actual_errstr, _expected_errstr) do { \
@@ -140,10 +140,10 @@ void TestQueryParser::validQueries()
     if (representationQuery.isEmpty())
         representationQuery = query;
 
-    QtIVIQueryParser parser;
+    QIviQueryParser parser;
     parser.setQuery(query);
 
-    QtIVIAbstractQueryTerm* term = parser.parse();
+    QIviAbstractQueryTerm* term = parser.parse();
     QVERIFY2(term, qPrintable(parser.lastError()));
 
 //    if ()
@@ -178,7 +178,7 @@ void TestQueryParser::invalidQueries()
 {
     QFETCH(QString, query);
 
-    QtIVIQueryParser parser;
+    QIviQueryParser parser;
     parser.setQuery(query);
 
     QVERIFY(!parser.parse());
@@ -201,13 +201,13 @@ void TestQueryParser::identifierList()
     QFETCH(QString, query);
     QFETCH(QString, identifier);
 
-    QtIVIQueryParser parser;
+    QIviQueryParser parser;
     parser.setQuery(query);
 
     QSet<QString> set;
     set.insert(identifier);
     parser.setAllowedIdentifiers(set);
-    QtIVIAbstractQueryTerm* term = parser.parse();
+    QIviAbstractQueryTerm* term = parser.parse();
     QVERIFY2(term, qPrintable(parser.lastError()));
     delete term;
 }
@@ -228,7 +228,7 @@ void TestQueryParser::invalidIdentifierList()
     QFETCH(QString, query);
     QFETCH(QString, identifier);
 
-    QtIVIQueryParser parser;
+    QIviQueryParser parser;
     parser.setQuery(query);
 
     QSet<QString> set;
diff --git a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.cpp b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.cpp
index 00bf6ff..9ac7d30 100644
--- a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.cpp
+++ b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
diff --git a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h
index 81dc4b9..1441c04 100644
--- a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h
+++ b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
@@ -32,13 +32,13 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
-#include <QtIVICore/QtIVIServiceInterface>
+#include <QtIviCore/QIviServiceInterface>
 
-class SimplePlugin : public QObject, public QtIVIServiceInterface
+class SimplePlugin : public QObject, public QIviServiceInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QtIVIServiceInterface)
-    Q_PLUGIN_METADATA(IID "com.pelagicore.QtIVIServiceInterface" FILE "simple_plugin.json")
+    Q_INTERFACES(QIviServiceInterface)
+    Q_PLUGIN_METADATA(IID "com.pelagicore.QIviServiceInterface" FILE "simple_plugin.json")
 public:
     SimplePlugin();
     virtual ~SimplePlugin() {}
diff --git a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp
index e942db4..9d73f9d 100644
--- a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp
+++ b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
@@ -30,14 +30,14 @@
 #include <QString>
 #include <QtTest>
 #include <qtiviservicemanager.h>
-#include <QtIVICore/private/qtiviservicemanager_p.h>
+#include <QtIviCore/private/qtiviservicemanager_p.h>
 #include <qtiviserviceinterface.h>
 #include <qtiviserviceobject.h>
 
-class MockServiceBackend : public QObject, public QtIVIServiceInterface
+class MockServiceBackend : public QObject, public QIviServiceInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QtIVIServiceInterface)
+    Q_INTERFACES(QIviServiceInterface)
 
 public:
     MockServiceBackend(QObject *parent=0) : QObject(parent)
@@ -84,7 +84,7 @@ private Q_SLOTS:
     void pluginLoaderTest();
 
 private:
-    QtIVIServiceManager *manager;
+    QIviServiceManager *manager;
     QString m_simplePluginID;
 };
 
@@ -98,15 +98,15 @@ void ServiceManagerTest::initTestCase()
     QCoreApplication::setLibraryPaths(QStringList());
     QTest::ignoreMessage(QtWarningMsg, "No plugins found in search path:  \"\"");
     QTest::ignoreMessage(QtWarningMsg, QRegularExpression("PluginManager - Malformed metaData in '.*'. MetaData must contain a list of interfaces"));
-    manager = QtIVIServiceManager::instance();
+    manager = QIviServiceManager::instance();
 
-    QList<QtIVIServiceObject *> services = manager->findServiceByInterface("simple_plugin");
+    QList<QIviServiceObject *> services = manager->findServiceByInterface("simple_plugin");
     QCOMPARE(services.count(), 0);
 
     //Reset original setting + this folder for finding our test plugins
     origList.append(QDir::currentPath());
     QCoreApplication::setLibraryPaths(origList);
-    QtIVIServiceManagerPrivate::get(manager)->searchPlugins();
+    QIviServiceManagerPrivate::get(manager)->searchPlugins();
 
     //Save the id of the service object. This needed in the pluginLoaderTest
     services = manager->findServiceByInterface("simple_plugin");
@@ -147,33 +147,33 @@ void ServiceManagerTest::testHasInterface()
 
 void ServiceManagerTest::testFindServiceObjectsReturnInValidInstance()
 {
-    QList<QtIVIServiceObject*> list = manager->findServiceByInterface("NonExistingInterface");
+    QList<QIviServiceObject*> list = manager->findServiceByInterface("NonExistingInterface");
     QVERIFY(list.isEmpty());
 }
 
 void ServiceManagerTest::testFindServiceObjects_data()
 {
-    QTest::addColumn<QtIVIServiceManager::SearchFlags>("searchFlags");
-    QTest::newRow("AllBackends") << QtIVIServiceManager::SearchFlags(QtIVIServiceManager::IncludeAll);
-    QTest::newRow("OnlyProductionBackends") << QtIVIServiceManager::SearchFlags(QtIVIServiceManager::IncludeProductionBackends);
-    QTest::newRow("OnlySimulationBackends") << QtIVIServiceManager::SearchFlags(QtIVIServiceManager::IncludeSimulationBackends);
+    QTest::addColumn<QIviServiceManager::SearchFlags>("searchFlags");
+    QTest::newRow("AllBackends") << QIviServiceManager::SearchFlags(QIviServiceManager::IncludeAll);
+    QTest::newRow("OnlyProductionBackends") << QIviServiceManager::SearchFlags(QIviServiceManager::IncludeProductionBackends);
+    QTest::newRow("OnlySimulationBackends") << QIviServiceManager::SearchFlags(QIviServiceManager::IncludeSimulationBackends);
 }
 
 void ServiceManagerTest::testFindServiceObjects()
 {
-    QFETCH(QtIVIServiceManager::SearchFlags, searchFlags);
+    QFETCH(QIviServiceManager::SearchFlags, searchFlags);
     MockServiceBackend *backend = new MockServiceBackend(manager);
-    QtIVIServiceManager::BackendType type = QtIVIServiceManager::ProductionBackend;
-    if (searchFlags & QtIVIServiceManager::IncludeSimulationBackends)
-        type = QtIVIServiceManager::SimulationBackend;
+    QIviServiceManager::BackendType type = QIviServiceManager::ProductionBackend;
+    if (searchFlags & QIviServiceManager::IncludeSimulationBackends)
+        type = QIviServiceManager::SimulationBackend;
     bool regResult = manager->registerService(backend, QStringList() << "TestInterface", type);
     QCOMPARE(regResult, true);
     QObject* testObject = new QObject();
     backend->addServiceObject("TestInterface", testObject);
 
-    QList<QtIVIServiceObject*> list = manager->findServiceByInterface("TestInterface", searchFlags);
+    QList<QIviServiceObject*> list = manager->findServiceByInterface("TestInterface", searchFlags);
     QVERIFY(!list.isEmpty());
-    QtIVIServiceObject* serviceObject = list.at(0);
+    QIviServiceObject* serviceObject = list.at(0);
     QVERIFY(serviceObject->interfaces().contains("TestInterface"));
     QCOMPARE(serviceObject->interfaceInstance("TestInterface"), testObject);
 }
@@ -218,7 +218,7 @@ void ServiceManagerTest::testManagerListModel()
     bool regResult = manager->registerService(backend0, QStringList() << "Interface0");
     QCOMPARE(regResult, true);
     QCOMPARE(manager->rowCount(), 1);
-    QCOMPARE(manager->data(manager->index(0), Qt::DisplayRole).value<QtIVIServiceInterface*>(), backend0);
+    QCOMPARE(manager->data(manager->index(0), Qt::DisplayRole).value<QIviServiceInterface*>(), backend0);
     QCOMPARE(managerModelSpy.count(), 1);
     // Extendend sanity check
     QCOMPARE(manager->data(manager->index(0,0), Qt::UserRole + 200), QVariant());
@@ -228,8 +228,8 @@ void ServiceManagerTest::testManagerListModel()
     regResult = manager->registerService(backend1, QStringList() << "Interface1" << "Interface2");
     QCOMPARE(regResult, true);
     QCOMPARE(manager->rowCount(), 2);
-    QCOMPARE(manager->data(manager->index(0), Qt::DisplayRole).value<QtIVIServiceInterface*>(), backend0);
-    QCOMPARE(manager->data(manager->index(1), Qt::DisplayRole).value<QtIVIServiceInterface*>(), backend1);
+    QCOMPARE(manager->data(manager->index(0), Qt::DisplayRole).value<QIviServiceInterface*>(), backend0);
+    QCOMPARE(manager->data(manager->index(1), Qt::DisplayRole).value<QIviServiceInterface*>(), backend1);
     QCOMPARE(managerModelSpy.count(), 2);
 
     // Register backend-2 with 'Interface1' and 'Interface2'. Should not result in any model changes
@@ -243,9 +243,9 @@ void ServiceManagerTest::testManagerListModel()
 void ServiceManagerTest::pluginLoaderTest()
 {
     QTest::ignoreMessage(QtWarningMsg, QRegularExpression("PluginManager - Malformed metaData in '.*'. MetaData must contain a list of interfaces"));
-    QtIVIServiceManagerPrivate::get(manager)->searchPlugins();
+    QIviServiceManagerPrivate::get(manager)->searchPlugins();
     QVERIFY(manager->hasInterface("simple_plugin"));
-    QList<QtIVIServiceObject *> services = manager->findServiceByInterface("simple_plugin");
+    QList<QIviServiceObject *> services = manager->findServiceByInterface("simple_plugin");
     QCOMPARE(services.count(), 1);
     //Because we unloaded the backend and created a new instance of it we expect to get a different id for the ServiceObject as in initTestCase()
     QCOMPARE(m_simplePluginID, services.at(0)->id());
@@ -253,7 +253,7 @@ void ServiceManagerTest::pluginLoaderTest()
 
     QVERIFY(manager->hasInterface("wrong_plugin"));
     QTest::ignoreMessage(QtWarningMsg, QRegularExpression("ServiceManager::serviceObjects - failed to cast to interface from '.*wrong_plugin.*'"));
-    QList<QtIVIServiceObject *> wServices = manager->findServiceByInterface("wrong_plugin");
+    QList<QIviServiceObject *> wServices = manager->findServiceByInterface("wrong_plugin");
     QCOMPARE(wServices.count(), 0);
 
     //Test that the plugin is unloaded (or at least removed from the registry)
diff --git a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.cpp b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.cpp
index c7c2c4b..c75fb79 100644
--- a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.cpp
+++ b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
diff --git a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h
index 63b67af..faaf8f7 100644
--- a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h
+++ b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
@@ -32,13 +32,13 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
-#include <QtIVICore/QtIVIServiceInterface>
+#include <QtIviCore/QIviServiceInterface>
 
 class WrongPlugin : public QObject
 {
     Q_OBJECT
-    //Q_INTERFACES(QtIVIServiceInterface)
-    Q_PLUGIN_METADATA(IID "com.pelagicore.QtIVIServiceInterface" FILE "wrong_plugin.json")
+    //Q_INTERFACES(QIviServiceInterface)
+    Q_PLUGIN_METADATA(IID "com.pelagicore.QIviServiceInterface" FILE "wrong_plugin.json")
 public:
     WrongPlugin();
     virtual ~WrongPlugin() {}
diff --git a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.cpp b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.cpp
index 0998412..90904f6 100644
--- a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.cpp
+++ b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
diff --git a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h
index 3dc722e..30d82df 100644
--- a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h
+++ b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
@@ -32,12 +32,12 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
-#include <QtIVICore/QtIVIServiceInterface>
+#include <QtIviCore/QIviServiceInterface>
 
-class WrongMetadataPlugin : public QObject, public QtIVIServiceInterface
+class WrongMetadataPlugin : public QObject, public QIviServiceInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QtIVIServiceInterface)
+    Q_INTERFACES(QIviServiceInterface)
 public:
     WrongMetadataPlugin();
     virtual ~WrongMetadataPlugin() {}
diff --git a/tests/auto/dlt/tst_dlt.cpp b/tests/auto/dlt/tst_dlt.cpp
index 1ba3b9a..b7e5fe5 100644
--- a/tests/auto/dlt/tst_dlt.cpp
+++ b/tests/auto/dlt/tst_dlt.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
diff --git a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
index 28462a9..c8e2068 100644
--- a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
+++ b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
@@ -28,58 +28,58 @@
 
 #include <QtTest>
 
-#include <QtIVICore/QtIVIServiceManager>
-#include <QtIVICore/QtIVIServiceObject>
-#include <QtIVIVehicleFunctions/QtIVIClimateControl>
-#include <QtIVIVehicleFunctions/QtIVIClimateControlBackendInterface>
+#include <QtIviCore/QIviServiceManager>
+#include <QtIviCore/QIviServiceObject>
+#include <QtIviVehicleFunctions/QIviClimateControl>
+#include <QtIviVehicleFunctions/QIviClimateControlBackendInterface>
 #include <private/qtivipropertytester_p.h>
 
-class ClimateControlTestBackend : public QtIVIClimateControlBackendInterface
+class ClimateControlTestBackend : public QIviClimateControlBackendInterface
 {
 public:
     ClimateControlTestBackend()
-        : QtIVIClimateControlBackendInterface()
-        , m_airflowDirections(QtIVIClimateControl::Floor | QtIVIClimateControl::Dashboard)
+        : QIviClimateControlBackendInterface()
+        , m_airflowDirections(QIviClimateControl::Floor | QIviClimateControl::Dashboard)
         , m_airConditioningEnabled(false)
-        , m_airConditioningAttribute(QtIVIPropertyAttribute<bool>(true))
+        , m_airConditioningAttribute(QIviPropertyAttribute<bool>(true))
         , m_heaterEnabled(false)
-        , m_heaterAttribute(QtIVIPropertyAttribute<bool>(true))
+        , m_heaterAttribute(QIviPropertyAttribute<bool>(true))
         , m_zoneSynchronizationEnabled(false)
-        , m_zoneSynchronizationAttribute(QtIVIPropertyAttribute<bool>(true))
+        , m_zoneSynchronizationAttribute(QIviPropertyAttribute<bool>(true))
         , m_defrostEnabled(false)
-        , m_defrostAttribute(QtIVIPropertyAttribute<bool>(true))
-        , m_recirculationMode(QtIVIClimateControl::RecirculationOff)
+        , m_defrostAttribute(QIviPropertyAttribute<bool>(true))
+        , m_recirculationMode(QIviClimateControl::RecirculationOff)
         , m_recirculationSensitivityLevel(0)
-        , m_recirculationSensitivityLevelAttribute(QtIVIPropertyAttribute<int>(0, 10))
-        , m_climateMode(QtIVIClimateControl::ClimateOff)
+        , m_recirculationSensitivityLevelAttribute(QIviPropertyAttribute<int>(0, 10))
+        , m_climateMode(QIviClimateControl::ClimateOff)
         , m_automaticClimateFanIntensityLevel(0)
-        , m_automaticClimateFanIntensityLevelAttribute(QtIVIPropertyAttribute<int>(0, 10))
+        , m_automaticClimateFanIntensityLevelAttribute(QIviPropertyAttribute<int>(0, 10))
         , m_outsideTemperature(0)
-        , m_outsideTemperatureAttribute(QtIVIPropertyAttribute<int>(0, 10))
+        , m_outsideTemperatureAttribute(QIviPropertyAttribute<int>(0, 10))
         , m_recirculationEnabled(false)
         , m_recirculationAttribute(true)
     {
-        QVector<QtIVIClimateControl::AirflowDirections> list;
-        list << (QtIVIClimateControl::Floor | QtIVIClimateControl::Dashboard) << QtIVIClimateControl::Floor << QtIVIClimateControl::Dashboard;
+        QVector<QIviClimateControl::AirflowDirections> list;
+        list << (QIviClimateControl::Floor | QIviClimateControl::Dashboard) << QIviClimateControl::Floor << QIviClimateControl::Dashboard;
         m_airflowDirectionsAttribute = list;
-        QVector<QtIVIClimateControl::RecirculationMode> recirculation;
-        recirculation << QtIVIClimateControl::RecirculationOff << QtIVIClimateControl::RecirculationOn;
+        QVector<QIviClimateControl::RecirculationMode> recirculation;
+        recirculation << QIviClimateControl::RecirculationOff << QIviClimateControl::RecirculationOn;
         m_recirculationModeAttribute = recirculation;
-        QVector<QtIVIClimateControl::ClimateMode> climate;
-        climate << QtIVIClimateControl::ClimateOff << QtIVIClimateControl::ClimateOn;
+        QVector<QIviClimateControl::ClimateMode> climate;
+        climate << QIviClimateControl::ClimateOff << QIviClimateControl::ClimateOn;
         m_climateModeAttribute = climate;
         m_zones << "FrontLeft" << "Upper" << "Lower";
         foreach (const QString &z, m_zones) {
             m_zoneTargetTemperature[z] = 0;
-            m_zoneTargetTemperatureAttribute[z] = QtIVIPropertyAttribute<int>(0, 10);
+            m_zoneTargetTemperatureAttribute[z] = QIviPropertyAttribute<int>(0, 10);
             m_zoneSeatCooler[z] = 0;
-            m_zoneSeatCoolerAttribute[z] = QtIVIPropertyAttribute<int>(0, 10);
+            m_zoneSeatCoolerAttribute[z] = QIviPropertyAttribute<int>(0, 10);
             m_zoneSeatHeater[z] = 0;
-            m_zoneSeatHeaterAttribute[z] = QtIVIPropertyAttribute<int>(0, 10);
+            m_zoneSeatHeaterAttribute[z] = QIviPropertyAttribute<int>(0, 10);
             m_zoneSteeringWheelHeater[z] = 0;
-            m_zoneSteeringWheelHeaterAttribute[z] = QtIVIPropertyAttribute<int>(0, 10);
+            m_zoneSteeringWheelHeaterAttribute[z] = QIviPropertyAttribute<int>(0, 10);
             m_zoneFanSpeedLevel[z] = 0;
-            m_zoneFanSpeedLevelAttribute[z] = QtIVIPropertyAttribute<int>(0, 10);
+            m_zoneFanSpeedLevelAttribute[z] = QIviPropertyAttribute<int>(0, 10);
         }
          m_zones << "Dummy"; // to test unavailable attributes
     }
@@ -143,7 +143,7 @@ public:
         }
     }
 
-    void setTargetTemperatureAttribute(QtIVIPropertyAttribute<int> attribute, const QString &z)
+    void setTargetTemperatureAttribute(QIviPropertyAttribute<int> attribute, const QString &z)
     {
         if (!m_zoneTargetTemperatureAttribute.contains(z))
             return;
@@ -167,7 +167,7 @@ public:
         }
     }
 
-    void setSeatCoolerAttribute(QtIVIPropertyAttribute<int> attribute, const QString &z)
+    void setSeatCoolerAttribute(QIviPropertyAttribute<int> attribute, const QString &z)
     {
         if (!m_zoneSeatCoolerAttribute.contains(z))
             return;
@@ -191,7 +191,7 @@ public:
         }
     }
 
-    void setSeatHeaterAttribute(QtIVIPropertyAttribute<int> attribute, const QString &z)
+    void setSeatHeaterAttribute(QIviPropertyAttribute<int> attribute, const QString &z)
     {
         if (!m_zoneSeatHeaterAttribute.contains(z))
             return;
@@ -202,7 +202,7 @@ public:
         }
     }
 
-    void setAirflowDirections(QtIVIClimateControl::AirflowDirections ad, const QString &z) Q_DECL_OVERRIDE
+    void setAirflowDirections(QIviClimateControl::AirflowDirections ad, const QString &z) Q_DECL_OVERRIDE
     {
         Q_UNUSED(z)
         if (m_airflowDirections != ad) {
@@ -211,7 +211,7 @@ public:
         }
     }
 
-    void setAirflowDirectionsAttribute(QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> attribute, const QString &z)
+    void setAirflowDirectionsAttribute(QIviPropertyAttribute<QIviClimateControl::AirflowDirections> attribute, const QString &z)
     {
         Q_UNUSED(z)
         if (m_airflowDirectionsAttribute != attribute) {
@@ -229,7 +229,7 @@ public:
         }
     }
 
-    void setAirConditioningAttribute(QtIVIPropertyAttribute<bool> attribute, const QString &z)
+    void setAirConditioningAttribute(QIviPropertyAttribute<bool> attribute, const QString &z)
     {
         Q_UNUSED(z)
         if (m_airConditioningAttribute != attribute) {
@@ -247,7 +247,7 @@ public:
         }
     }
 
-    void setHeaterAttribute(QtIVIPropertyAttribute<bool> attribute, const QString &z)
+    void setHeaterAttribute(QIviPropertyAttribute<bool> attribute, const QString &z)
     {
         Q_UNUSED(z)
         if (m_heaterAttribute != attribute) {
@@ -267,7 +267,7 @@ public:
         }
     }
 
-    void setSteeringWheelHeaterAttribute(QtIVIPropertyAttribute<int> attribute, const QString &z)
+    void setSteeringWheelHeaterAttribute(QIviPropertyAttribute<int> attribute, const QString &z)
     {
         if (!m_zoneSteeringWheelHeaterAttribute.contains(z))
             return;
@@ -294,7 +294,7 @@ public:
         }
     }
 
-    void setFanSpeedLevelAttribute(QtIVIPropertyAttribute<int> attribute, const QString &z)
+    void setFanSpeedLevelAttribute(QIviPropertyAttribute<int> attribute, const QString &z)
     {
         if (!m_zoneFanSpeedLevelAttribute.contains(z))
             return;
@@ -314,7 +314,7 @@ public:
         }
     }
 
-    void setOutsideTemperatureAttribute(QtIVIPropertyAttribute<int> attribute, const QString &z)
+    void setOutsideTemperatureAttribute(QIviPropertyAttribute<int> attribute, const QString &z)
     {
         Q_UNUSED(z)
         if (m_outsideTemperatureAttribute != attribute) {
@@ -332,7 +332,7 @@ public:
         }
     }
 
-    void setZoneSynchronizationAttribute(QtIVIPropertyAttribute<bool> attribute, const QString &z)
+    void setZoneSynchronizationAttribute(QIviPropertyAttribute<bool> attribute, const QString &z)
     {
         Q_UNUSED(z)
         if (m_zoneSynchronizationAttribute != attribute) {
@@ -350,7 +350,7 @@ public:
         }
     }
 
-    void setDefrostAttribute(QtIVIPropertyAttribute<bool> attribute, const QString &z)
+    void setDefrostAttribute(QIviPropertyAttribute<bool> attribute, const QString &z)
     {
         Q_UNUSED(z)
         if (m_defrostAttribute != attribute) {
@@ -359,7 +359,7 @@ public:
         }
     }
 
-    void setRecirculationMode(QtIVIClimateControl::RecirculationMode recirculationMode, const QString &z) Q_DECL_OVERRIDE
+    void setRecirculationMode(QIviClimateControl::RecirculationMode recirculationMode, const QString &z) Q_DECL_OVERRIDE
     {
         Q_UNUSED(z)
         if (m_recirculationMode != recirculationMode) {
@@ -368,7 +368,7 @@ public:
         }
     }
 
-    void setRecirculationModeAttribute(QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> attribute, const QString &z)
+    void setRecirculationModeAttribute(QIviPropertyAttribute<QIviClimateControl::RecirculationMode> attribute, const QString &z)
     {
         Q_UNUSED(z)
         if (m_recirculationModeAttribute != attribute) {
@@ -386,7 +386,7 @@ public:
         }
     }
 
-    void setRecirculationAttribute(QtIVIPropertyAttribute<bool> attribute, const QString &z)
+    void setRecirculationAttribute(QIviPropertyAttribute<bool> attribute, const QString &z)
     {
         Q_UNUSED(z)
         if (m_recirculationAttribute != attribute) {
@@ -410,7 +410,7 @@ public:
         }
     }
 
-    void setRecirculationSensitivityLevelAttribute(QtIVIPropertyAttribute<int> attribute, const QString &z)
+    void setRecirculationSensitivityLevelAttribute(QIviPropertyAttribute<int> attribute, const QString &z)
     {
         Q_UNUSED(z)
         if (m_recirculationSensitivityLevelAttribute != attribute) {
@@ -419,7 +419,7 @@ public:
         }
     }
 
-    void setClimateMode(QtIVIClimateControl::ClimateMode climateMode, const QString &z) Q_DECL_OVERRIDE
+    void setClimateMode(QIviClimateControl::ClimateMode climateMode, const QString &z) Q_DECL_OVERRIDE
     {
         Q_UNUSED(z)
         if (m_climateMode != climateMode) {
@@ -428,7 +428,7 @@ public:
         }
     }
 
-    void setClimateModeAttribute(QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode> attribute, const QString &z)
+    void setClimateModeAttribute(QIviPropertyAttribute<QIviClimateControl::ClimateMode> attribute, const QString &z)
     {
         Q_UNUSED(z)
         if (m_climateModeAttribute != attribute) {
@@ -452,7 +452,7 @@ public:
         }
     }
 
-    void setAutomaticClimateFanIntensityLevelAttribute(QtIVIPropertyAttribute<int> attribute, const QString &z)
+    void setAutomaticClimateFanIntensityLevelAttribute(QIviPropertyAttribute<int> attribute, const QString &z)
     {
         Q_UNUSED(z)
         if (m_automaticClimateFanIntensityLevelAttribute != attribute) {
@@ -462,64 +462,64 @@ public:
     }
 
 private:
-    QtIVIClimateControl::AirflowDirections m_airflowDirections;
-    QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> m_airflowDirectionsAttribute;
+    QIviClimateControl::AirflowDirections m_airflowDirections;
+    QIviPropertyAttribute<QIviClimateControl::AirflowDirections> m_airflowDirectionsAttribute;
     bool m_airConditioningEnabled;
-    QtIVIPropertyAttribute<bool> m_airConditioningAttribute;
+    QIviPropertyAttribute<bool> m_airConditioningAttribute;
     bool m_heaterEnabled;
-    QtIVIPropertyAttribute<bool> m_heaterAttribute;
+    QIviPropertyAttribute<bool> m_heaterAttribute;
     bool m_zoneSynchronizationEnabled;
-    QtIVIPropertyAttribute<bool> m_zoneSynchronizationAttribute;
+    QIviPropertyAttribute<bool> m_zoneSynchronizationAttribute;
     bool m_defrostEnabled;
-    QtIVIPropertyAttribute<bool> m_defrostAttribute;
-    QtIVIClimateControl::RecirculationMode m_recirculationMode;
-    QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> m_recirculationModeAttribute;
+    QIviPropertyAttribute<bool> m_defrostAttribute;
+    QIviClimateControl::RecirculationMode m_recirculationMode;
+    QIviPropertyAttribute<QIviClimateControl::RecirculationMode> m_recirculationModeAttribute;
     int m_recirculationSensitivityLevel;
-    QtIVIPropertyAttribute<int> m_recirculationSensitivityLevelAttribute;
-    QtIVIClimateControl::ClimateMode m_climateMode;
-    QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode> m_climateModeAttribute;
+    QIviPropertyAttribute<int> m_recirculationSensitivityLevelAttribute;
+    QIviClimateControl::ClimateMode m_climateMode;
+    QIviPropertyAttribute<QIviClimateControl::ClimateMode> m_climateModeAttribute;
     int m_automaticClimateFanIntensityLevel;
-    QtIVIPropertyAttribute<int> m_automaticClimateFanIntensityLevelAttribute;
+    QIviPropertyAttribute<int> m_automaticClimateFanIntensityLevelAttribute;
     int m_outsideTemperature;
-    QtIVIPropertyAttribute<int> m_outsideTemperatureAttribute;
+    QIviPropertyAttribute<int> m_outsideTemperatureAttribute;
     bool m_recirculationEnabled;
-    QtIVIPropertyAttribute<bool>  m_recirculationAttribute;
+    QIviPropertyAttribute<bool>  m_recirculationAttribute;
 
     QMap<QString, int> m_zoneTargetTemperature;
     QMap<QString, int> m_zoneSeatCooler;
     QMap<QString, int> m_zoneSeatHeater;
     QMap<QString, int> m_zoneSteeringWheelHeater;
     QMap<QString, int> m_zoneFanSpeedLevel;
-    QMap<QString, QtIVIPropertyAttribute<int>> m_zoneTargetTemperatureAttribute;
-    QMap<QString, QtIVIPropertyAttribute<int>> m_zoneSeatCoolerAttribute;
-    QMap<QString, QtIVIPropertyAttribute<int>> m_zoneSeatHeaterAttribute;
-    QMap<QString, QtIVIPropertyAttribute<int>> m_zoneSteeringWheelHeaterAttribute;
-    QMap<QString, QtIVIPropertyAttribute<int>> m_zoneFanSpeedLevelAttribute;
+    QMap<QString, QIviPropertyAttribute<int>> m_zoneTargetTemperatureAttribute;
+    QMap<QString, QIviPropertyAttribute<int>> m_zoneSeatCoolerAttribute;
+    QMap<QString, QIviPropertyAttribute<int>> m_zoneSeatHeaterAttribute;
+    QMap<QString, QIviPropertyAttribute<int>> m_zoneSteeringWheelHeaterAttribute;
+    QMap<QString, QIviPropertyAttribute<int>> m_zoneFanSpeedLevelAttribute;
 
     QStringList m_zones;
 };
 
-typedef QtIVIPropertyTestData<QtIVIClimateControl, ClimateControlTestBackend, int> ClimateControlTestDataInt;
+typedef QIviPropertyTestData<QIviClimateControl, ClimateControlTestBackend, int> ClimateControlTestDataInt;
 Q_DECLARE_METATYPE(ClimateControlTestDataInt)
 
-typedef QtIVIPropertyTestData<QtIVIClimateControl, ClimateControlTestBackend, bool> ClimateControlTestDataBool;
+typedef QIviPropertyTestData<QIviClimateControl, ClimateControlTestBackend, bool> ClimateControlTestDataBool;
 Q_DECLARE_METATYPE(ClimateControlTestDataBool)
 
-class ClimateControlTestServiceObject : public QtIVIServiceObject {
+class ClimateControlTestServiceObject : public QIviServiceObject {
 
 public:
     explicit ClimateControlTestServiceObject(QObject *parent=0) :
-        QtIVIServiceObject(parent), m_name(QLatin1String(""))
+        QIviServiceObject(parent), m_name(QLatin1String(""))
     {
         m_backend = new ClimateControlTestBackend;
-        m_interfaces << QtIVIStringClimateControlInterfaceName;
+        m_interfaces << QIviStringClimateControlInterfaceName;
     }
 
     QString name() const { return m_name; }
     QStringList interfaces() const { return m_interfaces; }
     QObject* interfaceInstance(const QString& interface) const
     {
-        if (interface == QtIVIStringClimateControlInterfaceName)
+        if (interface == QIviStringClimateControlInterfaceName)
             return testBackend();
         else
             return 0;
@@ -536,13 +536,13 @@ private:
     ClimateControlTestBackend* m_backend;
 };
 
-class ClimateControlInvalidServiceObject : public QtIVIServiceObject {
+class ClimateControlInvalidServiceObject : public QIviServiceObject {
 
 public:
     explicit ClimateControlInvalidServiceObject(QObject *parent=0) :
-        QtIVIServiceObject(parent), m_name(QLatin1String("")), m_dummyBackend(new QObject(this))
+        QIviServiceObject(parent), m_name(QLatin1String("")), m_dummyBackend(new QObject(this))
     {
-        m_interfaces << QtIVIStringClimateControlInterfaceName;
+        m_interfaces << QIviStringClimateControlInterfaceName;
     }
 
     QString name() const { return m_name; }
@@ -579,13 +579,13 @@ private slots:
     void testClimateMode();
 
 private:
-    QtIVIServiceManager *manager;
+    QIviServiceManager *manager;
 };
 
 ClimateControlTest::ClimateControlTest()
     : QObject()
 {
-    manager = QtIVIServiceManager::instance();
+    manager = QIviServiceManager::instance();
 }
 
 void ClimateControlTest::cleanup()
@@ -595,7 +595,7 @@ void ClimateControlTest::cleanup()
 
 void ClimateControlTest::testWithoutBackend()
 {
-    QtIVIClimateControl cc;
+    QIviClimateControl cc;
 
     // Running without a backend means that changes do not propagate
     // We check this on a single property in this case
@@ -614,7 +614,7 @@ void ClimateControlTest::testInvalidBackend()
 {
     ClimateControlInvalidServiceObject *service = new ClimateControlInvalidServiceObject(); \
     manager->registerService(service, service->interfaces()); \
-    QtIVIClimateControl cc;
+    QIviClimateControl cc;
     cc.startAutoDiscovery();
 
     // Running without a backend means that changes do not propagate
@@ -635,7 +635,7 @@ void ClimateControlTest::testClearServiceObject()
     ClimateControlTestServiceObject *service = new ClimateControlTestServiceObject();
     manager->registerService(service, service->interfaces());
     service->testBackend()->setAirConditioningEnabled(true, QString());
-    QtIVIClimateControl cc;
+    QIviClimateControl cc;
     cc.startAutoDiscovery();
     QCOMPARE(cc.isAirConditioningEnabled(), true);
     cc.setServiceObject(0);
@@ -647,38 +647,38 @@ void ClimateControlTest::testIntProperties_data()
     QTest::addColumn<ClimateControlTestDataInt>("testData");
     QTest::addColumn<bool>("testZones");
 
-    QTest::newRow("recirculationSensitivityLevel") << PROPERTY_TEST_DATA(QtIVIClimateControl, ClimateControlTestBackend, int, recirculationSensitivityLevel, RecirculationSensitivityLevel,
+    QTest::newRow("recirculationSensitivityLevel") << PROPERTY_TEST_DATA(QIviClimateControl, ClimateControlTestBackend, int, recirculationSensitivityLevel, RecirculationSensitivityLevel,
                                                                          QList<int>({0, 5, 8, 6}),
-                                                                         QList<QtIVIPropertyAttribute<int>>({QtIVIPropertyAttribute<int>(0, 10), QtIVIPropertyAttribute<int>(5, 15)}))
+                                                                         QList<QIviPropertyAttribute<int>>({QIviPropertyAttribute<int>(0, 10), QIviPropertyAttribute<int>(5, 15)}))
                                                    << false;
 
-    QTest::newRow("automaticClimateFanIntensityLevel") << PROPERTY_TEST_DATA(QtIVIClimateControl, ClimateControlTestBackend, int, automaticClimateFanIntensityLevel, AutomaticClimateFanIntensityLevel,
+    QTest::newRow("automaticClimateFanIntensityLevel") << PROPERTY_TEST_DATA(QIviClimateControl, ClimateControlTestBackend, int, automaticClimateFanIntensityLevel, AutomaticClimateFanIntensityLevel,
                                                                              QList<int>({0, 5, 8, 6}),
-                                                                             QList<QtIVIPropertyAttribute<int>>({QtIVIPropertyAttribute<int>(0, 10), QtIVIPropertyAttribute<int>(5, 15)}))
+                                                                             QList<QIviPropertyAttribute<int>>({QIviPropertyAttribute<int>(0, 10), QIviPropertyAttribute<int>(5, 15)}))
                                                        << false;
-    QTest::newRow("outsideTemperature") << PROPERTY_TEST_DATA_READONLY(QtIVIClimateControl, ClimateControlTestBackend, int, outsideTemperature, OutsideTemperature,
+    QTest::newRow("outsideTemperature") << PROPERTY_TEST_DATA_READONLY(QIviClimateControl, ClimateControlTestBackend, int, outsideTemperature, OutsideTemperature,
                                                                        QList<int>({0, 5, 8, 6}),
-                                                                       QList<QtIVIPropertyAttribute<int>>({QtIVIPropertyAttribute<int>(0, 10), QtIVIPropertyAttribute<int>(5, 15)}))
+                                                                       QList<QIviPropertyAttribute<int>>({QIviPropertyAttribute<int>(0, 10), QIviPropertyAttribute<int>(5, 15)}))
                                         << false;
-    QTest::newRow("fanSpeedLevel") << PROPERTY_TEST_DATA(QtIVIClimateControl, ClimateControlTestBackend, int, fanSpeedLevel, FanSpeedLevel,
+    QTest::newRow("fanSpeedLevel") << PROPERTY_TEST_DATA(QIviClimateControl, ClimateControlTestBackend, int, fanSpeedLevel, FanSpeedLevel,
                                                          QList<int>({0, 5, 8, 6}),
-                                                         QList<QtIVIPropertyAttribute<int>>({QtIVIPropertyAttribute<int>(0, 10), QtIVIPropertyAttribute<int>(5, 15)}))
+                                                         QList<QIviPropertyAttribute<int>>({QIviPropertyAttribute<int>(0, 10), QIviPropertyAttribute<int>(5, 15)}))
                                    << true;
-    QTest::newRow("steeringWheelHeater") << PROPERTY_TEST_DATA(QtIVIClimateControl, ClimateControlTestBackend, int, steeringWheelHeater, SteeringWheelHeater,
+    QTest::newRow("steeringWheelHeater") << PROPERTY_TEST_DATA(QIviClimateControl, ClimateControlTestBackend, int, steeringWheelHeater, SteeringWheelHeater,
                                                                QList<int>({0, 5, 8, 6}),
-                                                               QList<QtIVIPropertyAttribute<int>>({QtIVIPropertyAttribute<int>(0, 10), QtIVIPropertyAttribute<int>(5, 15)}))
+                                                               QList<QIviPropertyAttribute<int>>({QIviPropertyAttribute<int>(0, 10), QIviPropertyAttribute<int>(5, 15)}))
                                          << true;
-    QTest::newRow("targetTemperature") << PROPERTY_TEST_DATA(QtIVIClimateControl, ClimateControlTestBackend, int, targetTemperature, TargetTemperature,
+    QTest::newRow("targetTemperature") << PROPERTY_TEST_DATA(QIviClimateControl, ClimateControlTestBackend, int, targetTemperature, TargetTemperature,
                                                              QList<int>({0, 5, 8, 6}),
-                                                             QList<QtIVIPropertyAttribute<int>>({QtIVIPropertyAttribute<int>(0, 10), QtIVIPropertyAttribute<int>(5, 15)}))
+                                                             QList<QIviPropertyAttribute<int>>({QIviPropertyAttribute<int>(0, 10), QIviPropertyAttribute<int>(5, 15)}))
                                        << true;
-    QTest::newRow("seatCooler") << PROPERTY_TEST_DATA(QtIVIClimateControl, ClimateControlTestBackend, int, seatCooler, SeatCooler,
+    QTest::newRow("seatCooler") << PROPERTY_TEST_DATA(QIviClimateControl, ClimateControlTestBackend, int, seatCooler, SeatCooler,
                                                       QList<int>({0, 5, 8, 6}),
-                                                      QList<QtIVIPropertyAttribute<int>>({QtIVIPropertyAttribute<int>(0, 10), QtIVIPropertyAttribute<int>(5, 15)}))
+                                                      QList<QIviPropertyAttribute<int>>({QIviPropertyAttribute<int>(0, 10), QIviPropertyAttribute<int>(5, 15)}))
                                 << true;
-    QTest::newRow("seatHeater") << PROPERTY_TEST_DATA(QtIVIClimateControl, ClimateControlTestBackend, int, seatHeater, SeatHeater,
+    QTest::newRow("seatHeater") << PROPERTY_TEST_DATA(QIviClimateControl, ClimateControlTestBackend, int, seatHeater, SeatHeater,
                                                       QList<int>({0, 5, 8, 6}),
-                                                      QList<QtIVIPropertyAttribute<int>>({QtIVIPropertyAttribute<int>(0, 10), QtIVIPropertyAttribute<int>(5, 15)}))
+                                                      QList<QIviPropertyAttribute<int>>({QIviPropertyAttribute<int>(0, 10), QIviPropertyAttribute<int>(5, 15)}))
                                 << true;
 }
 
@@ -688,18 +688,18 @@ void ClimateControlTest::testIntProperties()
     QFETCH(bool, testZones);
     ClimateControlTestServiceObject *service = new ClimateControlTestServiceObject();
     manager->registerService(service, service->interfaces());
-    QtIVIClimateControl cc;
+    QIviClimateControl cc;
     cc.startAutoDiscovery();
 
     if (testZones) {
         QStringList zones = cc.availableZones();
         zones.removeAll("Dummy");
         foreach (QString z, zones) {
-            QtIVIClimateControl* climateZone = qobject_cast<QtIVIClimateControl*>(cc.zoneAt(z));
-            testIVIProperty<QtIVIClimateControl, ClimateControlTestBackend, int>(testData, climateZone, service->testBackend(), z);
+            QIviClimateControl* climateZone = qobject_cast<QIviClimateControl*>(cc.zoneAt(z));
+            testIVIProperty<QIviClimateControl, ClimateControlTestBackend, int>(testData, climateZone, service->testBackend(), z);
         }
     } else {
-        testIVIProperty<QtIVIClimateControl, ClimateControlTestBackend, int>(testData, &cc, service->testBackend());
+        testIVIProperty<QIviClimateControl, ClimateControlTestBackend, int>(testData, &cc, service->testBackend());
     }
 }
 
@@ -708,25 +708,25 @@ void ClimateControlTest::testBoolProperties_data()
      QTest::addColumn<ClimateControlTestDataBool>("testData");
      QTest::addColumn<bool>("testZones");
 
-     QTest::newRow("airConditioning") << PROPERTY_TEST_DATA_BOOL(QtIVIClimateControl, ClimateControlTestBackend, airConditioning, AirConditioning,
+     QTest::newRow("airConditioning") << PROPERTY_TEST_DATA_BOOL(QIviClimateControl, ClimateControlTestBackend, airConditioning, AirConditioning,
                                                                  QList<bool>({false, true, false, true}),
-                                                                 QList<QtIVIPropertyAttribute<bool>>({QtIVIPropertyAttribute<bool>(true), QtIVIPropertyAttribute<bool>(false)}))
+                                                                 QList<QIviPropertyAttribute<bool>>({QIviPropertyAttribute<bool>(true), QIviPropertyAttribute<bool>(false)}))
                                                     << false;
-     QTest::newRow("heater") << PROPERTY_TEST_DATA_BOOL(QtIVIClimateControl, ClimateControlTestBackend, heater, Heater,
+     QTest::newRow("heater") << PROPERTY_TEST_DATA_BOOL(QIviClimateControl, ClimateControlTestBackend, heater, Heater,
                                                                  QList<bool>({false, true, false, true}),
-                                                                 QList<QtIVIPropertyAttribute<bool>>({QtIVIPropertyAttribute<bool>(true), QtIVIPropertyAttribute<bool>(false)}))
+                                                                 QList<QIviPropertyAttribute<bool>>({QIviPropertyAttribute<bool>(true), QIviPropertyAttribute<bool>(false)}))
                                                     << false;
-     QTest::newRow("zoneSynchronization") << PROPERTY_TEST_DATA_BOOL(QtIVIClimateControl, ClimateControlTestBackend, zoneSynchronization, ZoneSynchronization,
+     QTest::newRow("zoneSynchronization") << PROPERTY_TEST_DATA_BOOL(QIviClimateControl, ClimateControlTestBackend, zoneSynchronization, ZoneSynchronization,
                                                                  QList<bool>({false, true, false, true}),
-                                                                 QList<QtIVIPropertyAttribute<bool>>({QtIVIPropertyAttribute<bool>(true), QtIVIPropertyAttribute<bool>(false)}))
+                                                                 QList<QIviPropertyAttribute<bool>>({QIviPropertyAttribute<bool>(true), QIviPropertyAttribute<bool>(false)}))
                                                     << false;
-     QTest::newRow("defrost") << PROPERTY_TEST_DATA_BOOL(QtIVIClimateControl, ClimateControlTestBackend, defrost, Defrost,
+     QTest::newRow("defrost") << PROPERTY_TEST_DATA_BOOL(QIviClimateControl, ClimateControlTestBackend, defrost, Defrost,
                                                                  QList<bool>({false, true, false, true}),
-                                                                 QList<QtIVIPropertyAttribute<bool>>({QtIVIPropertyAttribute<bool>(true), QtIVIPropertyAttribute<bool>(false)}))
+                                                                 QList<QIviPropertyAttribute<bool>>({QIviPropertyAttribute<bool>(true), QIviPropertyAttribute<bool>(false)}))
                                                     << false;
-     QTest::newRow("recirculation") << PROPERTY_TEST_DATA_BOOL_READONLY(QtIVIClimateControl, ClimateControlTestBackend, recirculation, Recirculation,
+     QTest::newRow("recirculation") << PROPERTY_TEST_DATA_BOOL_READONLY(QIviClimateControl, ClimateControlTestBackend, recirculation, Recirculation,
                                                                         QList<bool>({false, true, false, true}),
-                                                                        QList<QtIVIPropertyAttribute<bool>>({QtIVIPropertyAttribute<bool>(true), QtIVIPropertyAttribute<bool>(false)}))
+                                                                        QList<QIviPropertyAttribute<bool>>({QIviPropertyAttribute<bool>(true), QIviPropertyAttribute<bool>(false)}))
                                                     << false;
 }
 
@@ -736,67 +736,67 @@ void ClimateControlTest::testBoolProperties()
     QFETCH(bool, testZones);
     ClimateControlTestServiceObject *service = new ClimateControlTestServiceObject();
     manager->registerService(service, service->interfaces());
-    QtIVIClimateControl cc;
+    QIviClimateControl cc;
     cc.startAutoDiscovery();
 
     if (testZones) {
         QStringList zones = cc.availableZones();
         zones.removeAll("Dummy");
         foreach (QString z, zones) {
-            QtIVIClimateControl* climateZone = qobject_cast<QtIVIClimateControl*>(cc.zoneAt(z));
-            testIVIProperty<QtIVIClimateControl, ClimateControlTestBackend, bool>(testData, climateZone, service->testBackend(), z);
+            QIviClimateControl* climateZone = qobject_cast<QIviClimateControl*>(cc.zoneAt(z));
+            testIVIProperty<QIviClimateControl, ClimateControlTestBackend, bool>(testData, climateZone, service->testBackend(), z);
         }
     } else {
-        testIVIProperty<QtIVIClimateControl, ClimateControlTestBackend, bool>(testData, &cc, service->testBackend());
+        testIVIProperty<QIviClimateControl, ClimateControlTestBackend, bool>(testData, &cc, service->testBackend());
     }
 }
 
 void ClimateControlTest::testAirflowDirections()
 {
-    QVector<QtIVIClimateControl::AirflowDirections> list;
-    list << (QtIVIClimateControl::Floor | QtIVIClimateControl::Dashboard) << QtIVIClimateControl::Floor << QtIVIClimateControl::Dashboard;
+    QVector<QIviClimateControl::AirflowDirections> list;
+    list << (QIviClimateControl::Floor | QIviClimateControl::Dashboard) << QIviClimateControl::Floor << QIviClimateControl::Dashboard;
 
-    auto testData = PROPERTY_TEST_DATA(QtIVIClimateControl, ClimateControlTestBackend, QtIVIClimateControl::AirflowDirections, airflowDirections, AirflowDirections,
-                                       QList<QtIVIClimateControl::AirflowDirections>({QtIVIClimateControl::Dashboard, QtIVIClimateControl::Floor, QtIVIClimateControl::Windshield, QtIVIClimateControl::Dashboard | QtIVIClimateControl::Windshield}),
-                                       QList<QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections>>({QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections>(list), QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections>(QtIVIClimateControl::Dashboard)}));
+    auto testData = PROPERTY_TEST_DATA(QIviClimateControl, ClimateControlTestBackend, QIviClimateControl::AirflowDirections, airflowDirections, AirflowDirections,
+                                       QList<QIviClimateControl::AirflowDirections>({QIviClimateControl::Dashboard, QIviClimateControl::Floor, QIviClimateControl::Windshield, QIviClimateControl::Dashboard | QIviClimateControl::Windshield}),
+                                       QList<QIviPropertyAttribute<QIviClimateControl::AirflowDirections>>({QIviPropertyAttribute<QIviClimateControl::AirflowDirections>(list), QIviPropertyAttribute<QIviClimateControl::AirflowDirections>(QIviClimateControl::Dashboard)}));
 
     ClimateControlTestServiceObject *service = new ClimateControlTestServiceObject();
     manager->registerService(service, service->interfaces());
-    QtIVIClimateControl cc;
+    QIviClimateControl cc;
     cc.startAutoDiscovery();
-    testIVIProperty<QtIVIClimateControl, ClimateControlTestBackend, QtIVIClimateControl::AirflowDirections>(testData, &cc, service->testBackend());
+    testIVIProperty<QIviClimateControl, ClimateControlTestBackend, QIviClimateControl::AirflowDirections>(testData, &cc, service->testBackend());
 }
 
 void ClimateControlTest::testRecirculationMode()
 {
-    QVector<QtIVIClimateControl::RecirculationMode> list;
-    list << QtIVIClimateControl::RecirculationOff << QtIVIClimateControl::RecirculationOn;
+    QVector<QIviClimateControl::RecirculationMode> list;
+    list << QIviClimateControl::RecirculationOff << QIviClimateControl::RecirculationOn;
 
-    auto testData = PROPERTY_TEST_DATA(QtIVIClimateControl, ClimateControlTestBackend, QtIVIClimateControl::RecirculationMode, recirculationMode, RecirculationMode,
-                                       QList<QtIVIClimateControl::RecirculationMode>({QtIVIClimateControl::RecirculationOff, QtIVIClimateControl::RecirculationOn, QtIVIClimateControl::RecirculationOff, QtIVIClimateControl::RecirculationOn}),
-                                       QList<QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode>>({QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode>(list), QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode>(QtIVIClimateControl::RecirculationOn)}));
+    auto testData = PROPERTY_TEST_DATA(QIviClimateControl, ClimateControlTestBackend, QIviClimateControl::RecirculationMode, recirculationMode, RecirculationMode,
+                                       QList<QIviClimateControl::RecirculationMode>({QIviClimateControl::RecirculationOff, QIviClimateControl::RecirculationOn, QIviClimateControl::RecirculationOff, QIviClimateControl::RecirculationOn}),
+                                       QList<QIviPropertyAttribute<QIviClimateControl::RecirculationMode>>({QIviPropertyAttribute<QIviClimateControl::RecirculationMode>(list), QIviPropertyAttribute<QIviClimateControl::RecirculationMode>(QIviClimateControl::RecirculationOn)}));
 
     ClimateControlTestServiceObject *service = new ClimateControlTestServiceObject();
     manager->registerService(service, service->interfaces());
-    QtIVIClimateControl cc;
+    QIviClimateControl cc;
     cc.startAutoDiscovery();
-    testIVIProperty<QtIVIClimateControl, ClimateControlTestBackend, QtIVIClimateControl::RecirculationMode>(testData, &cc, service->testBackend());
+    testIVIProperty<QIviClimateControl, ClimateControlTestBackend, QIviClimateControl::RecirculationMode>(testData, &cc, service->testBackend());
 }
 
 void ClimateControlTest::testClimateMode()
 {
-    QVector<QtIVIClimateControl::ClimateMode> list;
-    list << QtIVIClimateControl::ClimateOff << QtIVIClimateControl::ClimateOn;
+    QVector<QIviClimateControl::ClimateMode> list;
+    list << QIviClimateControl::ClimateOff << QIviClimateControl::ClimateOn;
 
-    auto testData = PROPERTY_TEST_DATA(QtIVIClimateControl, ClimateControlTestBackend, QtIVIClimateControl::ClimateMode, climateMode, ClimateMode,
-                                       QList<QtIVIClimateControl::ClimateMode>({QtIVIClimateControl::ClimateOff, QtIVIClimateControl::ClimateOn, QtIVIClimateControl::ClimateOff, QtIVIClimateControl::ClimateOn}),
-                                       QList<QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode>>({QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode>(list), QtIVIPropertyAttribute<QtIVIClimateControl::ClimateMode>(QtIVIClimateControl::ClimateOn)}));
+    auto testData = PROPERTY_TEST_DATA(QIviClimateControl, ClimateControlTestBackend, QIviClimateControl::ClimateMode, climateMode, ClimateMode,
+                                       QList<QIviClimateControl::ClimateMode>({QIviClimateControl::ClimateOff, QIviClimateControl::ClimateOn, QIviClimateControl::ClimateOff, QIviClimateControl::ClimateOn}),
+                                       QList<QIviPropertyAttribute<QIviClimateControl::ClimateMode>>({QIviPropertyAttribute<QIviClimateControl::ClimateMode>(list), QIviPropertyAttribute<QIviClimateControl::ClimateMode>(QIviClimateControl::ClimateOn)}));
 
     ClimateControlTestServiceObject *service = new ClimateControlTestServiceObject();
     manager->registerService(service, service->interfaces());
-    QtIVIClimateControl cc;
+    QIviClimateControl cc;
     cc.startAutoDiscovery();
-    testIVIProperty<QtIVIClimateControl, ClimateControlTestBackend, QtIVIClimateControl::ClimateMode>(testData, &cc, service->testBackend());
+    testIVIProperty<QIviClimateControl, ClimateControlTestBackend, QIviClimateControl::ClimateMode>(testData, &cc, service->testBackend());
 }
 
 QTEST_APPLESS_MAIN(ClimateControlTest)
diff --git a/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp b/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
index e34b7f6..0ad77c4 100644
--- a/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
+++ b/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2016 Pelagicore AG
 ** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:GPL-EXCEPT-QTAS$
 ** Commercial License Usage
@@ -28,29 +28,29 @@
 
 #include <QtTest>
 
-#include <QtIVICore/QtIVIServiceManager>
-#include <QtIVICore/QtIVIServiceObject>
-#include <QtIVIVehicleFunctions/QtIVIWindowControl>
-#include <QtIVIVehicleFunctions/QtIVIWindowControlBackendInterface>
+#include <QtIviCore/QIviServiceManager>
+#include <QtIviCore/QIviServiceObject>
+#include <QtIviVehicleFunctions/QIviWindowControl>
+#include <QtIviVehicleFunctions/QIviWindowControlBackendInterface>
 #include <private/qtivipropertytester_p.h>
 
-class WindowControlTestBackend : public QtIVIWindowControlBackendInterface
+class WindowControlTestBackend : public QIviWindowControlBackendInterface
 {
 public:
     WindowControlTestBackend()
-        : QtIVIWindowControlBackendInterface()
+        : QIviWindowControlBackendInterface()
     {
         ZoneBackend zone;
-        zone.heaterMode = QtIVIWindowControl::HeaterOff;
-        zone.heaterModeAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode>(QVector<QtIVIWindowControl::HeaterMode>({QtIVIWindowControl::HeaterOff, QtIVIWindowControl::HeaterOn}));
+        zone.heaterMode = QIviWindowControl::HeaterOff;
+        zone.heaterModeAttribute = QIviPropertyAttribute<QIviWindowControl::HeaterMode>(QVector<QIviWindowControl::HeaterMode>({QIviWindowControl::HeaterOff, QIviWindowControl::HeaterOn}));
         zone.heaterEnabled = false;
-        zone.heaterAttribute = QtIVIPropertyAttribute<bool>(true);
-        zone.blindMode = QtIVIWindowControl::BlindClosed;
-        zone.blindModeAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode>(QVector<QtIVIWindowControl::BlindMode>({QtIVIWindowControl::BlindClosed, QtIVIWindowControl::BlindOpen}));
-        zone.blindState = QtIVIWindowControl::Closed;
-        zone.blindStateAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::State>({QtIVIWindowControl::Closed, QtIVIWindowControl::Open, QtIVIWindowControl::FullyOpen});
-        zone.state = QtIVIWindowControl::Closed;
-        zone.stateAttribute = QtIVIPropertyAttribute<QtIVIWindowControl::State>({QtIVIWindowControl::Closed, QtIVIWindowControl::Open, QtIVIWindowControl::FullyOpen});
+        zone.heaterAttribute = QIviPropertyAttribute<bool>(true);
+        zone.blindMode = QIviWindowControl::BlindClosed;
+        zone.blindModeAttribute = QIviPropertyAttribute<QIviWindowControl::BlindMode>(QVector<QIviWindowControl::BlindMode>({QIviWindowControl::BlindClosed, QIviWindowControl::BlindOpen}));
+        zone.blindState = QIviWindowControl::Closed;
+        zone.blindStateAttribute = QIviPropertyAttribute<QIviWindowControl::State>({QIviWindowControl::Closed, QIviWindowControl::Open, QIviWindowControl::FullyOpen});
+        zone.state = QIviWindowControl::Closed;
+        zone.stateAttribute = QIviPropertyAttribute<QIviWindowControl::State>({QIviWindowControl::Closed, QIviWindowControl::Open, QIviWindowControl::FullyOpen});
 
         m_zoneMap.insert("FrontLeft", zone);
         m_zoneMap.insert("FrontRight", zone);
@@ -82,7 +82,7 @@ public:
 
 public:
 
-    void setHeaterMode(QtIVIWindowControl::HeaterMode value, const QString &zone) Q_DECL_OVERRIDE
+    void setHeaterMode(QIviWindowControl::HeaterMode value, const QString &zone) Q_DECL_OVERRIDE
     {
         if (!m_zoneMap.contains(zone))
             return;
@@ -93,7 +93,7 @@ public:
         }
     }
 
-    void setHeaterModeAttribute(QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode> attribute, const QString &zone)
+    void setHeaterModeAttribute(QIviPropertyAttribute<QIviWindowControl::HeaterMode> attribute, const QString &zone)
     {
         if (!m_zoneMap.contains(zone))
             return;
@@ -115,7 +115,7 @@ public:
         }
     }
 
-    void setHeaterAttribute(QtIVIPropertyAttribute<bool> attribute, const QString &zone)
+    void setHeaterAttribute(QIviPropertyAttribute<bool> attribute, const QString &zone)
     {
         if (!m_zoneMap.contains(zone))
             return;
@@ -126,7 +126,7 @@ public:
         }
     }
 
-    void setBlindMode(QtIVIWindowControl::BlindMode value, const QString &zone) Q_DECL_OVERRIDE
+    void setBlindMode(QIviWindowControl::BlindMode value, const QString &zone) Q_DECL_OVERRIDE
     {
         if (!m_zoneMap.contains(zone))
             return;
@@ -137,7 +137,7 @@ public:
         }
     }
 
-    void setBlindModeAttribute(QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode> attribute, const QString &zone)
+    void setBlindModeAttribute(QIviPropertyAttribute<QIviWindowControl::BlindMode> attribute, const QString &zone)
     {
         if (!m_zoneMap.contains(zone))
             return;
@@ -148,7 +148,7 @@ public:
         }
     }
 
-    void setBlindState(QtIVIWindowControl::State value, const QString &zone)
+    void setBlindState(QIviWindowControl::State value, const QString &zone)
     {
         if (!m_zoneMap.contains(zone))
             return;
@@ -159,7 +159,7 @@ public:
         }
     }
 
-    void setBlindStateAttribute(QtIVIPropertyAttribute<QtIVIWindowControl::State> attribute, const QString &zone)
+    void setBlindStateAttribute(QIviPropertyAttribute<QIviWindowControl::State> attribute, const QString &zone)
     {
         if (!m_zoneMap.contains(zone))
             return;
@@ -171,7 +171,7 @@ public:
     }
 
 
-    void setState(QtIVIWindowControl::State value, const QString &zone)
+    void setState(QIviWindowControl::State value, const QString &zone)
     {
         if (!m_zoneMap.contains(zone))
             return;
@@ -182,7 +182,7 @@ public:
         }
     }
 
-    void setStateAttribute(QtIVIPropertyAttribute<QtIVIWindowControl::State> attribute, const QString &zone)
+    void setStateAttribute(QIviPropertyAttribute<QIviWindowControl::State> attribute, const QString &zone)
     {
         if (!m_zoneMap.contains(zone))
             return;
@@ -207,40 +207,40 @@ public:
 private:
 
     struct ZoneBackend {
-        QtIVIWindowControl::HeaterMode heaterMode;
-        QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode> heaterModeAttribute;
+        QIviWindowControl::HeaterMode heaterMode;
+        QIviPropertyAttribute<QIviWindowControl::HeaterMode> heaterModeAttribute;
         bool heaterEnabled;
-        QtIVIPropertyAttribute<bool> heaterAttribute;
-        QtIVIWindowControl::BlindMode blindMode;
-        QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode> blindModeAttribute;
-        QtIVIWindowControl::State blindState;
-        QtIVIPropertyAttribute<QtIVIWindowControl::State> blindStateAttribute;
-        QtIVIWindowControl::State state;
-        QtIVIPropertyAttribute<QtIVIWindowControl::State> stateAttribute;
+        QIviPropertyAttribute<bool> heaterAttribute;
+        QIviWindowControl::BlindMode blindMode;
+        QIviPropertyAttribute<QIviWindowControl::BlindMode> blindModeAttribute;
+        QIviWindowControl::State blindState;
+        QIviPropertyAttribute<QIviWindowControl::State> blindStateAttribute;
+        QIviWindowControl::State state;
+        QIviPropertyAttribute<QIviWindowControl::State> stateAttribute;
     };
 
     QMap<QString,ZoneBackend> m_zoneMap;
 };
 
 
-typedef QtIVIPropertyTestData<QtIVIWindowControl, WindowControlTestBackend, QtIVIWindowControl::State> WindowControlTestDataState;
+typedef QIviPropertyTestData<QIviWindowControl, WindowControlTestBackend, QIviWindowControl::State> WindowControlTestDataState;
 Q_DECLARE_METATYPE(WindowControlTestDataState)
 
-class WindowControlTestServiceObject : public QtIVIServiceObject {
+class WindowControlTestServiceObject : public QIviServiceObject {
 
 public:
     explicit WindowControlTestServiceObject(QObject *parent=0) :
-        QtIVIServiceObject(parent), m_name(QLatin1String(""))
+        QIviServiceObject(parent), m_name(QLatin1String(""))
     {
         m_backend = new WindowControlTestBackend;
-        m_interfaces << QtIVIStringWindowControlInterfaceName;
+        m_interfaces << QIviStringWindowControlInterfaceName;
     }
 
     QString name() const { return m_name; }
     QStringList interfaces() const { return m_interfaces; }
     QObject* interfaceInstance(const QString& interface) const
     {
-        if (interface == QtIVIStringWindowControlInterfaceName)
+        if (interface == QIviStringWindowControlInterfaceName)
             return testBackend();
         else
             return 0;
@@ -257,13 +257,13 @@ private:
     WindowControlTestBackend* m_backend;
 };
 
-class WindowControlInvalidServiceObject : public QtIVIServiceObject {
+class WindowControlInvalidServiceObject : public QIviServiceObject {
 
 public:
     explicit WindowControlInvalidServiceObject(QObject *parent=0) :
-        QtIVIServiceObject(parent), m_name(QLatin1String("")), m_dummyBackend(new QObject(this))
+        QIviServiceObject(parent), m_name(QLatin1String("")), m_dummyBackend(new QObject(this))
     {
-        m_interfaces << QtIVIStringWindowControlInterfaceName;
+        m_interfaces << QIviStringWindowControlInterfaceName;
     }
 
     QString name() const { return m_name; }
@@ -298,13 +298,13 @@ private slots:
     void testStates();
 
 private:
-    QtIVIServiceManager *manager;
+    QIviServiceManager *manager;
 };
 
 WindowControlTest::WindowControlTest()
     : QObject()
 {
-    manager = QtIVIServiceManager::instance();
+    manager = QIviServiceManager::instance();
 }
 
 void WindowControlTest::cleanup()
@@ -314,15 +314,15 @@ void WindowControlTest::cleanup()
 
 void WindowControlTest::testWithoutBackend()
 {
-    QtIVIWindowControl wc;
+    QIviWindowControl wc;
 
     // Running without a backend means that changes do not propagate
     // We check this on a single property in this case
-    QSignalSpy heaterModeSpy(&wc, SIGNAL(heaterModeChanged(QtIVIWindowControl::HeaterMode)));
+    QSignalSpy heaterModeSpy(&wc, SIGNAL(heaterModeChanged(QIviWindowControl::HeaterMode)));
 
-    QtIVIWindowControl::HeaterMode e = wc.heaterMode();
-    QCOMPARE(e, QtIVIWindowControl::HeaterOff);
-    wc.setHeaterMode(QtIVIWindowControl::HeaterOn);
+    QIviWindowControl::HeaterMode e = wc.heaterMode();
+    QCOMPARE(e, QIviWindowControl::HeaterOff);
+    wc.setHeaterMode(QIviWindowControl::HeaterOn);
     QCOMPARE(heaterModeSpy.count(), 0);
     QCOMPARE(wc.heaterMode(), e);
 
@@ -333,16 +333,16 @@ void WindowControlTest::testInvalidBackend()
 {
     WindowControlInvalidServiceObject *service = new WindowControlInvalidServiceObject();
     manager->registerService(service, service->interfaces());
-    QtIVIWindowControl wc;
+    QIviWindowControl wc;
     wc.startAutoDiscovery();
 
     // Running without a backend means that changes do not propagate
     // We check this on a single property in this case
-    QSignalSpy heaterModeSpy(&wc, SIGNAL(heaterModeChanged(QtIVIWindowControl::HeaterMode)));
+    QSignalSpy heaterModeSpy(&wc, SIGNAL(heaterModeChanged(QIviWindowControl::HeaterMode)));
 
-    QtIVIWindowControl::HeaterMode e = wc.heaterMode();
-    QCOMPARE(e, QtIVIWindowControl::HeaterOff);
-    wc.setHeaterMode(QtIVIWindowControl::HeaterOn);
+    QIviWindowControl::HeaterMode e = wc.heaterMode();
+    QCOMPARE(e, QIviWindowControl::HeaterOff);
+    wc.setHeaterMode(QIviWindowControl::HeaterOn);
     QCOMPARE(heaterModeSpy.count(), 0);
     QCOMPARE(wc.heaterMode(), e);
 
@@ -353,90 +353,90 @@ void WindowControlTest::testClearServiceObject()
 {
     WindowControlTestServiceObject *service = new WindowControlTestServiceObject();
     manager->registerService(service, service->interfaces());
-    service->testBackend()->setHeaterMode(QtIVIWindowControl::HeaterOn, "FrontLeft");
-    QtIVIWindowControl wc;
+    service->testBackend()->setHeaterMode(QIviWindowControl::HeaterOn, "FrontLeft");
+    QIviWindowControl wc;
     wc.startAutoDiscovery();
     QVERIFY(wc.availableZones().contains("FrontLeft"));
-    QtIVIWindowControl* zone = qobject_cast<QtIVIWindowControl*>(wc.zoneAt("FrontLeft"));
+    QIviWindowControl* zone = qobject_cast<QIviWindowControl*>(wc.zoneAt("FrontLeft"));
     QVERIFY(zone);
-    QCOMPARE(zone->heaterMode(), QtIVIWindowControl::HeaterOn);
+    QCOMPARE(zone->heaterMode(), QIviWindowControl::HeaterOn);
     wc.setServiceObject(0);
     QVERIFY(!wc.zoneAt("FrontLeft"));
 }
 
 void WindowControlTest::testHeaterMode()
 {
-    QVector<QtIVIWindowControl::HeaterMode> list;
-    list << QtIVIWindowControl::HeaterOff << QtIVIWindowControl::HeaterOn;
+    QVector<QIviWindowControl::HeaterMode> list;
+    list << QIviWindowControl::HeaterOff << QIviWindowControl::HeaterOn;
 
-    auto testData = PROPERTY_TEST_DATA(QtIVIWindowControl, WindowControlTestBackend, QtIVIWindowControl::HeaterMode, heaterMode, HeaterMode,
-                                       QList<QtIVIWindowControl::HeaterMode>({QtIVIWindowControl::HeaterOff, QtIVIWindowControl::HeaterOn, QtIVIWindowControl::HeaterOff, QtIVIWindowControl::HeaterOn}),
-                                       QList<QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode>>({QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode>(list), QtIVIPropertyAttribute<QtIVIWindowControl::HeaterMode>(QtIVIWindowControl::AutoHeater)}));
+    auto testData = PROPERTY_TEST_DATA(QIviWindowControl, WindowControlTestBackend, QIviWindowControl::HeaterMode, heaterMode, HeaterMode,
+                                       QList<QIviWindowControl::HeaterMode>({QIviWindowControl::HeaterOff, QIviWindowControl::HeaterOn, QIviWindowControl::HeaterOff, QIviWindowControl::HeaterOn}),
+                                       QList<QIviPropertyAttribute<QIviWindowControl::HeaterMode>>({QIviPropertyAttribute<QIviWindowControl::HeaterMode>(list), QIviPropertyAttribute<QIviWindowControl::HeaterMode>(QIviWindowControl::AutoHeater)}));
 
     WindowControlTestServiceObject *service = new WindowControlTestServiceObject();
     manager->registerService(service, service->interfaces());
-    QtIVIWindowControl wc;
+    QIviWindowControl wc;
     wc.startAutoDiscovery();
     QStringList zones = wc.availableZones();
     zones.removeAll("Dummy");
     foreach (QString z, zones) {
-        QtIVIWindowControl* window = qobject_cast<QtIVIWindowControl*>(wc.zoneAt(z));
-        testIVIProperty<QtIVIWindowControl, WindowControlTestBackend, QtIVIWindowControl::HeaterMode>(testData, window, service->testBackend(), z);
+        QIviWindowControl* window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z));
+        testIVIProperty<QIviWindowControl, WindowControlTestBackend, QIviWindowControl::HeaterMode>(testData, window, service->testBackend(), z);
     }
 }
 
 void WindowControlTest::testHeaterEnabled()
 {
-    auto testData = PROPERTY_TEST_DATA_BOOL_READONLY(QtIVIWindowControl, WindowControlTestBackend, heater, Heater,
+    auto testData = PROPERTY_TEST_DATA_BOOL_READONLY(QIviWindowControl, WindowControlTestBackend, heater, Heater,
                                                      QList<bool>({false, true, false, true}),
-                                                     QList<QtIVIPropertyAttribute<bool>>({QtIVIPropertyAttribute<bool>(true), QtIVIPropertyAttribute<bool>(false)}));
+                                                     QList<QIviPropertyAttribute<bool>>({QIviPropertyAttribute<bool>(true), QIviPropertyAttribute<bool>(false)}));
 
     WindowControlTestServiceObject *service = new WindowControlTestServiceObject();
     manager->registerService(service, service->interfaces());
-    QtIVIWindowControl wc;
+    QIviWindowControl wc;
     wc.startAutoDiscovery();
     QStringList zones = wc.availableZones();
     zones.removeAll("Dummy");
     foreach (QString z, zones) {
-        QtIVIWindowControl* window = qobject_cast<QtIVIWindowControl*>(wc.zoneAt(z));
-        testIVIProperty<QtIVIWindowControl, WindowControlTestBackend, bool>(testData, window, service->testBackend(), z);
+        QIviWindowControl* window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z));
+        testIVIProperty<QIviWindowControl, WindowControlTestBackend, bool>(testData, window, service->testBackend(), z);
     }
 }
 
 void WindowControlTest::testBlindMode()
 {
-    QVector<QtIVIWindowControl::BlindMode> list;
-    list << QtIVIWindowControl::BlindClosed << QtIVIWindowControl::BlindOpen;
+    QVector<QIviWindowControl::BlindMode> list;
+    list << QIviWindowControl::BlindClosed << QIviWindowControl::BlindOpen;
 
-    auto testData = PROPERTY_TEST_DATA(QtIVIWindowControl, WindowControlTestBackend, QtIVIWindowControl::BlindMode, blindMode, BlindMode,
-                                       QList<QtIVIWindowControl::BlindMode>({QtIVIWindowControl::BlindClosed, QtIVIWindowControl::BlindOpen, QtIVIWindowControl::BlindClosed, QtIVIWindowControl::BlindOpen}),
-                                       QList<QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode>>({QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode>(list), QtIVIPropertyAttribute<QtIVIWindowControl::BlindMode>(QtIVIWindowControl::AutoBlind)}));
+    auto testData = PROPERTY_TEST_DATA(QIviWindowControl, WindowControlTestBackend, QIviWindowControl::BlindMode, blindMode, BlindMode,
+                                       QList<QIviWindowControl::BlindMode>({QIviWindowControl::BlindClosed, QIviWindowControl::BlindOpen, QIviWindowControl::BlindClosed, QIviWindowControl::BlindOpen}),
+                                       QList<QIviPropertyAttribute<QIviWindowControl::BlindMode>>({QIviPropertyAttribute<QIviWindowControl::BlindMode>(list), QIviPropertyAttribute<QIviWindowControl::BlindMode>(QIviWindowControl::AutoBlind)}));
 
     WindowControlTestServiceObject *service = new WindowControlTestServiceObject();
     manager->registerService(service, service->interfaces());
-    QtIVIWindowControl wc;
+    QIviWindowControl wc;
     wc.startAutoDiscovery();
     QStringList zones = wc.availableZones();
     zones.removeAll("Dummy");
     foreach (QString z, zones) {
-        QtIVIWindowControl* window = qobject_cast<QtIVIWindowControl*>(wc.zoneAt(z));
-        testIVIProperty<QtIVIWindowControl, WindowControlTestBackend, QtIVIWindowControl::BlindMode>(testData, window, service->testBackend(), z);
+        QIviWindowControl* window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z));
+        testIVIProperty<QIviWindowControl, WindowControlTestBackend, QIviWindowControl::BlindMode>(testData, window, service->testBackend(), z);
     }
 }
 
 void WindowControlTest::testStates_data()
 {
     QTest::addColumn<WindowControlTestDataState>("testData");
-    QVector<QtIVIWindowControl::State> list;
-    list << QtIVIWindowControl::Closed << QtIVIWindowControl::Open  << QtIVIWindowControl::FullyOpen;
+    QVector<QIviWindowControl::State> list;
+    list << QIviWindowControl::Closed << QIviWindowControl::Open  << QIviWindowControl::FullyOpen;
 
-    QTest::newRow("state") << PROPERTY_TEST_DATA_READONLY(QtIVIWindowControl, WindowControlTestBackend, QtIVIWindowControl::State, state, State,
-                                                          QList<QtIVIWindowControl::State>({QtIVIWindowControl::Closed, QtIVIWindowControl::Open, QtIVIWindowControl::FullyOpen, QtIVIWindowControl::Closed}),
-                                                          QList<QtIVIPropertyAttribute<QtIVIWindowControl::State>>({QtIVIPropertyAttribute<QtIVIWindowControl::State>(list), QtIVIPropertyAttribute<QtIVIWindowControl::State>(QtIVIWindowControl::Closed)}));
+    QTest::newRow("state") << PROPERTY_TEST_DATA_READONLY(QIviWindowControl, WindowControlTestBackend, QIviWindowControl::State, state, State,
+                                                          QList<QIviWindowControl::State>({QIviWindowControl::Closed, QIviWindowControl::Open, QIviWindowControl::FullyOpen, QIviWindowControl::Closed}),
+                                                          QList<QIviPropertyAttribute<QIviWindowControl::State>>({QIviPropertyAttribute<QIviWindowControl::State>(list), QIviPropertyAttribute<QIviWindowControl::State>(QIviWindowControl::Closed)}));
 
-    QTest::newRow("blindState") << PROPERTY_TEST_DATA_READONLY(QtIVIWindowControl, WindowControlTestBackend, QtIVIWindowControl::State, state, State,
-                                                               QList<QtIVIWindowControl::State>({QtIVIWindowControl::Closed, QtIVIWindowControl::Open, QtIVIWindowControl::FullyOpen, QtIVIWindowControl::Closed}),
-                                                               QList<QtIVIPropertyAttribute<QtIVIWindowControl::State>>({QtIVIPropertyAttribute<QtIVIWindowControl::State>(list), QtIVIPropertyAttribute<QtIVIWindowControl::State>(QtIVIWindowControl::Closed)}));
+    QTest::newRow("blindState") << PROPERTY_TEST_DATA_READONLY(QIviWindowControl, WindowControlTestBackend, QIviWindowControl::State, state, State,
+                                                               QList<QIviWindowControl::State>({QIviWindowControl::Closed, QIviWindowControl::Open, QIviWindowControl::FullyOpen, QIviWindowControl::Closed}),
+                                                               QList<QIviPropertyAttribute<QIviWindowControl::State>>({QIviPropertyAttribute<QIviWindowControl::State>(list), QIviPropertyAttribute<QIviWindowControl::State>(QIviWindowControl::Closed)}));
 
 }
 
@@ -446,13 +446,13 @@ void WindowControlTest::testStates()
 
     WindowControlTestServiceObject *service = new WindowControlTestServiceObject();
     manager->registerService(service, service->interfaces());
-    QtIVIWindowControl wc;
+    QIviWindowControl wc;
     wc.startAutoDiscovery();
     QStringList zones = wc.availableZones();
     zones.removeAll("Dummy");
     foreach (QString z, zones) {
-        QtIVIWindowControl* window = qobject_cast<QtIVIWindowControl*>(wc.zoneAt(z));
-        testIVIProperty<QtIVIWindowControl, WindowControlTestBackend, QtIVIWindowControl::State>(testData, window, service->testBackend(), z);
+        QIviWindowControl* window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z));
+        testIVIProperty<QIviWindowControl, WindowControlTestBackend, QIviWindowControl::State>(testData, window, service->testBackend(), z);
     }
 }