Module renamed

Task-number: QTRD-2224

Change-Id: Iec18b6121809300b11d85445281d3c626c434f35
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

308 files changed, 1054 insertions, 1048 deletions

diff --git a/examples/audiolevels/audiolevels.cpp b/examples/audiolevels/audiolevels.cpp
index 73a71562..5c5cf3d1 100644
--- a/examples/audiolevels/audiolevels.cpp
+++ b/examples/audiolevels/audiolevels.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,13 +19,13 @@
 #include "audiolevelsiodevice.h"
 #include "audiolevels.h"
 
-#include <QtDataVis3D/qbardataproxy.h>
-#include <QtDataVis3D/q3dvalueaxis.h>
+#include <QtDataVisualization/qbardataproxy.h>
+#include <QtDataVisualization/q3dvalueaxis.h>
 
 #include <QAudioDeviceInfo>
 #include <QAudioInput>
 
-QT_DATAVIS3D_USE_NAMESPACE
+QT_DATAVISUALIZATION_USE_NAMESPACE
 
 AudioLevels::AudioLevels(Q3DBars *chart, QObject *parent)
     : QObject(parent),
diff --git a/examples/audiolevels/audiolevels.h b/examples/audiolevels/audiolevels.h
index 5b91a0db..eafb799e 100644
--- a/examples/audiolevels/audiolevels.h
+++ b/examples/audiolevels/audiolevels.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,9 +19,9 @@
 #ifndef AUDIOLEVELS_H
 #define AUDIOLEVELS_H
 
-#include <QtDataVis3D/q3dbars.h>
+#include <QtDataVisualization/q3dbars.h>
 
-QT_DATAVIS3D_USE_NAMESPACE
+QT_DATAVISUALIZATION_USE_NAMESPACE
 
 class AudioLevelsIODevice;
 class QAudioInput;
diff --git a/examples/audiolevels/audiolevelsiodevice.cpp b/examples/audiolevels/audiolevelsiodevice.cpp
index 2e36787f..c3a5cfd0 100644
--- a/examples/audiolevels/audiolevelsiodevice.cpp
+++ b/examples/audiolevels/audiolevelsiodevice.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,7 +19,7 @@
 #include "audiolevelsiodevice.h"
 #include <QDebug>
 
-QT_DATAVIS3D_USE_NAMESPACE
+QT_DATAVISUALIZATION_USE_NAMESPACE
 
 AudioLevelsIODevice::AudioLevelsIODevice(QBarDataProxy *proxy, QObject *parent)
     : QIODevice(parent),
diff --git a/examples/audiolevels/audiolevelsiodevice.h b/examples/audiolevels/audiolevelsiodevice.h
index b2342866..cc2929f8 100644
--- a/examples/audiolevels/audiolevelsiodevice.h
+++ b/examples/audiolevels/audiolevelsiodevice.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,10 +19,10 @@
 #ifndef AUDIOLEVELSIODEVICE_H
 #define AUDIOLEVELSIODEVICE_H
 
-#include <QtDataVis3D/qbardataproxy.h>
+#include <QtDataVisualization/qbardataproxy.h>
 #include <QIODevice>
 
-QT_DATAVIS3D_USE_NAMESPACE
+QT_DATAVISUALIZATION_USE_NAMESPACE
 
 class AudioLevelsIODevice : public QIODevice
 {
diff --git a/examples/audiolevels/doc/src/audiolevels.qdoc b/examples/audiolevels/doc/src/audiolevels.qdoc
index 6e19e97b..0ac9de78 100644
--- a/examples/audiolevels/doc/src/audiolevels.qdoc
+++ b/examples/audiolevels/doc/src/audiolevels.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/audiolevels/main.cpp b/examples/audiolevels/main.cpp
index 2b8556e1..ea8acd6b 100644
--- a/examples/audiolevels/main.cpp
+++ b/examples/audiolevels/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -21,7 +21,7 @@
 #include <QGuiApplication>
 #include <QAudio>
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 int main(int argc, char *argv[])
 {
@@ -29,7 +29,7 @@ int main(int argc, char *argv[])
 
     Q3DBars window;
     window.resize(1024, 768);
-    window.setTitle("QtDataVis3D microphone audio levels visualizer");
+    window.setTitle("QtDataVisualization microphone audio levels visualizer");
     window.show();
 
     AudioLevels audioLevels(&window);
diff --git a/examples/barchart/doc/src/barchart.qdoc b/examples/barchart/doc/src/barchart.qdoc
index 6c2c8760..0966bd29 100644
--- a/examples/barchart/doc/src/barchart.qdoc
+++ b/examples/barchart/doc/src/barchart.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp
index e102561c..5fa798fd 100644
--- a/examples/barchart/main.cpp
+++ b/examples/barchart/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -16,10 +16,10 @@
 **
 ****************************************************************************/
 
-#include <QtDataVis3D/q3dbars.h>
-#include <QtDataVis3D/q3dcategoryaxis.h>
-#include <QtDataVis3D/qitemmodelbardataproxy.h>
-#include <QtDataVis3D/q3dvalueaxis.h>
+#include <QtDataVisualization/q3dbars.h>
+#include <QtDataVisualization/q3dcategoryaxis.h>
+#include <QtDataVisualization/qitemmodelbardataproxy.h>
+#include <QtDataVisualization/q3dvalueaxis.h>
 
 #include <QApplication>
 #include <QVBoxLayout>
@@ -31,7 +31,7 @@
 
 #define USE_STATIC_DATA
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 class ChartDataGenerator : public QObject
 {
diff --git a/examples/examples.pri b/examples/examples.pri
index f1cf3b3b..82692204 100644
--- a/examples/examples.pri
+++ b/examples/examples.pri
@@ -1,7 +1,7 @@
 android {
     target.path = /libs/$$ANDROID_TARGET_ARCH
 } else {
-    target.path = $$[QT_INSTALL_EXAMPLES]/datavis3d/$$TARGET
+    target.path = $$[QT_INSTALL_EXAMPLES]/datavisualization/$$TARGET
 }
 
 win32 {
@@ -15,11 +15,11 @@ LIBS += -L$$OUT_PWD/../../lib
 
 TEMPLATE = app
 
-QT += datavis3d
+QT += datavisualization
 
 contains(TARGET, qml.*) {
-    uri = com.digia.QtDataVis3D
-    lib_name = datavis3dqml2
+    uri = com.digia.QtDataVisualization
+    lib_name = datavisualizationqml2
 
     uri_replaced = $$replace(uri, \\., $$QMAKE_DIR_SEP)
     make_qmldir_path = $$DESTDIR/$$uri_replaced
diff --git a/examples/qmlbarchart/doc/src/qmlbarchart.qdoc b/examples/qmlbarchart/doc/src/qmlbarchart.qdoc
index 091d4b77..b7b84c0e 100644
--- a/examples/qmlbarchart/doc/src/qmlbarchart.qdoc
+++ b/examples/qmlbarchart/doc/src/qmlbarchart.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/qmlbarchart/main.cpp b/examples/qmlbarchart/main.cpp
index b58e66f8..1a3fcddc 100644
--- a/examples/qmlbarchart/main.cpp
+++ b/examples/qmlbarchart/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/qmlbarchart/qml/qmlbarchart/axes.qml b/examples/qmlbarchart/qml/qmlbarchart/axes.qml
index 588e27ca..36324e0d 100644
--- a/examples/qmlbarchart/qml/qmlbarchart/axes.qml
+++ b/examples/qmlbarchart/qml/qmlbarchart/axes.qml
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 import QtQuick 2.1
-import com.digia.QtDataVis3D 1.0
+import com.digia.QtDataVisualization 1.0
 
 Item {
     property alias row: rowAxis
diff --git a/examples/qmlbarchart/qml/qmlbarchart/button.qml b/examples/qmlbarchart/qml/qmlbarchart/button.qml
index 7fdc3ff1..ac7d1be4 100644
--- a/examples/qmlbarchart/qml/qmlbarchart/button.qml
+++ b/examples/qmlbarchart/qml/qmlbarchart/button.qml
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/qmlbarchart/qml/qmlbarchart/data.qml b/examples/qmlbarchart/qml/qmlbarchart/data.qml
index 29d26183..47c08cce 100644
--- a/examples/qmlbarchart/qml/qmlbarchart/data.qml
+++ b/examples/qmlbarchart/qml/qmlbarchart/data.qml
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 import QtQuick 2.1
-import com.digia.QtDataVis3D 1.0
+import com.digia.QtDataVisualization 1.0
 
 Item {
     property alias mapping: valueMapping
diff --git a/examples/qmlbarchart/qml/qmlbarchart/main.qml b/examples/qmlbarchart/qml/qmlbarchart/main.qml
index e3536ce4..598de15d 100644
--- a/examples/qmlbarchart/qml/qmlbarchart/main.qml
+++ b/examples/qmlbarchart/qml/qmlbarchart/main.qml
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -18,7 +18,7 @@
 
 import QtQuick 2.1
 import QtQuick.Controls 1.0
-import com.digia.QtDataVis3D 1.0
+import com.digia.QtDataVisualization 1.0
 import "."
 
 Item {
diff --git a/examples/qmlscatter/doc/src/qmlscatter.qdoc b/examples/qmlscatter/doc/src/qmlscatter.qdoc
index 4c1d8c2f..a014874e 100644
--- a/examples/qmlscatter/doc/src/qmlscatter.qdoc
+++ b/examples/qmlscatter/doc/src/qmlscatter.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/qmlscatter/main.cpp b/examples/qmlscatter/main.cpp
index f4aac723..150a36a6 100644
--- a/examples/qmlscatter/main.cpp
+++ b/examples/qmlscatter/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/qmlscatter/qml/qmlscatter/button.qml b/examples/qmlscatter/qml/qmlscatter/button.qml
index 8e0e8b86..6da582b4 100644
--- a/examples/qmlscatter/qml/qmlscatter/button.qml
+++ b/examples/qmlscatter/qml/qmlscatter/button.qml
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/qmlscatter/qml/qmlscatter/data.qml b/examples/qmlscatter/qml/qmlscatter/data.qml
index 30fce67a..8a6ada45 100644
--- a/examples/qmlscatter/qml/qmlscatter/data.qml
+++ b/examples/qmlscatter/qml/qmlscatter/data.qml
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 import QtQuick 2.1
-import com.digia.QtDataVis3D 1.0
+import com.digia.QtDataVisualization 1.0
 
 Item {
     property alias mapping: scatterMapping
diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml
index 9fcce132..947bd867 100644
--- a/examples/qmlscatter/qml/qmlscatter/main.qml
+++ b/examples/qmlscatter/qml/qmlscatter/main.qml
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 import QtQuick 2.1
-import com.digia.QtDataVis3D 1.0
+import com.digia.QtDataVisualization 1.0
 import "."
 
 Item {
diff --git a/examples/qmlsurface/doc/src/qmlsurface.qdoc b/examples/qmlsurface/doc/src/qmlsurface.qdoc
index 23a5a67d..c589d55a 100644
--- a/examples/qmlsurface/doc/src/qmlsurface.qdoc
+++ b/examples/qmlsurface/doc/src/qmlsurface.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/qmlsurface/main.cpp b/examples/qmlsurface/main.cpp
index b58e66f8..1a3fcddc 100644
--- a/examples/qmlsurface/main.cpp
+++ b/examples/qmlsurface/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/qmlsurface/qml/qmlsurface/button.qml b/examples/qmlsurface/qml/qmlsurface/button.qml
index 75032c39..761bd1e1 100644
--- a/examples/qmlsurface/qml/qmlsurface/button.qml
+++ b/examples/qmlsurface/qml/qmlsurface/button.qml
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/qmlsurface/qml/qmlsurface/data.qml b/examples/qmlsurface/qml/qmlsurface/data.qml
index 00334897..650662f0 100644
--- a/examples/qmlsurface/qml/qmlsurface/data.qml
+++ b/examples/qmlsurface/qml/qmlsurface/data.qml
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 import QtQuick 2.1
-import com.digia.QtDataVis3D 1.0
+import com.digia.QtDataVisualization 1.0
 
 Item {
     property alias mapping: surfaceMapping
diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/qmlsurface/qml/qmlsurface/main.qml
index 6fde95cb..4be6aa68 100644
--- a/examples/qmlsurface/qml/qmlsurface/main.qml
+++ b/examples/qmlsurface/qml/qmlsurface/main.qml
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -18,7 +18,7 @@
 
 import QtQuick 2.1
 import QtQuick.Controls 1.0
-import com.digia.QtDataVis3D 1.0
+import com.digia.QtDataVisualization 1.0
 import "."
 
 Item {
diff --git a/examples/rainfall/doc/src/rainfall.qdoc b/examples/rainfall/doc/src/rainfall.qdoc
index bfe7fc36..95050dff 100644
--- a/examples/rainfall/doc/src/rainfall.qdoc
+++ b/examples/rainfall/doc/src/rainfall.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/rainfall/main.cpp b/examples/rainfall/main.cpp
index a4e316be..638fb842 100644
--- a/examples/rainfall/main.cpp
+++ b/examples/rainfall/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,7 +19,7 @@
 #include "rainfallchart.h"
 #include <QGuiApplication>
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 int main(int argc, char **argv)
 {
diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallchart.cpp
index 15ed6b65..f6e9ae0c 100644
--- a/examples/rainfall/rainfallchart.cpp
+++ b/examples/rainfall/rainfallchart.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,15 +17,15 @@
 ****************************************************************************/
 
 #include "rainfallchart.h"
-#include <QtDataVis3D/q3dcategoryaxis.h>
-#include <QtDataVis3D/q3dvalueaxis.h>
+#include <QtDataVisualization/q3dcategoryaxis.h>
+#include <QtDataVisualization/q3dvalueaxis.h>
 #include <QGuiApplication>
 #include <QFont>
 #include <QDebug>
 #include <QTextStream>
 #include <QFile>
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 RainfallChart::RainfallChart(Q3DBars *rainfall)
     : m_chart(rainfall)
diff --git a/examples/rainfall/rainfallchart.h b/examples/rainfall/rainfallchart.h
index 9c8a3b5f..2c596f5c 100644
--- a/examples/rainfall/rainfallchart.h
+++ b/examples/rainfall/rainfallchart.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,9 +20,9 @@
 #define RAINFALLCHART_H
 
 #include "variantbardataproxy.h"
-#include <QtDataVis3D/q3dbars.h>
+#include <QtDataVisualization/q3dbars.h>
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 class RainfallChart : public QObject
 {
diff --git a/examples/rainfall/variantbardatamapping.cpp b/examples/rainfall/variantbardatamapping.cpp
index 8d61a643..0c2f146c 100644
--- a/examples/rainfall/variantbardatamapping.cpp
+++ b/examples/rainfall/variantbardatamapping.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/rainfall/variantbardatamapping.h b/examples/rainfall/variantbardatamapping.h
index 616ee563..0204ddc8 100644
--- a/examples/rainfall/variantbardatamapping.h
+++ b/examples/rainfall/variantbardatamapping.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,10 +19,10 @@
 #ifndef VARIANTBARDATAMAPPING_H
 #define VARIANTBARDATAMAPPING_H
 
-#include "qdatavis3denums.h"
+#include "qdatavisualizationenums.h"
 #include <QStringList>
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 class VariantBarDataMapping : public QObject
 {
diff --git a/examples/rainfall/variantbardataproxy.cpp b/examples/rainfall/variantbardataproxy.cpp
index b01c7616..c907a1e3 100644
--- a/examples/rainfall/variantbardataproxy.cpp
+++ b/examples/rainfall/variantbardataproxy.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -18,7 +18,7 @@
 
 #include "variantbardataproxy.h"
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 VariantBarDataProxy::VariantBarDataProxy() :
     QBarDataProxy()
diff --git a/examples/rainfall/variantbardataproxy.h b/examples/rainfall/variantbardataproxy.h
index acef9999..b931aa5c 100644
--- a/examples/rainfall/variantbardataproxy.h
+++ b/examples/rainfall/variantbardataproxy.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -26,7 +26,7 @@
 #include <QMap>
 #include <QPointer>
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 class VariantBarDataProxy : public QBarDataProxy
 {
diff --git a/examples/rainfall/variantdataset.cpp b/examples/rainfall/variantdataset.cpp
index 3fe4fa6b..f73d83f8 100644
--- a/examples/rainfall/variantdataset.cpp
+++ b/examples/rainfall/variantdataset.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/rainfall/variantdataset.h b/examples/rainfall/variantdataset.h
index f3965978..7906d4f5 100644
--- a/examples/rainfall/variantdataset.h
+++ b/examples/rainfall/variantdataset.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,11 +19,11 @@
 #ifndef VARIANTDATASET_H
 #define VARIANTDATASET_H
 
-#include "qdatavis3denums.h"
+#include "qdatavisualizationenums.h"
 #include <QScopedPointer>
 #include <QVariantList>
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 typedef QVariantList VariantDataItem;
 typedef QList<VariantDataItem *> VariantDataItemList;
diff --git a/examples/scatterchart/doc/src/scatterchart.qdoc b/examples/scatterchart/doc/src/scatterchart.qdoc
index 6e8dcd03..d6878ff9 100644
--- a/examples/scatterchart/doc/src/scatterchart.qdoc
+++ b/examples/scatterchart/doc/src/scatterchart.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/scatterchart/main.cpp b/examples/scatterchart/main.cpp
index ceecbc69..cdbc6ec9 100644
--- a/examples/scatterchart/main.cpp
+++ b/examples/scatterchart/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp
index 19b768a1..a7571252 100644
--- a/examples/scatterchart/scatterchart.cpp
+++ b/examples/scatterchart/scatterchart.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,10 +17,10 @@
 ****************************************************************************/
 
 #include "scatterchart.h"
-#include <QtDataVis3D/qscatterdataproxy.h>
-#include <QtDataVis3D/q3dvalueaxis.h>
+#include <QtDataVisualization/qscatterdataproxy.h>
+#include <QtDataVisualization/q3dvalueaxis.h>
 #include <qmath.h>
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 //#define RANDOM_SCATTER // Uncomment this to switch to random scatter
 
diff --git a/examples/scatterchart/scatterchart.h b/examples/scatterchart/scatterchart.h
index 9e01f0dc..f19eb60f 100644
--- a/examples/scatterchart/scatterchart.h
+++ b/examples/scatterchart/scatterchart.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,10 +19,10 @@
 #ifndef SCATTERDATAMODIFIER_H
 #define SCATTERDATAMODIFIER_H
 
-#include <QtDataVis3D/q3dscatter.h>
+#include <QtDataVisualization/q3dscatter.h>
 #include <QtGui/QFont>
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 class ScatterDataModifier : public QObject
 {
diff --git a/examples/surfacechart/chartmodifier.cpp b/examples/surfacechart/chartmodifier.cpp
index 48a4bcce..916a3f8c 100644
--- a/examples/surfacechart/chartmodifier.cpp
+++ b/examples/surfacechart/chartmodifier.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -24,7 +24,7 @@
 
 #include <QDebug>
 
-QT_DATAVIS3D_USE_NAMESPACE
+QT_DATAVISUALIZATION_USE_NAMESPACE
 
 ChartModifier::ChartModifier(Q3DSurface *chart)
     : m_chart(chart),
diff --git a/examples/surfacechart/chartmodifier.h b/examples/surfacechart/chartmodifier.h
index cb0a20a6..1de5840e 100644
--- a/examples/surfacechart/chartmodifier.h
+++ b/examples/surfacechart/chartmodifier.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,10 +19,10 @@
 #ifndef CHARTMODIFIER_H
 #define CHARTMODIFIER_H
 
-#include <QtDataVis3D/Q3DSurface>
+#include <QtDataVisualization/Q3DSurface>
 #include <QSlider>
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 class ChartModifier : public QObject
 {
diff --git a/examples/surfacechart/main.cpp b/examples/surfacechart/main.cpp
index 660ed25c..8a090570 100644
--- a/examples/surfacechart/main.cpp
+++ b/examples/surfacechart/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -32,7 +32,7 @@
 #include <QPainter>
 #include <QDebug>
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp
index d4bde7f3..79833eaa 100644
--- a/examples/widget/chart.cpp
+++ b/examples/widget/chart.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,12 +17,12 @@
 ****************************************************************************/
 
 #include "chart.h"
-#include <QtDataVis3D/q3dcategoryaxis.h>
-#include <QtDataVis3D/q3dvalueaxis.h>
-#include <QtDataVis3D/qbardataproxy.h>
+#include <QtDataVisualization/q3dcategoryaxis.h>
+#include <QtDataVisualization/q3dvalueaxis.h>
+#include <QtDataVisualization/qbardataproxy.h>
 #include <QTime>
 
-QT_DATAVIS3D_USE_NAMESPACE
+QT_DATAVISUALIZATION_USE_NAMESPACE
 
 const QString celsiusString = QString(QChar(0xB0)) + "C";
 
diff --git a/examples/widget/chart.h b/examples/widget/chart.h
index a29f955b..caae4fff 100644
--- a/examples/widget/chart.h
+++ b/examples/widget/chart.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,14 +19,14 @@
 #ifndef CHARTMODIFIER_H
 #define CHARTMODIFIER_H
 
-#include <QtDataVis3D/q3dbars.h>
+#include <QtDataVisualization/q3dbars.h>
 
 #include <QFont>
 #include <QDebug>
 #include <QStringList>
 #include <QPointer>
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 class ChartModifier : public QObject
 {
diff --git a/examples/widget/doc/src/widget.qdoc b/examples/widget/doc/src/widget.qdoc
index 6645d356..d76df2b5 100644
--- a/examples/widget/doc/src/widget.qdoc
+++ b/examples/widget/doc/src/widget.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/examples/widget/main.cpp b/examples/widget/main.cpp
index 76ec6dee..e9fda889 100644
--- a/examples/widget/main.cpp
+++ b/examples/widget/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/qtdatavis3d.pro b/qtdatavisualization.pro
index 8a6fa51e..d7cb1c90 100644
--- a/qtdatavis3d.pro
+++ b/qtdatavisualization.pro
@@ -2,8 +2,8 @@ load(qt_parts)
 
 # We need opengl, minimum es2 or desktop
 !contains(QT_CONFIG, opengl) {
-    error(QtDataVis3D requires OpenGL!)
+    error(QtDataVisualization requires OpenGL!)
 }
 contains(QT_CONFIG, opengles1) {
-    error(QtDataVis3D does not support OpenGL ES 1!)
+    error(QtDataVisualization does not support OpenGL ES 1!)
 }
diff --git a/src/datavis3d/doc/qtdatavis3d.qdocconf b/src/datavis3d/doc/qtdatavis3d.qdocconf
deleted file mode 100644
index 0e9f6d5b..00000000
--- a/src/datavis3d/doc/qtdatavis3d.qdocconf
+++ /dev/null
@@ -1,33 +0,0 @@
-include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
-
-project             = QtDataVis3D
-description         = Qt Data Visualization 3D Reference Documentation
-version             = 1.0.0
-
-exampledirs += ../../../examples \
-               snippets
-
-headerdirs += ..
-imagedirs  += ../images \
-              images
-sourcedirs += ..
-
-depends += qtcore \
-           qtgui
-
-qhp.projects                    = qtdatavis3d
-
-qhp.qtdatavis3d.file            = qtdatavis3d.qhp
-qhp.qtdatavis3d.namespace       = org.qt-project.qtdatavis3d.1.0.0
-qhp.qtdatavis3d.virtualFolder   = qtdatavis3d
-qhp.qtdatavis3d.indexTitle      = Qt Data Visualization 3D
-qhp.qtdatavis3d.indexRoot       =
-
-qhp.qtdatavis3d.filterAttributes                    = qtdatavis3d 1.0.0 qtrefdoc
-qhp.qtdatavis3d.customFilters.Qt.name               = QtDataVis3D 1.0.0
-qhp.qtdatavis3d.customFilters.Qt.filterAttributes   = qtdatavis3d 1.0.0
-qhp.qtdatavis3d.subprojects                         = classes
-qhp.qtdatavis3d.subprojects.classes.title           = C++ Classes
-qhp.qtdatavis3d.subprojects.classes.indexTitle      = Qt Data Visualization 3D C++ Classes
-qhp.qtdatavis3d.subprojects.classes.selectors       = class fake:headerfile
-qhp.qtdatavis3d.subprojects.classes.sortPages       = true
diff --git a/src/datavis3d/global/global.pri b/src/datavis3d/global/global.pri
deleted file mode 100644
index 7292bbd6..00000000
--- a/src/datavis3d/global/global.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-HEADERS += \
-    $$PWD/qdatavis3dglobal.h \
-    $$PWD/qdatavis3denums.h \
-    $$PWD/datavis3dglobal_p.h
diff --git a/src/datavis3d/global/qdatavis3dglobal.h b/src/datavis3d/global/qdatavis3dglobal.h
deleted file mode 100644
index 5e2e88b1..00000000
--- a/src/datavis3d/global/qdatavis3dglobal.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtDataVis3D module.
-**
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-**
-****************************************************************************/
-
-#ifndef QDATAVIS3DGLOBAL_H
-#define QDATAVIS3DGLOBAL_H
-
-#include <qglobal.h>
-
-#define QT_DATAVIS3D_VERSION_STR   "0.0.1"
-/*
-   QT_DATAVIS3D_VERSION is (major << 16) + (minor << 8) + patch.
-*/
-#define QT_DATAVIS3D_VERSION       0x000001
-/*
-   can be used like #if (QT_DATAVIS3D_VERSION >= QT_DATAVIS3D_VERSION_CHECK(1, 1, 0))
-*/
-#define QT_DATAVIS3D_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
-
-#if defined(QT_DATAVIS3D_LIBRARY)
-#  define QT_DATAVIS3D_EXPORT Q_DECL_EXPORT
-#else
-#  define QT_DATAVIS3D_EXPORT Q_DECL_IMPORT
-#endif
-
-#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_DATAVIS3D_LIBRARY)
-#  define QT_DATAVIS3D_AUTOTEST_EXPORT Q_DECL_EXPORT
-#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_DATAVIS3D_LIBRARY)
-#  define QT_DATAVIS3D_AUTOTEST_EXPORT Q_DECL_IMPORT
-#else
-#  define QT_DATAVIS3D_AUTOTEST_EXPORT
-#endif
-
-#ifdef QT_DATAVIS3D_STATICLIB
-#  undef QT_DATAVIS3D_EXPORT
-#  undef QT_DATAVIS3D_AUTOTEST_EXPORT
-#  define QT_DATAVIS3D_EXPORT
-#  define QT_DATAVIS3D_AUTOTEST_EXPORT
-#endif
-
-#define QT_DATAVIS3D_NAMESPACE QtDataVis3D
-
-#ifdef QT_DATAVIS3D_NAMESPACE
-#  define QT_DATAVIS3D_BEGIN_NAMESPACE namespace QT_DATAVIS3D_NAMESPACE {
-#  define QT_DATAVIS3D_END_NAMESPACE }
-#  define QT_DATAVIS3D_USE_NAMESPACE using namespace QT_DATAVIS3D_NAMESPACE;
-#else
-#  define QT_DATAVIS3D_BEGIN_NAMESPACE
-#  define QT_DATAVIS3D_END_NAMESPACE
-#  define QT_DATAVIS3D_USE_NAMESPACE
-#endif
-
-#endif // QVIS3DGLOBAL_H
diff --git a/src/datavis3dqml2/qmldir b/src/datavis3dqml2/qmldir
deleted file mode 100644
index 876138db..00000000
--- a/src/datavis3dqml2/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-module com.digia.QtDataVis3D
-plugin datavis3dqml2
-
diff --git a/src/datavis3d/axis/axis.pri b/src/datavisualization/axis/axis.pri
index 4e96618b..4e96618b 100644
--- a/src/datavis3d/axis/axis.pri
+++ b/src/datavisualization/axis/axis.pri
diff --git a/src/datavis3d/axis/q3dabstractaxis.cpp b/src/datavisualization/axis/q3dabstractaxis.cpp
index 215351b8..67f4f5fc 100644
--- a/src/datavis3d/axis/q3dabstractaxis.cpp
+++ b/src/datavisualization/axis/q3dabstractaxis.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,11 +19,11 @@
 #include "q3dabstractaxis.h"
 #include "q3dabstractaxis_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class Q3DAbstractAxis
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief Q3DAbstractAxis is base class for axes of a graph.
  * \since 1.0.0
  *
@@ -146,4 +146,4 @@ void Q3DAbstractAxisPrivate::updateLabels()
     // Default implementation does nothing
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/axis/q3dabstractaxis.h b/src/datavisualization/axis/q3dabstractaxis.h
index 37bdb89e..6e89723a 100644
--- a/src/datavis3d/axis/q3dabstractaxis.h
+++ b/src/datavisualization/axis/q3dabstractaxis.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,17 +19,17 @@
 #ifndef Q3DABSTRACTAXIS_H
 #define Q3DABSTRACTAXIS_H
 
-#include <QtDataVis3D/qdatavis3denums.h>
+#include <QtDataVisualization/qdatavisualizationenums.h>
 #include <QObject>
 #include <QScopedPointer>
 #include <QVector>
 #include <QStringList>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DAbstractAxisPrivate;
 
-class QT_DATAVIS3D_EXPORT Q3DAbstractAxis : public QObject
+class QT_DATAVISUALIZATION_EXPORT Q3DAbstractAxis : public QObject
 {
     Q_OBJECT
     Q_ENUMS(AxisOrientation)
@@ -83,6 +83,6 @@ private:
     friend class Bars3DController;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QABSTRACTAXIS_H
diff --git a/src/datavis3d/axis/q3dabstractaxis_p.h b/src/datavisualization/axis/q3dabstractaxis_p.h
index 77f362db..f961e82e 100644
--- a/src/datavis3d/axis/q3dabstractaxis_p.h
+++ b/src/datavisualization/axis/q3dabstractaxis_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,20 +20,20 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
 // We mean it.
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "q3dabstractaxis.h"
 #include "abstract3dcontroller_p.h"
 
 #ifndef Q3DABSTRACTAXIS_P_H
 #define Q3DABSTRACTAXIS_P_H
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DAbstractAxisPrivate : public QObject
 {
@@ -63,6 +63,6 @@ protected:
     friend class Q3DCategoryAxis;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QABSTRACTAXIS_P_H
diff --git a/src/datavis3d/axis/q3dcategoryaxis.cpp b/src/datavisualization/axis/q3dcategoryaxis.cpp
index 2090ad1c..55a27f52 100644
--- a/src/datavis3d/axis/q3dcategoryaxis.cpp
+++ b/src/datavisualization/axis/q3dcategoryaxis.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,11 +19,11 @@
 #include "q3dcategoryaxis.h"
 #include "q3dcategoryaxis_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class Q3DCategoryAxis
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief The Q3DCategoryAxis class is used for manipulating an axis of a graph.
  * \since 1.0.0
  *
@@ -85,4 +85,4 @@ Q3DCategoryAxisPrivate::~Q3DCategoryAxisPrivate()
 {
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/axis/q3dcategoryaxis.h b/src/datavisualization/axis/q3dcategoryaxis.h
index 15e9b6ed..8b7f966c 100644
--- a/src/datavis3d/axis/q3dcategoryaxis.h
+++ b/src/datavisualization/axis/q3dcategoryaxis.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,13 +19,13 @@
 #ifndef Q3DCATEGORYAXIS_H
 #define Q3DCATEGORYAXIS_H
 
-#include <QtDataVis3D/q3dabstractaxis.h>
+#include <QtDataVisualization/q3dabstractaxis.h>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DCategoryAxisPrivate;
 
-class QT_DATAVIS3D_EXPORT Q3DCategoryAxis : public Q3DAbstractAxis
+class QT_DATAVISUALIZATION_EXPORT Q3DCategoryAxis : public Q3DAbstractAxis
 {
     Q_OBJECT
     // Note: categoryLabels actually reads/writes the labels property in abstract axis,
@@ -49,6 +49,6 @@ private:
     Q_DISABLE_COPY(Q3DCategoryAxis)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QCATEGORYAXIS_H
diff --git a/src/datavis3d/axis/q3dcategoryaxis_p.h b/src/datavisualization/axis/q3dcategoryaxis_p.h
index e2e9d574..f7fa7b35 100644
--- a/src/datavis3d/axis/q3dcategoryaxis_p.h
+++ b/src/datavisualization/axis/q3dcategoryaxis_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -33,7 +33,7 @@
 #ifndef QCATEGORYAXIS_P_H
 #define QCATEGORYAXIS_P_H
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DCategoryAxisPrivate : public Q3DAbstractAxisPrivate
 {
@@ -44,6 +44,6 @@ public:
     virtual ~Q3DCategoryAxisPrivate();
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QCATEGORYAXIS_P_H
diff --git a/src/datavis3d/axis/q3dvalueaxis.cpp b/src/datavisualization/axis/q3dvalueaxis.cpp
index 50a0525c..a17fef69 100644
--- a/src/datavis3d/axis/q3dvalueaxis.cpp
+++ b/src/datavisualization/axis/q3dvalueaxis.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,11 +20,11 @@
 #include "q3dvalueaxis_p.h"
 #include "utils_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class Q3DValueAxis
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief The Q3DValueAxis class is used for manipulating an axis of a graph.
  * \since 1.0.0
  *
@@ -329,4 +329,4 @@ Q3DValueAxis *Q3DValueAxisPrivate::qptr()
     return static_cast<Q3DValueAxis *>(q_ptr);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/axis/q3dvalueaxis.h b/src/datavisualization/axis/q3dvalueaxis.h
index 07e21a41..eb00f27f 100644
--- a/src/datavis3d/axis/q3dvalueaxis.h
+++ b/src/datavisualization/axis/q3dvalueaxis.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,13 +19,13 @@
 #ifndef QVALUEAXIS_H
 #define QVALUEAXIS_H
 
-#include <QtDataVis3D/q3dabstractaxis.h>
+#include <QtDataVisualization/q3dabstractaxis.h>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DValueAxisPrivate;
 
-class QT_DATAVIS3D_EXPORT Q3DValueAxis : public Q3DAbstractAxis
+class QT_DATAVISUALIZATION_EXPORT Q3DValueAxis : public Q3DAbstractAxis
 {
     Q_OBJECT
     Q_PROPERTY(qreal min READ min WRITE setMin NOTIFY rangeChanged)
@@ -72,6 +72,6 @@ private:
     friend class Scatter3DController;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QVALUEAXIS_H
diff --git a/src/datavis3d/axis/q3dvalueaxis_p.h b/src/datavisualization/axis/q3dvalueaxis_p.h
index 823983aa..8fcf50da 100644
--- a/src/datavis3d/axis/q3dvalueaxis_p.h
+++ b/src/datavisualization/axis/q3dvalueaxis_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -32,7 +32,7 @@
 #ifndef QVALUEAXIS_P_H
 #define QVALUEAXIS_P_H
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DValueAxisPrivate : public Q3DAbstractAxisPrivate
 {
@@ -64,6 +64,6 @@ private:
     friend class Q3DValueAxis;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QVALUEAXIS_P_H
diff --git a/src/datavis3d/common.pri b/src/datavisualization/common.pri
index 57948697..57948697 100644
--- a/src/datavis3d/common.pri
+++ b/src/datavisualization/common.pri
diff --git a/src/datavis3d/data/abstractitemmodelhandler.cpp b/src/datavisualization/data/abstractitemmodelhandler.cpp
index c441f0d8..0ad0ac0b 100644
--- a/src/datavis3d/data/abstractitemmodelhandler.cpp
+++ b/src/datavisualization/data/abstractitemmodelhandler.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 #include "qabstractdatamapping.h"
 #include <QTimer>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 AbstractItemModelHandler::AbstractItemModelHandler(QObject *parent)
     : QObject(parent),
@@ -247,4 +247,4 @@ void AbstractItemModelHandler::handlePendingResolve()
     resolveModel();
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h
index aa49faeb..fbaaa1f9 100644
--- a/src/datavis3d/data/abstractitemmodelhandler_p.h
+++ b/src/datavisualization/data/abstractitemmodelhandler_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,12 +29,12 @@
 #ifndef ABSTRACTITEMMODELHANDLER_P_H
 #define ABSTRACTITEMMODELHANDLER_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include <QAbstractItemModel>
 #include <QPointer>
 #include <QTimer>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QAbstractDataMapping;
 
@@ -85,6 +85,6 @@ private:
     Q_DISABLE_COPY(AbstractItemModelHandler)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/abstractrenderitem.cpp b/src/datavisualization/data/abstractrenderitem.cpp
index 296cebb4..22a1c6de 100644
--- a/src/datavis3d/data/abstractrenderitem.cpp
+++ b/src/datavisualization/data/abstractrenderitem.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -18,7 +18,7 @@
 
 #include "abstractrenderitem_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 AbstractRenderItem::AbstractRenderItem()
     : m_selectionLabelItem(0)
@@ -57,4 +57,4 @@ QString &AbstractRenderItem::selectionLabel()
 }
 
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/abstractrenderitem_p.h b/src/datavisualization/data/abstractrenderitem_p.h
index becacbe5..5f623c41 100644
--- a/src/datavis3d/data/abstractrenderitem_p.h
+++ b/src/datavisualization/data/abstractrenderitem_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,14 +29,14 @@
 #ifndef ABSTRACTRENDERITEM_P_H
 #define ABSTRACTRENDERITEM_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "labelitem_p.h"
 
 #include <QOpenGLFunctions>
 #include <QString>
 #include <QVector3D>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class AbstractRenderItem
 {
@@ -64,6 +64,6 @@ protected:
     friend class QAbstractDataItem;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/baritemmodelhandler.cpp b/src/datavisualization/data/baritemmodelhandler.cpp
index 57f8d7d0..ec922f2b 100644
--- a/src/datavis3d/data/baritemmodelhandler.cpp
+++ b/src/datavisualization/data/baritemmodelhandler.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,7 +19,7 @@
 #include "baritemmodelhandler_p.h"
 #include <QTimer>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 BarItemModelHandler::BarItemModelHandler(QItemModelBarDataProxy *proxy, QObject *parent)
     : AbstractItemModelHandler(parent),
@@ -91,4 +91,4 @@ void BarItemModelHandler::resolveModel()
     m_proxy->resetArray(newProxyArray);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/baritemmodelhandler_p.h b/src/datavisualization/data/baritemmodelhandler_p.h
index 0124e56e..94e83b9d 100644
--- a/src/datavis3d/data/baritemmodelhandler_p.h
+++ b/src/datavisualization/data/baritemmodelhandler_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -32,7 +32,7 @@
 #include "abstractitemmodelhandler_p.h"
 #include "qitemmodelbardataproxy.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class BarItemModelHandler : public AbstractItemModelHandler
 {
@@ -47,6 +47,6 @@ protected:
     QItemModelBarDataProxy *m_proxy; // Not owned
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/barrenderitem.cpp b/src/datavisualization/data/barrenderitem.cpp
index 3240d19d..558e2f96 100644
--- a/src/datavis3d/data/barrenderitem.cpp
+++ b/src/datavisualization/data/barrenderitem.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,7 +19,7 @@
 #include "barrenderitem_p.h"
 #include "bars3drenderer_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 BarRenderItem::BarRenderItem()
     : AbstractRenderItem(),
@@ -64,4 +64,4 @@ QString &BarRenderItem::sliceLabel()
 }
 
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/barrenderitem_p.h b/src/datavisualization/data/barrenderitem_p.h
index b1331b18..6cd2b0fa 100644
--- a/src/datavis3d/data/barrenderitem_p.h
+++ b/src/datavisualization/data/barrenderitem_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -31,7 +31,7 @@
 
 #include "abstractrenderitem_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Bars3DRenderer;
 
@@ -84,6 +84,6 @@ void BarRenderItem::setValue(qreal value)
 typedef QVector<BarRenderItem> BarRenderItemRow;
 typedef QVector<BarRenderItemRow> BarRenderItemArray;
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/data.pri b/src/datavisualization/data/data.pri
index 6571aacc..6571aacc 100644
--- a/src/datavis3d/data/data.pri
+++ b/src/datavisualization/data/data.pri
diff --git a/src/datavis3d/data/labelitem.cpp b/src/datavisualization/data/labelitem.cpp
index 1d1bf6f7..5e27a50e 100644
--- a/src/datavis3d/data/labelitem.cpp
+++ b/src/datavisualization/data/labelitem.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -18,7 +18,7 @@
 
 #include "labelitem_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 LabelItem::LabelItem()
     : m_size(QSize(0, 0)),
@@ -61,4 +61,4 @@ void LabelItem::clear()
     m_size = QSize(0, 0);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/labelitem_p.h b/src/datavisualization/data/labelitem_p.h
index 84625002..c10c1f12 100644
--- a/src/datavis3d/data/labelitem_p.h
+++ b/src/datavisualization/data/labelitem_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,11 +29,11 @@
 #ifndef LABELITEM_P_H
 #define LABELITEM_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include <QOpenGLFunctions>
 #include <QSize>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class LabelItem
 {
@@ -54,6 +54,6 @@ private:
     GLuint m_textureId;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qabstractdatamapping.cpp b/src/datavisualization/data/qabstractdatamapping.cpp
index f85983ec..892d2f94 100644
--- a/src/datavis3d/data/qabstractdatamapping.cpp
+++ b/src/datavisualization/data/qabstractdatamapping.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -18,16 +18,16 @@
 
 #include "qabstractdatamapping_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class QAbstractDataMapping
- * \inmodule QtDataVis3D
- * \brief Abstract base class for QtDataVis3D data mapping classes.
+ * \inmodule QtDataVisualization
+ * \brief Abstract base class for QtDataVisualization data mapping classes.
  * \since 1.0.0
  *
  * Data mapping classes provide a way to map data from an external data source to one of
- * QtDataVis3D data proxies.
+ * QtDataVisualization data proxies.
  * \sa QItemModelBarDataMapping, QItemModelScatterDataMapping
  */
 
@@ -67,5 +67,5 @@ QAbstractDataMappingPrivate::~QAbstractDataMappingPrivate()
 {
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
diff --git a/src/datavis3d/data/qabstractdatamapping.h b/src/datavisualization/data/qabstractdatamapping.h
index 8e1f3b2a..eb892cb7 100644
--- a/src/datavis3d/data/qabstractdatamapping.h
+++ b/src/datavisualization/data/qabstractdatamapping.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,14 +19,14 @@
 #ifndef QABSTRACTDATAMAPPING_H
 #define QABSTRACTDATAMAPPING_H
 
-#include <QtDataVis3D/qdatavis3denums.h>
-#include <QtDataVis3D/qabstractdataproxy.h>
+#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/qabstractdataproxy.h>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QAbstractDataMappingPrivate;
 
-class QT_DATAVIS3D_EXPORT QAbstractDataMapping : public QObject
+class QT_DATAVISUALIZATION_EXPORT QAbstractDataMapping : public QObject
 {
     Q_OBJECT
 
@@ -48,6 +48,6 @@ private:
 };
 
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qabstractdatamapping_p.h b/src/datavisualization/data/qabstractdatamapping_p.h
index 4b16d7a4..39012237 100644
--- a/src/datavis3d/data/qabstractdatamapping_p.h
+++ b/src/datavisualization/data/qabstractdatamapping_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -31,7 +31,7 @@
 #ifndef QABSTRACTDATAMAPPING_P_H
 #define QABSTRACTDATAMAPPING_P_H
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QAbstractDataMappingPrivate : public QObject
 {
@@ -45,6 +45,6 @@ private:
     QAbstractDataProxy::DataType m_type;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qabstractdataproxy.cpp b/src/datavisualization/data/qabstractdataproxy.cpp
index 187fa518..2ef4b614 100644
--- a/src/datavis3d/data/qabstractdataproxy.cpp
+++ b/src/datavisualization/data/qabstractdataproxy.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,12 +19,12 @@
 #include "qabstractdataproxy.h"
 #include "qabstractdataproxy_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class QAbstractDataProxy
- * \inmodule QtDataVis3D
- * \brief Base class for all QtDataVis3D data proxies.
+ * \inmodule QtDataVisualization
+ * \brief Base class for all QtDataVisualization data proxies.
  * \since 1.0.0
  *
  * You use the visualization type specific inherited classes instead of the base class.
@@ -116,4 +116,4 @@ void QAbstractDataProxyPrivate::setItemLabelFormat(const QString &format)
     m_itemLabelFormat = format;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/qabstractdataproxy.h b/src/datavisualization/data/qabstractdataproxy.h
index ba190583..db0e0863 100644
--- a/src/datavis3d/data/qabstractdataproxy.h
+++ b/src/datavisualization/data/qabstractdataproxy.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,15 +19,15 @@
 #ifndef QABSTRACTDATAPROXY_H
 #define QABSTRACTDATAPROXY_H
 
-#include <QtDataVis3D/qdatavis3denums.h>
+#include <QtDataVisualization/qdatavisualizationenums.h>
 #include <QObject>
 #include <QScopedPointer>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QAbstractDataProxyPrivate;
 
-class QT_DATAVIS3D_EXPORT QAbstractDataProxy : public QObject
+class QT_DATAVISUALIZATION_EXPORT QAbstractDataProxy : public QObject
 {
     Q_OBJECT
     Q_ENUMS(DataType)
@@ -68,6 +68,6 @@ private:
     friend class Surface3DController;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QABSTRACTDATAPROXY_H
diff --git a/src/datavis3d/data/qabstractdataproxy_p.h b/src/datavisualization/data/qabstractdataproxy_p.h
index 6737c681..4aa1b678 100644
--- a/src/datavis3d/data/qabstractdataproxy_p.h
+++ b/src/datavisualization/data/qabstractdataproxy_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,20 +20,20 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
 // We mean it.
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "qabstractdataproxy.h"
 #include <QString>
 
 #ifndef QABSTRACTDATAPROXY_P_H
 #define QABSTRACTDATAPROXY_P_H
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QAbstractDataProxyPrivate : public QObject
 {
@@ -57,6 +57,6 @@ private:
     friend class QAbstractDataProxy;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QABSTRACTDATAPROXY_P_H
diff --git a/src/datavis3d/data/qbardataitem.cpp b/src/datavisualization/data/qbardataitem.cpp
index ffd4f707..e69a5a69 100644
--- a/src/datavis3d/data/qbardataitem.cpp
+++ b/src/datavisualization/data/qbardataitem.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -18,11 +18,11 @@
 
 #include "qbardataitem_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class QBarDataItem
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief The QBarDataItem class provides a container for resolved data to be added to bar graphs.
  * \since 1.0.0
  *
@@ -113,4 +113,4 @@ QBarDataItemPrivate::~QBarDataItemPrivate()
 {
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/qbardataitem.h b/src/datavisualization/data/qbardataitem.h
index d7062b66..683120b2 100644
--- a/src/datavis3d/data/qbardataitem.h
+++ b/src/datavisualization/data/qbardataitem.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,13 +19,13 @@
 #ifndef QBARDATAITEM_H
 #define QBARDATAITEM_H
 
-#include <QtDataVis3D/qdatavis3denums.h>
+#include <QtDataVisualization/qdatavisualizationenums.h>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QBarDataItemPrivate;
 
-class QT_DATAVIS3D_EXPORT QBarDataItem
+class QT_DATAVISUALIZATION_EXPORT QBarDataItem
 {
 public:
     QBarDataItem();
@@ -49,6 +49,6 @@ private:
     qreal m_value;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qbardataitem_p.h b/src/datavisualization/data/qbardataitem_p.h
index e63ce787..20b7ea69 100644
--- a/src/datavis3d/data/qbardataitem_p.h
+++ b/src/datavisualization/data/qbardataitem_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,10 +29,10 @@
 #ifndef QBARDATAITEM_P_H
 #define QBARDATAITEM_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "qbardataitem.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QBarDataItemPrivate
 {
@@ -46,6 +46,6 @@ protected:
     friend class QBarDataItem;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp
index c0ff2f7f..9c30e1b1 100644
--- a/src/datavis3d/data/qbardataproxy.cpp
+++ b/src/datavisualization/data/qbardataproxy.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,11 +19,11 @@
 #include "qbardataproxy.h"
 #include "qbardataproxy_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class QBarDataProxy
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief Proxy class for Q3DBars.
  * \since 1.0.0
  *
@@ -61,7 +61,7 @@ QT_DATAVIS3D_BEGIN_NAMESPACE
  * \endtable
  *
  * For example:
- * \snippet doc_src_qtdatavis3d.cpp 1
+ * \snippet doc_src_qtdatavisualization.cpp 1
  */
 
 /*!
@@ -406,4 +406,4 @@ QPair<GLfloat, GLfloat> QBarDataProxyPrivate::limitValues(int startRow, int endR
     return limits;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index 3338bc75..8ebaf5ae 100644
--- a/src/datavis3d/data/qbardataproxy.h
+++ b/src/datavisualization/data/qbardataproxy.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,18 +19,18 @@
 #ifndef QBARDATAPROXY_H
 #define QBARDATAPROXY_H
 
-#include <QtDataVis3D/qabstractdataproxy.h>
-#include <QtDataVis3D/qbardataitem.h>
+#include <QtDataVisualization/qabstractdataproxy.h>
+#include <QtDataVisualization/qbardataitem.h>
 #include <QVector>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 typedef QVector<QBarDataItem> QBarDataRow;
 typedef QList<QBarDataRow *> QBarDataArray;
 
 class QBarDataProxyPrivate;
 
-class QT_DATAVIS3D_EXPORT QBarDataProxy : public QAbstractDataProxy
+class QT_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy
 {
     Q_OBJECT
 
@@ -104,6 +104,6 @@ private:
     friend class Bars3DController;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QBARDATAPROXY_H
diff --git a/src/datavis3d/data/qbardataproxy_p.h b/src/datavisualization/data/qbardataproxy_p.h
index fa6ccd0d..ab64c4a1 100644
--- a/src/datavis3d/data/qbardataproxy_p.h
+++ b/src/datavisualization/data/qbardataproxy_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -33,7 +33,7 @@
 #include "qabstractdataproxy_p.h"
 #include "qbardataitem.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QBarDataProxyPrivate : public QAbstractDataProxyPrivate
 {
@@ -64,6 +64,6 @@ private:
     friend class QBarDataProxy;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QBARDATAPROXY_P_H
diff --git a/src/datavis3d/data/qitemmodelbardatamapping.cpp b/src/datavisualization/data/qitemmodelbardatamapping.cpp
index cefe5b5e..4577a614 100644
--- a/src/datavis3d/data/qitemmodelbardatamapping.cpp
+++ b/src/datavisualization/data/qitemmodelbardatamapping.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -18,11 +18,11 @@
 
 #include "qitemmodelbardatamapping_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class QItemModelBarDataMapping
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief Data model mapping for Q3DBars.
  * \since 1.0.0
  *
@@ -41,7 +41,7 @@ QT_DATAVIS3D_BEGIN_NAMESPACE
  *    Each item in the model has roles "year", "month", "income", and "expenses".
  *    You could do the following to display the data in a bar chart:
  *
- *    \snippet doc_src_qtdatavis3d.cpp 3
+ *    \snippet doc_src_qtdatavisualization.cpp 3
  *
  * \sa QItemModelBarDataProxy
  */
@@ -234,5 +234,5 @@ QItemModelBarDataMappingPrivate::~QItemModelBarDataMappingPrivate()
 }
 
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
diff --git a/src/datavis3d/data/qitemmodelbardatamapping.h b/src/datavisualization/data/qitemmodelbardatamapping.h
index 7a989919..a781f020 100644
--- a/src/datavis3d/data/qitemmodelbardatamapping.h
+++ b/src/datavisualization/data/qitemmodelbardatamapping.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,15 +19,15 @@
 #ifndef QITEMMODELBARDATAMAPPING_H
 #define QITEMMODELBARDATAMAPPING_H
 
-#include <QtDataVis3D/qdatavis3denums.h>
-#include <QtDataVis3D/qabstractdatamapping.h>
+#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/qabstractdatamapping.h>
 #include <QStringList>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QItemModelBarDataMappingPrivate;
 
-class QT_DATAVIS3D_EXPORT QItemModelBarDataMapping : public QAbstractDataMapping
+class QT_DATAVISUALIZATION_EXPORT QItemModelBarDataMapping : public QAbstractDataMapping
 {
     Q_OBJECT
     Q_PROPERTY(QString rowRole READ rowRole WRITE setRowRole)
@@ -71,6 +71,6 @@ private:
     Q_DISABLE_COPY(QItemModelBarDataMapping)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qitemmodelbardatamapping_p.h b/src/datavisualization/data/qitemmodelbardatamapping_p.h
index d7db8e62..b444e384 100644
--- a/src/datavis3d/data/qitemmodelbardatamapping_p.h
+++ b/src/datavisualization/data/qitemmodelbardatamapping_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -32,7 +32,7 @@
 #ifndef QITEMMODELBARDATAMAPPING_P_H
 #define QITEMMODELBARDATAMAPPING_P_H
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QItemModelBarDataMappingPrivate : public QAbstractDataMappingPrivate
 {
@@ -53,6 +53,6 @@ private:
     friend class QItemModelBarDataMapping;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qitemmodelbardataproxy.cpp b/src/datavisualization/data/qitemmodelbardataproxy.cpp
index 8b72d934..49905be5 100644
--- a/src/datavis3d/data/qitemmodelbardataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelbardataproxy.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,11 +20,11 @@
 #include "baritemmodelhandler_p.h"
 #include <QTimer>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class QItemModelBarDataProxy
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief Proxy class for Q3DBars data model mapping.
  * \since 1.0.0
  *
@@ -160,4 +160,4 @@ QItemModelBarDataProxy *QItemModelBarDataProxyPrivate::qptr()
     return static_cast<QItemModelBarDataProxy *>(q_ptr);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h
index dd9d8353..2a96f0c8 100644
--- a/src/datavis3d/data/qitemmodelbardataproxy.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,16 +19,16 @@
 #ifndef QITEMMODELBARDATAPROXY_H
 #define QITEMMODELBARDATAPROXY_H
 
-#include <QtDataVis3D/qbardataproxy.h>
-#include <QtDataVis3D/qitemmodelbardatamapping.h>
+#include <QtDataVisualization/qbardataproxy.h>
+#include <QtDataVisualization/qitemmodelbardatamapping.h>
 #include <QAbstractItemModel>
 #include <QStringList>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QItemModelBarDataProxyPrivate;
 
-class QT_DATAVIS3D_EXPORT QItemModelBarDataProxy : public QBarDataProxy
+class QT_DATAVISUALIZATION_EXPORT QItemModelBarDataProxy : public QBarDataProxy
 {
     Q_OBJECT
     Q_PROPERTY(const QAbstractItemModel* itemModel READ itemModel WRITE setItemModel)
@@ -57,6 +57,6 @@ private:
     Q_DISABLE_COPY(QItemModelBarDataProxy)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qitemmodelbardataproxy_p.h b/src/datavisualization/data/qitemmodelbardataproxy_p.h
index 34ca128b..fc646f0d 100644
--- a/src/datavis3d/data/qitemmodelbardataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelbardataproxy_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -34,7 +34,7 @@
 #include <QPointer>
 #include <QTimer>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class BarItemModelHandler;
 
@@ -53,6 +53,6 @@ private:
     friend class QItemModelBarDataProxy;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qitemmodelscatterdatamapping.cpp b/src/datavisualization/data/qitemmodelscatterdatamapping.cpp
index db8dff9e..1243c19e 100644
--- a/src/datavis3d/data/qitemmodelscatterdatamapping.cpp
+++ b/src/datavisualization/data/qitemmodelscatterdatamapping.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -18,11 +18,11 @@
 
 #include "qitemmodelscatterdatamapping_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class QItemModelScatterDataMapping
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief Data model mapping for Q3DScatter.
  * \since 1.0.0
  *
@@ -37,7 +37,7 @@ QT_DATAVIS3D_BEGIN_NAMESPACE
  * done on material samples, providing data for roles such as "density", "hardness" and
  * "conductivity". You could visualize these properties on a scatter chart:
  *
- * \snippet doc_src_qtdatavis3d.cpp 4
+ * \snippet doc_src_qtdatavisualization.cpp 4
  *
  * \sa QItemModelScatterDataProxy
  */
@@ -163,5 +163,5 @@ QItemModelScatterDataMappingPrivate::~QItemModelScatterDataMappingPrivate()
 {
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
diff --git a/src/datavis3d/data/qitemmodelscatterdatamapping.h b/src/datavisualization/data/qitemmodelscatterdatamapping.h
index 2f64f38c..62f2fefc 100644
--- a/src/datavis3d/data/qitemmodelscatterdatamapping.h
+++ b/src/datavisualization/data/qitemmodelscatterdatamapping.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,15 +19,15 @@
 #ifndef QITEMMODELSCATTERDATAMAPPING_H
 #define QITEMMODELSCATTERDATAMAPPING_H
 
-#include <QtDataVis3D/qdatavis3denums.h>
-#include <QtDataVis3D/qabstractdatamapping.h>
+#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/qabstractdatamapping.h>
 #include <QObject>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QItemModelScatterDataMappingPrivate;
 
-class QT_DATAVIS3D_EXPORT QItemModelScatterDataMapping : public QAbstractDataMapping
+class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataMapping : public QAbstractDataMapping
 {
     Q_OBJECT
     Q_PROPERTY(QString xPosRole READ xPosRole WRITE setXPosRole)
@@ -57,6 +57,6 @@ private:
     Q_DISABLE_COPY(QItemModelScatterDataMapping)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qitemmodelscatterdatamapping_p.h b/src/datavisualization/data/qitemmodelscatterdatamapping_p.h
index e88fa9be..9a8c1b6e 100644
--- a/src/datavis3d/data/qitemmodelscatterdatamapping_p.h
+++ b/src/datavisualization/data/qitemmodelscatterdatamapping_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -32,7 +32,7 @@
 #ifndef QITEMMODELSCATTERDATAMAPPING_P_H
 #define QITEMMODELSCATTERDATAMAPPING_P_H
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QItemModelScatterDataMappingPrivate : public QAbstractDataMappingPrivate
 {
@@ -51,6 +51,6 @@ private:
     friend class QItemModelScatterDataMapping;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
index 5a84b7f1..d647e5bc 100644
--- a/src/datavis3d/data/qitemmodelscatterdataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,11 +20,11 @@
 #include "scatteritemmodelhandler_p.h"
 #include <QTimer>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class QItemModelScatterDataProxy
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief Proxy class for Q3DScatter data model mapping.
  * \since 1.0.0
  *
@@ -156,4 +156,4 @@ QItemModelScatterDataProxy *QItemModelScatterDataProxyPrivate::qptr()
     return static_cast<QItemModelScatterDataProxy *>(q_ptr);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h
index c5cb73a5..891950c1 100644
--- a/src/datavis3d/data/qitemmodelscatterdataproxy.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,16 +19,16 @@
 #ifndef QITEMMODELSCATTERDATAPROXY_H
 #define QITEMMODELSCATTERDATAPROXY_H
 
-#include <QtDataVis3D/qscatterdataproxy.h>
-#include <QtDataVis3D/qitemmodelscatterdatamapping.h>
+#include <QtDataVisualization/qscatterdataproxy.h>
+#include <QtDataVisualization/qitemmodelscatterdatamapping.h>
 #include <QAbstractItemModel>
 #include <QStringList>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QItemModelScatterDataProxyPrivate;
 
-class QT_DATAVIS3D_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy
+class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy
 {
     Q_OBJECT
     Q_PROPERTY(const QAbstractItemModel* itemModel READ itemModel WRITE setItemModel)
@@ -57,6 +57,6 @@ private:
     Q_DISABLE_COPY(QItemModelScatterDataProxy)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qitemmodelscatterdataproxy_p.h b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h
index 6fee2f80..854062a3 100644
--- a/src/datavis3d/data/qitemmodelscatterdataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelscatterdataproxy_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -34,7 +34,7 @@
 #include <QPointer>
 #include <QTimer>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class ScatterItemModelHandler;
 
@@ -53,6 +53,6 @@ private:
     friend class QItemModelScatterDataProxy;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qitemmodelsurfacedatamapping.cpp b/src/datavisualization/data/qitemmodelsurfacedatamapping.cpp
index 2122a570..4b90f320 100644
--- a/src/datavis3d/data/qitemmodelsurfacedatamapping.cpp
+++ b/src/datavisualization/data/qitemmodelsurfacedatamapping.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -18,11 +18,11 @@
 
 #include "qitemmodelsurfacedatamapping_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class QItemModelSurfaceDataMapping
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief Data model mapping for Q3DSurface.
  * \since 1.0.0
  *
@@ -219,5 +219,5 @@ QItemModelSurfaceDataMappingPrivate::~QItemModelSurfaceDataMappingPrivate()
 }
 
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
diff --git a/src/datavis3d/data/qitemmodelsurfacedatamapping.h b/src/datavisualization/data/qitemmodelsurfacedatamapping.h
index ff16f296..1d937806 100644
--- a/src/datavis3d/data/qitemmodelsurfacedatamapping.h
+++ b/src/datavisualization/data/qitemmodelsurfacedatamapping.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,15 +19,15 @@
 #ifndef QITEMMODELSURFACEDATAMAPPING_H
 #define QITEMMODELSURFACEDATAMAPPING_H
 
-#include <QtDataVis3D/qdatavis3denums.h>
-#include <QtDataVis3D/qabstractdatamapping.h>
+#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/qabstractdatamapping.h>
 #include <QStringList>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QItemModelSurfaceDataMappingPrivate;
 
-class QT_DATAVIS3D_EXPORT QItemModelSurfaceDataMapping : public QAbstractDataMapping
+class QT_DATAVISUALIZATION_EXPORT QItemModelSurfaceDataMapping : public QAbstractDataMapping
 {
     Q_OBJECT
     Q_PROPERTY(QString rowRole READ rowRole WRITE setRowRole)
@@ -71,6 +71,6 @@ private:
     Q_DISABLE_COPY(QItemModelSurfaceDataMapping)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qitemmodelsurfacedatamapping_p.h b/src/datavisualization/data/qitemmodelsurfacedatamapping_p.h
index 26d1fbc7..69470423 100644
--- a/src/datavis3d/data/qitemmodelsurfacedatamapping_p.h
+++ b/src/datavisualization/data/qitemmodelsurfacedatamapping_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -32,7 +32,7 @@
 #ifndef QITEMMODELSURFACEDATAMAPPING_P_H
 #define QITEMMODELSURFACEDATAMAPPING_P_H
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QItemModelSurfaceDataMappingPrivate : public QAbstractDataMappingPrivate
 {
@@ -53,6 +53,6 @@ private:
     friend class QItemModelSurfaceDataMapping;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
index 3d2929c1..4e85542b 100644
--- a/src/datavis3d/data/qitemmodelsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,13 +20,13 @@
 #include "surfaceitemmodelhandler_p.h"
 #include <QTimer>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 // TODO: CHECK DOCUMENTATION!
 
 /*!
  * \class QItemModelSurfaceDataProxy
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief Proxy class for Q3DSurface data model mapping.
  * \since 1.0.0
  *
@@ -158,4 +158,4 @@ QItemModelSurfaceDataProxy *QItemModelSurfaceDataProxyPrivate::qptr()
     return static_cast<QItemModelSurfaceDataProxy *>(q_ptr);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
index d10e7005..080bf54b 100644
--- a/src/datavis3d/data/qitemmodelsurfacedataproxy.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,16 +19,16 @@
 #ifndef QITEMMODELSURFACEDATAPROXY_H
 #define QITEMMODELSURFACEDATAPROXY_H
 
-#include <QtDataVis3D/qsurfacedataproxy.h>
-#include <QtDataVis3D/qitemmodelsurfacedatamapping.h>
+#include <QtDataVisualization/qsurfacedataproxy.h>
+#include <QtDataVisualization/qitemmodelsurfacedatamapping.h>
 #include <QAbstractItemModel>
 #include <QStringList>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QItemModelSurfaceDataProxyPrivate;
 
-class QT_DATAVIS3D_EXPORT QItemModelSurfaceDataProxy : public QSurfaceDataProxy
+class QT_DATAVISUALIZATION_EXPORT QItemModelSurfaceDataProxy : public QSurfaceDataProxy
 {
     Q_OBJECT
     Q_PROPERTY(const QAbstractItemModel* itemModel READ itemModel WRITE setItemModel)
@@ -57,6 +57,6 @@ private:
     Q_DISABLE_COPY(QItemModelSurfaceDataProxy)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qitemmodelsurfacedataproxy_p.h b/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h
index f9d12618..ff9d13de 100644
--- a/src/datavis3d/data/qitemmodelsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -34,7 +34,7 @@
 #include <QPointer>
 #include <QTimer>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class SurfaceItemModelHandler;
 
@@ -53,6 +53,6 @@ private:
     friend class QItemModelSurfaceDataProxy;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qscatterdataitem.cpp b/src/datavisualization/data/qscatterdataitem.cpp
index c2926811..63bb32ec 100644
--- a/src/datavis3d/data/qscatterdataitem.cpp
+++ b/src/datavisualization/data/qscatterdataitem.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -18,11 +18,11 @@
 
 #include "qscatterdataitem_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class QScatterDataItem
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief The QScatterDataItem class provides a container for resolved data to be added to scatter
  * graphs.
  * \since 1.0.0
@@ -126,4 +126,4 @@ QScatterDataItemPrivate::~QScatterDataItemPrivate()
 {
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/qscatterdataitem.h b/src/datavisualization/data/qscatterdataitem.h
index 96a33eb2..42a27e92 100644
--- a/src/datavis3d/data/qscatterdataitem.h
+++ b/src/datavisualization/data/qscatterdataitem.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,14 +19,14 @@
 #ifndef QSCATTERDATAITEM_H
 #define QSCATTERDATAITEM_H
 
-#include <QtDataVis3D/qdatavis3denums.h>
+#include <QtDataVisualization/qdatavisualizationenums.h>
 #include <QVector3D>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QScatterDataItemPrivate;
 
-class QT_DATAVIS3D_EXPORT QScatterDataItem
+class QT_DATAVISUALIZATION_EXPORT QScatterDataItem
 {
 public:
     QScatterDataItem();
@@ -52,6 +52,6 @@ private:
     //qreal m_size;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qscatterdataitem_p.h b/src/datavisualization/data/qscatterdataitem_p.h
index 3718a185..acc67347 100644
--- a/src/datavis3d/data/qscatterdataitem_p.h
+++ b/src/datavisualization/data/qscatterdataitem_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,10 +29,10 @@
 #ifndef QSCATTERDATAITEM_P_H
 #define QSCATTERDATAITEM_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "qscatterdataitem.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QScatterDataItemPrivate
 {
@@ -46,6 +46,6 @@ protected:
     friend class QScatterDataItem;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp
index 16b14621..134b8a64 100644
--- a/src/datavis3d/data/qscatterdataproxy.cpp
+++ b/src/datavisualization/data/qscatterdataproxy.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,11 +19,11 @@
 #include "qscatterdataproxy.h"
 #include "qscatterdataproxy_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class QScatterDataProxy
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief Proxy class for Q3DScatter.
  * \since 1.0.0
  *
@@ -51,7 +51,7 @@ QT_DATAVIS3D_BEGIN_NAMESPACE
  * \endtable
  *
  * For example:
- * \snippet doc_src_qtdatavis3d.cpp 2
+ * \snippet doc_src_qtdatavisualization.cpp 2
  */
 
 /*!
@@ -329,4 +329,4 @@ QVector3D QScatterDataProxyPrivate::limitValues()
     return limits;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h
index d5897631..a1191c16 100644
--- a/src/datavis3d/data/qscatterdataproxy.h
+++ b/src/datavisualization/data/qscatterdataproxy.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,16 +19,16 @@
 #ifndef QSCATTERDATAPROXY_H
 #define QSCATTERDATAPROXY_H
 
-#include <QtDataVis3D/qabstractdataproxy.h>
-#include <QtDataVis3D/qscatterdataitem.h>
+#include <QtDataVisualization/qabstractdataproxy.h>
+#include <QtDataVisualization/qscatterdataitem.h>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 typedef QVector<QScatterDataItem> QScatterDataArray;
 
 class QScatterDataProxyPrivate;
 
-class QT_DATAVIS3D_EXPORT QScatterDataProxy : public QAbstractDataProxy
+class QT_DATAVISUALIZATION_EXPORT QScatterDataProxy : public QAbstractDataProxy
 {
     Q_OBJECT
 
@@ -80,6 +80,6 @@ private:
     friend class Scatter3DController;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/qscatterdataproxy_p.h b/src/datavisualization/data/qscatterdataproxy_p.h
index 23a2fc6a..fe06fcf9 100644
--- a/src/datavis3d/data/qscatterdataproxy_p.h
+++ b/src/datavisualization/data/qscatterdataproxy_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -33,7 +33,7 @@
 #include "qabstractdataproxy_p.h"
 #include "qscatterdataitem.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QScatterDataProxyPrivate : public QAbstractDataProxyPrivate
 {
@@ -59,6 +59,6 @@ private:
     friend class QScatterDataProxy;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QBARDATAPROXY_P_H
diff --git a/src/datavis3d/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp
index 4d2d2176..9fcc4bc8 100644
--- a/src/datavis3d/data/qsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qsurfacedataproxy.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,7 +19,7 @@
 #include "qsurfacedataproxy.h"
 #include "qsurfacedataproxy_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * Constructs QSurfaceDataProxy with the given \a parent.
@@ -103,4 +103,4 @@ bool QSurfaceDataProxyPrivate::resetArray(QSurfaceDataArray *newArray)
     return true;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h
index 70481ee2..8932574c 100644
--- a/src/datavis3d/data/qsurfacedataproxy.h
+++ b/src/datavisualization/data/qsurfacedataproxy.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,10 +19,10 @@
 #ifndef QSURFACEDATAPROXY_H
 #define QSURFACEDATAPROXY_H
 
-#include <QtDataVis3D/qdatavis3dglobal.h>
-#include <QtDataVis3D/qabstractdataproxy.h>
+#include <QtDataVisualization/qdatavisualizationglobal.h>
+#include <QtDataVisualization/qabstractdataproxy.h>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 typedef qreal QSurfaceDataItem; // Let's stick to this for now, expand if needed
 typedef QVector<QSurfaceDataItem> QSurfaceDataRow;
@@ -30,7 +30,7 @@ typedef QList<QSurfaceDataRow *> QSurfaceDataArray;
 
 class QSurfaceDataProxyPrivate;
 
-class QT_DATAVIS3D_EXPORT QSurfaceDataProxy : public QAbstractDataProxy
+class QT_DATAVISUALIZATION_EXPORT QSurfaceDataProxy : public QAbstractDataProxy
 {
     Q_OBJECT
 
@@ -58,6 +58,6 @@ private:
     friend class Surface3DController;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QSURFACEDATAPROXY_H
diff --git a/src/datavis3d/data/qsurfacedataproxy_p.h b/src/datavisualization/data/qsurfacedataproxy_p.h
index f6a13818..37663a87 100644
--- a/src/datavis3d/data/qsurfacedataproxy_p.h
+++ b/src/datavisualization/data/qsurfacedataproxy_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -34,7 +34,7 @@
 
 #include <QSize>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QSurfaceDataProxyPrivate : public QAbstractDataProxyPrivate
 {
@@ -51,6 +51,6 @@ private:
     friend class QSurfaceDataProxy;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QSURFACEDATAPROXY_P_H
diff --git a/src/datavis3d/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp
index 57b83f94..a6430297 100644
--- a/src/datavis3d/data/scatteritemmodelhandler.cpp
+++ b/src/datavisualization/data/scatteritemmodelhandler.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,7 +19,7 @@
 #include "scatteritemmodelhandler_p.h"
 #include <QTimer>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 ScatterItemModelHandler::ScatterItemModelHandler(QItemModelScatterDataProxy *proxy, QObject *parent)
     : AbstractItemModelHandler(parent),
@@ -79,4 +79,4 @@ void ScatterItemModelHandler::resolveModel()
     m_proxy->resetArray(newProxyArray);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/scatteritemmodelhandler_p.h b/src/datavisualization/data/scatteritemmodelhandler_p.h
index f5b01994..c39bc57f 100644
--- a/src/datavis3d/data/scatteritemmodelhandler_p.h
+++ b/src/datavisualization/data/scatteritemmodelhandler_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -32,7 +32,7 @@
 #include "abstractitemmodelhandler_p.h"
 #include "qitemmodelscatterdataproxy.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class ScatterItemModelHandler : public AbstractItemModelHandler
 {
@@ -47,6 +47,6 @@ protected:
     QItemModelScatterDataProxy *m_proxy; // Not owned
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/scatterrenderitem.cpp b/src/datavisualization/data/scatterrenderitem.cpp
index 4a6fdfd7..1fd7ad97 100644
--- a/src/datavis3d/data/scatterrenderitem.cpp
+++ b/src/datavisualization/data/scatterrenderitem.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 #include "scatter3drenderer_p.h"
 #include "qscatterdataproxy.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 ScatterRenderItem::ScatterRenderItem()
     : AbstractRenderItem()
@@ -37,4 +37,4 @@ ScatterRenderItem::~ScatterRenderItem()
 {
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/scatterrenderitem_p.h b/src/datavisualization/data/scatterrenderitem_p.h
index dd708f59..09c1246e 100644
--- a/src/datavis3d/data/scatterrenderitem_p.h
+++ b/src/datavisualization/data/scatterrenderitem_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -31,7 +31,7 @@
 
 #include "abstractrenderitem_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Scatter3DRenderer;
 
@@ -67,6 +67,6 @@ void ScatterRenderItem::setPosition(const QVector3D &pos)
 
 typedef QVector<ScatterRenderItem> ScatterRenderItemArray;
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp
index cdd04ae7..911e2995 100644
--- a/src/datavis3d/data/surfaceitemmodelhandler.cpp
+++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,7 +19,7 @@
 #include "surfaceitemmodelhandler_p.h"
 #include <QTimer>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 SurfaceItemModelHandler::SurfaceItemModelHandler(QItemModelSurfaceDataProxy *proxy, QObject *parent)
     : AbstractItemModelHandler(parent),
@@ -91,4 +91,4 @@ void SurfaceItemModelHandler::resolveModel()
     m_proxy->resetArray(newProxyArray);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/data/surfaceitemmodelhandler_p.h b/src/datavisualization/data/surfaceitemmodelhandler_p.h
index 2cdf5b47..045ac379 100644
--- a/src/datavis3d/data/surfaceitemmodelhandler_p.h
+++ b/src/datavisualization/data/surfaceitemmodelhandler_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -32,7 +32,7 @@
 #include "abstractitemmodelhandler_p.h"
 #include "qitemmodelsurfacedataproxy.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class SurfaceItemModelHandler : public AbstractItemModelHandler
 {
@@ -47,6 +47,6 @@ protected:
     QItemModelSurfaceDataProxy *m_proxy; // Not owned
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/datavis3d.pro b/src/datavisualization/datavisualization.pro
index 1f0118f0..58ec4b19 100644
--- a/src/datavis3d/datavis3d.pro
+++ b/src/datavisualization/datavisualization.pro
@@ -1,9 +1,9 @@
-TARGET = QtDataVis3D
+TARGET = QtDataVisualization
 QT = core gui
 
-DEFINES += QT_DATAVIS3D_LIBRARY
+DEFINES += QT_DATAVISUALIZATION_LIBRARY
 
-QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf
+QMAKE_DOCS = $$PWD/doc/qtdatavisualization.qdocconf
 
 load(qt_module)
 
@@ -24,7 +24,7 @@ wince* {
     }
 }
 
-OTHER_FILES += doc/qtdatavis3d.qdocconf \
+OTHER_FILES += doc/qtdatavisualization.qdocconf \
                doc/src/* \
                doc/images/* \
                doc/snippets/* \
diff --git a/src/datavis3d/doc/images/q3dbars-minimal.png b/src/datavisualization/doc/images/q3dbars-minimal.png
index fff8d415..fff8d415 100644
--- a/src/datavis3d/doc/images/q3dbars-minimal.png
+++ b/src/datavisualization/doc/images/q3dbars-minimal.png
diff --git a/src/datavis3d/doc/images/q3dscatter-minimal.png b/src/datavisualization/doc/images/q3dscatter-minimal.png
index 1c3290b3..1c3290b3 100644
--- a/src/datavis3d/doc/images/q3dscatter-minimal.png
+++ b/src/datavisualization/doc/images/q3dscatter-minimal.png
diff --git a/src/datavisualization/doc/qtdatavisualization.qdocconf b/src/datavisualization/doc/qtdatavisualization.qdocconf
new file mode 100644
index 00000000..016fbe0c
--- /dev/null
+++ b/src/datavisualization/doc/qtdatavisualization.qdocconf
@@ -0,0 +1,33 @@
+include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+
+project             = QtDataVisualization
+description         = Qt Data Visualization Reference Documentation
+version             = 1.0.0
+
+exampledirs += ../../../examples \
+               snippets
+
+headerdirs += ..
+imagedirs  += ../images \
+              images
+sourcedirs += ..
+
+depends += qtcore \
+           qtgui
+
+qhp.projects                    = qtdatavisualization
+
+qhp.qtdatavisualization.file            = qtdatavisualization.qhp
+qhp.qtdatavisualization.namespace       = org.qt-project.qtdatavisualization.1.0.0
+qhp.qtdatavisualization.virtualFolder   = qtdatavisualization
+qhp.qtdatavisualization.indexTitle      = Qt Data Visualization
+qhp.qtdatavisualization.indexRoot       =
+
+qhp.qtdatavisualization.filterAttributes                    = qtdatavisualization 1.0.0 qtrefdoc
+qhp.qtdatavisualization.customFilters.Qt.name               = QtDataVisualization 1.0.0
+qhp.qtdatavisualization.customFilters.Qt.filterAttributes   = qtdatavisualization 1.0.0
+qhp.qtdatavisualization.subprojects                         = classes
+qhp.qtdatavisualization.subprojects.classes.title           = C++ Classes
+qhp.qtdatavisualization.subprojects.classes.indexTitle      = Qt Data Visualization C++ Classes
+qhp.qtdatavisualization.subprojects.classes.selectors       = class fake:headerfile
+qhp.qtdatavisualization.subprojects.classes.sortPages       = true
diff --git a/src/datavis3d/doc/snippets/doc_src_q3dbars_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp
index 4372fada..85f2d7b4 100644
--- a/src/datavis3d/doc/snippets/doc_src_q3dbars_construction.cpp
+++ b/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 //! [3]
-#include <QtDataVis3D>
+#include <QtDataVisualization>
 
 int main(int argc, char **argv)
 {
diff --git a/src/datavis3d/doc/snippets/doc_src_q3dscatter_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp
index f92f60bc..deac1715 100644
--- a/src/datavis3d/doc/snippets/doc_src_q3dscatter_construction.cpp
+++ b/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 //! [3]
-#include <QtDataVis3D>
+#include <QtDataVisualization>
 
 int main(int argc, char **argv)
 {
diff --git a/src/datavis3d/doc/snippets/doc_src_qtdatavis3d.cpp b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp
index 269ea520..f4df32d5 100644
--- a/src/datavis3d/doc/snippets/doc_src_qtdatavis3d.cpp
+++ b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 //! [0]
-#include <QtDataVis3D>
+#include <QtDataVisualization>
 //! [0]
 
 //! [1]
diff --git a/src/datavis3d/doc/snippets/doc_src_qtdatavis3d.pro b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.pro
index ba0f320b..81555f88 100644
--- a/src/datavis3d/doc/snippets/doc_src_qtdatavis3d.pro
+++ b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.pro
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,5 +17,5 @@
 ****************************************************************************/
 
 #! [0]
-QT += datavis3d
+QT += datavisualization
 #! [0]
diff --git a/src/datavis3d/doc/src/qtdatavis3d-index.qdoc b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc
index d5bff9f8..d3afaf3b 100644
--- a/src/datavis3d/doc/src/qtdatavis3d-index.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,9 +17,9 @@
 ****************************************************************************/
 
 /*!
-    \title Qt Data Visualization 3D
-    \page qtdatavis3d-index.html
-    \brief QtDataVis3D module provides functionality for 3D visualization.
+    \title Qt Data Visualization
+    \page qtdatavisualization-index.html
+    \brief QtDataVisualization module provides functionality for 3D visualization.
 
     Qt Data Visualization module provides a way to visualize data in 3D.
     It uses OpneGL for the data rendering.
@@ -29,24 +29,24 @@
     Qt Data Visualization provides classes for rendering 3D data. To include
     the definitions of the module's classes, use the following directive:
 
-    \snippet doc_src_qtdatavis3d.cpp 0
+    \snippet doc_src_qtdatavisualization.cpp 0
 
     To link against the module, add this line to your qmake \c
     .pro file:
 
-    \snippet doc_src_qtdatavis3d.pro 0
+    \snippet doc_src_qtdatavisualization.pro 0
 
     \section1 Articles
     \list
-    \li \l{Qt Data Visualization 3D License Information}{License Information}
+    \li \l{Qt Data Visualization License Information}{License Information}
     \endlist
 
     \section1 References
     \list
-        \li \l{Qt Data Visualization 3D C++ Classes}
+        \li \l{Qt Data Visualization C++ Classes}
     \endlist
 
-    Qt Data Visualization 3D comes with the following examples:
+    Qt Data Visualization comes with the following examples:
 
     \list
         \li \l{Barchart Example}
diff --git a/src/datavis3d/doc/src/qtdatavis3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc
index c27fe0a3..5ddd0720 100644
--- a/src/datavis3d/doc/src/qtdatavis3d.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,10 +17,10 @@
 ****************************************************************************/
 
 /*!
-    \module QtDataVis3D
-    \title Qt Data Visualization 3D C++ Classes
+    \module QtDataVisualization
+    \title Qt Data Visualization C++ Classes
     \ingroup modules
 
-    \brief The QtDataVis3D module provides functionality for 3D visualization.
+    \brief The QtDataVisualization module provides functionality for 3D visualization.
 */
 
diff --git a/src/datavis3d/doc/src/qtdatavis3dlicense.qdoc b/src/datavisualization/doc/src/qtdatavisualizationlicense.qdoc
index 610fb9b7..16c1ed70 100644
--- a/src/datavis3d/doc/src/qtdatavis3dlicense.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualizationlicense.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,15 +17,21 @@
 ****************************************************************************/
 
 /*!
-    \page qtdatavis3dlicense.html
-    \title Qt Data Visualization 3D License Information
+    \page qtdatavisualizationlicense.html
+    \title Qt Data Visualization License Information
     \ingroup licensing
-    \brief License information for Qt Data Visualization 3D
-
-    TODO
+    \brief License information for Qt Data Visualization
 
     \legalese
-    TODO
-    \endlegalese
+    Copyright 2013 Digia.
+
+    Qt and Qt logos are trademarks of of Digia Corporation in Finland and/or other countries
+    worldwide.
 
+    All other trademarks are property of their respective owners.
+
+    Licensees holding valid Qt Enterprise licenses may use this document in accordance with the
+    Qt Enterprise License Agreement provided with the Software or, alternatively, in accordance
+    with the terms contained in a written agreement between you and Digia.
+    \endlegalese
 */
diff --git a/src/datavis3d/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index fcc75915..2f3476dc 100644
--- a/src/datavis3d/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -35,7 +35,7 @@
 
 #include <QThread>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 Abstract3DController::Abstract3DController(QRect boundRect, QObject *parent) :
     QObject(parent),
@@ -1054,4 +1054,4 @@ void Abstract3DController::emitNeedRender()
     }
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index ccc0cc40..1419c0f4 100644
--- a/src/datavis3d/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -31,7 +31,7 @@
 
 #include <QObject>
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "theme_p.h"
 #include "q3dabstractaxis.h"
 #include "drawer_p.h"
@@ -42,7 +42,7 @@
 
 class QFont;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class CameraHelper;
 class Abstract3DRenderer;
@@ -120,7 +120,7 @@ struct Abstract3DChangeBitField {
     }
 };
 
-class QT_DATAVIS3D_EXPORT Abstract3DController : public QObject
+class QT_DATAVISUALIZATION_EXPORT Abstract3DController : public QObject
 {
     Q_OBJECT
 
@@ -336,6 +336,6 @@ private:
                        Q3DAbstractAxis **axisPtr);
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // CONTROLLER3DBASE_H
diff --git a/src/datavis3d/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index 9f64157a..7e5962cc 100644
--- a/src/datavis3d/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -23,7 +23,7 @@
 #include "q3dscene.h"
 #include "q3dcamera.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller)
     : QObject(0),
@@ -304,4 +304,4 @@ AxisRenderCache &Abstract3DRenderer::axisCacheForOrientation(Q3DAbstractAxis::Ax
 }
 
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h
index 7f58f59c..1edca798 100644
--- a/src/datavis3d/engine/abstract3drenderer_p.h
+++ b/src/datavisualization/engine/abstract3drenderer_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -33,14 +33,14 @@
 #include <QtGui/QFont>
 #include <QTime>
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "abstract3dcontroller_p.h"
 #include "axisrendercache_p.h"
 #include "qabstractdataproxy.h"
 
 //#define DISPLAY_RENDER_SPEED
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class TextureHelper;
 class Theme;
@@ -133,6 +133,6 @@ protected:
     AxisRenderCache &axisCacheForOrientation(Q3DAbstractAxis::AxisOrientation orientation);
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // ABSTRACT3DRENDERER_P_H
diff --git a/src/datavis3d/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp
index f44aa3b9..c525c777 100644
--- a/src/datavis3d/engine/axisrendercache.cpp
+++ b/src/datavisualization/engine/axisrendercache.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 #include "qmath.h"
 #include <QFontMetrics>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 AxisRenderCache::AxisRenderCache()
     : m_type(Q3DAbstractAxis::AxisTypeNone),
@@ -183,4 +183,4 @@ int AxisRenderCache::maxLabelWidth(const QStringList &labels) const
     return labelWidth;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/axisrendercache_p.h b/src/datavisualization/engine/axisrendercache_p.h
index e4f965f4..0bb1cf92 100644
--- a/src/datavis3d/engine/axisrendercache_p.h
+++ b/src/datavisualization/engine/axisrendercache_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,12 +29,12 @@
 #ifndef AXISRENDERCACHE_P_H
 #define AXISRENDERCACHE_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "labelitem_p.h"
 #include "q3dabstractaxis_p.h"
 #include "drawer_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class AxisRenderCache : public QObject
 {
@@ -96,6 +96,6 @@ private:
     Q_DISABLE_COPY(AxisRenderCache)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index 0febdb68..90987fc5 100644
--- a/src/datavis3d/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -28,7 +28,7 @@
 #include <QMouseEvent>
 #include <qmath.h>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 Bars3DController::Bars3DController(QRect boundRect)
     : Abstract3DController(boundRect),
@@ -374,4 +374,4 @@ Q3DAbstractAxis *Bars3DController::createDefaultAxis(Q3DAbstractAxis::AxisOrient
     return defaultAxis;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h
index bfc35636..69ead98a 100644
--- a/src/datavis3d/engine/bars3dcontroller_p.h
+++ b/src/datavisualization/engine/bars3dcontroller_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,12 +29,12 @@
 #ifndef Q3DBARSCONTROLLER_p_H
 #define Q3DBARSCONTROLLER_p_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "abstract3dcontroller_p.h"
 
 //#define DISPLAY_RENDER_SPEED
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Bars3DRenderer;
 class QBarDataProxy;
@@ -54,7 +54,7 @@ struct Bars3DChangeBitField {
     }
 };
 
-class QT_DATAVIS3D_EXPORT Bars3DController : public Abstract3DController
+class QT_DATAVISUALIZATION_EXPORT Bars3DController : public Abstract3DController
 {
     Q_OBJECT
 
@@ -138,6 +138,6 @@ private:
 };
 
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 5a5a659a..6331ee8e 100644
--- a/src/datavis3d/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -42,7 +42,7 @@
 // You should see the scene from  where the light is
 //#define SHOW_DEPTH_TEXTURE_SCENE
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 const GLfloat labelMargin = 0.05f;
 const GLfloat gridLineWidth = 0.005f;
@@ -1825,4 +1825,4 @@ void Bars3DRenderer::initLabelShaders(const QString &vertexShader, const QString
     m_labelShader->initialize();
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h
index 99734315..3be0ebf9 100644
--- a/src/datavis3d/engine/bars3drenderer_p.h
+++ b/src/datavisualization/engine/bars3drenderer_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,7 +29,7 @@
 #ifndef Q3DBARSRENDERER_p_H
 #define Q3DBARSRENDERER_p_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "bars3dcontroller_p.h"
 #include "abstract3drenderer_p.h"
 #include "qbardataproxy.h"
@@ -39,14 +39,14 @@ class QPoint;
 class QSizeF;
 class QOpenGLShaderProgram;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class ShaderHelper;
 class ObjectHelper;
 class LabelItem;
 class Q3DScene;
 
-class QT_DATAVIS3D_EXPORT Bars3DRenderer : public Abstract3DRenderer
+class QT_DATAVISUALIZATION_EXPORT Bars3DRenderer : public Abstract3DRenderer
 {
     Q_OBJECT
 
@@ -166,6 +166,6 @@ private:
 };
 
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp
index aa16205f..284d57c5 100644
--- a/src/datavis3d/engine/drawer.cpp
+++ b/src/datavisualization/engine/drawer.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -16,7 +16,7 @@
 **
 ****************************************************************************/
 
-#include "qdatavis3denums.h"
+#include "qdatavisualizationenums.h"
 #include "drawer_p.h"
 #include "shaderhelper_p.h"
 #include "objecthelper_p.h"
@@ -39,7 +39,7 @@ public:
 };
 StaticLibInitializer staticLibInitializer;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 Drawer::Drawer(const Theme &theme, const QFont &font, QDataVis::LabelTransparency transparency)
     : m_theme(theme),
@@ -344,4 +344,4 @@ void Drawer::generateLabelItem(LabelItem &item, const QString &text, int widestL
     }
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/drawer_p.h b/src/datavisualization/engine/drawer_p.h
index 3654dcc1..3b3e7a1c 100644
--- a/src/datavis3d/engine/drawer_p.h
+++ b/src/datavisualization/engine/drawer_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,14 +29,14 @@
 #ifndef DRAWER_P_H
 #define DRAWER_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "q3dbars.h"
 #include "theme_p.h"
 #include "labelitem_p.h"
 #include "abstractrenderitem_p.h"
 #include <QFont>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class ShaderHelper;
 class ObjectHelper;
@@ -98,6 +98,6 @@ private:
     TextureHelper *m_textureHelper;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/engine/engine.pri b/src/datavisualization/engine/engine.pri
index 4c905fe9..4c905fe9 100644
--- a/src/datavis3d/engine/engine.pri
+++ b/src/datavisualization/engine/engine.pri
diff --git a/src/datavis3d/engine/engine.qrc b/src/datavisualization/engine/engine.qrc
index af6e899d..af6e899d 100644
--- a/src/datavis3d/engine/engine.qrc
+++ b/src/datavisualization/engine/engine.qrc
diff --git a/src/datavis3d/engine/meshes/backgroudFlat.obj b/src/datavisualization/engine/meshes/backgroudFlat.obj
index cf4d10a5..cf4d10a5 100644
--- a/src/datavis3d/engine/meshes/backgroudFlat.obj
+++ b/src/datavisualization/engine/meshes/backgroudFlat.obj
diff --git a/src/datavis3d/engine/meshes/backgroudNegatives.obj b/src/datavisualization/engine/meshes/backgroudNegatives.obj
index dd4d3f05..dd4d3f05 100644
--- a/src/datavis3d/engine/meshes/backgroudNegatives.obj
+++ b/src/datavisualization/engine/meshes/backgroudNegatives.obj
diff --git a/src/datavis3d/engine/meshes/backgroudSmooth.obj b/src/datavisualization/engine/meshes/backgroudSmooth.obj
index ad16d904..ad16d904 100644
--- a/src/datavis3d/engine/meshes/backgroudSmooth.obj
+++ b/src/datavisualization/engine/meshes/backgroudSmooth.obj
diff --git a/src/datavis3d/engine/meshes/barFilledFlat.obj b/src/datavisualization/engine/meshes/barFilledFlat.obj
index 5f627091..5f627091 100644
--- a/src/datavis3d/engine/meshes/barFilledFlat.obj
+++ b/src/datavisualization/engine/meshes/barFilledFlat.obj
diff --git a/src/datavis3d/engine/meshes/barFilledSmooth.obj b/src/datavisualization/engine/meshes/barFilledSmooth.obj
index efc4317a..efc4317a 100644
--- a/src/datavis3d/engine/meshes/barFilledSmooth.obj
+++ b/src/datavisualization/engine/meshes/barFilledSmooth.obj
diff --git a/src/datavis3d/engine/meshes/barFlat.obj b/src/datavisualization/engine/meshes/barFlat.obj
index b802feab..b802feab 100644
--- a/src/datavis3d/engine/meshes/barFlat.obj
+++ b/src/datavisualization/engine/meshes/barFlat.obj
diff --git a/src/datavis3d/engine/meshes/barSmooth.obj b/src/datavisualization/engine/meshes/barSmooth.obj
index aa4fdd92..aa4fdd92 100644
--- a/src/datavis3d/engine/meshes/barSmooth.obj
+++ b/src/datavisualization/engine/meshes/barSmooth.obj
diff --git a/src/datavis3d/engine/meshes/coneFilledFlat.obj b/src/datavisualization/engine/meshes/coneFilledFlat.obj
index cbbffaff..cbbffaff 100644
--- a/src/datavis3d/engine/meshes/coneFilledFlat.obj
+++ b/src/datavisualization/engine/meshes/coneFilledFlat.obj
diff --git a/src/datavis3d/engine/meshes/coneFilledSmooth.obj b/src/datavisualization/engine/meshes/coneFilledSmooth.obj
index ea3a8702..ea3a8702 100644
--- a/src/datavis3d/engine/meshes/coneFilledSmooth.obj
+++ b/src/datavisualization/engine/meshes/coneFilledSmooth.obj
diff --git a/src/datavis3d/engine/meshes/coneFlat.obj b/src/datavisualization/engine/meshes/coneFlat.obj
index 51c3821e..51c3821e 100644
--- a/src/datavis3d/engine/meshes/coneFlat.obj
+++ b/src/datavisualization/engine/meshes/coneFlat.obj
diff --git a/src/datavis3d/engine/meshes/coneSmooth.obj b/src/datavisualization/engine/meshes/coneSmooth.obj
index 48c48ba8..48c48ba8 100644
--- a/src/datavis3d/engine/meshes/coneSmooth.obj
+++ b/src/datavisualization/engine/meshes/coneSmooth.obj
diff --git a/src/datavis3d/engine/meshes/cubeFilledFlat.obj b/src/datavisualization/engine/meshes/cubeFilledFlat.obj
index 108cf7ac..108cf7ac 100644
--- a/src/datavis3d/engine/meshes/cubeFilledFlat.obj
+++ b/src/datavisualization/engine/meshes/cubeFilledFlat.obj
diff --git a/src/datavis3d/engine/meshes/cubeFilledSmooth.obj b/src/datavisualization/engine/meshes/cubeFilledSmooth.obj
index 07350f03..07350f03 100644
--- a/src/datavis3d/engine/meshes/cubeFilledSmooth.obj
+++ b/src/datavisualization/engine/meshes/cubeFilledSmooth.obj
diff --git a/src/datavis3d/engine/meshes/cubeFlat.obj b/src/datavisualization/engine/meshes/cubeFlat.obj
index 3c8d6d0a..3c8d6d0a 100644
--- a/src/datavis3d/engine/meshes/cubeFlat.obj
+++ b/src/datavisualization/engine/meshes/cubeFlat.obj
diff --git a/src/datavis3d/engine/meshes/cubeSmooth.obj b/src/datavisualization/engine/meshes/cubeSmooth.obj
index 9d147bfd..9d147bfd 100644
--- a/src/datavis3d/engine/meshes/cubeSmooth.obj
+++ b/src/datavisualization/engine/meshes/cubeSmooth.obj
diff --git a/src/datavis3d/engine/meshes/cylinderFilledFlat.obj b/src/datavisualization/engine/meshes/cylinderFilledFlat.obj
index 16c2ef36..16c2ef36 100644
--- a/src/datavis3d/engine/meshes/cylinderFilledFlat.obj
+++ b/src/datavisualization/engine/meshes/cylinderFilledFlat.obj
diff --git a/src/datavis3d/engine/meshes/cylinderFilledSmooth.obj b/src/datavisualization/engine/meshes/cylinderFilledSmooth.obj
index 90db7d63..90db7d63 100644
--- a/src/datavis3d/engine/meshes/cylinderFilledSmooth.obj
+++ b/src/datavisualization/engine/meshes/cylinderFilledSmooth.obj
diff --git a/src/datavis3d/engine/meshes/cylinderFlat.obj b/src/datavisualization/engine/meshes/cylinderFlat.obj
index 2b7e3e5e..2b7e3e5e 100644
--- a/src/datavis3d/engine/meshes/cylinderFlat.obj
+++ b/src/datavisualization/engine/meshes/cylinderFlat.obj
diff --git a/src/datavis3d/engine/meshes/cylinderSmooth.obj b/src/datavisualization/engine/meshes/cylinderSmooth.obj
index 6ccbb286..6ccbb286 100644
--- a/src/datavis3d/engine/meshes/cylinderSmooth.obj
+++ b/src/datavisualization/engine/meshes/cylinderSmooth.obj
diff --git a/src/datavis3d/engine/meshes/plane.obj b/src/datavisualization/engine/meshes/plane.obj
index 96ac0dd7..96ac0dd7 100644
--- a/src/datavis3d/engine/meshes/plane.obj
+++ b/src/datavisualization/engine/meshes/plane.obj
diff --git a/src/datavis3d/engine/meshes/pyramidFilledFlat.obj b/src/datavisualization/engine/meshes/pyramidFilledFlat.obj
index 0cf73bbe..0cf73bbe 100644
--- a/src/datavis3d/engine/meshes/pyramidFilledFlat.obj
+++ b/src/datavisualization/engine/meshes/pyramidFilledFlat.obj
diff --git a/src/datavis3d/engine/meshes/pyramidFilledSmooth.obj b/src/datavisualization/engine/meshes/pyramidFilledSmooth.obj
index 306bda58..306bda58 100644
--- a/src/datavis3d/engine/meshes/pyramidFilledSmooth.obj
+++ b/src/datavisualization/engine/meshes/pyramidFilledSmooth.obj
diff --git a/src/datavis3d/engine/meshes/pyramidFlat.obj b/src/datavisualization/engine/meshes/pyramidFlat.obj
index 35edb477..35edb477 100644
--- a/src/datavis3d/engine/meshes/pyramidFlat.obj
+++ b/src/datavisualization/engine/meshes/pyramidFlat.obj
diff --git a/src/datavis3d/engine/meshes/pyramidSmooth.obj b/src/datavisualization/engine/meshes/pyramidSmooth.obj
index b11c8750..b11c8750 100644
--- a/src/datavis3d/engine/meshes/pyramidSmooth.obj
+++ b/src/datavisualization/engine/meshes/pyramidSmooth.obj
diff --git a/src/datavis3d/engine/meshes/scatterdot.obj b/src/datavisualization/engine/meshes/scatterdot.obj
index d994a80f..d994a80f 100644
--- a/src/datavis3d/engine/meshes/scatterdot.obj
+++ b/src/datavisualization/engine/meshes/scatterdot.obj
diff --git a/src/datavis3d/engine/meshes/scatterdotFlat.obj b/src/datavisualization/engine/meshes/scatterdotFlat.obj
index 4052738d..4052738d 100644
--- a/src/datavis3d/engine/meshes/scatterdotFlat.obj
+++ b/src/datavisualization/engine/meshes/scatterdotFlat.obj
diff --git a/src/datavis3d/engine/meshes/sphere.obj b/src/datavisualization/engine/meshes/sphere.obj
index 671a7bcc..671a7bcc 100644
--- a/src/datavis3d/engine/meshes/sphere.obj
+++ b/src/datavisualization/engine/meshes/sphere.obj
diff --git a/src/datavis3d/engine/meshes/sphereSmooth.obj b/src/datavisualization/engine/meshes/sphereSmooth.obj
index 3c5b1299..3c5b1299 100644
--- a/src/datavis3d/engine/meshes/sphereSmooth.obj
+++ b/src/datavisualization/engine/meshes/sphereSmooth.obj
diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp
index 01731b40..e6832d87 100644
--- a/src/datavis3d/engine/q3dbars.cpp
+++ b/src/datavisualization/engine/q3dbars.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -27,11 +27,11 @@
 
 #include <QDebug>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class Q3DBars
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief The Q3DBars class provides methods for rendering 3D bar graphs.
  * \since 1.0.0
  *
@@ -597,4 +597,4 @@ void Q3DBarsPrivate::handleShadowQualityUpdate(QDataVis::ShadowQuality quality)
     emit q_ptr->shadowQualityChanged(quality);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h
index 095e7cdc..92772799 100644
--- a/src/datavis3d/engine/q3dbars.h
+++ b/src/datavisualization/engine/q3dbars.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,11 +19,11 @@
 #ifndef Q3DBARS_H
 #define Q3DBARS_H
 
-#include <QtDataVis3D/qdatavis3denums.h>
-#include <QtDataVis3D/q3dwindow.h>
+#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/q3dwindow.h>
 #include <QFont>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DBarsPrivate;
 class Q3DAbstractAxis;
@@ -31,19 +31,19 @@ class Q3DCategoryAxis;
 class Q3DValueAxis;
 class QBarDataProxy;
 
-class QT_DATAVIS3D_EXPORT Q3DBars : public Q3DWindow
+class QT_DATAVISUALIZATION_EXPORT Q3DBars : public Q3DWindow
 {
     Q_OBJECT
-    Q_PROPERTY(QtDataVis3D::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
-    Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
-    Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged)
+    Q_PROPERTY(QtDataVisualization::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
+    Q_PROPERTY(QtDataVisualization::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
+    Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged)
     Q_PROPERTY(QFont font READ font WRITE setFont)
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
     Q_PROPERTY(QPoint selectedBarPos READ selectedBarPos WRITE setSelectedBarPos NOTIFY selectedBarPosChanged)
-    Q_ENUMS(QtDataVis3D::QDataVis::SelectionMode)
-    Q_ENUMS(QtDataVis3D::QDataVis::ShadowQuality)
-    Q_ENUMS(QtDataVis3D::QDataVis::LabelTransparency)
+    Q_ENUMS(QtDataVisualization::QDataVis::SelectionMode)
+    Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality)
+    Q_ENUMS(QtDataVisualization::QDataVis::LabelTransparency)
 
 public:
     explicit Q3DBars();
@@ -132,6 +132,6 @@ private:
     Q_DISABLE_COPY(Q3DBars)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/engine/q3dbars_p.h b/src/datavisualization/engine/q3dbars_p.h
index f995cfbb..653db606 100644
--- a/src/datavis3d/engine/q3dbars_p.h
+++ b/src/datavisualization/engine/q3dbars_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -30,9 +30,9 @@
 #define Q3DBARS_p_H
 
 #include "bars3dcontroller_p.h"
-#include "qdatavis3denums.h"
+#include "qdatavisualizationenums.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DBars;
 
@@ -49,6 +49,6 @@ public:
     Bars3DController *m_shared;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/engine/q3dbox.cpp b/src/datavisualization/engine/q3dbox.cpp
index cb250a2b..0ce7f9a7 100644
--- a/src/datavis3d/engine/q3dbox.cpp
+++ b/src/datavisualization/engine/q3dbox.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -16,12 +16,12 @@
 **
 ****************************************************************************/
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "q3dbox.h"
 #include <QtGui/QMatrix4x4>
 #include <QtCore/QList>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
     \class Q3DBox
@@ -477,4 +477,4 @@ QDataStream &operator>>(QDataStream &stream, Q3DBox &box)
 
 #endif // QT_NO_DATASTREAM
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/q3dbox.h b/src/datavisualization/engine/q3dbox.h
index f41eda36..72d97219 100644
--- a/src/datavis3d/engine/q3dbox.h
+++ b/src/datavisualization/engine/q3dbox.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,13 +19,13 @@
 #ifndef Q3DBOX_H
 #define Q3DBOX_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 
 class QMatrix4x4;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
-class QT_DATAVIS3D_EXPORT Q3DBox
+class QT_DATAVISUALIZATION_EXPORT Q3DBox
 {
 public:
     Q3DBox();
@@ -169,16 +169,16 @@ inline bool qFuzzyCompare(const Q3DBox& box1, const Q3DBox& box2)
 }
 
 #ifndef QT_NO_DEBUG_STREAM
-QT_DATAVIS3D_EXPORT QDebug operator<<(QDebug dbg, const Q3DBox &box);
+QT_DATAVISUALIZATION_EXPORT QDebug operator<<(QDebug dbg, const Q3DBox &box);
 #endif
 
 #ifndef QT_NO_DATASTREAM
-QT_DATAVIS3D_EXPORT QDataStream &operator<<(QDataStream &stream, const Q3DBox &box);
-QT_DATAVIS3D_EXPORT QDataStream &operator>>(QDataStream &stream, Q3DBox &box);
+QT_DATAVISUALIZATION_EXPORT QDataStream &operator<<(QDataStream &stream, const Q3DBox &box);
+QT_DATAVISUALIZATION_EXPORT QDataStream &operator>>(QDataStream &stream, Q3DBox &box);
 #endif
 
 //Q_DECLARE_METATYPE(Q3DBox)
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp
index 480af9b6..906cd466 100644
--- a/src/datavis3d/engine/q3dcamera.cpp
+++ b/src/datavisualization/engine/q3dcamera.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -25,7 +25,7 @@
 #include <qmath.h>
 #include <QVector3D>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 Q3DCamera::Q3DCamera(QObject *parent) :
     Q3DObject(parent),
@@ -292,4 +292,4 @@ Q3DCameraPrivate::~Q3DCameraPrivate()
 {
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h
index 35eaaea7..ed09c3e1 100644
--- a/src/datavis3d/engine/q3dcamera.h
+++ b/src/datavisualization/engine/q3dcamera.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -22,7 +22,7 @@
 #include <QObject>
 #include <QMatrix4x4>
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "q3dbars.h"
 #include "q3dobject.h"
 
@@ -30,16 +30,16 @@ class QVector3D;
 class QPoint;
 class QPointF;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DCameraPrivate;
 
-class QT_DATAVIS3D_EXPORT Q3DCamera : public Q3DObject
+class QT_DATAVISUALIZATION_EXPORT Q3DCamera : public Q3DObject
 {
     Q_OBJECT
     Q_PROPERTY(QPointF rotations READ rotations WRITE setRotations)
     Q_PROPERTY(QMatrix4x4 viewMatrix READ viewMatrix WRITE setViewMatrix)
-    Q_PROPERTY(QtDataVis3D::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset)
+    Q_PROPERTY(QtDataVisualization::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset)
     Q_PROPERTY(int zoomLevel READ zoomLevel WRITE setZoomLevel)
 
 
@@ -82,6 +82,6 @@ private:
     Q_DISABLE_COPY(Q3DCamera)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // Q3DCAMERA_H
diff --git a/src/datavis3d/engine/q3dcamera_p.h b/src/datavisualization/engine/q3dcamera_p.h
index b8b1e913..75805d09 100644
--- a/src/datavis3d/engine/q3dcamera_p.h
+++ b/src/datavisualization/engine/q3dcamera_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,11 +29,11 @@
 #ifndef Q3DCAMERA_P_H
 #define Q3DCAMERA_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "q3dbars.h"
 #include <QObject>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DCamera;
 
@@ -56,6 +56,6 @@ public:
     QDataVis::CameraPreset m_activePreset;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // Q3DCAMERA_P_H
diff --git a/src/datavis3d/engine/q3dlight.cpp b/src/datavisualization/engine/q3dlight.cpp
index 44fe11c6..80debb83 100644
--- a/src/datavis3d/engine/q3dlight.cpp
+++ b/src/datavisualization/engine/q3dlight.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 #include "q3dscene.h"
 #include "q3dlight_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 Q3DLight::Q3DLight(QObject *parent) :
     Q3DObject(parent),
@@ -46,4 +46,4 @@ Q3DLightPrivate::~Q3DLightPrivate()
 {
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/q3dlight.h b/src/datavisualization/engine/q3dlight.h
index 6bbfcadd..1a7ef739 100644
--- a/src/datavis3d/engine/q3dlight.h
+++ b/src/datavisualization/engine/q3dlight.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -21,15 +21,15 @@
 
 #include <QObject>
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "q3dobject.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DLightPrivate;
 class Q3DScene;
 
-class QT_DATAVIS3D_EXPORT Q3DLight : public Q3DObject
+class QT_DATAVISUALIZATION_EXPORT Q3DLight : public Q3DObject
 {
     Q_OBJECT
 
@@ -45,6 +45,6 @@ private:
     Q_DISABLE_COPY(Q3DLight)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // Q3DLIGHT_H
diff --git a/src/datavis3d/engine/q3dlight_p.h b/src/datavisualization/engine/q3dlight_p.h
index 8bd0dea3..d0d28052 100644
--- a/src/datavis3d/engine/q3dlight_p.h
+++ b/src/datavisualization/engine/q3dlight_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,9 +29,9 @@
 #ifndef Q3DLIGHT_P_H
 #define Q3DLIGHT_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DScene;
 class Q3DLight;
@@ -47,7 +47,7 @@ public:
 
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // Q3DLIGHT_P_H
 
diff --git a/src/datavis3d/engine/q3dobject.cpp b/src/datavisualization/engine/q3dobject.cpp
index 54235ce1..cd609ae6 100644
--- a/src/datavis3d/engine/q3dobject.cpp
+++ b/src/datavisualization/engine/q3dobject.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,7 +19,7 @@
 #include "q3dobject.h"
 #include "q3dobject_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 Q3DObject::Q3DObject(QObject *parent) :
     QObject(parent),
@@ -70,4 +70,4 @@ Q3DObjectPrivate::~Q3DObjectPrivate()
 
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/q3dobject.h b/src/datavisualization/engine/q3dobject.h
index 29f759ac..85bb3858 100644
--- a/src/datavis3d/engine/q3dobject.h
+++ b/src/datavisualization/engine/q3dobject.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,9 +20,9 @@
 #define Q3DOBJECT_H
 
 #include <QObject>
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DScene;
 class Q3DObjectPrivate;
@@ -49,6 +49,6 @@ private:
     Q_DISABLE_COPY(Q3DObject)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // Q3DOBJECT_H
diff --git a/src/datavis3d/engine/q3dobject_p.h b/src/datavisualization/engine/q3dobject_p.h
index f55be225..d1064731 100644
--- a/src/datavis3d/engine/q3dobject_p.h
+++ b/src/datavisualization/engine/q3dobject_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,9 +29,9 @@
 #ifndef Q3DOBJECT_P_H
 #define Q3DOBJECT_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DObject;
 class Q3DScene;
@@ -48,6 +48,6 @@ public:
     QVector3D m_position;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // Q3DOBJECT_P_H
diff --git a/src/datavis3d/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp
index 0316243e..b9e74a22 100644
--- a/src/datavis3d/engine/q3dscatter.cpp
+++ b/src/datavisualization/engine/q3dscatter.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -26,11 +26,11 @@
 
 #include <QDebug>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class Q3DScatter
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief The Q3DScatter class provides methods for rendering 3D scatter graphs.
  * \since 1.0.0
  *
@@ -571,5 +571,5 @@ void Q3DScatterPrivate::handleShadowQualityUpdate(QDataVis::ShadowQuality qualit
     emit q_ptr->shadowQualityChanged(quality);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
diff --git a/src/datavis3d/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h
index ea8fa681..4c65b83d 100644
--- a/src/datavis3d/engine/q3dscatter.h
+++ b/src/datavisualization/engine/q3dscatter.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,11 +19,11 @@
 #ifndef Q3DSCATTER_H
 #define Q3DSCATTER_H
 
-#include <QtDataVis3D/qdatavis3denums.h>
-#include <QtDataVis3D/q3dwindow.h>
+#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/q3dwindow.h>
 #include <QFont>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DScatterPrivate;
 class LabelItem;
@@ -31,19 +31,19 @@ class Q3DValueAxis;
 class Q3DCategoryAxis;
 class QScatterDataProxy;
 
-class QT_DATAVIS3D_EXPORT Q3DScatter : public Q3DWindow
+class QT_DATAVISUALIZATION_EXPORT Q3DScatter : public Q3DWindow
 {
     Q_OBJECT
-    Q_PROPERTY(QtDataVis3D::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
-    Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
-    Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
+    Q_PROPERTY(QtDataVisualization::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
+    Q_PROPERTY(QtDataVisualization::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
+    Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
     Q_PROPERTY(QFont font READ font WRITE setFont)
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
     Q_PROPERTY(int selectedItemIndex READ selectedItemIndex WRITE setSelectedItemIndex NOTIFY selectedItemIndexChanged)
-    Q_ENUMS(QtDataVis3D::QDataVis::SelectionMode)
-    Q_ENUMS(QtDataVis3D::QDataVis::ShadowQuality)
-    Q_ENUMS(QtDataVis3D::QDataVis::LabelTransparency)
+    Q_ENUMS(QtDataVisualization::QDataVis::SelectionMode)
+    Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality)
+    Q_ENUMS(QtDataVisualization::QDataVis::LabelTransparency)
 
 public:
     explicit Q3DScatter();
@@ -124,6 +124,6 @@ private:
     Q_DISABLE_COPY(Q3DScatter)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/engine/q3dscatter_p.h b/src/datavisualization/engine/q3dscatter_p.h
index 435f6708..775344d0 100644
--- a/src/datavis3d/engine/q3dscatter_p.h
+++ b/src/datavisualization/engine/q3dscatter_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -30,9 +30,9 @@
 #define Q3DSCATTER_p_H
 
 #include "scatter3dcontroller_p.h"
-#include "qdatavis3denums.h"
+#include "qdatavisualizationenums.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DScatter;
 
@@ -49,6 +49,6 @@ public:
     Scatter3DController *m_shared;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp
index e0267e7d..49c08bbc 100644
--- a/src/datavis3d/engine/q3dscene.cpp
+++ b/src/datavisualization/engine/q3dscene.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -18,14 +18,14 @@
 
 #include <qmath.h>
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 
 #include "q3dscene.h"
 #include "q3dscene_p.h"
 #include "q3dcamera.h"
 #include "q3dlight.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 Q3DScene::Q3DScene(QObject *parent) :
     d_ptr(new Q3DScenePrivate(this))
@@ -196,4 +196,4 @@ Q3DScenePrivate::~Q3DScenePrivate()
     delete m_light;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h
index bd53e06a..352a3b82 100644
--- a/src/datavis3d/engine/q3dscene.h
+++ b/src/datavisualization/engine/q3dscene.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -21,10 +21,10 @@
 
 #include <QObject>
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "q3dscene_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DCamera;
 class Q3DBox;
@@ -32,7 +32,7 @@ class Q3DLight;
 
 // Note: Scene doesn't take ownership of any of the objects given as parameter. Upon destruction of the scene it will call setParentScene(0) on it's child objects.
 
-class QT_DATAVIS3D_EXPORT Q3DScene : public QObject
+class QT_DATAVISUALIZATION_EXPORT Q3DScene : public QObject
 {
     Q_OBJECT
 
@@ -78,6 +78,6 @@ private:
     Q_DISABLE_COPY(Q3DScene)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // Q3DSCENE_H
diff --git a/src/datavis3d/engine/q3dscene_p.h b/src/datavisualization/engine/q3dscene_p.h
index 35ee89be..86386a75 100644
--- a/src/datavis3d/engine/q3dscene_p.h
+++ b/src/datavisualization/engine/q3dscene_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -31,9 +31,9 @@
 
 #include <QRect>
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DCamera;
 class Q3DLight;
@@ -55,6 +55,6 @@ public:
     bool m_isSlicingActivated;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // Q3DSCENE_P_H
diff --git a/src/datavis3d/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp
index 6607b552..0dfc4c93 100644
--- a/src/datavis3d/engine/q3dsurface.cpp
+++ b/src/datavisualization/engine/q3dsurface.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -25,7 +25,7 @@
 
 #include <QDebug>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 Q3DSurface::Q3DSurface()
     : d_ptr(new Q3DSurfacePrivate(this, geometry()))
@@ -318,4 +318,4 @@ Q3DSurfacePrivate::~Q3DSurfacePrivate()
     delete m_shared;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h
index e99600dd..5a458b67 100644
--- a/src/datavis3d/engine/q3dsurface.h
+++ b/src/datavisualization/engine/q3dsurface.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,16 +19,16 @@
 #ifndef Q3DSURFACE_H
 #define Q3DSURFACE_H
 
-#include <QtDataVis3D/qdatavis3denums.h>
-#include <QtDataVis3D/q3dwindow.h>
+#include <QtDataVisualization/qdatavisualizationenums.h>
+#include <QtDataVisualization/q3dwindow.h>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DSurfacePrivate;
 class Q3DValueAxis;
 class QSurfaceDataProxy;
 
-class QT_DATAVIS3D_EXPORT Q3DSurface : public Q3DWindow
+class QT_DATAVISUALIZATION_EXPORT Q3DSurface : public Q3DWindow
 {
     Q_OBJECT
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
@@ -101,6 +101,6 @@ private:
     Q_DISABLE_COPY(Q3DSurface)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // Q3DSURFACE_H
diff --git a/src/datavis3d/engine/q3dsurface_p.h b/src/datavisualization/engine/q3dsurface_p.h
index d119f01f..7c70d08c 100644
--- a/src/datavis3d/engine/q3dsurface_p.h
+++ b/src/datavisualization/engine/q3dsurface_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -30,11 +30,11 @@
 #define Q3DSURFACE_P_H
 
 #include "surface3dcontroller_p.h"
-#include "qdatavis3denums.h"
+#include "qdatavisualizationenums.h"
 
 #include <QList>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DSurface;
 
@@ -48,6 +48,6 @@ public:
     Surface3DController *m_shared;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // Q3DSURFACE_P_H
diff --git a/src/datavis3d/engine/q3dwindow.cpp b/src/datavisualization/engine/q3dwindow.cpp
index 5e5350de..4bd40b04 100644
--- a/src/datavis3d/engine/q3dwindow.cpp
+++ b/src/datavisualization/engine/q3dwindow.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -27,11 +27,11 @@
 
 #include <QDebug>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 /*!
  * \class Q3DWindow
- * \inmodule QtDataVis3D
+ * \inmodule QtDataVisualization
  * \brief The Q3DWindow class provides a window and render loop.
  * \since 1.0.0
  *
@@ -161,4 +161,4 @@ Q3DWindowPrivate::~Q3DWindowPrivate()
 {
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/q3dwindow.h b/src/datavisualization/engine/q3dwindow.h
index fb0279c2..4a76c677 100644
--- a/src/datavis3d/engine/q3dwindow.h
+++ b/src/datavisualization/engine/q3dwindow.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,18 +19,18 @@
 #ifndef Q3DWINDOW_H
 #define Q3DWINDOW_H
 
-#include <QtDataVis3D/qdatavis3denums.h>
+#include <QtDataVisualization/qdatavisualizationenums.h>
 
 #include <QWindow>
 #include <QOpenGLFunctions>
 
 class QPainter;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DWindowPrivate;
 
-class QT_DATAVIS3D_EXPORT Q3DWindow : public QWindow, protected QOpenGLFunctions
+class QT_DATAVISUALIZATION_EXPORT Q3DWindow : public QWindow, protected QOpenGLFunctions
 {
     Q_OBJECT
 
@@ -56,6 +56,6 @@ private:
     friend class Q3DSurface;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/engine/q3dwindow_p.h b/src/datavisualization/engine/q3dwindow_p.h
index f5a614bf..b5ec9e6f 100644
--- a/src/datavis3d/engine/q3dwindow_p.h
+++ b/src/datavisualization/engine/q3dwindow_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,12 +29,12 @@
 #ifndef Q3DWINDOW_p_H
 #define Q3DWINDOW_p_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 
 class QOpenGLContext;
 class QOpenGLPaintDevice;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DWindow;
 
@@ -52,6 +52,6 @@ public:
     QOpenGLContext *m_context;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp
index 5230e0ff..af494e71 100644
--- a/src/datavis3d/engine/scatter3dcontroller.cpp
+++ b/src/datavisualization/engine/scatter3dcontroller.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -27,7 +27,7 @@
 #include <QMouseEvent>
 #include <qmath.h>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 Scatter3DController::Scatter3DController(QRect boundRect)
     : Abstract3DController(boundRect),
@@ -266,4 +266,4 @@ void Scatter3DController::adjustValueAxisRange()
     }
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h
index fb1b693f..63735aca 100644
--- a/src/datavis3d/engine/scatter3dcontroller_p.h
+++ b/src/datavisualization/engine/scatter3dcontroller_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,12 +29,12 @@
 #ifndef Q3DSCATTERCONTROLLER_p_H
 #define Q3DSCATTERCONTROLLER_p_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "abstract3dcontroller_p.h"
 
 //#define DISPLAY_RENDER_SPEED
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Scatter3DRenderer;
 class QScatterDataProxy;
@@ -50,7 +50,7 @@ struct Scatter3DChangeBitField {
     }
 };
 
-class QT_DATAVIS3D_EXPORT Scatter3DController : public Abstract3DController
+class QT_DATAVISUALIZATION_EXPORT Scatter3DController : public Abstract3DController
 {
     Q_OBJECT
 
@@ -101,6 +101,6 @@ private:
 };
 
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 43baaf4e..a8c68fb1 100644
--- a/src/datavis3d/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -39,7 +39,7 @@
 // You should see the scene from  where the light is
 //#define SHOW_DEPTH_TEXTURE_SCENE
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 //#define USE_UNIFORM_SCALING // Scale x and z uniformly, or based on autoscaled values
 
@@ -1605,4 +1605,4 @@ QVector3D Scatter3DRenderer::indexToSelectionColor(GLint index)
     return QVector3D(dotIdxRed, dotIdxGreen, dotIdxBlue);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h
index c8f5b765..f444f891 100644
--- a/src/datavis3d/engine/scatter3drenderer_p.h
+++ b/src/datavisualization/engine/scatter3drenderer_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,7 +29,7 @@
 #ifndef Q3DSCATTERRENDERER_P_H
 #define Q3DSCATTERRENDERER_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "scatter3dcontroller_p.h"
 #include "abstract3drenderer_p.h"
 #include "qscatterdataproxy.h"
@@ -39,7 +39,7 @@ class QPoint;
 class QSizeF;
 class QOpenGLShaderProgram;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class ShaderHelper;
 class ObjectHelper;
@@ -47,7 +47,7 @@ class LabelItem;
 class Q3DScene;
 class QAbstractAxisPrivate;
 
-class QT_DATAVIS3D_EXPORT Scatter3DRenderer : public Abstract3DRenderer
+class QT_DATAVISUALIZATION_EXPORT Scatter3DRenderer : public Abstract3DRenderer
 {
     Q_OBJECT
 
@@ -150,6 +150,6 @@ private:
     QVector3D indexToSelectionColor(GLint index);
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp
index 8746c8d1..dc50aef0 100644
--- a/src/datavis3d/engine/selectionpointer.cpp
+++ b/src/datavisualization/engine/selectionpointer.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -31,7 +31,7 @@
 
 #include <QDebug>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 SelectionPointer::SelectionPointer(Surface3DController *controller)
     : QObject(controller),
@@ -216,7 +216,7 @@ void SelectionPointer::setLabel(QString label)
                                            m_cachedTheme.m_textBackgroundColor,
                                            m_cachedTheme.m_textColor,
                                            m_labelTransparency);
-    //label.save("C:\\Users\\misalmel\\Work\\gerrit\\qtdatavis3d_2\\notification.png");
+    //label.save("C:\\Users\\misalmel\\Work\\gerrit\\qtdatavisualization_2\\notification.png");
 
     // Set label size
     m_labelItem.setSize(image.size());
@@ -268,4 +268,4 @@ void SelectionPointer::loadPointMesh()
     m_pointObj->load();
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/selectionpointer_p.h b/src/datavisualization/engine/selectionpointer_p.h
index 13ff42e3..67867232 100644
--- a/src/datavis3d/engine/selectionpointer_p.h
+++ b/src/datavisualization/engine/selectionpointer_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -36,12 +36,12 @@
 #include <QVector3D>
 
 #include "q3dscene.h"
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "surface3dcontroller_p.h"
 
 class QOpenGLShaderProgram;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class ShaderHelper;
 class ObjectHelper;
@@ -51,7 +51,7 @@ class Theme;
 class Drawer;
 class Q3DCamera;
 
-class QT_DATAVIS3D_EXPORT SelectionPointer : public QObject, protected QOpenGLFunctions
+class QT_DATAVISUALIZATION_EXPORT SelectionPointer : public QObject, protected QOpenGLFunctions
 {
     Q_OBJECT
 
@@ -92,6 +92,6 @@ private:
     Q3DScene *m_cachedScene;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // NOTIFICATIONLABEL_P_H
diff --git a/src/datavis3d/engine/shaders/ambient.frag b/src/datavisualization/engine/shaders/ambient.frag
index 88f850f3..88f850f3 100644
--- a/src/datavis3d/engine/shaders/ambient.frag
+++ b/src/datavisualization/engine/shaders/ambient.frag
diff --git a/src/datavis3d/engine/shaders/colorOnY.frag b/src/datavisualization/engine/shaders/colorOnY.frag
index 61a210c9..61a210c9 100644
--- a/src/datavis3d/engine/shaders/colorOnY.frag
+++ b/src/datavisualization/engine/shaders/colorOnY.frag
diff --git a/src/datavis3d/engine/shaders/colorOnY_ES2.frag b/src/datavisualization/engine/shaders/colorOnY_ES2.frag
index 78c778d3..78c778d3 100644
--- a/src/datavis3d/engine/shaders/colorOnY_ES2.frag
+++ b/src/datavisualization/engine/shaders/colorOnY_ES2.frag
diff --git a/src/datavis3d/engine/shaders/default.frag b/src/datavisualization/engine/shaders/default.frag
index fba1ce4a..fba1ce4a 100644
--- a/src/datavis3d/engine/shaders/default.frag
+++ b/src/datavisualization/engine/shaders/default.frag
diff --git a/src/datavis3d/engine/shaders/default.vert b/src/datavisualization/engine/shaders/default.vert
index 14f77773..14f77773 100644
--- a/src/datavis3d/engine/shaders/default.vert
+++ b/src/datavisualization/engine/shaders/default.vert
diff --git a/src/datavis3d/engine/shaders/default_ES2.frag b/src/datavisualization/engine/shaders/default_ES2.frag
index 7d6214b2..7d6214b2 100644
--- a/src/datavis3d/engine/shaders/default_ES2.frag
+++ b/src/datavisualization/engine/shaders/default_ES2.frag
diff --git a/src/datavis3d/engine/shaders/default_ES2.vert b/src/datavisualization/engine/shaders/default_ES2.vert
index efb40862..efb40862 100644
--- a/src/datavis3d/engine/shaders/default_ES2.vert
+++ b/src/datavisualization/engine/shaders/default_ES2.vert
diff --git a/src/datavis3d/engine/shaders/depth.frag b/src/datavisualization/engine/shaders/depth.frag
index 5cfd4b10..5cfd4b10 100644
--- a/src/datavis3d/engine/shaders/depth.frag
+++ b/src/datavisualization/engine/shaders/depth.frag
diff --git a/src/datavis3d/engine/shaders/depth.vert b/src/datavisualization/engine/shaders/depth.vert
index 9fe5a193..9fe5a193 100644
--- a/src/datavis3d/engine/shaders/depth.vert
+++ b/src/datavisualization/engine/shaders/depth.vert
diff --git a/src/datavis3d/engine/shaders/label.frag b/src/datavisualization/engine/shaders/label.frag
index 86021410..86021410 100644
--- a/src/datavis3d/engine/shaders/label.frag
+++ b/src/datavisualization/engine/shaders/label.frag
diff --git a/src/datavis3d/engine/shaders/label.vert b/src/datavisualization/engine/shaders/label.vert
index b4debe53..b4debe53 100644
--- a/src/datavis3d/engine/shaders/label.vert
+++ b/src/datavisualization/engine/shaders/label.vert
diff --git a/src/datavis3d/engine/shaders/selection.frag b/src/datavisualization/engine/shaders/selection.frag
index 099c87a1..099c87a1 100644
--- a/src/datavis3d/engine/shaders/selection.frag
+++ b/src/datavisualization/engine/shaders/selection.frag
diff --git a/src/datavis3d/engine/shaders/selection.vert b/src/datavisualization/engine/shaders/selection.vert
index 64d17e15..64d17e15 100644
--- a/src/datavis3d/engine/shaders/selection.vert
+++ b/src/datavisualization/engine/shaders/selection.vert
diff --git a/src/datavis3d/engine/shaders/shadow.frag b/src/datavisualization/engine/shaders/shadow.frag
index 5309b5bb..5309b5bb 100644
--- a/src/datavis3d/engine/shaders/shadow.frag
+++ b/src/datavisualization/engine/shaders/shadow.frag
diff --git a/src/datavis3d/engine/shaders/shadow.vert b/src/datavisualization/engine/shaders/shadow.vert
index e29a8a30..e29a8a30 100644
--- a/src/datavis3d/engine/shaders/shadow.vert
+++ b/src/datavisualization/engine/shaders/shadow.vert
diff --git a/src/datavis3d/engine/shaders/shadowNoTex.frag b/src/datavisualization/engine/shaders/shadowNoTex.frag
index 0252ba49..0252ba49 100644
--- a/src/datavis3d/engine/shaders/shadowNoTex.frag
+++ b/src/datavisualization/engine/shaders/shadowNoTex.frag
diff --git a/src/datavis3d/engine/shaders/shadowNoTexColorOnY.frag b/src/datavisualization/engine/shaders/shadowNoTexColorOnY.frag
index 515bf271..515bf271 100644
--- a/src/datavis3d/engine/shaders/shadowNoTexColorOnY.frag
+++ b/src/datavisualization/engine/shaders/shadowNoTexColorOnY.frag
diff --git a/src/datavis3d/engine/shaders/surface.frag b/src/datavisualization/engine/shaders/surface.frag
index 9fe7f45b..9fe7f45b 100644
--- a/src/datavis3d/engine/shaders/surface.frag
+++ b/src/datavisualization/engine/shaders/surface.frag
diff --git a/src/datavis3d/engine/shaders/surface.vert b/src/datavisualization/engine/shaders/surface.vert
index cbfb7569..cbfb7569 100644
--- a/src/datavis3d/engine/shaders/surface.vert
+++ b/src/datavisualization/engine/shaders/surface.vert
diff --git a/src/datavis3d/engine/shaders/surfaceFlat.frag b/src/datavisualization/engine/shaders/surfaceFlat.frag
index eb398582..eb398582 100644
--- a/src/datavis3d/engine/shaders/surfaceFlat.frag
+++ b/src/datavisualization/engine/shaders/surfaceFlat.frag
diff --git a/src/datavis3d/engine/shaders/surfaceFlat.vert b/src/datavisualization/engine/shaders/surfaceFlat.vert
index 24c9b9a3..24c9b9a3 100644
--- a/src/datavis3d/engine/shaders/surfaceFlat.vert
+++ b/src/datavisualization/engine/shaders/surfaceFlat.vert
diff --git a/src/datavis3d/engine/shaders/surfaceGrid.frag b/src/datavisualization/engine/shaders/surfaceGrid.frag
index 20b923fb..20b923fb 100644
--- a/src/datavis3d/engine/shaders/surfaceGrid.frag
+++ b/src/datavisualization/engine/shaders/surfaceGrid.frag
diff --git a/src/datavis3d/engine/shaders/surfaceGrid.vert b/src/datavisualization/engine/shaders/surfaceGrid.vert
index efb40862..efb40862 100644
--- a/src/datavis3d/engine/shaders/surfaceGrid.vert
+++ b/src/datavisualization/engine/shaders/surfaceGrid.vert
diff --git a/src/datavis3d/engine/shaders/texture.frag b/src/datavisualization/engine/shaders/texture.frag
index a6d7b2eb..a6d7b2eb 100644
--- a/src/datavis3d/engine/shaders/texture.frag
+++ b/src/datavisualization/engine/shaders/texture.frag
diff --git a/src/datavis3d/engine/shaders/texture.vert b/src/datavisualization/engine/shaders/texture.vert
index 01f922e0..01f922e0 100644
--- a/src/datavis3d/engine/shaders/texture.vert
+++ b/src/datavisualization/engine/shaders/texture.vert
diff --git a/src/datavis3d/engine/shaders/texture_ES2.frag b/src/datavisualization/engine/shaders/texture_ES2.frag
index 58097ba5..58097ba5 100644
--- a/src/datavis3d/engine/shaders/texture_ES2.frag
+++ b/src/datavisualization/engine/shaders/texture_ES2.frag
diff --git a/src/datavis3d/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index 8b7d38a7..327e02a2 100644
--- a/src/datavis3d/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -29,7 +29,7 @@
 
 #include <QDebug>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 Surface3DController::Surface3DController(QRect rect)
     : Abstract3DController(rect),
@@ -158,4 +158,4 @@ void Surface3DController::handleSelectionAtPoint(const QPoint &point)
     emit leftMousePressed(point);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h
index 3086250c..eb8f4329 100644
--- a/src/datavis3d/engine/surface3dcontroller_p.h
+++ b/src/datavisualization/engine/surface3dcontroller_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -30,15 +30,15 @@
 #define SURFACE3DCONTROLLER_P_H
 
 #include "abstract3dcontroller_p.h"
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 
 #include <QLinearGradient>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Surface3DRenderer;
 
-class QT_DATAVIS3D_EXPORT Surface3DController : public Abstract3DController
+class QT_DATAVISUALIZATION_EXPORT Surface3DController : public Abstract3DController
 {
     Q_OBJECT
 
@@ -97,6 +97,6 @@ private:
     Q_DISABLE_COPY(Surface3DController)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // SURFACE3DCONTROLLER_P_H
diff --git a/src/datavis3d/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index b1b78aec..f39a0228 100644
--- a/src/datavis3d/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -40,7 +40,7 @@
 
 static const int ID_TO_RGBA_MASK = 0xff;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 const GLfloat backgroundMargin = 1.1f; // Margin for background (1.1f = make it 10% larger to avoid items being drawn inside background)
 const GLfloat labelMargin = 0.05f;
@@ -976,7 +976,7 @@ void Surface3DRenderer::updateSelectionTexture()
 
     // Use this to save the ID image to file
     //QImage image(bits, idImageWidth, idImageHeight, QImage::Format_ARGB32);
-    //image.save("C:\\Users\\misalmel\\Work\\gerrit\\qtdatavis3d_2\\selection.png");
+    //image.save("C:\\Users\\misalmel\\Work\\gerrit\\qtdatavisualization_2\\selection.png");
 
     // If old texture exists, delete it
     if (m_selectionTexture) {
@@ -1253,4 +1253,4 @@ void Surface3DRenderer::initLabelShaders(const QString &vertexShader, const QStr
     m_labelShader->initialize();
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h
index 2166d9d1..23e9fbb1 100644
--- a/src/datavis3d/engine/surface3drenderer_p.h
+++ b/src/datavisualization/engine/surface3drenderer_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -36,7 +36,7 @@
 #include <QLinearGradient>
 #include <QWindow>
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "surface3dcontroller_p.h"
 #include "abstract3drenderer_p.h"
 #include "scatterrenderitem_p.h"
@@ -44,7 +44,7 @@
 
 class QOpenGLShaderProgram;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class ShaderHelper;
 class ObjectHelper;
@@ -55,7 +55,7 @@ class Drawer;
 class Q3DScene;
 class SelectionPointer;
 
-class QT_DATAVIS3D_EXPORT Surface3DRenderer : public Abstract3DRenderer
+class QT_DATAVISUALIZATION_EXPORT Surface3DRenderer : public Abstract3DRenderer
 {
     Q_OBJECT
 
@@ -159,6 +159,6 @@ private:
     Q_DISABLE_COPY(Surface3DRenderer)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // SURFACE3DRENDERER_P_H
diff --git a/src/datavis3d/engine/theme.cpp b/src/datavisualization/engine/theme.cpp
index 943b4f98..a4404a34 100644
--- a/src/datavis3d/engine/theme.cpp
+++ b/src/datavisualization/engine/theme.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #endif
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 Theme::Theme()
     : m_baseColor(QColor(Qt::gray)),
@@ -321,4 +321,4 @@ void Theme::setFromTheme(Theme &theme)
     m_uniformColor = theme.m_uniformColor;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/engine/theme_p.h b/src/datavisualization/engine/theme_p.h
index 4b36bdc4..a22ca513 100644
--- a/src/datavis3d/engine/theme_p.h
+++ b/src/datavisualization/engine/theme_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,13 +29,13 @@
 #ifndef THEME_P_H
 #define THEME_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "q3dbars.h"
 #include <QLinearGradient>
 
 class QColor;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Theme
 {
@@ -76,6 +76,6 @@ private:
     bool m_uniformColor;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/global/datavis3dglobal_p.h b/src/datavisualization/global/datavisualizationglobal_p.h
index d556c5e1..4d6f1b33 100644
--- a/src/datavis3d/global/datavis3dglobal_p.h
+++ b/src/datavisualization/global/datavisualizationglobal_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,24 +20,24 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
 // We mean it.
 
-#ifndef DATAVIS3DGLOBAL_P_H
-#define DATAVIS3DGLOBAL_P_H
+#ifndef DATAVISUALIZATIONGLOBAL_P_H
+#define DATAVISUALIZATIONGLOBAL_P_H
 
-#include "qdatavis3dglobal.h"
-#include "qdatavis3denums.h"
+#include "qdatavisualizationglobal.h"
+#include "qdatavisualizationenums.h"
 #include <QOpenGLFunctions>
 #include <QVector3D>
 #include <QDebug>
 
 //#define ROTATE_ZOOM_SELECTION
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 // Constants used in several files
 // Compensation for z position; move all objects to positive z, as shader can't handle negative values correctly
@@ -47,6 +47,6 @@ const GLfloat zComp = 10.0f;
 const QVector3D defaultLightPos = QVector3D(0.0f, 0.5f, zComp);
 const GLfloat defaultRatio = 1.0f / 1.6f; // default aspect ratio 16:10
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
-#endif // DATAVIS3DGLOBAL_P_H
+#endif // DATAVISUALIZATIONGLOBAL_P_H
diff --git a/src/datavisualization/global/global.pri b/src/datavisualization/global/global.pri
new file mode 100644
index 00000000..0fd7c576
--- /dev/null
+++ b/src/datavisualization/global/global.pri
@@ -0,0 +1,4 @@
+HEADERS += \
+    $$PWD/qdatavisualizationglobal.h \
+    $$PWD/qdatavisualizationenums.h \
+    $$PWD/datavisualizationglobal_p.h
diff --git a/src/datavis3d/global/qdatavis3denums.h b/src/datavisualization/global/qdatavisualizationenums.h
index a8f6d6a2..c62f8c94 100644
--- a/src/datavis3d/global/qdatavis3denums.h
+++ b/src/datavisualization/global/qdatavisualizationenums.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -16,16 +16,16 @@
 **
 ****************************************************************************/
 
-#ifndef QDATAVIS3DENUMS_H
-#define QDATAVIS3DENUMS_H
+#ifndef QDATAVISUALIZATIONENUMS_H
+#define QDATAVISUALIZATIONENUMS_H
 
-#include <QtDataVis3D/qdatavis3dglobal.h>
+#include <QtDataVisualization/qdatavisualizationglobal.h>
 #include <QObject>
 
 // namespace must be declared without using macros for qdoc
-namespace QtDataVis3D {
+namespace QtDataVisualization {
 
-class QT_DATAVIS3D_EXPORT QDataVis : public QObject
+class QT_DATAVISUALIZATION_EXPORT QDataVis : public QObject
 {
     Q_OBJECT
     Q_ENUMS(MeshStyle)
diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h
new file mode 100644
index 00000000..ac734960
--- /dev/null
+++ b/src/datavisualization/global/qdatavisualizationglobal.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+#ifndef QDATAVISUALIZATIONGLOBAL_H
+#define QDATAVISUALIZATIONGLOBAL_H
+
+#include <qglobal.h>
+
+#define QT_DATAVISUALIZATION_VERSION_STR   "0.0.1"
+/*
+   QT_DATAVISUALIZATION_VERSION is (major << 16) + (minor << 8) + patch.
+*/
+#define QT_DATAVISUALIZATION_VERSION       0x000001
+/*
+   can be used like #if (QT_DATAVISUALIZATION_VERSION >= QT_DATAVISUALIZATION_VERSION_CHECK(1, 1, 0))
+*/
+#define QT_DATAVISUALIZATION_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
+
+#if defined(QT_DATAVISUALIZATION_LIBRARY)
+#  define QT_DATAVISUALIZATION_EXPORT Q_DECL_EXPORT
+#else
+#  define QT_DATAVISUALIZATION_EXPORT Q_DECL_IMPORT
+#endif
+
+#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_DATAVISUALIZATION_LIBRARY)
+#  define QT_DATAVISUALIZATION_AUTOTEST_EXPORT Q_DECL_EXPORT
+#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_DATAVISUALIZATION_LIBRARY)
+#  define QT_DATAVISUALIZATION_AUTOTEST_EXPORT Q_DECL_IMPORT
+#else
+#  define QT_DATAVISUALIZATION_AUTOTEST_EXPORT
+#endif
+
+#ifdef QT_DATAVISUALIZATION_STATICLIB
+#  undef QT_DATAVISUALIZATION_EXPORT
+#  undef QT_DATAVISUALIZATION_AUTOTEST_EXPORT
+#  define QT_DATAVISUALIZATION_EXPORT
+#  define QT_DATAVISUALIZATION_AUTOTEST_EXPORT
+#endif
+
+#define QT_DATAVISUALIZATION_NAMESPACE QtDataVisualization
+
+#ifdef QT_DATAVISUALIZATION_NAMESPACE
+#  define QT_DATAVISUALIZATION_BEGIN_NAMESPACE namespace QT_DATAVISUALIZATION_NAMESPACE {
+#  define QT_DATAVISUALIZATION_END_NAMESPACE }
+#  define QT_DATAVISUALIZATION_USE_NAMESPACE using namespace QT_DATAVISUALIZATION_NAMESPACE;
+#else
+#  define QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+#  define QT_DATAVISUALIZATION_END_NAMESPACE
+#  define QT_DATAVISUALIZATION_USE_NAMESPACE
+#endif
+
+#endif // QVIS3DGLOBAL_H
diff --git a/src/datavis3d/global/qtdatavis3denums.qdoc b/src/datavisualization/global/qtdatavisualizationenums.qdoc
index 015b1803..a81b38f1 100644
--- a/src/datavis3d/global/qtdatavis3denums.qdoc
+++ b/src/datavisualization/global/qtdatavisualizationenums.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,13 +17,13 @@
 ****************************************************************************/
 
 /*!
-    \namespace QtDataVis3D
-    \inmodule QtDataVis3D
-    \target QtDataVis3D Enums
+    \namespace QtDataVisualization
+    \inmodule QtDataVisualization
+    \target QtDataVisualization Enums
 */
 
 /*!
-    \enum QtDataVis3D::QDataVis::InputState
+    \enum QtDataVisualization::QDataVis::InputState
 
     Predefined input states for mouse and touch based input handlers. All states are not valid with all input handlers.
 
@@ -42,7 +42,7 @@
 */
 
 /*!
-    \enum QtDataVis3D::QDataVis::MeshStyle
+    \enum QtDataVisualization::QDataVis::MeshStyle
 
     Predefined mesh types. All styles are not usable with all visualization types.
 
@@ -63,7 +63,7 @@
 */
 
 /*!
-    \enum QtDataVis3D::QDataVis::CameraPreset
+    \enum QtDataVisualization::QDataVis::CameraPreset
 
     Predefined positions for camera.
 
@@ -99,7 +99,7 @@
 */
 
 /*!
-    \enum QtDataVis3D::QDataVis::ColorTheme
+    \enum QtDataVisualization::QDataVis::ColorTheme
 
     Predefined color themes.
 
@@ -116,7 +116,7 @@
 */
 
 /*!
-    \enum QtDataVis3D::QDataVis::SelectionMode
+    \enum QtDataVisualization::QDataVis::SelectionMode
 
     Item selection modes.
 
@@ -142,7 +142,7 @@
 */
 
 /*!
-    \enum QtDataVis3D::QDataVis::ShadowQuality
+    \enum QtDataVisualization::QDataVis::ShadowQuality
 
     Quality of shadows.
 
@@ -163,7 +163,7 @@
 */
 
 /*!
-    \enum QtDataVis3D::QDataVis::LabelTransparency
+    \enum QtDataVisualization::QDataVis::LabelTransparency
 
     Label transparencies.
 
diff --git a/src/datavis3d/input/input.pri b/src/datavisualization/input/input.pri
index 8305604b..8305604b 100644
--- a/src/datavis3d/input/input.pri
+++ b/src/datavisualization/input/input.pri
diff --git a/src/datavis3d/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp
index a8bfc19a..85583a16 100644
--- a/src/datavis3d/input/q3dinputhandler.cpp
+++ b/src/datavisualization/input/q3dinputhandler.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,7 +19,7 @@
 #include "q3dcamera.h"
 #include "q3dlight.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 Q3DInputHandler::Q3DInputHandler(QObject *parent) :
     QAbstract3DInputHandler(parent)
@@ -121,4 +121,4 @@ void Q3DInputHandler::wheelEvent(QWheelEvent *event)
     scene()->camera()->setZoomLevel(zoomLevel);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h
index 98d7a047..2bab02d6 100644
--- a/src/datavis3d/input/q3dinputhandler.h
+++ b/src/datavisualization/input/q3dinputhandler.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -32,9 +32,9 @@ const float rotationSpeed    = 100.0f;
 
 #include "qabstract3dinputhandler.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
-class QT_DATAVIS3D_EXPORT Q3DInputHandler : public QAbstract3DInputHandler
+class QT_DATAVISUALIZATION_EXPORT Q3DInputHandler : public QAbstract3DInputHandler
 {
     Q_OBJECT
 
@@ -55,6 +55,6 @@ private:
     Q_DISABLE_COPY(Q3DInputHandler)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QDEFAULT3DINPUTHANDLER_H
diff --git a/src/datavis3d/input/q3dinputhandler_p.h b/src/datavisualization/input/q3dinputhandler_p.h
index b055bd85..af8bef5f 100644
--- a/src/datavis3d/input/q3dinputhandler_p.h
+++ b/src/datavisualization/input/q3dinputhandler_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,9 +29,9 @@
 #ifndef Q3DINPUTHANDLER_P_H
 #define Q3DINPUTHANDLER_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Q3DInputHandler;
 
@@ -46,6 +46,6 @@ public:
 
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // Q3DINPUTHANDLER_P_H
diff --git a/src/datavis3d/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp
index 7fb4f084..36125582 100644
--- a/src/datavis3d/input/qabstract3dinputhandler.cpp
+++ b/src/datavisualization/input/qabstract3dinputhandler.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,7 +17,7 @@
 ****************************************************************************/
 #include "qabstract3dinputhandler.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 QAbstract3DInputHandler::QAbstract3DInputHandler(QObject *parent) :
     QObject(parent),
@@ -138,4 +138,4 @@ QAbstract3DInputHandlerPrivate::~QAbstract3DInputHandlerPrivate()
 
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h
index 03c46a5e..36f4ea21 100644
--- a/src/datavis3d/input/qabstract3dinputhandler.h
+++ b/src/datavisualization/input/qabstract3dinputhandler.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,18 +19,18 @@
 #ifndef QABSTRACT3DINPUTHANDLER_H
 #define QABSTRACT3DINPUTHANDLER_H
 
-#include "qdatavis3denums.h"
+#include "qdatavisualizationenums.h"
 #include "qabstract3dinputhandler_p.h"
 #include "q3dscene.h"
 #include <QObject>
 #include <QMouseEvent>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
-class QT_DATAVIS3D_EXPORT QAbstract3DInputHandler : public QObject
+class QT_DATAVISUALIZATION_EXPORT QAbstract3DInputHandler : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QtDataVis3D::QDataVis::InputState inputState READ inputState WRITE setInputState NOTIFY inputStateChanged)
+    Q_PROPERTY(QtDataVisualization::QDataVis::InputState inputState READ inputState WRITE setInputState NOTIFY inputStateChanged)
     Q_PROPERTY(QPoint inputPosition READ inputPosition WRITE setInputPosition NOTIFY positionChanged)
     Q_PROPERTY(Q3DScene *scene READ scene WRITE setScene)
 
@@ -77,6 +77,6 @@ private:
     friend class Abstract3DController;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QABSTRACT3DINPUTHANDLER_H
diff --git a/src/datavis3d/input/qabstract3dinputhandler_p.h b/src/datavisualization/input/qabstract3dinputhandler_p.h
index a4b61ff3..0ec6cfe9 100644
--- a/src/datavis3d/input/qabstract3dinputhandler_p.h
+++ b/src/datavisualization/input/qabstract3dinputhandler_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,10 +29,10 @@
 #ifndef QABSTRACT3DINPUTHANDLER_P_H
 #define QABSTRACT3DINPUTHANDLER_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include <QRect>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class QAbstract3DInputHandler;
 class Q3DScene;
@@ -64,6 +64,6 @@ private:
     friend class Abstract3DController;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QABSTRACT3DINPUTHANDLER_P_H
diff --git a/src/datavis3d/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp
index d0676719..4df735a2 100644
--- a/src/datavis3d/input/qtouch3dinputhandler.cpp
+++ b/src/datavisualization/input/qtouch3dinputhandler.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -18,7 +18,7 @@
 #include "qtouch3dinputhandler.h"
 #include "q3dcamera.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 QTouch3DInputHandler::QTouch3DInputHandler(QObject *parent) :
     Q3DInputHandler(parent)
@@ -97,4 +97,4 @@ void QTouch3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mou
     }
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/input/qtouch3dinputhandler.h b/src/datavisualization/input/qtouch3dinputhandler.h
index 4b2dad69..b915ff2a 100644
--- a/src/datavis3d/input/qtouch3dinputhandler.h
+++ b/src/datavisualization/input/qtouch3dinputhandler.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -21,9 +21,9 @@
 
 #include "q3dinputhandler.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
-class QT_DATAVIS3D_EXPORT QTouch3DInputHandler : public Q3DInputHandler
+class QT_DATAVISUALIZATION_EXPORT QTouch3DInputHandler : public Q3DInputHandler
 {
     Q_OBJECT
 
@@ -40,6 +40,6 @@ private:
     Q_DISABLE_COPY(QTouch3DInputHandler)
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // QTOUCH3DINPUTHANDLER_H
diff --git a/src/datavis3d/utils/abstractobjecthelper.cpp b/src/datavisualization/utils/abstractobjecthelper.cpp
index d54a50c7..d47f2fe6 100644
--- a/src/datavis3d/utils/abstractobjecthelper.cpp
+++ b/src/datavisualization/utils/abstractobjecthelper.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 
 #include <QDebug>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 AbstractObjectHelper::AbstractObjectHelper()
     : m_vertexbuffer(0),
@@ -78,4 +78,4 @@ GLuint AbstractObjectHelper::indicesType()
     return m_indicesType;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/utils/abstractobjecthelper_p.h b/src/datavisualization/utils/abstractobjecthelper_p.h
index a4d701fa..a6de6941 100644
--- a/src/datavis3d/utils/abstractobjecthelper_p.h
+++ b/src/datavisualization/utils/abstractobjecthelper_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,10 +29,10 @@
 #ifndef ABSTRACTOBJECTHELPER_H
 #define ABSTRACTOBJECTHELPER_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include <QOpenGLFunctions>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class AbstractObjectHelper: protected QOpenGLFunctions
 {
@@ -60,6 +60,6 @@ public:
     GLuint m_indicesType;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif // ABSTRACTOBJECTHELPER_H
diff --git a/src/datavis3d/utils/camerahelper.cpp b/src/datavisualization/utils/camerahelper.cpp
index 5ae91adb..01de3f80 100644
--- a/src/datavis3d/utils/camerahelper.cpp
+++ b/src/datavisualization/utils/camerahelper.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -22,7 +22,7 @@
 #include <QMatrix4x4>
 #include <QVector3D>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 CameraHelper::CameraHelper(QObject *parent) :
     QObject(parent),
@@ -283,4 +283,4 @@ void CameraHelper::setCameraPreset(QDataVis::CameraPreset preset)
     }
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/utils/camerahelper_p.h b/src/datavisualization/utils/camerahelper_p.h
index 3b8c0c9c..1ef4d257 100644
--- a/src/datavis3d/utils/camerahelper_p.h
+++ b/src/datavisualization/utils/camerahelper_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,7 +29,7 @@
 #ifndef CAMERAPOSITIONER_P_H
 #define CAMERAPOSITIONER_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "q3dbars.h"
 #include <QObject>
 
@@ -38,7 +38,7 @@ class QVector3D;
 class QPoint;
 class QPointF;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class CameraHelper : public QObject
 {
@@ -85,6 +85,6 @@ public:
     void setCameraPreset(QDataVis::CameraPreset preset);
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/utils/meshloader.cpp b/src/datavisualization/utils/meshloader.cpp
index ee2f12a6..119cde3a 100644
--- a/src/datavis3d/utils/meshloader.cpp
+++ b/src/datavisualization/utils/meshloader.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -26,7 +26,7 @@
 
 #include <QDebug>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 QString slashTag = QStringLiteral("/");
 
@@ -122,4 +122,4 @@ bool MeshLoader::loadOBJ(const QString &path,
     return true;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/utils/meshloader_p.h b/src/datavisualization/utils/meshloader_p.h
index acbfb037..48551fff 100644
--- a/src/datavis3d/utils/meshloader_p.h
+++ b/src/datavisualization/utils/meshloader_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,12 +29,12 @@
 #ifndef MESHLOADER_P_H
 #define MESHLOADER_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 
 class QVector2D;
 class QVector3D;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class MeshLoader
 {
@@ -46,6 +46,6 @@ class MeshLoader
     // TODO: add loaders for other formats?
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/utils/objecthelper.cpp b/src/datavisualization/utils/objecthelper.cpp
index cbd1e960..9660c215 100644
--- a/src/datavis3d/utils/objecthelper.cpp
+++ b/src/datavisualization/utils/objecthelper.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -23,7 +23,7 @@
 
 #include <QDebug>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 ObjectHelper::ObjectHelper(const QString &objectFile)
     : m_objectFile(objectFile)
@@ -98,4 +98,4 @@ void ObjectHelper::load()
     m_meshDataLoaded = true;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/utils/objecthelper_p.h b/src/datavisualization/utils/objecthelper_p.h
index ba9fc2f3..9d643fdd 100644
--- a/src/datavis3d/utils/objecthelper_p.h
+++ b/src/datavisualization/utils/objecthelper_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,11 +29,11 @@
 #ifndef OBJECTHELPER_P_H
 #define OBJECTHELPER_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "abstractobjecthelper_p.h"
 #include <QOpenGLFunctions>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class ObjectHelper : public AbstractObjectHelper
 {
@@ -49,6 +49,6 @@ private:
     QString m_objectFile;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp
index c8716910..508bc90a 100644
--- a/src/datavis3d/utils/shaderhelper.cpp
+++ b/src/datavisualization/utils/shaderhelper.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 
 #include <QOpenGLShader>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 ShaderHelper::ShaderHelper(QObject *parent,
                            const QString &vertexShader,
@@ -226,4 +226,4 @@ GLuint ShaderHelper::normalAtt()
     return m_normalAttr;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h
index 97fcf8a0..72a7b256 100644
--- a/src/datavis3d/utils/shaderhelper_p.h
+++ b/src/datavisualization/utils/shaderhelper_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,12 +29,12 @@
 #ifndef SHADERHELPER_P_H
 #define SHADERHELPER_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include <QOpenGLFunctions>
 
 class QOpenGLShaderProgram;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class ShaderHelper
 {
@@ -105,6 +105,6 @@ class ShaderHelper
     GLboolean m_initialized;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp
index 211e483f..a0ed292a 100644
--- a/src/datavis3d/utils/surfaceobject.cpp
+++ b/src/datavisualization/utils/surfaceobject.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -24,7 +24,7 @@
 
 #include <QDebug>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 SurfaceObject::SurfaceObject()
 {
@@ -292,7 +292,7 @@ QVector3D SurfaceObject::normal(const QVector3D &a, const QVector3D &b, const QV
     return QVector3D::crossProduct(v1, v2);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 
 
diff --git a/src/datavis3d/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h
index e71d6832..e9057f88 100644
--- a/src/datavis3d/utils/surfaceobject_p.h
+++ b/src/datavisualization/utils/surfaceobject_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,14 +29,14 @@
 #ifndef SURFACEOBJECT_P_H
 #define SURFACEOBJECT_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "abstractobjecthelper_p.h"
 #include "qsurfacedataproxy.h"
 
 #include <QOpenGLFunctions>
 #include <QRect>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class SurfaceObject : public AbstractObjectHelper
 {
@@ -63,5 +63,5 @@ private:
     GLuint m_gridIndexCount;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 #endif // SURFACEOBJECT_P_H
diff --git a/src/datavis3d/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp
index 1773c0f8..4c7d71a5 100644
--- a/src/datavis3d/utils/texturehelper.cpp
+++ b/src/datavisualization/utils/texturehelper.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -23,7 +23,7 @@
 
 #include <QDebug>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 TextureHelper::TextureHelper()
 {
@@ -391,4 +391,4 @@ QRgb TextureHelper::qt_gl_convertToGLFormatHelper(QRgb src_pixel, GLenum texture
     }
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h
index 3acf387a..e5f54d00 100644
--- a/src/datavis3d/utils/texturehelper_p.h
+++ b/src/datavisualization/utils/texturehelper_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,11 +29,11 @@
 #ifndef TEXTUREHELPER_P_H
 #define TEXTUREHELPER_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include <QOpenGLFunctions>
 #include <QRgb>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class TextureHelper : protected QOpenGLFunctions
 {
@@ -66,6 +66,6 @@ class TextureHelper : protected QOpenGLFunctions
     friend class Scatter3DRenderer;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/utils/utils.cpp b/src/datavisualization/utils/utils.cpp
index b4a6ae03..8771c88a 100644
--- a/src/datavis3d/utils/utils.cpp
+++ b/src/datavisualization/utils/utils.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -26,7 +26,7 @@
 #include <QRegExp>
 #include <qmath.h>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 #define NUM_IN_POWER(y, x) for (;y<x;y<<=1)
 #define MIN_POWER 32
@@ -300,4 +300,4 @@ QString Utils::defaultLabelFormat()
     return defaultFormat;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/utils/utils.pri b/src/datavisualization/utils/utils.pri
index cef5ebf0..cef5ebf0 100644
--- a/src/datavis3d/utils/utils.pri
+++ b/src/datavisualization/utils/utils.pri
diff --git a/src/datavis3d/utils/utils_p.h b/src/datavisualization/utils/utils_p.h
index 1fd261e6..4cbd8f35 100644
--- a/src/datavis3d/utils/utils_p.h
+++ b/src/datavisualization/utils/utils_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,7 +29,7 @@
 #ifndef UTILS_P_H
 #define UTILS_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "q3dbars.h"
 
 class QVector3D;
@@ -39,7 +39,7 @@ class QString;
 class QPoint;
 class QImage;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Utils
 {
@@ -71,6 +71,6 @@ private:
     static ParamType mapFormatCharToParamType(const QChar &formatChar);
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3d/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp
index 6efba116..63b9faaf 100644
--- a/src/datavis3d/utils/vertexindexer.cpp
+++ b/src/datavisualization/utils/vertexindexer.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -23,7 +23,7 @@
 
 #include <QDebug>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 int unique_vertices = 0;
 
@@ -150,4 +150,4 @@ void VertexIndexer::indexVBO_TBN(const QVector<QVector3D> &in_vertices,
     //qDebug() << "unique vertices" << unique_vertices;
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3d/utils/vertexindexer_p.h b/src/datavisualization/utils/vertexindexer_p.h
index 3ca62236..0cf1857b 100644
--- a/src/datavis3d/utils/vertexindexer_p.h
+++ b/src/datavisualization/utils/vertexindexer_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,13 +29,13 @@
 #ifndef VERTEXINDEXER_P_H
 #define VERTEXINDEXER_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 
 #include <QVector>
 #include <QVector2D>
 #include <QVector3D>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class VertexIndexer
 {
@@ -83,6 +83,6 @@ class VertexIndexer
                                            unsigned short &result);
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3dqml2/datavis3dqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro
index aa4d7d71..c5ee910b 100644
--- a/src/datavis3dqml2/datavis3dqml2.pro
+++ b/src/datavisualizationqml2/datavisualizationqml2.pro
@@ -1,23 +1,23 @@
 TEMPLATE = lib
-TARGET = datavis3dqml2
-QT += qml quick datavis3d
+TARGET = datavisualizationqml2
+QT += qml quick datavisualization
 CONFIG += qt plugin
 
 TARGET = $$qtLibraryTarget($$TARGET)
-uri = com.digia.QtDataVis3D
+uri = com.digia.QtDataVisualization
 
 static {
-    DEFINES += QT_DATAVIS3D_STATICLIB
+    DEFINES += QT_DATAVISUALIZATION_STATICLIB
     CONFIG -= static staticlib
 }
 
 # Input
-INCLUDEPATH += ../datavis3d/engine \
-               ../datavis3d/global \
-               ../datavis3d/data
+INCLUDEPATH += ../datavisualization/engine \
+               ../datavisualization/global \
+               ../datavisualization/data
 
 SOURCES += \
-    datavis3dqml2_plugin.cpp \
+    datavisualizationqml2_plugin.cpp \
     declarativebars.cpp \
     declarativebarsrenderer.cpp \
     declarativescatter.cpp \
@@ -26,7 +26,7 @@ SOURCES += \
     declarativesurfacerenderer.cpp
 
 HEADERS += \
-    datavis3dqml2_plugin.h \
+    datavisualizationqml2_plugin.h \
     declarativebars_p.h \
     declarativebarsrenderer_p.h \
     declarativescatter_p.h \
diff --git a/src/datavis3dqml2/datavis3dqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
index 6caacfd1..83c9eaf8 100644
--- a/src/datavis3dqml2/datavis3dqml2_plugin.cpp
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -16,15 +16,15 @@
 **
 ****************************************************************************/
 
-#include "datavis3dqml2_plugin.h"
+#include "datavisualizationqml2_plugin.h"
 
 #include <qqml.h>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 void Datavis3Dqml2Plugin::registerTypes(const char *uri)
 {
-    // @uri com.digia.QtDataVis3D
+    // @uri com.digia.QtDataVisualization
     qmlRegisterUncreatableType<const QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
                                                          QLatin1String("Trying to create uncreatable: AbstractItemModel."));
     qmlRegisterUncreatableType<QDataVis>(uri, 1, 0, "DataVis",
@@ -56,5 +56,5 @@ void Datavis3Dqml2Plugin::registerTypes(const char *uri)
     qmlRegisterType<QItemModelSurfaceDataProxy>(uri, 1, 0, "ItemModelSurfaceDataProxy");
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
diff --git a/src/datavis3dqml2/datavis3dqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
index 35b98ca6..543afb9c 100644
--- a/src/datavis3dqml2/datavis3dqml2_plugin.h
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -16,10 +16,10 @@
 **
 ****************************************************************************/
 
-#ifndef DATAVIS3DQML2_PLUGIN_H
-#define DATAVIS3DQML2_PLUGIN_H
+#ifndef DATAVISUALIZATIONQML2_PLUGIN_H
+#define DATAVISUALIZATIONQML2_PLUGIN_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "declarativebars_p.h"
 #include "declarativescatter_p.h"
 #include "declarativesurface_p.h"
@@ -34,7 +34,7 @@
 
 #include <QQmlExtensionPlugin>
 
-QT_DATAVIS3D_USE_NAMESPACE
+QT_DATAVISUALIZATION_USE_NAMESPACE
 
 Q_DECLARE_METATYPE(DeclarativeBars *)
 Q_DECLARE_METATYPE(DeclarativeScatter *)
@@ -60,7 +60,7 @@ Q_DECLARE_METATYPE(QItemModelScatterDataProxy *)
 Q_DECLARE_METATYPE(QSurfaceDataProxy *)
 Q_DECLARE_METATYPE(QItemModelSurfaceDataProxy *)
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class Datavis3Dqml2Plugin : public QQmlExtensionPlugin
 {
@@ -71,7 +71,7 @@ public:
     void registerTypes(const char *uri);
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
-#endif // DATAVIS3DQML2_PLUGIN_H
+#endif // DATAVISUALIZATIONQML2_PLUGIN_H
 
diff --git a/src/datavis3dqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index 30ee0257..29d138e2 100644
--- a/src/datavis3dqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -21,7 +21,7 @@
 #include "q3dvalueaxis.h"
 #include "qitemmodelbardataproxy.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 const QString smoothString(QStringLiteral("Smooth"));
 
@@ -387,4 +387,4 @@ void DeclarativeBars::wheelEvent(QWheelEvent *event)
     m_shared->wheelEvent(event);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3dqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h
index a5d2ee05..79ad7884 100644
--- a/src/datavis3dqml2/declarativebars_p.h
+++ b/src/datavisualizationqml2/declarativebars_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,7 +29,7 @@
 #ifndef DECLARATIVEBARS_P_H
 #define DECLARATIVEBARS_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "bars3dcontroller_p.h"
 #include "declarativebars_p.h"
 #include "q3dvalueaxis.h"
@@ -41,7 +41,7 @@
 #include <QObject>
 #include <QQuickWindow>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class DeclarativeBars : public QQuickItem
 {
@@ -50,12 +50,12 @@ class DeclarativeBars : public QQuickItem
     Q_PROPERTY(Q3DCategoryAxis *rowAxis READ rowAxis WRITE setRowAxis)
     Q_PROPERTY(Q3DValueAxis *valueAxis READ valueAxis WRITE setValueAxis)
     Q_PROPERTY(Q3DCategoryAxis *columnAxis READ columnAxis WRITE setColumnAxis)
-    Q_PROPERTY(QtDataVis3D::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
-    Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
-    Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
-    Q_PROPERTY(QtDataVis3D::QDataVis::MeshStyle barType READ barType WRITE setBarType)
-    Q_PROPERTY(QtDataVis3D::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset)
-    Q_PROPERTY(QtDataVis3D::QDataVis::ColorTheme theme READ theme WRITE setTheme)
+    Q_PROPERTY(QtDataVisualization::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
+    Q_PROPERTY(QtDataVisualization::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
+    Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
+    Q_PROPERTY(QtDataVisualization::QDataVis::MeshStyle barType READ barType WRITE setBarType)
+    Q_PROPERTY(QtDataVisualization::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset)
+    Q_PROPERTY(QtDataVisualization::QDataVis::ColorTheme theme READ theme WRITE setTheme)
     Q_PROPERTY(qreal barThickness READ barThickness WRITE setBarThickness)
     Q_PROPERTY(QSizeF barSpacing READ barSpacing WRITE setBarSpacing)
     Q_PROPERTY(bool barSpacingRelative READ isBarSpacingRelative WRITE setBarSpacingRelative)
@@ -68,12 +68,12 @@ class DeclarativeBars : public QQuickItem
     Q_PROPERTY(int columns READ columns WRITE setColumns)
     Q_PROPERTY(QString itemLabelFormat READ itemLabelFormat WRITE setItemLabelFormat)
     Q_PROPERTY(QPointF selectedBarPos READ selectedBarPos WRITE setSelectedBarPos)
-    Q_ENUMS(QtDataVis3D::QDataVis::SelectionMode)
-    Q_ENUMS(QtDataVis3D::QDataVis::ShadowQuality)
-    Q_ENUMS(QtDataVis3D::QDataVis::LabelTransparency)
-    Q_ENUMS(QtDataVis3D::QDataVis::MeshStyle)
-    Q_ENUMS(QtDataVis3D::QDataVis::CameraPreset)
-    Q_ENUMS(QtDataVis3D::QDataVis::ColorTheme)
+    Q_ENUMS(QtDataVisualization::QDataVis::SelectionMode)
+    Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality)
+    Q_ENUMS(QtDataVisualization::QDataVis::LabelTransparency)
+    Q_ENUMS(QtDataVisualization::QDataVis::MeshStyle)
+    Q_ENUMS(QtDataVisualization::QDataVis::CameraPreset)
+    Q_ENUMS(QtDataVisualization::QDataVis::ColorTheme)
 
 public:
     explicit DeclarativeBars(QQuickItem *parent = 0);
@@ -197,6 +197,6 @@ private:
     QDataVis::ColorTheme m_theme;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3dqml2/declarativebarsrenderer.cpp b/src/datavisualizationqml2/declarativebarsrenderer.cpp
index 062dc951..3925e062 100644
--- a/src/datavis3dqml2/declarativebarsrenderer.cpp
+++ b/src/datavisualizationqml2/declarativebarsrenderer.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -21,7 +21,7 @@
 #include <QtQuick/QQuickWindow>
 #include <QtGui/QOpenGLFramebufferObject>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 DeclarativeBarsRenderer::DeclarativeBarsRenderer(QQuickWindow *window, Bars3DController *renderer)
     : m_fbo(0),
@@ -84,4 +84,4 @@ void DeclarativeBarsRenderer::renderFBO()
     m_fbo->release();
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3dqml2/declarativebarsrenderer_p.h b/src/datavisualizationqml2/declarativebarsrenderer_p.h
index 7f721a23..3be9b911 100644
--- a/src/datavis3dqml2/declarativebarsrenderer_p.h
+++ b/src/datavisualizationqml2/declarativebarsrenderer_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,7 +29,7 @@
 #ifndef DECLARATIVEBARSRENDERER_H
 #define DECLARATIVEBARSRENDERER_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "bars3dcontroller_p.h"
 #include <qsgsimpletexturenode.h>
 
@@ -37,7 +37,7 @@ class QOpenGLFramebufferObject;
 class QSGTexture;
 class QQuickWindow;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class DeclarativeBarsRenderer : public QObject, public QSGSimpleTextureNode
 {
@@ -60,6 +60,6 @@ private:
     Bars3DController *m_barsRenderer;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3dqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index 79f91265..dc9ac209 100644
--- a/src/datavis3dqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 #include "declarativescatterrenderer_p.h"
 #include "qitemmodelscatterdataproxy.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 const QString smoothString(QStringLiteral("Smooth"));
 
@@ -324,4 +324,4 @@ void DeclarativeScatter::wheelEvent(QWheelEvent *event)
     m_shared->wheelEvent(event);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3dqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h
index 60a751be..ad6ccb2a 100644
--- a/src/datavis3dqml2/declarativescatter_p.h
+++ b/src/datavisualizationqml2/declarativescatter_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,7 +29,7 @@
 #ifndef DECLARATIVESCATTER_P_H
 #define DECLARATIVESCATTER_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "scatter3dcontroller_p.h"
 #include "declarativescatter_p.h"
 #include "q3dvalueaxis.h"
@@ -39,7 +39,7 @@
 #include <QQuickItem>
 #include <QObject>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class DeclarativeScatter : public QQuickItem
 {
@@ -48,24 +48,24 @@ class DeclarativeScatter : public QQuickItem
     Q_PROPERTY(Q3DValueAxis *axisX READ axisX WRITE setAxisX)
     Q_PROPERTY(Q3DValueAxis *axisY READ axisY WRITE setAxisY)
     Q_PROPERTY(Q3DValueAxis *axisZ READ axisZ WRITE setAxisZ)
-    Q_PROPERTY(QtDataVis3D::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
-    Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
-    Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
-    Q_PROPERTY(QtDataVis3D::QDataVis::MeshStyle objectType READ objectType WRITE setObjectType)
-    Q_PROPERTY(QtDataVis3D::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset)
-    Q_PROPERTY(QtDataVis3D::QDataVis::ColorTheme theme READ theme WRITE setTheme)
+    Q_PROPERTY(QtDataVisualization::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
+    Q_PROPERTY(QtDataVisualization::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
+    Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
+    Q_PROPERTY(QtDataVisualization::QDataVis::MeshStyle objectType READ objectType WRITE setObjectType)
+    Q_PROPERTY(QtDataVisualization::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset)
+    Q_PROPERTY(QtDataVisualization::QDataVis::ColorTheme theme READ theme WRITE setTheme)
     Q_PROPERTY(bool objectSmooth READ objectSmooth WRITE setObjectSmooth)
     Q_PROPERTY(QString meshFileName READ meshFileName WRITE setMeshFileName)
     Q_PROPERTY(QFont font READ font WRITE setFont)
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
     Q_PROPERTY(QString itemLabelFormat READ itemLabelFormat WRITE setItemLabelFormat)
-    Q_ENUMS(QtDataVis3D::QDataVis::SelectionMode)
-    Q_ENUMS(QtDataVis3D::QDataVis::ShadowQuality)
-    Q_ENUMS(QtDataVis3D::QDataVis::LabelTransparency)
-    Q_ENUMS(QtDataVis3D::QDataVis::MeshStyle)
-    Q_ENUMS(QtDataVis3D::QDataVis::CameraPreset)
-    Q_ENUMS(QtDataVis3D::QDataVis::ColorTheme)
+    Q_ENUMS(QtDataVisualization::QDataVis::SelectionMode)
+    Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality)
+    Q_ENUMS(QtDataVisualization::QDataVis::LabelTransparency)
+    Q_ENUMS(QtDataVisualization::QDataVis::MeshStyle)
+    Q_ENUMS(QtDataVisualization::QDataVis::CameraPreset)
+    Q_ENUMS(QtDataVisualization::QDataVis::ColorTheme)
 
 public:
     explicit DeclarativeScatter(QQuickItem *parent = 0);
@@ -162,6 +162,6 @@ private:
     QDataVis::ColorTheme m_theme;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3dqml2/declarativescatterrenderer.cpp b/src/datavisualizationqml2/declarativescatterrenderer.cpp
index fead0039..39aaa22e 100644
--- a/src/datavis3dqml2/declarativescatterrenderer.cpp
+++ b/src/datavisualizationqml2/declarativescatterrenderer.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -21,7 +21,7 @@
 #include <QtQuick/QQuickWindow>
 #include <QtGui/QOpenGLFramebufferObject>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 DeclarativeScatterRenderer::DeclarativeScatterRenderer(QQuickWindow *window,
                                                        Scatter3DController *renderer)
@@ -85,4 +85,4 @@ void DeclarativeScatterRenderer::renderFBO()
     m_fbo->release();
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3dqml2/declarativescatterrenderer_p.h b/src/datavisualizationqml2/declarativescatterrenderer_p.h
index 498b1d83..0bbd01ec 100644
--- a/src/datavis3dqml2/declarativescatterrenderer_p.h
+++ b/src/datavisualizationqml2/declarativescatterrenderer_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,7 +29,7 @@
 #ifndef DECLARATIVESCATTERRENDERER_P_H
 #define DECLARATIVESCATTERRENDERER_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "scatter3dcontroller_p.h"
 #include <qsgsimpletexturenode.h>
 
@@ -37,7 +37,7 @@ class QOpenGLFramebufferObject;
 class QSGTexture;
 class QQuickWindow;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class DeclarativeScatterRenderer : public QObject, public QSGSimpleTextureNode
 {
@@ -60,6 +60,6 @@ private:
     Scatter3DController *m_scatterRenderer;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3dqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp
index a85b926e..7597bef0 100644
--- a/src/datavis3dqml2/declarativesurface.cpp
+++ b/src/datavisualizationqml2/declarativesurface.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -21,7 +21,7 @@
 #include "q3dvalueaxis.h"
 #include "qitemmodelsurfacedataproxy.h"
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 DeclarativeSurface::DeclarativeSurface(QQuickItem *parent)
     : QQuickItem(parent),
@@ -285,4 +285,4 @@ void DeclarativeSurface::wheelEvent(QWheelEvent *event)
     m_shared->wheelEvent(event);
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3dqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h
index f115963c..c6aae7c0 100644
--- a/src/datavis3dqml2/declarativesurface_p.h
+++ b/src/datavisualizationqml2/declarativesurface_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,7 +29,7 @@
 #ifndef DECLARATIVESURFACE_P_H
 #define DECLARATIVESURFACE_P_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "surface3dcontroller_p.h"
 #include "declarativesurface_p.h"
 #include "q3dvalueaxis.h"
@@ -40,7 +40,7 @@
 #include <QObject>
 #include <QQuickWindow>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class DeclarativeSurface : public QQuickItem
 {
@@ -49,22 +49,22 @@ class DeclarativeSurface : public QQuickItem
     Q_PROPERTY(Q3DValueAxis *axisX READ axisX WRITE setAxisX)
     Q_PROPERTY(Q3DValueAxis *axisY READ axisY WRITE setAxisY)
     Q_PROPERTY(Q3DValueAxis *axisZ READ axisZ WRITE setAxisZ)
-    Q_PROPERTY(QtDataVis3D::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
-    Q_PROPERTY(QtDataVis3D::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
-    Q_PROPERTY(QtDataVis3D::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
-    Q_PROPERTY(QtDataVis3D::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset)
-    Q_PROPERTY(QtDataVis3D::QDataVis::ColorTheme theme READ theme WRITE setTheme)
+    Q_PROPERTY(QtDataVisualization::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
+    Q_PROPERTY(QtDataVisualization::QDataVis::LabelTransparency labelTransparency READ labelTransparency WRITE setLabelTransparency)
+    Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality)
+    Q_PROPERTY(QtDataVisualization::QDataVis::CameraPreset cameraPreset READ cameraPreset WRITE setCameraPreset)
+    Q_PROPERTY(QtDataVisualization::QDataVis::ColorTheme theme READ theme WRITE setTheme)
     Q_PROPERTY(QFont font READ font WRITE setFont)
     Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible)
     Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
     Q_PROPERTY(bool smoothSurface READ smoothSurface WRITE setSmoothSurface)
     Q_PROPERTY(bool surfaceGrid READ surfaceGrid WRITE setSurfaceGrid)
     Q_PROPERTY(QString itemLabelFormat READ itemLabelFormat WRITE setItemLabelFormat)
-    Q_ENUMS(QtDataVis3D::QDataVis::SelectionMode)
-    Q_ENUMS(QtDataVis3D::QDataVis::ShadowQuality)
-    Q_ENUMS(QtDataVis3D::QDataVis::LabelTransparency)
-    Q_ENUMS(QtDataVis3D::QDataVis::CameraPreset)
-    Q_ENUMS(QtDataVis3D::QDataVis::ColorTheme)
+    Q_ENUMS(QtDataVisualization::QDataVis::SelectionMode)
+    Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality)
+    Q_ENUMS(QtDataVisualization::QDataVis::LabelTransparency)
+    Q_ENUMS(QtDataVisualization::QDataVis::CameraPreset)
+    Q_ENUMS(QtDataVisualization::QDataVis::ColorTheme)
 
 public:
     explicit DeclarativeSurface(QQuickItem *parent = 0);
@@ -151,6 +151,6 @@ private:
     QDataVis::ColorTheme m_theme;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavis3dqml2/declarativesurfacerenderer.cpp b/src/datavisualizationqml2/declarativesurfacerenderer.cpp
index 5e3dc367..87a290ce 100644
--- a/src/datavis3dqml2/declarativesurfacerenderer.cpp
+++ b/src/datavisualizationqml2/declarativesurfacerenderer.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -21,7 +21,7 @@
 #include <QtQuick/QQuickWindow>
 #include <QtGui/QOpenGLFramebufferObject>
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 DeclarativeSurfaceRenderer::DeclarativeSurfaceRenderer(QQuickWindow *window,
                                                        Surface3DController *renderer)
@@ -84,4 +84,4 @@ void DeclarativeSurfaceRenderer::renderFBO()
     m_fbo->release();
 }
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
diff --git a/src/datavis3dqml2/declarativesurfacerenderer_p.h b/src/datavisualizationqml2/declarativesurfacerenderer_p.h
index 4aae91b1..09128f59 100644
--- a/src/datavis3dqml2/declarativesurfacerenderer_p.h
+++ b/src/datavisualizationqml2/declarativesurfacerenderer_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -20,7 +20,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the QtDataVis3D API.  It exists purely as an
+// This file is not part of the QtDataVisualization API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -29,7 +29,7 @@
 #ifndef DECLARATIVESURFACERENDERER_H
 #define DECLARATIVESURFACERENDERER_H
 
-#include "datavis3dglobal_p.h"
+#include "datavisualizationglobal_p.h"
 #include "surface3dcontroller_p.h"
 #include <qsgsimpletexturenode.h>
 
@@ -37,7 +37,7 @@ class QOpenGLFramebufferObject;
 class QSGTexture;
 class QQuickWindow;
 
-QT_DATAVIS3D_BEGIN_NAMESPACE
+QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
 class DeclarativeSurfaceRenderer : public QObject, public QSGSimpleTextureNode
 {
@@ -60,6 +60,6 @@ private:
     Surface3DController *m_surfaceRenderer;
 };
 
-QT_DATAVIS3D_END_NAMESPACE
+QT_DATAVISUALIZATION_END_NAMESPACE
 
 #endif
diff --git a/src/datavisualizationqml2/qmldir b/src/datavisualizationqml2/qmldir
new file mode 100644
index 00000000..1def2238
--- /dev/null
+++ b/src/datavisualizationqml2/qmldir
@@ -0,0 +1,3 @@
+module com.digia.QtDataVisualization
+plugin datavisualizationqml2
+
diff --git a/src/src.pro b/src/src.pro
index 079d26e4..33e3c009 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS += datavis3d \
-           datavis3dqml2
+SUBDIRS += datavisualization \
+           datavisualizationqml2
diff --git a/sync.profile b/sync.profile
index 0f8f0093..00e85462 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,5 +1,5 @@
 %modules = ( # path to module name map
-    "QtDataVis3D" => "$basedir/src/datavis3d",
+    "QtDataVisualization" => "$basedir/src/datavisualization",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp
index 2f21801f..08ce4d94 100644
--- a/tests/barstest/chart.cpp
+++ b/tests/barstest/chart.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,12 +17,12 @@
 ****************************************************************************/
 
 #include "chart.h"
-#include <QtDataVis3D/q3dcategoryaxis.h>
-#include <QtDataVis3D/q3dvalueaxis.h>
-#include <QtDataVis3D/qbardataproxy.h>
+#include <QtDataVisualization/q3dcategoryaxis.h>
+#include <QtDataVisualization/q3dvalueaxis.h>
+#include <QtDataVisualization/qbardataproxy.h>
 #include <QTime>
 
-QT_DATAVIS3D_USE_NAMESPACE
+QT_DATAVISUALIZATION_USE_NAMESPACE
 
 const QString celsiusString = QString(QChar(0xB0)) + "C";
 
diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h
index 7210d606..bd601021 100644
--- a/tests/barstest/chart.h
+++ b/tests/barstest/chart.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,14 +19,14 @@
 #ifndef CHARTMODIFIER_H
 #define CHARTMODIFIER_H
 
-#include <QtDataVis3D/q3dbars.h>
+#include <QtDataVisualization/q3dbars.h>
 
 #include <QFont>
 #include <QDebug>
 #include <QStringList>
 #include <QPointer>
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 class ChartModifier : public QObject
 {
diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp
index a59f1de1..b5225d4c 100644
--- a/tests/barstest/main.cpp
+++ b/tests/barstest/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/tests/scattertest/main.cpp b/tests/scattertest/main.cpp
index b0135ef3..933ae58e 100644
--- a/tests/scattertest/main.cpp
+++ b/tests/scattertest/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp
index 0542374b..90346559 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -17,10 +17,10 @@
 ****************************************************************************/
 
 #include "scatterchart.h"
-#include <QtDataVis3D/qscatterdataproxy.h>
-#include <QtDataVis3D/q3dvalueaxis.h>
+#include <QtDataVisualization/qscatterdataproxy.h>
+#include <QtDataVisualization/q3dvalueaxis.h>
 #include <qmath.h>
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 //#define RANDOM_SCATTER
 
diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h
index 4412af99..eef94ac4 100644
--- a/tests/scattertest/scatterchart.h
+++ b/tests/scattertest/scatterchart.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,13 +19,13 @@
 #ifndef SCATTERDATAMODIFIER_H
 #define SCATTERDATAMODIFIER_H
 
-#include <QtDataVis3D/q3dscatter.h>
+#include <QtDataVisualization/q3dscatter.h>
 
 #include <QFont>
 #include <QDebug>
 #include <QTimer>
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 class ScatterDataModifier : public QObject
 {
diff --git a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
index 45aee653..f6fc37e0 100644
--- a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
+++ b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the examples of QtDataVis3D.
+** This file is part of the examples of QtDataVisualization.
 **
 ** This program is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as
diff --git a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h
index 2fb602de..4cfa580b 100644
--- a/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h
+++ b/tests/spectrum/3rdparty/fftreal/fftreal_wrapper.h
@@ -3,7 +3,7 @@
 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
-** This file is part of the examples of QtDataVis3D.
+** This file is part of the examples of QtDataVisualization.
 **
 ** This program is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as
diff --git a/tests/spectrum/spectrumapp/engine.cpp b/tests/spectrum/spectrumapp/engine.cpp
index 60605223..9d049384 100644
--- a/tests/spectrum/spectrumapp/engine.cpp
+++ b/tests/spectrum/spectrumapp/engine.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/tests/spectrum/spectrumapp/engine.h b/tests/spectrum/spectrumapp/engine.h
index cdd8373f..1ad86065 100644
--- a/tests/spectrum/spectrumapp/engine.h
+++ b/tests/spectrum/spectrumapp/engine.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/tests/spectrum/spectrumapp/frequencyspectrum.cpp b/tests/spectrum/spectrumapp/frequencyspectrum.cpp
index 013d0454..c5f62cef 100644
--- a/tests/spectrum/spectrumapp/frequencyspectrum.cpp
+++ b/tests/spectrum/spectrumapp/frequencyspectrum.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/tests/spectrum/spectrumapp/frequencyspectrum.h b/tests/spectrum/spectrumapp/frequencyspectrum.h
index fac9a1b7..0008985f 100644
--- a/tests/spectrum/spectrumapp/frequencyspectrum.h
+++ b/tests/spectrum/spectrumapp/frequencyspectrum.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp
index 89051da4..6c264516 100644
--- a/tests/spectrum/spectrumapp/main.cpp
+++ b/tests/spectrum/spectrumapp/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
@@ -19,9 +19,9 @@
 #include "engine.h"
 #include "utils.h"
 
-#include <QtDataVis3D/q3dbars.h>
-#include <QtDataVis3D/qbardataproxy.h>
-#include <QtDataVis3D/q3dvalueaxis.h>
+#include <QtDataVisualization/q3dbars.h>
+#include <QtDataVisualization/qbardataproxy.h>
+#include <QtDataVisualization/q3dvalueaxis.h>
 
 #include <QGuiApplication>
 #include <QAudio>
@@ -29,7 +29,7 @@
 
 //#define USE_CONES
 
-using namespace QtDataVis3D;
+using namespace QtDataVisualization;
 
 class MainApp : public QObject
 {
@@ -188,7 +188,7 @@ int MainApp::barIndex(qreal frequency) const
 int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
-    app.setApplicationName("QtDataVis3D spectrum analyzer");
+    app.setApplicationName("QtDataVisualization spectrum analyzer");
 
     Q3DBars window;
     window.resize(1024, 768);
diff --git a/tests/spectrum/spectrumapp/spectrum.h b/tests/spectrum/spectrumapp/spectrum.h
index 015989d5..97096b1c 100644
--- a/tests/spectrum/spectrumapp/spectrum.h
+++ b/tests/spectrum/spectrumapp/spectrum.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/tests/spectrum/spectrumapp/spectrumanalyser.cpp b/tests/spectrum/spectrumapp/spectrumanalyser.cpp
index 4cebfde9..b86a851c 100644
--- a/tests/spectrum/spectrumapp/spectrumanalyser.cpp
+++ b/tests/spectrum/spectrumapp/spectrumanalyser.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/tests/spectrum/spectrumapp/spectrumanalyser.h b/tests/spectrum/spectrumapp/spectrumanalyser.h
index 6d9291ef..0e40fe66 100644
--- a/tests/spectrum/spectrumapp/spectrumanalyser.h
+++ b/tests/spectrum/spectrumapp/spectrumanalyser.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/tests/spectrum/spectrumapp/spectrumapp.pro b/tests/spectrum/spectrumapp/spectrumapp.pro
index 0fc0584c..940cce75 100644
--- a/tests/spectrum/spectrumapp/spectrumapp.pro
+++ b/tests/spectrum/spectrumapp/spectrumapp.pro
@@ -50,7 +50,7 @@ RESOURCES = spectrum.qrc
 android {
     target.path = /libs/$$ANDROID_TARGET_ARCH
 } else {
-    target.path = $$[QT_INSTALL_EXAMPLES]/datavis3d/spectrum
+    target.path = $$[QT_INSTALL_EXAMPLES]/datavisualization/spectrum
 }
 INSTALLS += target
 
diff --git a/tests/spectrum/spectrumapp/utils.cpp b/tests/spectrum/spectrumapp/utils.cpp
index bad6cc48..f007959c 100644
--- a/tests/spectrum/spectrumapp/utils.cpp
+++ b/tests/spectrum/spectrumapp/utils.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/tests/spectrum/spectrumapp/utils.h b/tests/spectrum/spectrumapp/utils.h
index f0ae5633..009f895b 100644
--- a/tests/spectrum/spectrumapp/utils.h
+++ b/tests/spectrum/spectrumapp/utils.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/tests/spectrum/spectrumapp/wavfile.cpp b/tests/spectrum/spectrumapp/wavfile.cpp
index 24482507..56dd340e 100644
--- a/tests/spectrum/spectrumapp/wavfile.cpp
+++ b/tests/spectrum/spectrumapp/wavfile.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/tests/spectrum/spectrumapp/wavfile.h b/tests/spectrum/spectrumapp/wavfile.h
index e408911b..25673630 100644
--- a/tests/spectrum/spectrumapp/wavfile.h
+++ b/tests/spectrum/spectrumapp/wavfile.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
-** This file is part of the QtDataVis3D module.
+** This file is part of the QtDataVisualization module.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
diff --git a/tests/tests.pri b/tests/tests.pri
index e772d18a..815ce4dd 100644
--- a/tests/tests.pri
+++ b/tests/tests.pri
@@ -1,7 +1,7 @@
 android {
     target.path = /libs/$$ANDROID_TARGET_ARCH
 } else {
-    target.path = $$[QT_INSTALL_TESTS]/datavis3d/$$TARGET
+    target.path = $$[QT_INSTALL_TESTS]/datavisualization/$$TARGET
 }
 
 win32 {
@@ -15,11 +15,11 @@ LIBS += -L$$OUT_PWD/../../lib
 
 TEMPLATE = app
 
-QT += datavis3d
+QT += datavisualization
 
 contains(TARGET, qml.*) {
-    uri = com.digia.QtDataVis3D
-    lib_name = datavis3dqml2
+    uri = com.digia.QtDataVisualization
+    lib_name = datavisualizationqml2
 
     uri_replaced = $$replace(uri, \\., $$QMAKE_DIR_SEP)
     make_qmldir_path = $$DESTDIR/$$uri_replaced