Renamed all files to match the new class names and fixed the includes

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

65 files changed, 127 insertions, 127 deletions

diff --git a/src/ivicore/ivicore.pro b/src/ivicore/ivicore.pro
index 8cce832..d5e530e 100644
--- a/src/ivicore/ivicore.pro
+++ b/src/ivicore/ivicore.pro
@@ -11,38 +11,38 @@ OTHER_FILES += \
 CMAKE_MODULE_TESTS = '-'
 
 HEADERS += \
-    qtiviservicemanager.h \
-    qtiviserviceinterface.h \
-    qtiviservicemanager_p.h \
-    qtiviserviceobject.h \
-    qtiviabstractfeature.h \
-    qtiviabstractzonedfeature.h \
+    qiviservicemanager.h \
+    qiviserviceinterface.h \
+    qiviservicemanager_p.h \
+    qiviserviceobject.h \
+    qiviabstractfeature.h \
+    qiviabstractzonedfeature.h \
     qtiviglobal.h \
-    qtiviproxyserviceobject_p.h \
-    qtivizonedfeatureinterface.h \
-    qtivipropertyattribute.h \
-    qtiviproperty.h \
-    qtivipropertyfactory.h \
-    qtiviproperty_p.h \
-    qtiviabstractfeature_p.h \
-    qtiviabstractzonedfeature_p.h \
-    qtiviqmlconversion_helper.h \
-    qtivipropertytester_p.h \
-    qtivitypetraits.h \
-    qtiviabstractfeaturelistmodel.h \
-    qtiviabstractfeaturelistmodel_p.h
+    qiviproxyserviceobject_p.h \
+    qivizonedfeatureinterface.h \
+    qivipropertyattribute.h \
+    qiviproperty.h \
+    qivipropertyfactory.h \
+    qiviproperty_p.h \
+    qiviabstractfeature_p.h \
+    qiviabstractzonedfeature_p.h \
+    qiviqmlconversion_helper.h \
+    qivipropertytester_p.h \
+    qivitypetraits.h \
+    qiviabstractfeaturelistmodel.h \
+    qiviabstractfeaturelistmodel_p.h
 
 SOURCES += \
-    qtiviservicemanager.cpp \
-    qtiviserviceobject.cpp \
-    qtiviabstractfeature.cpp \
-    qtiviabstractzonedfeature.cpp \
-    qtiviproxyserviceobject_p.cpp \
-    qtivizonedfeatureinterface.cpp \
-    qtivipropertyattribute.cpp \
-    qtiviproperty.cpp \
-    qtivipropertyfactory.cpp \
-    qtiviabstractfeaturelistmodel.cpp
+    qiviservicemanager.cpp \
+    qiviserviceobject.cpp \
+    qiviabstractfeature.cpp \
+    qiviabstractzonedfeature.cpp \
+    qiviproxyserviceobject_p.cpp \
+    qivizonedfeatureinterface.cpp \
+    qivipropertyattribute.cpp \
+    qiviproperty.cpp \
+    qivipropertyfactory.cpp \
+    qiviabstractfeaturelistmodel.cpp
 
 include(queryparser/queryparser.pri)
 
diff --git a/src/ivicore/qtiviabstractfeature.cpp b/src/ivicore/qiviabstractfeature.cpp
index b92c4f3..ebac55d 100644
--- a/src/ivicore/qtiviabstractfeature.cpp
+++ b/src/ivicore/qiviabstractfeature.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qtiviabstractfeature.h"
-#include "qtiviabstractfeature_p.h"
+#include "qiviabstractfeature.h"
+#include "qiviabstractfeature_p.h"
 
-#include "qtiviserviceobject.h"
-#include "qtiviservicemanager.h"
+#include "qiviserviceobject.h"
+#include "qiviservicemanager.h"
 
 #include <QMetaEnum>
 #include <QDebug>
diff --git a/src/ivicore/qtiviabstractfeature.h b/src/ivicore/qiviabstractfeature.h
index 80cb130..80cb130 100644
--- a/src/ivicore/qtiviabstractfeature.h
+++ b/src/ivicore/qiviabstractfeature.h
diff --git a/src/ivicore/qtiviabstractfeature_p.h b/src/ivicore/qiviabstractfeature_p.h
index 8658e08..af865b7 100644
--- a/src/ivicore/qtiviabstractfeature_p.h
+++ b/src/ivicore/qiviabstractfeature_p.h
@@ -55,7 +55,7 @@
 
 #include <private/qobject_p.h>
 
-#include "qtiviabstractfeature.h"
+#include "qiviabstractfeature.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ivicore/qtiviabstractfeaturelistmodel.cpp b/src/ivicore/qiviabstractfeaturelistmodel.cpp
index 75258c2..ec9564e 100644
--- a/src/ivicore/qtiviabstractfeaturelistmodel.cpp
+++ b/src/ivicore/qiviabstractfeaturelistmodel.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qtiviabstractfeaturelistmodel.h"
-#include "qtiviabstractfeaturelistmodel_p.h"
+#include "qiviabstractfeaturelistmodel.h"
+#include "qiviabstractfeaturelistmodel_p.h"
 
 QIviHelperFeature::QIviHelperFeature(const QString &interface, QIviAbstractFeatureListModel *model)
     : QIviAbstractFeature(interface)
diff --git a/src/ivicore/qtiviabstractfeaturelistmodel.h b/src/ivicore/qiviabstractfeaturelistmodel.h
index 259dccb..259dccb 100644
--- a/src/ivicore/qtiviabstractfeaturelistmodel.h
+++ b/src/ivicore/qiviabstractfeaturelistmodel.h
diff --git a/src/ivicore/qtiviabstractfeaturelistmodel_p.h b/src/ivicore/qiviabstractfeaturelistmodel_p.h
index a9edb98..0d796df 100644
--- a/src/ivicore/qtiviabstractfeaturelistmodel_p.h
+++ b/src/ivicore/qiviabstractfeaturelistmodel_p.h
@@ -55,7 +55,7 @@
 
 #include <private/qabstractitemmodel_p.h>
 
-#include "qtiviabstractfeaturelistmodel.h"
+#include "qiviabstractfeaturelistmodel.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ivicore/qtiviabstractzonedfeature.cpp b/src/ivicore/qiviabstractzonedfeature.cpp
index 75a4b77..93054c5 100644
--- a/src/ivicore/qtiviabstractzonedfeature.cpp
+++ b/src/ivicore/qiviabstractzonedfeature.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 #include <QtCore/qmetaobject.h>
-#include <QtIviCore/qtiviserviceobject.h>
+#include <QtIviCore/qiviserviceobject.h>
 
-#include "qtiviabstractzonedfeature.h"
-#include "qtiviabstractzonedfeature_p.h"
-#include "qtivizonedfeatureinterface.h"
+#include "qiviabstractzonedfeature.h"
+#include "qiviabstractzonedfeature_p.h"
+#include "qivizonedfeatureinterface.h"
 
 QIviAbstractZonedFeaturePrivate::QIviAbstractZonedFeaturePrivate(const QString &interface, const QString &zone, QIviAbstractFeature *parent)
     : QIviAbstractFeaturePrivate(interface, parent)
diff --git a/src/ivicore/qtiviabstractzonedfeature.h b/src/ivicore/qiviabstractzonedfeature.h
index 54bc0d8..54bc0d8 100644
--- a/src/ivicore/qtiviabstractzonedfeature.h
+++ b/src/ivicore/qiviabstractzonedfeature.h
diff --git a/src/ivicore/qtiviabstractzonedfeature_p.h b/src/ivicore/qiviabstractzonedfeature_p.h
index 58427c7..eb756dd 100644
--- a/src/ivicore/qtiviabstractzonedfeature_p.h
+++ b/src/ivicore/qiviabstractzonedfeature_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "qtiviabstractfeature_p.h"
-#include "qtiviabstractzonedfeature.h"
+#include "qiviabstractfeature_p.h"
+#include "qiviabstractzonedfeature.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ivicore/qtiviproperty.cpp b/src/ivicore/qiviproperty.cpp
index 56cd014..a8da811 100644
--- a/src/ivicore/qtiviproperty.cpp
+++ b/src/ivicore/qiviproperty.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qtiviproperty.h"
-#include "qtiviproperty_p.h"
+#include "qiviproperty.h"
+#include "qiviproperty_p.h"
 
 #include <QMetaEnum>
 
diff --git a/src/ivicore/qtiviproperty.h b/src/ivicore/qiviproperty.h
index e359366..e359366 100644
--- a/src/ivicore/qtiviproperty.h
+++ b/src/ivicore/qiviproperty.h
diff --git a/src/ivicore/qtiviproperty_p.h b/src/ivicore/qiviproperty_p.h
index 2039e65..2039e65 100644
--- a/src/ivicore/qtiviproperty_p.h
+++ b/src/ivicore/qiviproperty_p.h
diff --git a/src/ivicore/qtivipropertyattribute.cpp b/src/ivicore/qivipropertyattribute.cpp
index 52eac04..b45f08c 100644
--- a/src/ivicore/qtivipropertyattribute.cpp
+++ b/src/ivicore/qivipropertyattribute.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qtivipropertyattribute.h"
+#include "qivipropertyattribute.h"
 
 QIviPropertyAttributeBase::QIviPropertyAttributeBase()
 {
diff --git a/src/ivicore/qtivipropertyattribute.h b/src/ivicore/qivipropertyattribute.h
index fab4a0a..fab4a0a 100644
--- a/src/ivicore/qtivipropertyattribute.h
+++ b/src/ivicore/qivipropertyattribute.h
diff --git a/src/ivicore/qtivipropertyfactory.cpp b/src/ivicore/qivipropertyfactory.cpp
index da68981..a79b8fd 100644
--- a/src/ivicore/qtivipropertyfactory.cpp
+++ b/src/ivicore/qivipropertyfactory.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qtivipropertyfactory.h"
+#include "qivipropertyfactory.h"
 
 /*!
  * \class QIviPropertyFactory
diff --git a/src/ivicore/qtivipropertyfactory.h b/src/ivicore/qivipropertyfactory.h
index 39707ca..b40dbc3 100644
--- a/src/ivicore/qtivipropertyfactory.h
+++ b/src/ivicore/qivipropertyfactory.h
@@ -44,8 +44,8 @@
 
 #include <QtIviCore/qtiviglobal.h>
 #include <QtIviCore/QIviProperty>
-#include <QtIviCore/qtivitypetraits.h>
-#include <QtIviCore/qtiviqmlconversion_helper.h>
+#include <QtIviCore/qivitypetraits.h>
+#include <QtIviCore/qiviqmlconversion_helper.h>
 #include <QMetaEnum>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/ivicore/qtivipropertytester_p.h b/src/ivicore/qivipropertytester_p.h
index 8c2f5e2..4b21a75 100644
--- a/src/ivicore/qtivipropertytester_p.h
+++ b/src/ivicore/qivipropertytester_p.h
@@ -55,7 +55,7 @@
 
 #include <QtIviCore/QIviProperty>
 #include <QtIviCore/QIviPropertyFactory>
-#include <QtIviCore/qtiviqmlconversion_helper.h>
+#include <QtIviCore/qiviqmlconversion_helper.h>
 #include <QVariant>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/ivicore/qtiviproxyserviceobject_p.cpp b/src/ivicore/qiviproxyserviceobject_p.cpp
index 230859a..519108a 100644
--- a/src/ivicore/qtiviproxyserviceobject_p.cpp
+++ b/src/ivicore/qiviproxyserviceobject_p.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qtiviproxyserviceobject_p.h"
+#include "qiviproxyserviceobject_p.h"
 
 QIviProxyServiceObject::QIviProxyServiceObject(QIviServiceInterface *interface)
     : QIviServiceObject()
diff --git a/src/ivicore/qtiviproxyserviceobject_p.h b/src/ivicore/qiviproxyserviceobject_p.h
index 8de9e5c..8de9e5c 100644
--- a/src/ivicore/qtiviproxyserviceobject_p.h
+++ b/src/ivicore/qiviproxyserviceobject_p.h
diff --git a/src/ivicore/qtiviqmlconversion_helper.h b/src/ivicore/qiviqmlconversion_helper.h
index 7d8ff78..7d8ff78 100644
--- a/src/ivicore/qtiviqmlconversion_helper.h
+++ b/src/ivicore/qiviqmlconversion_helper.h
diff --git a/src/ivicore/qtiviserviceinterface.h b/src/ivicore/qiviserviceinterface.h
index 436b9ae..436b9ae 100644
--- a/src/ivicore/qtiviserviceinterface.h
+++ b/src/ivicore/qiviserviceinterface.h
diff --git a/src/ivicore/qtiviservicemanager.cpp b/src/ivicore/qiviservicemanager.cpp
index 681dd4a..4d68152 100644
--- a/src/ivicore/qtiviservicemanager.cpp
+++ b/src/ivicore/qiviservicemanager.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qtiviservicemanager.h"
+#include "qiviservicemanager.h"
 
-#include "qtiviproxyserviceobject_p.h"
-#include "qtiviservicemanager_p.h"
+#include "qiviproxyserviceobject_p.h"
+#include "qiviservicemanager_p.h"
 
 #include <QStringList>
 #include <QPluginLoader>
diff --git a/src/ivicore/qtiviservicemanager.h b/src/ivicore/qiviservicemanager.h
index ebe3833..ebe3833 100644
--- a/src/ivicore/qtiviservicemanager.h
+++ b/src/ivicore/qiviservicemanager.h
diff --git a/src/ivicore/qtiviservicemanager_p.h b/src/ivicore/qiviservicemanager_p.h
index b4616e9..f7ce588 100644
--- a/src/ivicore/qtiviservicemanager_p.h
+++ b/src/ivicore/qiviservicemanager_p.h
@@ -60,7 +60,7 @@
 #include <QtCore/QSet>
 
 #include <QtIviCore/qtiviglobal.h>
-#include <QtIviCore/qtiviservicemanager.h>
+#include <QtIviCore/qiviservicemanager.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ivicore/qtiviserviceobject.cpp b/src/ivicore/qiviserviceobject.cpp
index f1300dc..523edf5 100644
--- a/src/ivicore/qtiviserviceobject.cpp
+++ b/src/ivicore/qiviserviceobject.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qtiviserviceobject.h"
+#include "qiviserviceobject.h"
 
 #include <QUuid>
 
diff --git a/src/ivicore/qtiviserviceobject.h b/src/ivicore/qiviserviceobject.h
index 8cdd3af..8cdd3af 100644
--- a/src/ivicore/qtiviserviceobject.h
+++ b/src/ivicore/qiviserviceobject.h
diff --git a/src/ivicore/qtivitypetraits.h b/src/ivicore/qivitypetraits.h
index c32bdb3..c32bdb3 100644
--- a/src/ivicore/qtivitypetraits.h
+++ b/src/ivicore/qivitypetraits.h
diff --git a/src/ivicore/qtivizonedfeatureinterface.cpp b/src/ivicore/qivizonedfeatureinterface.cpp
index c6e4d9d..5ab9a30 100644
--- a/src/ivicore/qtivizonedfeatureinterface.cpp
+++ b/src/ivicore/qivizonedfeatureinterface.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qtivizonedfeatureinterface.h"
+#include "qivizonedfeatureinterface.h"
 
 /*!
    \class QIviZonedFeatureInterface
diff --git a/src/ivicore/qtivizonedfeatureinterface.h b/src/ivicore/qivizonedfeatureinterface.h
index 5df18db..5df18db 100644
--- a/src/ivicore/qtivizonedfeatureinterface.h
+++ b/src/ivicore/qivizonedfeatureinterface.h
diff --git a/src/ivicore/queryparser/README b/src/ivicore/queryparser/README
index 840712e..3fa9150 100644
--- a/src/ivicore/queryparser/README
+++ b/src/ivicore/queryparser/README
@@ -6,7 +6,7 @@ The Grammer is defined by using flex (*.l) and QLALR (*.g)
 To change the grammer you need to edit the *.l or *.g files
 and generate the corresponding header files
 
-All header files (besides the qtiviqueryterm.*) are autogenerated.
+All header files (besides the qiviqueryterm.*) are autogenerated.
 
 You can automatically generate the header files on every change
 by setting the enable-qlalr CONFIG option
diff --git a/src/ivicore/queryparser/qtiviqueryparser.g b/src/ivicore/queryparser/qiviqueryparser.g
index 1964793..9637b91 100644
--- a/src/ivicore/queryparser/qtiviqueryparser.g
+++ b/src/ivicore/queryparser/qiviqueryparser.g
@@ -51,7 +51,7 @@
 --
 
 %parser QIviQueryParserTable
-%merged_output qtiviqueryparser_p.h
+%merged_output qiviqueryparser_p.h
 
 %token AND_OP2 "&"
 %token AND_OP "&&"
@@ -86,7 +86,7 @@
 
 #include <QtCore>
 #include <QtIviCore/QIviAbstractQueryTerm>
-#include <QtIviCore/private/qtiviqueryterm_p.h>
+#include <QtIviCore/private/qiviqueryterm_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -219,7 +219,7 @@ QIviQueryParser::QIviQueryParser():
       reallocateStack();
 }
 
-#include "qtiviqueryparser_flex_p.h"
+#include "qiviqueryparser_flex_p.h"
 
 QIviQueryParser::~QIviQueryParser()
 {
diff --git a/src/ivicore/queryparser/qtiviqueryparser.l b/src/ivicore/queryparser/qiviqueryparser.l
index b364c2b..b364c2b 100644
--- a/src/ivicore/queryparser/qtiviqueryparser.l
+++ b/src/ivicore/queryparser/qiviqueryparser.l
diff --git a/src/ivicore/queryparser/qtiviqueryparser_flex_p.h b/src/ivicore/queryparser/qiviqueryparser_flex_p.h
index 3eb0f55..937f87c 100644
--- a/src/ivicore/queryparser/qtiviqueryparser_flex_p.h
+++ b/src/ivicore/queryparser/qiviqueryparser_flex_p.h
@@ -1,4 +1,4 @@
-#line 11 "/home/gagi/work/qtas/tqtc-qtivi/src/ivicore/queryparser/qtiviqueryparser.l"
+#line 11 "/home/gagi/work/qtas/tqtc-qivi/src/ivicore/queryparser/qiviqueryparser.l"
 /****************************************************************************
 **
 ** Copyright (C) 2016 Pelagicore AG
diff --git a/src/ivicore/queryparser/qtiviqueryparser_p.h b/src/ivicore/queryparser/qiviqueryparser_p.h
index 905e940..317cb37 100644
--- a/src/ivicore/queryparser/qtiviqueryparser_p.h
+++ b/src/ivicore/queryparser/qiviqueryparser_p.h
@@ -213,7 +213,7 @@ const short QIviQueryParserTable::action_check [] = {
 
 #include <QtCore>
 #include <QtIviCore/QIviAbstractQueryTerm>
-#include <QtIviCore/private/qtiviqueryterm_p.h>
+#include <QtIviCore/private/qiviqueryterm_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -343,7 +343,7 @@ QIviQueryParser::QIviQueryParser():
       reallocateStack();
 }
 
-#include "qtiviqueryparser_flex_p.h"
+#include "qiviqueryparser_flex_p.h"
 
 QIviQueryParser::~QIviQueryParser()
 {
diff --git a/src/ivicore/queryparser/qtiviqueryterm.cpp b/src/ivicore/queryparser/qiviqueryterm.cpp
index 15f1fd8..8706708 100644
--- a/src/ivicore/queryparser/qtiviqueryterm.cpp
+++ b/src/ivicore/queryparser/qiviqueryterm.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qtiviqueryterm.h"
-#include "qtiviqueryterm_p.h"
+#include "qiviqueryterm.h"
+#include "qiviqueryterm_p.h"
 
 QIviConjunctionTermPrivate::QIviConjunctionTermPrivate()
     : m_conjunction(QIviConjunctionTerm::And)
diff --git a/src/ivicore/queryparser/qtiviqueryterm.h b/src/ivicore/queryparser/qiviqueryterm.h
index 8aa9499..8aa9499 100644
--- a/src/ivicore/queryparser/qtiviqueryterm.h
+++ b/src/ivicore/queryparser/qiviqueryterm.h
diff --git a/src/ivicore/queryparser/qtiviqueryterm_p.h b/src/ivicore/queryparser/qiviqueryterm_p.h
index b7744a5..ccd90ec 100644
--- a/src/ivicore/queryparser/qtiviqueryterm_p.h
+++ b/src/ivicore/queryparser/qiviqueryterm_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qtiviqueryterm.h"
+#include "qiviqueryterm.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ivicore/queryparser/queryparser.pri b/src/ivicore/queryparser/queryparser.pri
index 35feba1..fed5d70 100644
--- a/src/ivicore/queryparser/queryparser.pri
+++ b/src/ivicore/queryparser/queryparser.pri
@@ -1,8 +1,8 @@
 QT += core
 
 
-FLEX += $$PWD/qtiviqueryparser.l
-QLALR += $$PWD/qtiviqueryparser.g
+FLEX += $$PWD/qiviqueryparser.l
+QLALR += $$PWD/qiviqueryparser.g
 
 enable-qlalr {
     build-pass: message("Using flex and qlalr to generate code")
@@ -21,15 +21,15 @@ enable-qlalr {
     qlalr.CONFIG += no_link
     QMAKE_EXTRA_COMPILERS += qlalr
 } else {
-    HEADERS += $$PWD/qtiviqueryparser_p.h \
-               $$PWD/qtiviqueryparser_flex_p.h
+    HEADERS += $$PWD/qiviqueryparser_p.h \
+               $$PWD/qiviqueryparser_flex_p.h
     OTHER_FILES += $$FLEX
     OTHER_FILES += $$QLALR
 }
 
 HEADERS += \
-    $$PWD/qtiviqueryterm.h \
-    $$PWD/qtiviqueryterm_p.h
+    $$PWD/qiviqueryterm.h \
+    $$PWD/qiviqueryterm_p.h
 
 SOURCES += \
-    $$PWD/qtiviqueryterm.cpp
+    $$PWD/qiviqueryterm.cpp
diff --git a/src/ivivehiclefunctions/ivivehiclefunctions.pro b/src/ivivehiclefunctions/ivivehiclefunctions.pro
index dd0908a..c303d0b 100644
--- a/src/ivivehiclefunctions/ivivehiclefunctions.pro
+++ b/src/ivivehiclefunctions/ivivehiclefunctions.pro
@@ -12,18 +12,18 @@ OTHER_FILES = \
 CMAKE_MODULE_TESTS = '-'
 
 HEADERS += \
-    qtiviclimatecontrol.h \
-    qtiviclimatecontrolbackendinterface.h \
+    qiviclimatecontrol.h \
+    qiviclimatecontrolbackendinterface.h \
     qtivivehiclefunctionsglobal.h \
-    qtiviclimatecontrol_p.h \
-    qtiviwindowcontrol.h \
-    qtiviwindowcontrol_p.h \
-    qtiviwindowcontrolbackendinterface.h
+    qiviclimatecontrol_p.h \
+    qiviwindowcontrol.h \
+    qiviwindowcontrol_p.h \
+    qiviwindowcontrolbackendinterface.h
 
 SOURCES += \
-    qtiviclimatecontrol.cpp \
-    qtiviclimatecontrolbackendinterface.cpp \
-    qtiviwindowcontrol.cpp \
-    qtiviwindowcontrolbackendinterface.cpp
+    qiviclimatecontrol.cpp \
+    qiviclimatecontrolbackendinterface.cpp \
+    qiviwindowcontrol.cpp \
+    qiviwindowcontrolbackendinterface.cpp
 
 load(qt_module)
diff --git a/src/ivivehiclefunctions/qtiviclimatecontrol.cpp b/src/ivivehiclefunctions/qiviclimatecontrol.cpp
index f3f5564..f1fe633 100644
--- a/src/ivivehiclefunctions/qtiviclimatecontrol.cpp
+++ b/src/ivivehiclefunctions/qiviclimatecontrol.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qtiviclimatecontrol.h"
-#include "qtiviclimatecontrol_p.h"
-#include "qtiviclimatecontrolbackendinterface.h"
+#include "qiviclimatecontrol.h"
+#include "qiviclimatecontrol_p.h"
+#include "qiviclimatecontrolbackendinterface.h"
 #include <QtIviCore/QIviServiceObject>
 #include <QtIviCore/QIviPropertyFactory>
 
@@ -1854,4 +1854,4 @@ void QIviClimateControl::setAutomaticClimateFanIntensityLevel(int value)
  * \sa automaticClimateFanIntensityLevelAttribute() automaticClimateFanIntensityLevel()
  */
 
- #include "moc_qtiviclimatecontrol.cpp"
+ #include "moc_qiviclimatecontrol.cpp"
diff --git a/src/ivivehiclefunctions/qtiviclimatecontrol.h b/src/ivivehiclefunctions/qiviclimatecontrol.h
index 8010fd3..8010fd3 100644
--- a/src/ivivehiclefunctions/qtiviclimatecontrol.h
+++ b/src/ivivehiclefunctions/qiviclimatecontrol.h
diff --git a/src/ivivehiclefunctions/qtiviclimatecontrol_p.h b/src/ivivehiclefunctions/qiviclimatecontrol_p.h
index f38c13f..b8a3f46 100644
--- a/src/ivivehiclefunctions/qtiviclimatecontrol_p.h
+++ b/src/ivivehiclefunctions/qiviclimatecontrol_p.h
@@ -54,9 +54,9 @@
 //
 
 #include <QtIviCore/QIviProperty>
-#include "private/qtiviabstractzonedfeature_p.h"
+#include "private/qiviabstractzonedfeature_p.h"
 
-#include "qtiviclimatecontrol.h"
+#include "qiviclimatecontrol.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.cpp b/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.cpp
index 8247e16..cf240ac 100644
--- a/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.cpp
+++ b/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qtiviclimatecontrolbackendinterface.h"
+#include "qiviclimatecontrolbackendinterface.h"
 
 /*!
  * \class QIviClimateControlBackendInterface
diff --git a/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.h b/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.h
index 65fc7f0..e49a019 100644
--- a/src/ivivehiclefunctions/qtiviclimatecontrolbackendinterface.h
+++ b/src/ivivehiclefunctions/qiviclimatecontrolbackendinterface.h
@@ -44,9 +44,9 @@
 
 #include <QtCore/QObject>
 
-#include <QtIviCore/qtivizonedfeatureinterface.h>
-#include <QtIviCore/qtivipropertyattribute.h>
-#include <QtIviVehicleFunctions/qtiviclimatecontrol.h>
+#include <QtIviCore/qivizonedfeatureinterface.h>
+#include <QtIviCore/qivipropertyattribute.h>
+#include <QtIviVehicleFunctions/qiviclimatecontrol.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ivivehiclefunctions/qtiviwindowcontrol.cpp b/src/ivivehiclefunctions/qiviwindowcontrol.cpp
index f1d50a1..68f3955 100644
--- a/src/ivivehiclefunctions/qtiviwindowcontrol.cpp
+++ b/src/ivivehiclefunctions/qiviwindowcontrol.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qtiviwindowcontrol.h"
-#include "qtiviwindowcontrol_p.h"
-#include "qtiviwindowcontrolbackendinterface.h"
+#include "qiviwindowcontrol.h"
+#include "qiviwindowcontrol_p.h"
+#include "qiviwindowcontrolbackendinterface.h"
 #include <QtIviCore/QIviPropertyFactory>
 #include <QtIviCore/QIviServiceObject>
 
@@ -761,4 +761,4 @@ void QIviWindowControl::close()
 
 
 
-#include "moc_qtiviwindowcontrol.cpp"
+#include "moc_qiviwindowcontrol.cpp"
diff --git a/src/ivivehiclefunctions/qtiviwindowcontrol.h b/src/ivivehiclefunctions/qiviwindowcontrol.h
index 9844b62..9844b62 100644
--- a/src/ivivehiclefunctions/qtiviwindowcontrol.h
+++ b/src/ivivehiclefunctions/qiviwindowcontrol.h
diff --git a/src/ivivehiclefunctions/qtiviwindowcontrol_p.h b/src/ivivehiclefunctions/qiviwindowcontrol_p.h
index 4cf3ad7..39ac012 100644
--- a/src/ivivehiclefunctions/qtiviwindowcontrol_p.h
+++ b/src/ivivehiclefunctions/qiviwindowcontrol_p.h
@@ -54,9 +54,9 @@
 //
 
 #include <QtIviCore/QIviProperty>
-#include "private/qtiviabstractzonedfeature_p.h"
+#include "private/qiviabstractzonedfeature_p.h"
 
-#include "qtiviwindowcontrol.h"
+#include "qiviwindowcontrol.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/ivivehiclefunctions/qtiviwindowcontrolbackendinterface.cpp b/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.cpp
index ac32b0f..a9af55c 100644
--- a/src/ivivehiclefunctions/qtiviwindowcontrolbackendinterface.cpp
+++ b/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qtiviwindowcontrolbackendinterface.h"
+#include "qiviwindowcontrolbackendinterface.h"
 
 /*!
  * \class QIviWindowControlBackendInterface
diff --git a/src/ivivehiclefunctions/qtiviwindowcontrolbackendinterface.h b/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.h
index 7447e68..4a768b9 100644
--- a/src/ivivehiclefunctions/qtiviwindowcontrolbackendinterface.h
+++ b/src/ivivehiclefunctions/qiviwindowcontrolbackendinterface.h
@@ -44,9 +44,9 @@
 
 #include <QtCore/QObject>
 
-#include <QtIviCore/qtivizonedfeatureinterface.h>
-#include <QtIviCore/qtivipropertyattribute.h>
-#include <QtIviVehicleFunctions/qtiviwindowcontrol.h>
+#include <QtIviCore/qivizonedfeatureinterface.h>
+#include <QtIviCore/qivipropertyattribute.h>
+#include <QtIviVehicleFunctions/qiviwindowcontrol.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/sync.profile b/sync.profile
index 08b3ae0..c5df974 100644
--- a/sync.profile
+++ b/sync.profile
@@ -7,7 +7,7 @@
 );
 %classnames = (
      "qdlt.h" => "QtDlt",
-     "qtiviqueryterm.h" => "QIviAbstractQueryTerm", "QIviConjunctionTerm", "QIviScopeTerm", "QIviFilterTerm", "QIviOrderTerm",
+     "qiviqueryterm.h" => "QIviAbstractQueryTerm", "QIviConjunctionTerm", "QIviScopeTerm", "QIviFilterTerm", "QIviOrderTerm",
 );
 %deprecatedheaders = (
 );
diff --git a/tests/auto/core/core.pro b/tests/auto/core/core.pro
index f703abd..373bce2 100644
--- a/tests/auto/core/core.pro
+++ b/tests/auto/core/core.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 
 SUBDIRS = servicemanagertest \
-          qtivipropertyattribute \
-          qtiviproperty \
-          qtiviabstractfeature \
+          qivipropertyattribute \
+          qiviproperty \
+          qiviabstractfeature \
           queryparser \
diff --git a/tests/auto/core/qtiviabstractfeature/qtiviabstractfeature.pro b/tests/auto/core/qiviabstractfeature/qiviabstractfeature.pro
index faa0b1b..5d7a2a6 100644
--- a/tests/auto/core/qtiviabstractfeature/qtiviabstractfeature.pro
+++ b/tests/auto/core/qiviabstractfeature/qiviabstractfeature.pro
@@ -1,12 +1,12 @@
 QT       += testlib ivicore ivicore-private qml
 
-TARGET = tst_qtiviabstractfeature
+TARGET = tst_qiviabstractfeature
 CONFIG   += testcase
 
 TEMPLATE = app
 
 SOURCES += \
-    tst_qtiviabstractfeature.cpp
+    tst_qiviabstractfeature.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 TESTDATA = testdata/*
diff --git a/tests/auto/core/qtiviabstractfeature/testdata/autodiscovery.qml b/tests/auto/core/qiviabstractfeature/testdata/autodiscovery.qml
index 016abad..016abad 100644
--- a/tests/auto/core/qtiviabstractfeature/testdata/autodiscovery.qml
+++ b/tests/auto/core/qiviabstractfeature/testdata/autodiscovery.qml
diff --git a/tests/auto/core/qtiviabstractfeature/tst_qtiviabstractfeature.cpp b/tests/auto/core/qiviabstractfeature/tst_qiviabstractfeature.cpp
index f5e1256..3c32bd4 100644
--- a/tests/auto/core/qtiviabstractfeature/tst_qtiviabstractfeature.cpp
+++ b/tests/auto/core/qiviabstractfeature/tst_qiviabstractfeature.cpp
@@ -389,5 +389,5 @@ void tst_QIviAbstractFeature::testResetServiceObject()
 
 QTEST_MAIN(tst_QIviAbstractFeature)
 
-#include "tst_qtiviabstractfeature.moc"
+#include "tst_qiviabstractfeature.moc"
 
diff --git a/tests/auto/core/qtiviproperty/qtiviproperty.pro b/tests/auto/core/qiviproperty/qiviproperty.pro
index 32ef903..cb4f329 100644
--- a/tests/auto/core/qtiviproperty/qtiviproperty.pro
+++ b/tests/auto/core/qiviproperty/qiviproperty.pro
@@ -1,12 +1,12 @@
 QT       += testlib ivicore qml
 
-TARGET = tst_qtiviproperty
+TARGET = tst_qiviproperty
 CONFIG   += testcase
 
 TEMPLATE = app
 
 SOURCES += \
-    tst_qtiviproperty.cpp
+    tst_qiviproperty.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 TESTDATA = testdata/*
diff --git a/tests/auto/core/qtiviproperty/testdata/readWrite.qml b/tests/auto/core/qiviproperty/testdata/readWrite.qml
index 542a283..542a283 100644
--- a/tests/auto/core/qtiviproperty/testdata/readWrite.qml
+++ b/tests/auto/core/qiviproperty/testdata/readWrite.qml
diff --git a/tests/auto/core/qtiviproperty/testdata/writeError.qml b/tests/auto/core/qiviproperty/testdata/writeError.qml
index bca2cfb..bca2cfb 100644
--- a/tests/auto/core/qtiviproperty/testdata/writeError.qml
+++ b/tests/auto/core/qiviproperty/testdata/writeError.qml
diff --git a/tests/auto/core/qtiviproperty/tst_qtiviproperty.cpp b/tests/auto/core/qiviproperty/tst_qiviproperty.cpp
index 2c1a33f..abaa10b 100644
--- a/tests/auto/core/qtiviproperty/tst_qtiviproperty.cpp
+++ b/tests/auto/core/qiviproperty/tst_qiviproperty.cpp
@@ -31,8 +31,8 @@
 #include <QQmlEngine>
 #include <QQmlComponent>
 #include <QQmlContext>
-#include <qtivipropertyattribute.h>
-#include <qtivipropertyfactory.h>
+#include <qivipropertyattribute.h>
+#include <qivipropertyfactory.h>
 
 #define QIVIPROPERTY(_type_, _name_) \
 Q_PROPERTY(QIviProperty* _name_##Property READ _name_##Property CONSTANT)  \
@@ -486,5 +486,5 @@ void tst_QIviProperty::readOnly_qml()
 
 QTEST_MAIN(tst_QIviProperty)
 
-#include "tst_qtiviproperty.moc"
+#include "tst_qiviproperty.moc"
 
diff --git a/tests/auto/core/qtivipropertyattribute/qtivipropertyattribute.pro b/tests/auto/core/qivipropertyattribute/qivipropertyattribute.pro
index 416b566..bd99816 100644
--- a/tests/auto/core/qtivipropertyattribute/qtivipropertyattribute.pro
+++ b/tests/auto/core/qivipropertyattribute/qivipropertyattribute.pro
@@ -1,12 +1,12 @@
 QT       += testlib ivicore
 
-TARGET = tst_qtivipropertyattribute
+TARGET = tst_qivipropertyattribute
 CONFIG   += testcase
 
 TEMPLATE = app
 
 SOURCES += \
-    tst_qtivipropertyattribute.cpp
+    tst_qivipropertyattribute.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
diff --git a/tests/auto/core/qtivipropertyattribute/tst_qtivipropertyattribute.cpp b/tests/auto/core/qivipropertyattribute/tst_qivipropertyattribute.cpp
index e9a6d01..d780319 100644
--- a/tests/auto/core/qtivipropertyattribute/tst_qtivipropertyattribute.cpp
+++ b/tests/auto/core/qivipropertyattribute/tst_qivipropertyattribute.cpp
@@ -28,7 +28,7 @@
 
 
 #include <QtTest>
-#include <qtivipropertyattribute.h>
+#include <qivipropertyattribute.h>
 
 struct ComplexType
 {
@@ -154,5 +154,5 @@ void tst_QIviPropertyAttribute::complex()
 
 QTEST_APPLESS_MAIN(tst_QIviPropertyAttribute)
 
-#include "tst_qtivipropertyattribute.moc"
+#include "tst_qivipropertyattribute.moc"
 
diff --git a/tests/auto/core/queryparser/tst_queryparser.cpp b/tests/auto/core/queryparser/tst_queryparser.cpp
index de11de5..0093d57 100644
--- a/tests/auto/core/queryparser/tst_queryparser.cpp
+++ b/tests/auto/core/queryparser/tst_queryparser.cpp
@@ -29,7 +29,7 @@
 #include <QtTest/QtTest>
 #include <QtCore/QString>
 
-#include "QtIviCore/private/qtiviqueryparser_p.h"
+#include "QtIviCore/private/qiviqueryparser_p.h"
 
 // sadly this has to be a define for QVERIFY2() to work
 #define CHECK_ERRORSTRING(_actual_errstr, _expected_errstr) do { \
diff --git a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp
index 9d73f9d..ee51fc7 100644
--- a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp
+++ b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp
@@ -29,10 +29,10 @@
 
 #include <QString>
 #include <QtTest>
-#include <qtiviservicemanager.h>
-#include <QtIviCore/private/qtiviservicemanager_p.h>
-#include <qtiviserviceinterface.h>
-#include <qtiviserviceobject.h>
+#include <qiviservicemanager.h>
+#include <QtIviCore/private/qiviservicemanager_p.h>
+#include <qiviserviceinterface.h>
+#include <qiviserviceobject.h>
 
 class MockServiceBackend : public QObject, public QIviServiceInterface
 {
diff --git a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
index c8e2068..9973e6c 100644
--- a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
+++ b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
@@ -32,7 +32,7 @@
 #include <QtIviCore/QIviServiceObject>
 #include <QtIviVehicleFunctions/QIviClimateControl>
 #include <QtIviVehicleFunctions/QIviClimateControlBackendInterface>
-#include <private/qtivipropertytester_p.h>
+#include <private/qivipropertytester_p.h>
 
 class ClimateControlTestBackend : public QIviClimateControlBackendInterface
 {
diff --git a/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp b/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
index 0ad77c4..93db29e 100644
--- a/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
+++ b/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp
@@ -32,7 +32,7 @@
 #include <QtIviCore/QIviServiceObject>
 #include <QtIviVehicleFunctions/QIviWindowControl>
 #include <QtIviVehicleFunctions/QIviWindowControlBackendInterface>
-#include <private/qtivipropertytester_p.h>
+#include <private/qivipropertytester_p.h>
 
 class WindowControlTestBackend : public QIviWindowControlBackendInterface
 {