Rename *datavis* files and classeswip/NG

Change-Id: I5bd4735421732ec6b3cade8ab298f7ef35f2efe0
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

34 files changed, 548 insertions, 1400 deletions

diff --git a/src/graphs/CMakeLists.txt b/src/graphs/CMakeLists.txt
index d829cc0c..686a8cd5 100644
--- a/src/graphs/CMakeLists.txt
+++ b/src/graphs/CMakeLists.txt
@@ -68,7 +68,6 @@ qt_internal_add_qml_module(Graphs
         engine/qabstract3dgraph.cpp engine/qabstract3dgraph.h
         engine/scatter3dcontroller.cpp engine/scatter3dcontroller_p.h
         engine/surface3dcontroller.cpp engine/surface3dcontroller_p.h
-        engine/datavisquick3dtexturedata.cpp engine/datavisquick3dtexturedata_p.h # Maybe change this location
         engine/surfaceselectioninstancing.cpp engine/surfaceselectioninstancing_p.h
 
         global/graphsglobal_p.h
@@ -90,10 +89,11 @@ qt_internal_add_qml_module(Graphs
         qml/declarativescene.cpp qml/declarativescene_p.h
         qml/declarativeseries.cpp qml/declarativeseries_p.h
         qml/declarativetheme.cpp qml/declarativetheme_p.h
-        qml/qquickdatavisitem.cpp qml/qquickdatavisitem_p.h
-        qml/qquickdatavisbars.cpp qml/qquickdatavisbars_p.h
-        qml/qquickdatavissurface.cpp qml/qquickdatavissurface_p.h
-        qml/qquickdatavisscatter.cpp qml/qquickdatavisscatter_p.h
+        qml/qquickgraphsitem.cpp qml/qquickgraphsitem_p.h
+        qml/qquickgraphsbars.cpp qml/qquickgraphsbars_p.h
+        qml/qquickgraphssurface.cpp qml/qquickgraphssurface_p.h
+        qml/qquickgraphsscatter.cpp qml/qquickgraphsscatter_p.h
+        qml/quickgraphstexturedata.cpp qml/quickgraphstexturedata_p.h
     INCLUDE_DIRECTORIES
         axis
         data
diff --git a/src/graphs/axis/qvalue3daxis.h b/src/graphs/axis/qvalue3daxis.h
index 35867436..e10c4e4e 100644
--- a/src/graphs/axis/qvalue3daxis.h
+++ b/src/graphs/axis/qvalue3daxis.h
@@ -66,8 +66,8 @@ private:
     friend class Scatter3DController;
     friend class Surface3DController;
     friend class QValue3DAxisFormatterPrivate;
-    friend class QQuickDataVisScatter;
-    friend class QQuickDataVisBars;
+    friend class QQuickGraphsScatter;
+    friend class QQuickGraphsBars;
 };
 
 QT_END_NAMESPACE
diff --git a/src/graphs/axis/qvalue3daxisformatter.h b/src/graphs/axis/qvalue3daxisformatter.h
index 1a84c1a8..15544d6d 100644
--- a/src/graphs/axis/qvalue3daxisformatter.h
+++ b/src/graphs/axis/qvalue3daxisformatter.h
@@ -65,8 +65,8 @@ private:
     friend class QBar3DSeriesPrivate;
     friend class QScatter3DSeriesPrivate;
     friend class QSurface3DSeriesPrivate;
-    friend class QQuickDataVisScatter;
-    friend class QQuickDataVisBars;
+    friend class QQuickGraphsScatter;
+    friend class QQuickGraphsBars;
     friend class Bars3DController;
 };
 
diff --git a/src/graphs/data/qbar3dseries.h b/src/graphs/data/qbar3dseries.h
index f5b2e6c4..671fdf6e 100644
--- a/src/graphs/data/qbar3dseries.h
+++ b/src/graphs/data/qbar3dseries.h
@@ -52,7 +52,7 @@ private:
     Q_DISABLE_COPY(QBar3DSeries)
 
     friend class Bars3DController;
-    friend class QQuickDataVisBars;
+    friend class QQuickGraphsBars;
 };
 
 QT_END_NAMESPACE
diff --git a/src/graphs/data/qbardataproxy.h b/src/graphs/data/qbardataproxy.h
index 81fc3d5a..a82598b7 100644
--- a/src/graphs/data/qbardataproxy.h
+++ b/src/graphs/data/qbardataproxy.h
@@ -94,7 +94,7 @@ private:
     Q_DISABLE_COPY(QBarDataProxy)
 
     friend class Bars3DController;
-    friend class QQuickDataVisBars;
+    friend class QQuickGraphsBars;
 };
 
 QT_END_NAMESPACE
diff --git a/src/graphs/data/qscatter3dseries.h b/src/graphs/data/qscatter3dseries.h
index 5b26bf82..b935d894 100644
--- a/src/graphs/data/qscatter3dseries.h
+++ b/src/graphs/data/qscatter3dseries.h
@@ -47,7 +47,7 @@ private:
     Q_DISABLE_COPY(QScatter3DSeries)
 
     friend class Scatter3DController;
-    friend class QQuickDataVisScatter;
+    friend class QQuickGraphsScatter;
 };
 
 QT_END_NAMESPACE
diff --git a/src/graphs/data/qscatterdataproxy.h b/src/graphs/data/qscatterdataproxy.h
index 5cb1ae41..0eda6a83 100644
--- a/src/graphs/data/qscatterdataproxy.h
+++ b/src/graphs/data/qscatterdataproxy.h
@@ -64,7 +64,7 @@ private:
     Q_DISABLE_COPY(QScatterDataProxy)
 
     friend class Scatter3DController;
-    friend class QQuickDataVisScatter;
+    friend class QQuickGraphsScatter;
 };
 
 QT_END_NAMESPACE
diff --git a/src/graphs/engine/abstract3dcontroller.cpp b/src/graphs/engine/abstract3dcontroller.cpp
index ebb7bfd5..adf349c5 100644
--- a/src/graphs/engine/abstract3dcontroller.cpp
+++ b/src/graphs/engine/abstract3dcontroller.cpp
@@ -5,7 +5,7 @@
 #include "qabstract3daxis_p.h"
 #include "qvalue3daxis_p.h"
 #include "qcategory3daxis_p.h"
-#include "qquickdatavisitem_p.h"
+#include "qquickgraphsitem_p.h"
 #include "qabstract3dseries_p.h"
 #include "q3dscene_p.h"
 #include "qabstract3dinputhandler_p.h"
diff --git a/src/graphs/engine/abstract3dcontroller_p.h b/src/graphs/engine/abstract3dcontroller_p.h
index eed89af6..f4b7a1a3 100644
--- a/src/graphs/engine/abstract3dcontroller_p.h
+++ b/src/graphs/engine/abstract3dcontroller_p.h
@@ -200,7 +200,7 @@ protected:
     qreal m_margin;
 
     QMutex m_renderMutex;
-    QQuickDataVisItem *m_qml = nullptr;
+    QQuickGraphsItem *m_qml = nullptr;
 
     explicit Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent = 0);
 
@@ -403,7 +403,7 @@ private:
                        QAbstract3DAxis **axisPtr);
 
     friend class AbstractDeclarative;
-    friend class QQuickDataVisItem;
+    friend class QQuickGraphsItem;
     friend class Bars3DController;
     friend class QAbstract3DGraphPrivate;
 };
diff --git a/src/graphs/engine/bars3dcontroller_p.h b/src/graphs/engine/bars3dcontroller_p.h
index e443e6e5..e901f8e6 100644
--- a/src/graphs/engine/bars3dcontroller_p.h
+++ b/src/graphs/engine/bars3dcontroller_p.h
@@ -152,8 +152,8 @@ private:
     void adjustSelectionPosition(QPoint &pos, const QBar3DSeries *series);
 
     Q_DISABLE_COPY(Bars3DController)
-    friend class QQuickDataVisItem;
-    friend class QQuickDataVisBars;
+    friend class QQuickGraphsItem;
+    friend class QQuickGraphsBars;
 };
 
 QT_END_NAMESPACE
diff --git a/src/graphs/engine/q3dbars.cpp b/src/graphs/engine/q3dbars.cpp
index 604c111d..371f3ad8 100644
--- a/src/graphs/engine/q3dbars.cpp
+++ b/src/graphs/engine/q3dbars.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "q3dbars.h"
-#include "qquickdatavisbars_p.h"
+#include "qquickgraphsbars_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -278,7 +278,7 @@ Q3DBars::Q3DBars() : QAbstract3DGraph()
 {
     QQmlComponent *component = new QQmlComponent(engine(), this);
     component->setData("import QtQuick; import QtGraphs; Bars3D { anchors.fill: parent; }", QUrl());
-    d_ptr.reset(qobject_cast<QQuickDataVisBars *>(component->create()));
+    d_ptr.reset(qobject_cast<QQuickGraphsBars *>(component->create()));
     setContent(component->url(), component, d_ptr.data());
 }
 
@@ -447,14 +447,14 @@ void Q3DBars::setReflection(bool reflection)
     emit reflectionChanged(reflection);
 }
 
-QQuickDataVisBars *Q3DBars::dptr()
+QQuickGraphsBars *Q3DBars::dptr()
 {
-    return static_cast<QQuickDataVisBars *>(d_ptr.data());
+    return static_cast<QQuickGraphsBars *>(d_ptr.data());
 }
 
-const QQuickDataVisBars *Q3DBars::dptrc() const
+const QQuickGraphsBars *Q3DBars::dptrc() const
 {
-    return static_cast<const QQuickDataVisBars *>(d_ptr.data());
+    return static_cast<const QQuickGraphsBars *>(d_ptr.data());
 }
 
 QT_END_NAMESPACE
diff --git a/src/graphs/engine/q3dbars.h b/src/graphs/engine/q3dbars.h
index 91ec6d94..a8bc22af 100644
--- a/src/graphs/engine/q3dbars.h
+++ b/src/graphs/engine/q3dbars.h
@@ -11,7 +11,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDataVisBars;
+class QQuickGraphsBars;
 
 class Q_GRAPHS_EXPORT Q3DBars : public QAbstract3DGraph
 {
@@ -87,8 +87,8 @@ Q_SIGNALS:
     void reflectionChanged(bool reflection);
 
 private:
-    QQuickDataVisBars *dptr();
-    const QQuickDataVisBars *dptrc() const;
+    QQuickGraphsBars *dptr();
+    const QQuickGraphsBars *dptrc() const;
 };
 
 QT_END_NAMESPACE
diff --git a/src/graphs/engine/q3dcamera.h b/src/graphs/engine/q3dcamera.h
index ab55a03d..08aa24ef 100644
--- a/src/graphs/engine/q3dcamera.h
+++ b/src/graphs/engine/q3dcamera.h
@@ -107,8 +107,8 @@ private:
     friend class SelectionPointer;
     friend class Q3DInputHandler;
     friend class QTouch3DInputHandlerPrivate;
-    friend class QQuickDataVisScatter;
-    friend class QQuickDataVisBars;
+    friend class QQuickGraphsScatter;
+    friend class QQuickGraphsBars;
     friend class GraphSceneNode3D;
 };
 
diff --git a/src/graphs/engine/q3dscatter.cpp b/src/graphs/engine/q3dscatter.cpp
index 2243b17c..b0e23177 100644
--- a/src/graphs/engine/q3dscatter.cpp
+++ b/src/graphs/engine/q3dscatter.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "q3dscatter.h"
-#include "qquickdatavisscatter_p.h"
+#include "qquickgraphsscatter_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -175,7 +175,7 @@ Q3DScatter::Q3DScatter() : QAbstract3DGraph()
 {
     QQmlComponent *component = new QQmlComponent(engine(), this);
     component->setData("import QtQuick; import QtGraphs; Scatter3D { anchors.fill: parent; }", QUrl());
-    d_ptr.reset(qobject_cast<QQuickDataVisScatter *>(component->create()));
+    d_ptr.reset(qobject_cast<QQuickGraphsScatter *>(component->create()));
     setContent(component->url(), component, d_ptr.data());
 }
 
@@ -198,14 +198,14 @@ QList<QScatter3DSeries *> Q3DScatter::seriesList() const
     return dptrc()->m_scatterController->scatterSeriesList();
 }
 
-QQuickDataVisScatter *Q3DScatter::dptr()
+QQuickGraphsScatter *Q3DScatter::dptr()
 {
-    return static_cast<QQuickDataVisScatter *>(d_ptr.data());
+    return static_cast<QQuickGraphsScatter *>(d_ptr.data());
 }
 
-const QQuickDataVisScatter *Q3DScatter::dptrc() const
+const QQuickGraphsScatter *Q3DScatter::dptrc() const
 {
-    return static_cast<const QQuickDataVisScatter *>(d_ptr.data());
+    return static_cast<const QQuickGraphsScatter *>(d_ptr.data());
 }
 
 void Q3DScatter::setAxisX(QValue3DAxis *axis)
diff --git a/src/graphs/engine/q3dscatter.h b/src/graphs/engine/q3dscatter.h
index 826919c3..930ce7cb 100644
--- a/src/graphs/engine/q3dscatter.h
+++ b/src/graphs/engine/q3dscatter.h
@@ -10,7 +10,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDataVisScatter;
+class QQuickGraphsScatter;
 
 class Q_GRAPHS_EXPORT Q3DScatter : public QAbstract3DGraph
 {
@@ -47,8 +47,8 @@ Q_SIGNALS:
     void selectedSeriesChanged(QScatter3DSeries *series);
 
 private:
-    QQuickDataVisScatter *dptr();
-    const QQuickDataVisScatter *dptrc() const;
+    QQuickGraphsScatter *dptr();
+    const QQuickGraphsScatter *dptrc() const;
     Q_DISABLE_COPY(Q3DScatter)
 };
 
diff --git a/src/graphs/engine/q3dscene.h b/src/graphs/engine/q3dscene.h
index bd174204..9d26fb52 100644
--- a/src/graphs/engine/q3dscene.h
+++ b/src/graphs/engine/q3dscene.h
@@ -89,7 +89,7 @@ private:
     friend class Q3DScenePrivate;
     friend class Q3DCameraPrivate;
     friend class Q3DObject;
-    friend class QQuickDataVisItem;
+    friend class QQuickGraphsItem;
 };
 
 QT_END_NAMESPACE
diff --git a/src/graphs/engine/q3dsurface.cpp b/src/graphs/engine/q3dsurface.cpp
index 85fe80f3..54fe48ca 100644
--- a/src/graphs/engine/q3dsurface.cpp
+++ b/src/graphs/engine/q3dsurface.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "q3dsurface.h"
-#include "qquickdatavissurface_p.h"
+#include "qquickgraphssurface_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -210,7 +210,7 @@ Q3DSurface::Q3DSurface() : QAbstract3DGraph()
 {
     QQmlComponent *component = new QQmlComponent(engine(), this);
     component->setData("import QtQuick; import QtGraphs; Surface3D { anchors.fill: parent; }", QUrl());
-    d_ptr.reset(qobject_cast<QQuickDataVisSurface *>(component->create()));
+    d_ptr.reset(qobject_cast<QQuickGraphsSurface *>(component->create()));
     setContent(component->url(), component, d_ptr.data());
 }
 
@@ -298,14 +298,14 @@ QList<QValue3DAxis *> Q3DSurface::axes() const
     return retList;
 }
 
-QQuickDataVisSurface *Q3DSurface::dptr()
+QQuickGraphsSurface *Q3DSurface::dptr()
 {
-    return static_cast<QQuickDataVisSurface *>(d_ptr.data());
+    return static_cast<QQuickGraphsSurface *>(d_ptr.data());
 }
 
-const QQuickDataVisSurface *Q3DSurface::dptrc() const
+const QQuickGraphsSurface *Q3DSurface::dptrc() const
 {
-    return static_cast<const QQuickDataVisSurface *>(d_ptr.data());
+    return static_cast<const QQuickGraphsSurface *>(d_ptr.data());
 }
 
 
diff --git a/src/graphs/engine/q3dsurface.h b/src/graphs/engine/q3dsurface.h
index c9e2702a..34602838 100644
--- a/src/graphs/engine/q3dsurface.h
+++ b/src/graphs/engine/q3dsurface.h
@@ -11,7 +11,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDataVisSurface;
+class QQuickGraphsSurface;
 
 class Q_GRAPHS_EXPORT Q3DSurface : public QAbstract3DGraph
 {
@@ -53,8 +53,8 @@ Q_SIGNALS:
     void flipHorizontalGridChanged(bool flip);
 
 private:
-    QQuickDataVisSurface *dptr();
-    const QQuickDataVisSurface *dptrc() const;
+    QQuickGraphsSurface *dptr();
+    const QQuickGraphsSurface *dptrc() const;
 };
 
 QT_END_NAMESPACE
diff --git a/src/graphs/engine/qabstract3dgraph.cpp b/src/graphs/engine/qabstract3dgraph.cpp
index 80586e7d..e045a120 100644
--- a/src/graphs/engine/qabstract3dgraph.cpp
+++ b/src/graphs/engine/qabstract3dgraph.cpp
@@ -6,7 +6,7 @@
 #include "qabstract3dinputhandler_p.h"
 #include "q3dscene_p.h"
 #include "utils_p.h"
-#include "qquickdatavisitem_p.h"
+#include "qquickgraphsitem_p.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QOpenGLContext>
@@ -603,7 +603,7 @@ QAbstract3DGraph::ShadowQuality QAbstract3DGraph::shadowQuality() const
 
 void QAbstract3DGraph::setShadowQuality(const QAbstract3DGraph::ShadowQuality &shadowQuality)
 {
-    d_ptr->setShadowQuality(QQuickDataVisItem::ShadowQuality(shadowQuality));
+    d_ptr->setShadowQuality(QQuickGraphsItem::ShadowQuality(shadowQuality));
     emit shadowQualityChanged(shadowQuality);
 }
 
@@ -627,7 +627,7 @@ QAbstract3DGraph::SelectionFlags QAbstract3DGraph::selectionMode() const
 void QAbstract3DGraph::setSelectionMode(const QAbstract3DGraph::SelectionFlags &selectionMode)
 {
     int intmode = int(selectionMode);
-    d_ptr->setSelectionMode(QQuickDataVisItem::SelectionFlags(intmode));
+    d_ptr->setSelectionMode(QQuickGraphsItem::SelectionFlags(intmode));
     emit selectionModeChanged(selectionMode);
 }
 
diff --git a/src/graphs/engine/qabstract3dgraph.h b/src/graphs/engine/qabstract3dgraph.h
index 1666a5ae..8eb263a2 100644
--- a/src/graphs/engine/qabstract3dgraph.h
+++ b/src/graphs/engine/qabstract3dgraph.h
@@ -19,7 +19,7 @@ QT_BEGIN_NAMESPACE
 class QCustom3DItem;
 class QAbstract3DAxis;
 class QAbstract3DSeries;
-class QQuickDataVisItem;
+class QQuickGraphsItem;
 
 class Q_GRAPHS_EXPORT QAbstract3DGraph : public QQuickWidget
 {
@@ -94,7 +94,7 @@ Q_SIGNALS:
 
 private:
     Q_DISABLE_COPY(QAbstract3DGraph)
-    QScopedPointer<QQuickDataVisItem> d_ptr;
+    QScopedPointer<QQuickGraphsItem> d_ptr;
 
     friend class Q3DBars;
     friend class Q3DScatter;
diff --git a/src/graphs/engine/scatter3dcontroller_p.h b/src/graphs/engine/scatter3dcontroller_p.h
index 6aa4dfdf..94bcbce2 100644
--- a/src/graphs/engine/scatter3dcontroller_p.h
+++ b/src/graphs/engine/scatter3dcontroller_p.h
@@ -123,7 +123,7 @@ protected:
 
 private:
 
-    friend class QQuickDataVisScatter;
+    friend class QQuickGraphsScatter;
     Q_DISABLE_COPY(Scatter3DController)
 };
 
diff --git a/src/graphs/qml/qquickdatavisbars.cpp b/src/graphs/qml/qquickgraphsbars.cpp
index 63f410d4..d358e6de 100644
--- a/src/graphs/qml/qquickdatavisbars.cpp
+++ b/src/graphs/qml/qquickgraphsbars.cpp
@@ -1,8 +1,8 @@
 // Copyright (C) 2023 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include "qquickdatavisbars_p.h"
-#include "datavisquick3dtexturedata_p.h"
+#include "qquickgraphsbars_p.h"
+#include "quickgraphstexturedata_p.h"
 #include "bars3dcontroller_p.h"
 #include "declarativescene_p.h"
 #include "qbar3dseries_p.h"
@@ -14,11 +14,11 @@
 
 #include <QtQuick3D/private/qquick3drepeater_p.h>
 #include <QtQuick3D/private/qquick3dprincipledmaterial_p.h>
-#include "datavisquick3dtexturedata_p.h"
+#include "quickgraphstexturedata_p.h"
 #include <QtQuick3D/private/qquick3dcustommaterial_p.h>
 
-QQuickDataVisBars::QQuickDataVisBars(QQuickItem *parent)
-    : QQuickDataVisItem(parent),
+QQuickGraphsBars::QQuickGraphsBars(QQuickItem *parent)
+    : QQuickGraphsItem(parent),
       m_barsController(0),
       m_cachedRowCount(0),
       m_cachedColumnCount(0),
@@ -63,14 +63,14 @@ QQuickDataVisBars::QQuickDataVisBars(QQuickItem *parent)
     scene->setClearColor(Qt::blue);
 
     QObject::connect(m_barsController, &Bars3DController::primarySeriesChanged,
-                     this, &QQuickDataVisBars::primarySeriesChanged);
+                     this, &QQuickGraphsBars::primarySeriesChanged);
     QObject::connect(m_barsController, &Bars3DController::selectedSeriesChanged,
-                     this, &QQuickDataVisBars::selectedSeriesChanged);
+                     this, &QQuickGraphsBars::selectedSeriesChanged);
     QObject::connect(m_barsController, &Abstract3DController::optimizationHintsChanged,
-                     this, &QQuickDataVisBars::handleOptimizationHintsChanged);
+                     this, &QQuickGraphsBars::handleOptimizationHintsChanged);
 }
 
-QQuickDataVisBars::~QQuickDataVisBars()
+QQuickGraphsBars::~QQuickGraphsBars()
 {
     QMutexLocker locker(m_nodeMutex.data());
     const QMutexLocker locker2(mutex());
@@ -78,22 +78,22 @@ QQuickDataVisBars::~QQuickDataVisBars()
     m_barModelsMap.clear();
 }
 
-QCategory3DAxis *QQuickDataVisBars::rowAxis() const
+QCategory3DAxis *QQuickGraphsBars::rowAxis() const
 {
     return static_cast<QCategory3DAxis *>(m_barsController->axisZ());
 }
 
-void QQuickDataVisBars::setRowAxis(QCategory3DAxis *axis)
+void QQuickGraphsBars::setRowAxis(QCategory3DAxis *axis)
 {
     m_barsController->setAxisZ(axis);
 }
 
-QValue3DAxis *QQuickDataVisBars::valueAxis() const
+QValue3DAxis *QQuickGraphsBars::valueAxis() const
 {
     return static_cast<QValue3DAxis *>(m_barsController->axisY());
 }
 
-void QQuickDataVisBars::setValueAxis(QValue3DAxis *axis)
+void QQuickGraphsBars::setValueAxis(QValue3DAxis *axis)
 {
     m_barsController->setAxisY(axis);
     if (segmentLineRepeaterY()) {
@@ -116,17 +116,17 @@ void QQuickDataVisBars::setValueAxis(QValue3DAxis *axis)
     }
 }
 
-QCategory3DAxis *QQuickDataVisBars::columnAxis() const
+QCategory3DAxis *QQuickGraphsBars::columnAxis() const
 {
     return static_cast<QCategory3DAxis *>(m_barsController->axisX());
 }
 
-void QQuickDataVisBars::setColumnAxis(QCategory3DAxis *axis)
+void QQuickGraphsBars::setColumnAxis(QCategory3DAxis *axis)
 {
     m_barsController->setAxisX(axis);
 }
 
-void QQuickDataVisBars::setMultiSeriesUniform(bool uniform)
+void QQuickGraphsBars::setMultiSeriesUniform(bool uniform)
 {
     if (uniform != isMultiSeriesUniform()) {
         m_barsController->setMultiSeriesScaling(uniform);
@@ -134,12 +134,12 @@ void QQuickDataVisBars::setMultiSeriesUniform(bool uniform)
     }
 }
 
-bool QQuickDataVisBars::isMultiSeriesUniform() const
+bool QQuickGraphsBars::isMultiSeriesUniform() const
 {
     return m_barsController->multiSeriesScaling();
 }
 
-void QQuickDataVisBars::setBarThickness(float thicknessRatio)
+void QQuickGraphsBars::setBarThickness(float thicknessRatio)
 {
     if (thicknessRatio != barThickness()) {
         m_barsController->setBarSpecs(thicknessRatio, barSpacing(),
@@ -148,12 +148,12 @@ void QQuickDataVisBars::setBarThickness(float thicknessRatio)
     }
 }
 
-float QQuickDataVisBars::barThickness() const
+float QQuickGraphsBars::barThickness() const
 {
     return m_barsController->barThickness();
 }
 
-void QQuickDataVisBars::setBarSpacing(const QSizeF &spacing)
+void QQuickGraphsBars::setBarSpacing(const QSizeF &spacing)
 {
     if (spacing != barSpacing()) {
         m_barsController->setBarSpecs(barThickness(), spacing, isBarSpacingRelative());
@@ -161,12 +161,12 @@ void QQuickDataVisBars::setBarSpacing(const QSizeF &spacing)
     }
 }
 
-QSizeF QQuickDataVisBars::barSpacing() const
+QSizeF QQuickGraphsBars::barSpacing() const
 {
     return m_barsController->barSpacing();
 }
 
-void QQuickDataVisBars::setBarSpacingRelative(bool relative)
+void QQuickGraphsBars::setBarSpacingRelative(bool relative)
 {
     if (relative != isBarSpacingRelative()) {
         m_barsController->setBarSpecs(barThickness(), barSpacing(), relative);
@@ -174,12 +174,12 @@ void QQuickDataVisBars::setBarSpacingRelative(bool relative)
     }
 }
 
-bool QQuickDataVisBars::isBarSpacingRelative() const
+bool QQuickGraphsBars::isBarSpacingRelative() const
 {
     return m_barsController->isBarSpecRelative();
 }
 
-void QQuickDataVisBars::setBarSeriesMargin(const QSizeF &margin)
+void QQuickGraphsBars::setBarSeriesMargin(const QSizeF &margin)
 {
     if (margin != barSeriesMargin()) {
         m_barsController->setBarSeriesMargin(margin);
@@ -187,45 +187,45 @@ void QQuickDataVisBars::setBarSeriesMargin(const QSizeF &margin)
     }
 }
 
-QSizeF QQuickDataVisBars::barSeriesMargin() const
+QSizeF QQuickGraphsBars::barSeriesMargin() const
 {
     return m_barsController->barSeriesMargin();
 }
 
-QQmlListProperty<QBar3DSeries> QQuickDataVisBars::seriesList()
+QQmlListProperty<QBar3DSeries> QQuickGraphsBars::seriesList()
 {
     return QQmlListProperty<QBar3DSeries>(this, this,
-                                          &QQuickDataVisBars::appendSeriesFunc,
-                                          &QQuickDataVisBars::countSeriesFunc,
-                                          &QQuickDataVisBars::atSeriesFunc,
-                                          &QQuickDataVisBars::clearSeriesFunc);
+                                          &QQuickGraphsBars::appendSeriesFunc,
+                                          &QQuickGraphsBars::countSeriesFunc,
+                                          &QQuickGraphsBars::atSeriesFunc,
+                                          &QQuickGraphsBars::clearSeriesFunc);
 }
 
-void QQuickDataVisBars::appendSeriesFunc(QQmlListProperty<QBar3DSeries> *list, QBar3DSeries *series)
+void QQuickGraphsBars::appendSeriesFunc(QQmlListProperty<QBar3DSeries> *list, QBar3DSeries *series)
 {
-    reinterpret_cast<QQuickDataVisBars *>(list->data)->addSeries(series);
+    reinterpret_cast<QQuickGraphsBars *>(list->data)->addSeries(series);
 }
 
-qsizetype QQuickDataVisBars::countSeriesFunc(QQmlListProperty<QBar3DSeries> *list)
+qsizetype QQuickGraphsBars::countSeriesFunc(QQmlListProperty<QBar3DSeries> *list)
 {
-    return reinterpret_cast<QQuickDataVisBars *>(list->data)->m_barsController->barSeriesList().size();
+    return reinterpret_cast<QQuickGraphsBars *>(list->data)->m_barsController->barSeriesList().size();
 }
 
-QBar3DSeries *QQuickDataVisBars::atSeriesFunc(QQmlListProperty<QBar3DSeries> *list, qsizetype index)
+QBar3DSeries *QQuickGraphsBars::atSeriesFunc(QQmlListProperty<QBar3DSeries> *list, qsizetype index)
 {
-    return reinterpret_cast<QQuickDataVisBars *>(list->data)->m_barsController->barSeriesList().at(index);
+    return reinterpret_cast<QQuickGraphsBars *>(list->data)->m_barsController->barSeriesList().at(index);
 }
 
-void QQuickDataVisBars::clearSeriesFunc(QQmlListProperty<QBar3DSeries> *list)
+void QQuickGraphsBars::clearSeriesFunc(QQmlListProperty<QBar3DSeries> *list)
 {
-    QQuickDataVisBars *declBars = reinterpret_cast<QQuickDataVisBars *>(list->data);
+    QQuickGraphsBars *declBars = reinterpret_cast<QQuickGraphsBars *>(list->data);
     QList<QBar3DSeries *> realList = declBars->m_barsController->barSeriesList();
     int count = realList.size();
     for (int i = 0; i < count; i++)
         declBars->removeSeries(realList.at(i));
 }
 
-void QQuickDataVisBars::addSeries(QBar3DSeries *series)
+void QQuickGraphsBars::addSeries(QBar3DSeries *series)
 {
     m_barsController->addSeries(series);
     connectSeries(series);
@@ -233,33 +233,33 @@ void QQuickDataVisBars::addSeries(QBar3DSeries *series)
         updateSelectedBar();
 }
 
-void QQuickDataVisBars::removeSeries(QBar3DSeries *series)
+void QQuickGraphsBars::removeSeries(QBar3DSeries *series)
 {
     m_barsController->removeSeries(series);
     series->setParent(this); // Reparent as removing will leave series parentless
 }
 
-void QQuickDataVisBars::insertSeries(int index, QBar3DSeries *series)
+void QQuickGraphsBars::insertSeries(int index, QBar3DSeries *series)
 {
     m_barsController->insertSeries(index, series);
 }
 
-void QQuickDataVisBars::setPrimarySeries(QBar3DSeries *series)
+void QQuickGraphsBars::setPrimarySeries(QBar3DSeries *series)
 {
     m_barsController->setPrimarySeries(series);
 }
 
-QBar3DSeries *QQuickDataVisBars::primarySeries() const
+QBar3DSeries *QQuickGraphsBars::primarySeries() const
 {
     return m_barsController->primarySeries();
 }
 
-QBar3DSeries *QQuickDataVisBars::selectedSeries() const
+QBar3DSeries *QQuickGraphsBars::selectedSeries() const
 {
     return m_barsController->selectedSeries();
 }
 
-void QQuickDataVisBars::setFloorLevel(float level)
+void QQuickGraphsBars::setFloorLevel(float level)
 {
     if (level != floorLevel()) {
         m_barsController->setFloorLevel(level);
@@ -267,14 +267,14 @@ void QQuickDataVisBars::setFloorLevel(float level)
     }
 }
 
-float QQuickDataVisBars::floorLevel() const
+float QQuickGraphsBars::floorLevel() const
 {
     return m_barsController->floorLevel();
 }
 
-void QQuickDataVisBars::componentComplete()
+void QQuickGraphsBars::componentComplete()
 {
-    QQuickDataVisItem::componentComplete();
+    QQuickGraphsItem::componentComplete();
 
     auto wallBackground = background();
     QUrl wallUrl = QUrl(QStringLiteral("defaultMeshes/backgroundNoFloorMesh"));
@@ -305,7 +305,7 @@ void QQuickDataVisBars::componentComplete()
     setVerticalSegmentLine(false);
 }
 
-void QQuickDataVisBars::synchData()
+void QQuickGraphsBars::synchData()
 {
     if (!m_noZeroInRange) {
         m_barsController->m_scene->activeCamera()->d_ptr->setMinYRotation(-90.0f);
@@ -341,7 +341,7 @@ void QQuickDataVisBars::synchData()
     axisY->formatter()->d_ptr->recalculate();
     m_helperAxisY.setFormatter(axisY->formatter());
 
-    QQuickDataVisItem::synchData();
+    QQuickGraphsItem::synchData();
 
     // Needs to be done after data is set, as it needs to know the visual array.
     if (m_barsController->m_changeTracker.selectedBarChanged) {
@@ -394,7 +394,7 @@ void QQuickDataVisBars::synchData()
     }
 }
 
-void QQuickDataVisBars::updateParameters() {
+void QQuickGraphsBars::updateParameters() {
     m_minRow = m_barsController->m_axisZ->min();
     m_maxRow = m_barsController->m_axisZ->max();
     m_minCol = m_barsController->m_axisX->min();
@@ -426,13 +426,13 @@ void QQuickDataVisBars::updateParameters() {
     update();
 }
 
-void QQuickDataVisBars::updateFloorLevel(float level)
+void QQuickGraphsBars::updateFloorLevel(float level)
 {
     setFloorLevel(level);
     calculateHeightAdjustment();
 }
 
-void QQuickDataVisBars::updateGraph()
+void QQuickGraphsBars::updateGraph()
 {
     QList<QBar3DSeries *> barSeriesList = m_barsController->barSeriesList();
     calculateSceneScalingFactors();
@@ -457,9 +457,9 @@ void QQuickDataVisBars::updateGraph()
     }
 }
 
-void QQuickDataVisBars::updateAxisRange(float min, float max)
+void QQuickGraphsBars::updateAxisRange(float min, float max)
 {
-    QQuickDataVisItem::updateAxisRange(min, max);
+    QQuickGraphsItem::updateAxisRange(min, max);
 
     m_helperAxisY.setMin(min);
     m_helperAxisY.setMax(max);
@@ -467,13 +467,13 @@ void QQuickDataVisBars::updateAxisRange(float min, float max)
     calculateHeightAdjustment();
 }
 
-void QQuickDataVisBars::updateAxisReversed(bool enable)
+void QQuickGraphsBars::updateAxisReversed(bool enable)
 {
     m_helperAxisY.setReversed(enable);
     calculateHeightAdjustment();
 }
 
-void QQuickDataVisBars::calculateSceneScalingFactors()
+void QQuickGraphsBars::calculateSceneScalingFactors()
 {
     m_rowWidth = (m_cachedColumnCount * m_cachedBarSpacing.width()) * 0.5f;
     m_columnDepth = (m_cachedRowCount * m_cachedBarSpacing.height()) * 0.5f;
@@ -517,7 +517,7 @@ void QQuickDataVisBars::calculateSceneScalingFactors()
     m_helperAxisY.setTranslate(0.0f);
 }
 
-void QQuickDataVisBars::calculateHeightAdjustment()
+void QQuickGraphsBars::calculateHeightAdjustment()
 {
     m_minHeight = m_helperAxisY.min();
     m_maxHeight = m_helperAxisY.max();
@@ -558,14 +558,14 @@ void QQuickDataVisBars::calculateHeightAdjustment()
         m_backgroundAdjustment = newAdjustment;
 }
 
-void QQuickDataVisBars::calculateSeriesStartPosition()
+void QQuickGraphsBars::calculateSeriesStartPosition()
 {
     m_seriesStart = -((float(m_visibleSeriesCount) - 1.0f) * 0.5f)
             * (m_seriesStep - (m_seriesStep * m_cachedBarSeriesMargin.width()));
 }
 
-QVector3D QQuickDataVisBars::calculateCategoryLabelPosition(QAbstract3DAxis *axis,
-                                                            QVector3D labelPosition, int index)
+QVector3D QQuickGraphsBars::calculateCategoryLabelPosition(QAbstract3DAxis *axis,
+                                                           QVector3D labelPosition, int index)
 {
     QVector3D ret = labelPosition;
     if (axis->orientation() == QAbstract3DAxis::AxisOrientationX) {
@@ -580,7 +580,7 @@ QVector3D QQuickDataVisBars::calculateCategoryLabelPosition(QAbstract3DAxis *axi
     return ret;
 }
 
-float QQuickDataVisBars::calculateCategoryGridLinePosition(QAbstract3DAxis *axis, int index)
+float QQuickGraphsBars::calculateCategoryGridLinePosition(QAbstract3DAxis *axis, int index)
 {
     float ret = 0.0f;
     if (axis->orientation() == QAbstract3DAxis::AxisOrientationZ) {
@@ -596,22 +596,22 @@ float QQuickDataVisBars::calculateCategoryGridLinePosition(QAbstract3DAxis *axis
     return ret;
 }
 
-void QQuickDataVisBars::handleAxisXChanged(QAbstract3DAxis *axis)
+void QQuickGraphsBars::handleAxisXChanged(QAbstract3DAxis *axis)
 {
     emit columnAxisChanged(static_cast<QCategory3DAxis *>(axis));
 }
 
-void QQuickDataVisBars::handleAxisYChanged(QAbstract3DAxis *axis)
+void QQuickGraphsBars::handleAxisYChanged(QAbstract3DAxis *axis)
 {
     emit valueAxisChanged(static_cast<QValue3DAxis *>(axis));
 }
 
-void QQuickDataVisBars::handleAxisZChanged(QAbstract3DAxis *axis)
+void QQuickGraphsBars::handleAxisZChanged(QAbstract3DAxis *axis)
 {
     emit rowAxisChanged(static_cast<QCategory3DAxis *>(axis));
 }
 
-void QQuickDataVisBars::handleSeriesMeshChanged(QAbstract3DSeries::Mesh mesh)
+void QQuickGraphsBars::handleSeriesMeshChanged(QAbstract3DSeries::Mesh mesh)
 {
     QList<QBar3DSeries *> barSeriesList = m_barsController->barSeriesList();
     m_meshType = mesh;
@@ -631,13 +631,13 @@ void QQuickDataVisBars::handleSeriesMeshChanged(QAbstract3DSeries::Mesh mesh)
     }
 }
 
-void QQuickDataVisBars::handleOptimizationHintsChanged(QAbstract3DGraph::OptimizationHints hints)
+void QQuickGraphsBars::handleOptimizationHintsChanged(QAbstract3DGraph::OptimizationHints hints)
 {
     Q_UNUSED(hints);
-    //    setup();
+//    setup();
 }
 
-void QQuickDataVisBars::handleMeshSmoothChanged(bool enable)
+void QQuickGraphsBars::handleMeshSmoothChanged(bool enable)
 {
     QList<QBar3DSeries *> barSeriesList = m_barsController->barSeriesList();
     m_smooth = enable;
@@ -658,7 +658,7 @@ void QQuickDataVisBars::handleMeshSmoothChanged(bool enable)
     }
 }
 
-void QQuickDataVisBars::handleRowCountChanged()
+void QQuickGraphsBars::handleRowCountChanged()
 {
     QCategory3DAxis *categoryAxisZ = static_cast<QCategory3DAxis *>(m_barsController->axisZ());
     segmentLineRepeaterZ()->setModel(categoryAxisZ->labels().size());
@@ -666,7 +666,7 @@ void QQuickDataVisBars::handleRowCountChanged()
     updateParameters();
 }
 
-void QQuickDataVisBars::handleColCountChanged()
+void QQuickGraphsBars::handleColCountChanged()
 {
     QCategory3DAxis *categoryAxisX = static_cast<QCategory3DAxis *>(m_barsController->axisX());
     segmentLineRepeaterX()->setModel(categoryAxisX->labels().size());
@@ -674,27 +674,27 @@ void QQuickDataVisBars::handleColCountChanged()
     updateParameters();
 }
 
-void QQuickDataVisBars::connectSeries(QBar3DSeries *series)
+void QQuickGraphsBars::connectSeries(QBar3DSeries *series)
 {
     m_meshType = series->mesh();
     m_smooth = series->isMeshSmooth();
 
     QObject::connect(series, &QBar3DSeries::meshChanged, this,
-                     &QQuickDataVisBars::handleSeriesMeshChanged);
+                     &QQuickGraphsBars::handleSeriesMeshChanged);
     QObject::connect(series, &QBar3DSeries::meshSmoothChanged, this,
-                     &QQuickDataVisBars::handleMeshSmoothChanged);
+                     &QQuickGraphsBars::handleMeshSmoothChanged);
     QObject::connect(series->dataProxy(), &QBarDataProxy::rowCountChanged, this,
-                     &QQuickDataVisBars::handleRowCountChanged);
+                     &QQuickGraphsBars::handleRowCountChanged);
     QObject::connect(series->dataProxy(), &QBarDataProxy::colCountChanged, this,
-                     &QQuickDataVisBars::handleColCountChanged);
+                     &QQuickGraphsBars::handleColCountChanged);
 }
 
-void QQuickDataVisBars::disconnectSeries(QBar3DSeries *series)
+void QQuickGraphsBars::disconnectSeries(QBar3DSeries *series)
 {
     QObject::disconnect(series, 0, this, 0);
 }
 
-void QQuickDataVisBars::generateBars(QList<QBar3DSeries *> &barSeriesList)
+void QQuickGraphsBars::generateBars(QList<QBar3DSeries *> &barSeriesList)
 {
     int seriesCount = barSeriesList.size();
     m_visibleSeriesCount = 0;
@@ -709,7 +709,7 @@ void QQuickDataVisBars::generateBars(QList<QBar3DSeries *> &barSeriesList)
             QQuick3DTexture *texture = createTexture();
             texture->setParent(this);
             auto gradient = barSeries->baseGradient();
-            auto textureData = static_cast<DatavisQuick3DTextureData *>(texture->textureData());
+            auto textureData = static_cast<QuickGraphsTextureData *>(texture->textureData());
             textureData->createGradient(gradient);
 
             bool visible = barSeries->isVisible();
@@ -749,7 +749,7 @@ void QQuickDataVisBars::generateBars(QList<QBar3DSeries *> &barSeriesList)
     }
 }
 
-QQuick3DModel *QQuickDataVisBars::createDataItem(QQuick3DNode *scene)
+QQuick3DModel *QQuickGraphsBars::createDataItem(QQuick3DNode *scene)
 {
     auto model = new QQuick3DModel();
     model->setParent(scene);
@@ -760,7 +760,7 @@ QQuick3DModel *QQuickDataVisBars::createDataItem(QQuick3DNode *scene)
     return model;
 }
 
-QString QQuickDataVisBars::getMeshFileName()
+QString QQuickGraphsBars::getMeshFileName()
 {
     QString fileName;
     QString smoothString = QStringLiteral("Smooth");
@@ -796,7 +796,7 @@ QString QQuickDataVisBars::getMeshFileName()
     return fileName;
 }
 
-void QQuickDataVisBars::fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh meshType)
+void QQuickGraphsBars::fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh meshType)
 {
     if (!m_barsController->activeTheme()->isBackgroundEnabled()
             && meshType != QAbstract3DSeries::MeshSphere) {
@@ -804,7 +804,7 @@ void QQuickDataVisBars::fixMeshFileName(QString &fileName, QAbstract3DSeries::Me
     }
 }
 
-void QQuickDataVisBars::updateBarVisuality(QBar3DSeries *series, int visualIndex)
+void QQuickGraphsBars::updateBarVisuality(QBar3DSeries *series, int visualIndex)
 {
     QVector<BarModel *> barList = *m_barModelsMap.value(series);
     for (int i = 0; i < barList.count(); i++) {
@@ -819,7 +819,7 @@ void QQuickDataVisBars::updateBarVisuality(QBar3DSeries *series, int visualIndex
     itemLabel()->setVisible(false);
 }
 
-void QQuickDataVisBars::updateBarPositions(QBar3DSeries *series)
+void QQuickGraphsBars::updateBarPositions(QBar3DSeries *series)
 {
     QBarDataProxy *dataProxy = series->dataProxy();
     int dataRowCount = 0;
@@ -913,7 +913,7 @@ void QQuickDataVisBars::updateBarPositions(QBar3DSeries *series)
     }
 }
 
-void QQuickDataVisBars::updateBarVisuals(QBar3DSeries *series)
+void QQuickGraphsBars::updateBarVisuals(QBar3DSeries *series)
 {
     QVector<BarModel *> barList = *m_barModelsMap.value(series);
     bool useGradient = series->d_ptr->isUsingGradient();
@@ -925,7 +925,7 @@ void QQuickDataVisBars::updateBarVisuals(QBar3DSeries *series)
             m_hasHighlightTexture = true;
         }
         auto highlightGradient = series->singleHighlightGradient();
-        auto highlightTextureData = static_cast<DatavisQuick3DTextureData *>(m_highlightTexture->textureData());
+        auto highlightTextureData = static_cast<QuickGraphsTextureData *>(m_highlightTexture->textureData());
         highlightTextureData->createGradient(highlightGradient);
     } else {
         if (m_hasHighlightTexture) {
@@ -935,7 +935,7 @@ void QQuickDataVisBars::updateBarVisuals(QBar3DSeries *series)
     }
 
     bool rangeGradient = (useGradient && series->d_ptr->m_colorStyle == Q3DTheme::ColorStyleRangeGradient)
-                        ? true : false;
+            ? true : false;
 
     if (m_barsController->optimizationHints() == QAbstract3DGraph::OptimizationDefault) {
         if (!rangeGradient) {
@@ -955,7 +955,7 @@ void QQuickDataVisBars::updateBarVisuals(QBar3DSeries *series)
     }
 }
 
-void QQuickDataVisBars::updateItemMaterial(QQuick3DModel *item, bool useGradient, bool rangeGradient)
+void QQuickGraphsBars::updateItemMaterial(QQuick3DModel *item, bool useGradient, bool rangeGradient)
 {
     Q_UNUSED(useGradient);
     QQmlListReference materialsRef(item, "materials");
@@ -988,8 +988,8 @@ void QQuickDataVisBars::updateItemMaterial(QQuick3DModel *item, bool useGradient
     }
 }
 
-void QQuickDataVisBars::updateCustomMaterial(QQuick3DModel *item, bool isHighlight,
-                                             QQuick3DTexture *texture)
+void QQuickGraphsBars::updateCustomMaterial(QQuick3DModel *item, bool isHighlight,
+                                            QQuick3DTexture *texture)
 {
     QQmlListReference materialsRef(item, "materials");
     auto customMaterial = static_cast<QQuick3DCustomMaterial *>(materialsRef.at(0));
@@ -1006,9 +1006,9 @@ void QQuickDataVisBars::updateCustomMaterial(QQuick3DModel *item, bool isHighlig
     customMaterial->setProperty("gradientPos", value);
 }
 
-void QQuickDataVisBars::updatePrincipledMaterial(QQuick3DModel *model, const QColor &color,
-                                                 bool useGradient, bool isHighlight,
-                                                 QQuick3DTexture *texture)
+void QQuickGraphsBars::updatePrincipledMaterial(QQuick3DModel *model, const QColor &color,
+                                                bool useGradient, bool isHighlight,
+                                                QQuick3DTexture *texture)
 {
     QQmlListReference materialsRef(model, "materials");
     auto principledMaterial = static_cast<QQuick3DPrincipledMaterial *>(materialsRef.at(0));
@@ -1025,7 +1025,7 @@ void QQuickDataVisBars::updatePrincipledMaterial(QQuick3DModel *model, const QCo
     }
 }
 
-void QQuickDataVisBars::removeDataItems(QBar3DSeries *series)
+void QQuickGraphsBars::removeDataItems(QBar3DSeries *series)
 {
     if (m_barModelsMap.value(series)->isEmpty())
         return;
@@ -1045,14 +1045,14 @@ void QQuickDataVisBars::removeDataItems(QBar3DSeries *series)
     itemLabel()->setVisible(false);
 }
 
-QQuick3DTexture *QQuickDataVisBars::createTexture()
+QQuick3DTexture *QQuickGraphsBars::createTexture()
 {
     QQuick3DTexture *texture = new QQuick3DTexture();
     texture->setParent(this);
     texture->setRotationUV(-90.0f);
     texture->setHorizontalTiling(QQuick3DTexture::ClampToEdge);
     texture->setVerticalTiling(QQuick3DTexture::ClampToEdge);
-    DatavisQuick3DTextureData *textureData = new DatavisQuick3DTextureData();
+    QuickGraphsTextureData *textureData = new QuickGraphsTextureData();
     textureData->setParent(texture);
     textureData->setParentItem(texture);
     texture->setTextureData(textureData);
@@ -1060,9 +1060,9 @@ QQuick3DTexture *QQuickDataVisBars::createTexture()
     return texture;
 }
 
-bool QQuickDataVisBars::handleMousePressedEvent(QMouseEvent *event)
+bool QQuickGraphsBars::handleMousePressedEvent(QMouseEvent *event)
 {
-    QQuickDataVisItem::handleMousePressedEvent(event);
+    QQuickGraphsItem::handleMousePressedEvent(event);
 
     if (Qt::LeftButton == event->button()) {
         auto mousePos = event->pos();
@@ -1106,7 +1106,7 @@ bool QQuickDataVisBars::handleMousePressedEvent(QMouseEvent *event)
     return true;
 }
 
-void QQuickDataVisBars::setSelectedBar(QBar3DSeries *series, const QPoint &coord)
+void QQuickGraphsBars::setSelectedBar(QBar3DSeries *series, const QPoint &coord)
 {
     if (!m_barModelsMap.contains(series))
         series = 0;
@@ -1131,7 +1131,7 @@ void QQuickDataVisBars::setSelectedBar(QBar3DSeries *series, const QPoint &coord
     }
 }
 
-void QQuickDataVisBars::updateSelectedBar()
+void QQuickGraphsBars::updateSelectedBar()
 {
     bool visible = false;
     if (m_selectedBarSeries) {
@@ -1199,8 +1199,8 @@ void QQuickDataVisBars::updateSelectedBar()
     itemLabel()->setVisible(visible);
 }
 
-Abstract3DController::SelectionType QQuickDataVisBars::isSelected(int row, int bar,
-                                                                  QBar3DSeries *series)
+Abstract3DController::SelectionType QQuickGraphsBars::isSelected(int row, int bar,
+                                                                 QBar3DSeries *series)
 {
     Bars3DController::SelectionType isSelectedType = Bars3DController::SelectionNone;
     auto selectionMode = m_barsController->selectionMode();
@@ -1221,7 +1221,7 @@ Abstract3DController::SelectionType QQuickDataVisBars::isSelected(int row, int b
     return isSelectedType;
 }
 
-void QQuickDataVisBars::resetClickedStatus()
+void QQuickGraphsBars::resetClickedStatus()
 {
     m_barsController->m_isSeriesVisualsDirty = true;
     m_selectedBarPos = QVector3D(0.0f, 0.0f, 0.0f);
@@ -1230,9 +1230,9 @@ void QQuickDataVisBars::resetClickedStatus()
     m_barsController->clearSelection();
 }
 
-void QQuickDataVisBars::updateSliceGraph()
+void QQuickGraphsBars::updateSliceGraph()
 {
-    QQuickDataVisItem::updateSliceGraph();
+    QQuickGraphsItem::updateSliceGraph();
 
     if (!sliceView()->isVisible()) {
         if (!m_sliceViewBars.isEmpty()) {
@@ -1268,7 +1268,7 @@ void QQuickDataVisBars::updateSliceGraph()
             texture->setParent(barModel->model);
             texture->setParentItem(barModel->model);
             auto gradient = m_selectedBarSeries->baseGradient();
-            auto textureData = static_cast<DatavisQuick3DTextureData *>(texture->textureData());
+            auto textureData = static_cast<QuickGraphsTextureData *>(texture->textureData());
             textureData->createGradient(gradient);
 
             barModel->texture = texture;
@@ -1296,7 +1296,7 @@ void QQuickDataVisBars::updateSliceGraph()
     }
 }
 
-void QQuickDataVisBars::updateBarSpecs(float thicknessRatio, const QSizeF &spacing, bool relative)
+void QQuickGraphsBars::updateBarSpecs(float thicknessRatio, const QSizeF &spacing, bool relative)
 {
     // Convert ratio to QSizeF, as we need it in that format for autoscaling calculations
     m_cachedBarThickness.setWidth(1.0);
@@ -1322,7 +1322,7 @@ void QQuickDataVisBars::updateBarSpecs(float thicknessRatio, const QSizeF &spaci
     calculateSceneScalingFactors();
 }
 
-void QQuickDataVisBars::updateBarSeriesMargin(const QSizeF &margin)
+void QQuickGraphsBars::updateBarSeriesMargin(const QSizeF &margin)
 {
     m_cachedBarSeriesMargin = margin;
     calculateSeriesStartPosition();
diff --git a/src/graphs/qml/qquickdatavisbars_p.h b/src/graphs/qml/qquickgraphsbars_p.h
index 7e6a9095..0d641441 100644
--- a/src/graphs/qml/qquickdatavisbars_p.h
+++ b/src/graphs/qml/qquickgraphsbars_p.h
@@ -11,11 +11,11 @@
 //
 // We mean it.
 
-#ifndef QQUICKDATAVISBARS_H
-#define QQUICKDATAVISBARS_H
+#ifndef QQUICKGRAPHSBARS_H
+#define QQUICKGRAPHSBARS_H
 
 #include "qbar3dseries.h"
-#include "qquickdatavisitem_p.h"
+#include "qquickgraphsitem_p.h"
 #include "bars3dcontroller_p.h"
 
 #include <QtQuick3D/private/qquick3dmaterial_p.h>
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 
 class Q3DBars;
 
-class QQuickDataVisBars : public QQuickDataVisItem
+class QQuickGraphsBars : public QQuickGraphsItem
 {
     Q_OBJECT
     Q_PROPERTY(QCategory3DAxis *rowAxis READ rowAxis WRITE setRowAxis NOTIFY rowAxisChanged)
@@ -45,8 +45,8 @@ class QQuickDataVisBars : public QQuickDataVisItem
     QML_ADDED_IN_VERSION(6, 6)
 
 public:
-    explicit QQuickDataVisBars(QQuickItem *parent = 0);
-    ~QQuickDataVisBars();
+    explicit QQuickGraphsBars(QQuickItem *parent = 0);
+    ~QQuickGraphsBars();
 
     QCategory3DAxis *rowAxis() const;
     void setRowAxis(QCategory3DAxis *axis);
@@ -245,4 +245,4 @@ private:
 };
 
 QT_END_NAMESPACE
-#endif // QQUICKDATAVISBARS_H
+#endif // QQUICKGRAPHSBARS_H
diff --git a/src/graphs/qml/qquickdatavisitem.cpp b/src/graphs/qml/qquickgraphsitem.cpp
index d934ed15..0517d0e1 100644
--- a/src/graphs/qml/qquickdatavisitem.cpp
+++ b/src/graphs/qml/qquickgraphsitem.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2023 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include "qquickdatavisitem_p.h"
+#include "qquickgraphsitem_p.h"
 #include "declarativetheme_p.h"
 #include "declarativescene_p.h"
 #include "qvalue3daxis_p.h"
@@ -30,7 +30,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QQuickDataVisItem::QQuickDataVisItem(QQuickItem *parent) :
+QQuickGraphsItem::QQuickGraphsItem(QQuickItem *parent) :
     QQuick3DViewport(parent),
     m_controller(0),
     m_renderMode(RenderIndirect),
@@ -41,7 +41,7 @@ QQuickDataVisItem::QQuickDataVisItem(QQuickItem *parent) :
     m_nodeMutex = QSharedPointer<QMutex>::create();
 
     auto sceneManager = QQuick3DObjectPrivate::get(rootNode())->sceneManager;
-    connect(sceneManager.data(), &QQuick3DSceneManager::windowChanged, this, &QQuickDataVisItem::handleWindowChanged);
+    connect(sceneManager.data(), &QQuick3DSceneManager::windowChanged, this, &QQuickGraphsItem::handleWindowChanged);
     // Set contents to false in case we are in qml designer to make component look nice
     m_runningInDesigner = QGuiApplication::applicationDisplayName() == QLatin1String("Qml2Puppet");
     setFlag(ItemHasContents/*, !m_runningInDesigner*/); // Is this relevant anymore?
@@ -50,7 +50,7 @@ QQuickDataVisItem::QQuickDataVisItem(QQuickItem *parent) :
     setAcceptTouchEvents(true);
 }
 
-QQuickDataVisItem::~QQuickDataVisItem()
+QQuickGraphsItem::~QQuickGraphsItem()
 {
     disconnect(this, 0, this, 0);
     checkWindowList(0);
@@ -62,7 +62,7 @@ QQuickDataVisItem::~QQuickDataVisItem()
     m_nodeMutex.clear();
 }
 
-void QQuickDataVisItem::setRenderingMode(QQuickDataVisItem::RenderingMode mode)
+void QQuickGraphsItem::setRenderingMode(QQuickGraphsItem::RenderingMode mode)
 {
     if (mode == m_renderMode)
         return;
@@ -82,10 +82,10 @@ void QQuickDataVisItem::setRenderingMode(QQuickDataVisItem::RenderingMode mode)
         update();
         setRenderMode(QQuick3DViewport::Underlay);
         if (previousMode == RenderIndirect) {
-                checkWindowList(window());
-                setAntialiasing(m_windowSamples > 0);
-                if (m_windowSamples != m_samples)
-                    emit msaaSamplesChanged(m_windowSamples);
+            checkWindowList(window());
+            setAntialiasing(m_windowSamples > 0);
+            if (m_windowSamples != m_samples)
+                emit msaaSamplesChanged(m_windowSamples);
         }
         break;
     case RenderIndirect:
@@ -99,19 +99,19 @@ void QQuickDataVisItem::setRenderingMode(QQuickDataVisItem::RenderingMode mode)
     emit renderingModeChanged(mode);
 }
 
-QQuickDataVisItem::RenderingMode QQuickDataVisItem::renderingMode() const
+QQuickGraphsItem::RenderingMode QQuickGraphsItem::renderingMode() const
 {
     return m_renderMode;
 }
 
-void QQuickDataVisItem::keyPressEvent(QKeyEvent *ev)
+void QQuickGraphsItem::keyPressEvent(QKeyEvent *ev)
 {
     ev->ignore();
     setFlag(ItemHasContents);
     update();
 }
 
-bool QQuickDataVisItem::handleMousePressedEvent(QMouseEvent *event)
+bool QQuickGraphsItem::handleMousePressedEvent(QMouseEvent *event)
 {
     if (Qt::LeftButton == event->button()) {
         if (m_sliceEnabled && m_controller->isSlicingActive()) {
@@ -129,17 +129,17 @@ bool QQuickDataVisItem::handleMousePressedEvent(QMouseEvent *event)
     return true;
 }
 
-void QQuickDataVisItem::handleThemeTypeChange()
+void QQuickGraphsItem::handleThemeTypeChange()
 {
 }
 
-void QQuickDataVisItem::handleFpsChanged()
+void QQuickGraphsItem::handleFpsChanged()
 {
     int fps = renderStats()->fps();
     emit currentFpsChanged(fps);
 }
 
-void QQuickDataVisItem::componentComplete()
+void QQuickGraphsItem::componentComplete()
 {
     QQuick3DViewport::componentComplete();
 
@@ -271,142 +271,142 @@ void QQuickDataVisItem::componentComplete()
     m_controller->handleAxisLabelsChangedBySender(m_controller->axisZ());
 }
 
-QQuick3DDirectionalLight *QQuickDataVisItem::light() const
+QQuick3DDirectionalLight *QQuickGraphsItem::light() const
 {
     return m_light;
 }
 
-void QQuickDataVisItem::setTheme(Q3DTheme *theme)
+void QQuickGraphsItem::setTheme(Q3DTheme *theme)
 {
     m_controller->setActiveTheme(theme, isComponentComplete());
 }
 
-Q3DTheme *QQuickDataVisItem::theme() const
+Q3DTheme *QQuickGraphsItem::theme() const
 {
     return m_controller->activeTheme();
 }
 
-void QQuickDataVisItem::clearSelection()
+void QQuickGraphsItem::clearSelection()
 {
     m_controller->clearSelection();
 }
 
-bool QQuickDataVisItem::hasSeries(QAbstract3DSeries *series)
+bool QQuickGraphsItem::hasSeries(QAbstract3DSeries *series)
 {
     return m_controller->hasSeries(series);
 }
 
-void QQuickDataVisItem::setSelectionMode(SelectionFlags mode)
+void QQuickGraphsItem::setSelectionMode(SelectionFlags mode)
 {
     int intmode = int(mode);
     m_controller->setSelectionMode(QAbstract3DGraph::SelectionFlags(intmode));
 }
 
-QQuickDataVisItem::SelectionFlags QQuickDataVisItem::selectionMode() const
+QQuickGraphsItem::SelectionFlags QQuickGraphsItem::selectionMode() const
 {
     int intmode = int(m_controller->selectionMode());
     return SelectionFlags(intmode);
 }
 
-void QQuickDataVisItem::setShadowQuality(ShadowQuality quality)
+void QQuickGraphsItem::setShadowQuality(ShadowQuality quality)
 {
     m_controller->setShadowQuality(QAbstract3DGraph::ShadowQuality(quality));
 }
 
-QQuickDataVisItem::ShadowQuality QQuickDataVisItem::shadowQuality() const
+QQuickGraphsItem::ShadowQuality QQuickGraphsItem::shadowQuality() const
 {
     return ShadowQuality(m_controller->shadowQuality());
 }
 
-bool QQuickDataVisItem::shadowsSupported() const
+bool QQuickGraphsItem::shadowsSupported() const
 {
     return m_controller->shadowsSupported();
 }
 
-int QQuickDataVisItem::addCustomItem(QCustom3DItem *item)
+int QQuickGraphsItem::addCustomItem(QCustom3DItem *item)
 {
     return m_controller->addCustomItem(item);
 }
 
-void QQuickDataVisItem::removeCustomItems()
+void QQuickGraphsItem::removeCustomItems()
 {
     m_controller->deleteCustomItems();
 }
 
-void QQuickDataVisItem::removeCustomItem(QCustom3DItem *item)
+void QQuickGraphsItem::removeCustomItem(QCustom3DItem *item)
 {
     m_controller->deleteCustomItem(item);
 }
 
-void QQuickDataVisItem::removeCustomItemAt(const QVector3D &position)
+void QQuickGraphsItem::removeCustomItemAt(const QVector3D &position)
 {
     m_controller->deleteCustomItem(position);
 }
 
-void QQuickDataVisItem::releaseCustomItem(QCustom3DItem *item)
+void QQuickGraphsItem::releaseCustomItem(QCustom3DItem *item)
 {
     m_controller->releaseCustomItem(item);
 }
 
-int QQuickDataVisItem::selectedLabelIndex() const
+int QQuickGraphsItem::selectedLabelIndex() const
 {
     return m_controller->selectedLabelIndex();
 }
 
-QAbstract3DAxis *QQuickDataVisItem::selectedAxis() const
+QAbstract3DAxis *QQuickGraphsItem::selectedAxis() const
 {
     return m_controller->selectedAxis();
 }
 
-int QQuickDataVisItem::selectedCustomItemIndex() const
+int QQuickGraphsItem::selectedCustomItemIndex() const
 {
     return m_controller->selectedCustomItemIndex();
 }
 
-QCustom3DItem *QQuickDataVisItem::selectedCustomItem() const
+QCustom3DItem *QQuickGraphsItem::selectedCustomItem() const
 {
     return m_controller->selectedCustomItem();
 }
 
-QQmlListProperty<QCustom3DItem> QQuickDataVisItem::customItemList()
+QQmlListProperty<QCustom3DItem> QQuickGraphsItem::customItemList()
 {
     return QQmlListProperty<QCustom3DItem>(this, this,
-                                           &QQuickDataVisItem::appendCustomItemFunc,
-                                           &QQuickDataVisItem::countCustomItemFunc,
-                                           &QQuickDataVisItem::atCustomItemFunc,
-                                           &QQuickDataVisItem::clearCustomItemFunc);
+                                           &QQuickGraphsItem::appendCustomItemFunc,
+                                           &QQuickGraphsItem::countCustomItemFunc,
+                                           &QQuickGraphsItem::atCustomItemFunc,
+                                           &QQuickGraphsItem::clearCustomItemFunc);
 }
 
-void QQuickDataVisItem::appendCustomItemFunc(QQmlListProperty<QCustom3DItem> *list,
-                                               QCustom3DItem *item)
+void QQuickGraphsItem::appendCustomItemFunc(QQmlListProperty<QCustom3DItem> *list,
+                                            QCustom3DItem *item)
 {
-    QQuickDataVisItem *decl = reinterpret_cast<QQuickDataVisItem *>(list->data);
+    QQuickGraphsItem *decl = reinterpret_cast<QQuickGraphsItem *>(list->data);
     decl->addCustomItem(item);
 }
 
-qsizetype QQuickDataVisItem::countCustomItemFunc(QQmlListProperty<QCustom3DItem> *list)
+qsizetype QQuickGraphsItem::countCustomItemFunc(QQmlListProperty<QCustom3DItem> *list)
 {
     Q_UNUSED(list);
     return 0;
-//    return reinterpret_cast<QQuickDataVisItem *>(list->data)->m_controller->m_customItems.size();
+//    return reinterpret_cast<QQuickGraphsItem *>(list->data)->m_controller->m_customItems.size();
 }
 
-QCustom3DItem *QQuickDataVisItem::atCustomItemFunc(QQmlListProperty<QCustom3DItem> *list,
-                                                     qsizetype index)
+QCustom3DItem *QQuickGraphsItem::atCustomItemFunc(QQmlListProperty<QCustom3DItem> *list,
+                                                  qsizetype index)
 {
     Q_UNUSED(list);
     Q_UNUSED(index);
     return new QCustom3DItem();
-//    return reinterpret_cast<QQuickDataVisItem *>(list->data)->m_controller->m_customItems.at(index);
+//    return reinterpret_cast<QQuickGraphsItem *>(list->data)->m_controller->m_customItems.at(index);
 }
 
-void QQuickDataVisItem::clearCustomItemFunc(QQmlListProperty<QCustom3DItem> *list)
+void QQuickGraphsItem::clearCustomItemFunc(QQmlListProperty<QCustom3DItem> *list)
 {
-    QQuickDataVisItem *decl = reinterpret_cast<QQuickDataVisItem *>(list->data);
+    QQuickGraphsItem *decl = reinterpret_cast<QQuickGraphsItem *>(list->data);
     decl->removeCustomItems();
 }
 
-void QQuickDataVisItem::setSharedController(Abstract3DController *controller)
+void QQuickGraphsItem::setSharedController(Abstract3DController *controller)
 {
     Q_ASSERT(controller);
     m_controller = controller;
@@ -422,56 +422,56 @@ void QQuickDataVisItem::setSharedController(Abstract3DController *controller)
     m_controller->setActiveTheme(defaultTheme);
 
     QObject::connect(m_controller.data(), &Abstract3DController::shadowQualityChanged, this,
-                     &QQuickDataVisItem::handleShadowQualityChange);
+                     &QQuickGraphsItem::handleShadowQualityChange);
     QObject::connect(m_controller.data(), &Abstract3DController::activeInputHandlerChanged, this,
-                     &QQuickDataVisItem::inputHandlerChanged);
+                     &QQuickGraphsItem::inputHandlerChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::activeThemeChanged, this,
-                     &QQuickDataVisItem::themeChanged);
+                     &QQuickGraphsItem::themeChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::themeTypeChanged, this,
-                     &QQuickDataVisItem::handleThemeTypeChange);
+                     &QQuickGraphsItem::handleThemeTypeChange);
     QObject::connect(m_controller.data(), &Abstract3DController::selectionModeChanged, this,
-                     &QQuickDataVisItem::handleSelectionModeChange);
+                     &QQuickGraphsItem::handleSelectionModeChange);
     QObject::connect(m_controller.data(), &Abstract3DController::elementSelected, this,
-                     &QQuickDataVisItem::handleSelectedElementChange);
+                     &QQuickGraphsItem::handleSelectedElementChange);
 
     QObject::connect(m_controller.data(), &Abstract3DController::axisXChanged, this,
-                     &QQuickDataVisItem::handleAxisXChanged);
+                     &QQuickGraphsItem::handleAxisXChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::axisYChanged, this,
-                     &QQuickDataVisItem::handleAxisYChanged);
+                     &QQuickGraphsItem::handleAxisYChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::axisZChanged, this,
-                     &QQuickDataVisItem::handleAxisZChanged);
+                     &QQuickGraphsItem::handleAxisZChanged);
 
     QObject::connect(m_controller.data(), &Abstract3DController::measureFpsChanged, this,
-                     &QQuickDataVisItem::measureFpsChanged);
+                     &QQuickGraphsItem::measureFpsChanged);
 //    QObject::connect(m_controller.data(), &Abstract3DController::currentFpsChanged, this,
-//                     &QQuickDataVisItem::currentFpsChanged);
+//                     &QQuickGraphsItem::currentFpsChanged);
 
     QObject::connect(m_controller.data(), &Abstract3DController::orthoProjectionChanged, this,
-                     &QQuickDataVisItem::orthoProjectionChanged);
+                     &QQuickGraphsItem::orthoProjectionChanged);
 
     QObject::connect(m_controller.data(), &Abstract3DController::aspectRatioChanged, this,
-                     &QQuickDataVisItem::aspectRatioChanged);
+                     &QQuickGraphsItem::aspectRatioChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::optimizationHintsChanged, this,
-                     &QQuickDataVisItem::handleOptimizationHintChange);
+                     &QQuickGraphsItem::handleOptimizationHintChange);
     QObject::connect(m_controller.data(), &Abstract3DController::polarChanged, this,
-                     &QQuickDataVisItem::polarChanged);
+                     &QQuickGraphsItem::polarChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::radialLabelOffsetChanged, this,
-                     &QQuickDataVisItem::radialLabelOffsetChanged);
+                     &QQuickGraphsItem::radialLabelOffsetChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::horizontalAspectRatioChanged, this,
-                     &QQuickDataVisItem::horizontalAspectRatioChanged);
+                     &QQuickGraphsItem::horizontalAspectRatioChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::reflectionChanged, this,
-                     &QQuickDataVisItem::reflectionChanged);
+                     &QQuickGraphsItem::reflectionChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::reflectivityChanged, this,
-                     &QQuickDataVisItem::reflectivityChanged);
+                     &QQuickGraphsItem::reflectivityChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::localeChanged, this,
-                     &QQuickDataVisItem::localeChanged);
+                     &QQuickGraphsItem::localeChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::queriedGraphPositionChanged, this,
-                     &QQuickDataVisItem::queriedGraphPositionChanged);
+                     &QQuickGraphsItem::queriedGraphPositionChanged);
     QObject::connect(m_controller.data(), &Abstract3DController::marginChanged, this,
-                     &QQuickDataVisItem::marginChanged);
+                     &QQuickGraphsItem::marginChanged);
 }
 
-void QQuickDataVisItem::synchData()
+void QQuickGraphsItem::synchData()
 {
     m_controller->m_renderPending = false;
 
@@ -792,7 +792,7 @@ void QQuickDataVisItem::synchData()
     }
 }
 
-void QQuickDataVisItem::updateGrid()
+void QQuickGraphsItem::updateGrid()
 {
     int gridLineCountX = segmentLineRepeaterX()->count();
     int subGridLineCountX = subsegmentLineRepeaterX()->count();
@@ -1018,7 +1018,7 @@ void QQuickDataVisItem::updateGrid()
     }
 }
 
-void QQuickDataVisItem::updateLabels()
+void QQuickGraphsItem::updateLabels()
 {
     auto axisX = m_controller->axisX();
 
@@ -1390,13 +1390,13 @@ void QQuickDataVisItem::updateLabels()
 
 }
 
-void QQuickDataVisItem::positionAndScaleLine(QQuick3DNode *lineNode, QVector3D scale, QVector3D position)
+void QQuickGraphsItem::positionAndScaleLine(QQuick3DNode *lineNode, QVector3D scale, QVector3D position)
 {
     lineNode->setScale(scale);
     lineNode->setPosition(position);
 }
 
-void QQuickDataVisItem::graphPositionAt(const QPoint &point)
+void QQuickGraphsItem::graphPositionAt(const QPoint &point)
 {
     bool isHitted = false;
     auto results = pickAll(point.x(), point.y());
@@ -1404,10 +1404,10 @@ void QQuickDataVisItem::graphPositionAt(const QPoint &point)
         if (auto hit = result.objectHit()) {
             isHitted = true;
             m_controller->setQueriedGraphPosition(QVector3D(
-                        result.scenePosition().x(),
-                        result.scenePosition().y(),
-                        result.scenePosition().z()
-                        ));
+                                                      result.scenePosition().x(),
+                                                      result.scenePosition().y(),
+                                                      result.scenePosition().z()
+                                                      ));
             if (m_backgroundBB != hit) {
                 m_controller->setQueriedGraphPosition(hit->position());
                 break;
@@ -1424,23 +1424,23 @@ void QQuickDataVisItem::graphPositionAt(const QPoint &point)
     scene()->setGraphPositionQuery(Q3DScene::invalidSelectionPoint());
 }
 
-void QQuickDataVisItem::updateShadowQuality(ShadowQuality quality)
+void QQuickGraphsItem::updateShadowQuality(ShadowQuality quality)
 {
-    if (quality != QQuickDataVisItem::ShadowQualityNone) {
+    if (quality != QQuickGraphsItem::ShadowQualityNone) {
         light()->setCastsShadow(true);
 
         QQuick3DAbstractLight::QSSGShadowMapQuality shadowMapQuality;
         switch (quality) {
-        case QQuickDataVisItem::ShadowQualityLow:
-        case QQuickDataVisItem::ShadowQualitySoftLow:
+        case QQuickGraphsItem::ShadowQualityLow:
+        case QQuickGraphsItem::ShadowQualitySoftLow:
             shadowMapQuality = QQuick3DAbstractLight::QSSGShadowMapQuality::ShadowMapQualityLow;
             break;
-        case QQuickDataVisItem::ShadowQualityMedium:
-        case QQuickDataVisItem::ShadowQualitySoftMedium:
+        case QQuickGraphsItem::ShadowQualityMedium:
+        case QQuickGraphsItem::ShadowQualitySoftMedium:
             shadowMapQuality = QQuick3DAbstractLight::QSSGShadowMapQuality::ShadowMapQualityMedium;
             break;
-        case QQuickDataVisItem::ShadowQualityHigh:
-        case QQuickDataVisItem::ShadowQualitySoftHigh:
+        case QQuickGraphsItem::ShadowQualityHigh:
+        case QQuickGraphsItem::ShadowQualitySoftHigh:
             shadowMapQuality = QQuick3DAbstractLight::QSSGShadowMapQuality::ShadowMapQualityHigh;
             break;
         default:
@@ -1453,18 +1453,18 @@ void QQuickDataVisItem::updateShadowQuality(ShadowQuality quality)
     }
 }
 
-void QQuickDataVisItem::updateAxisRange(float min, float max)
+void QQuickGraphsItem::updateAxisRange(float min, float max)
 {
     Q_UNUSED(min);
     Q_UNUSED(max);
 }
 
-void QQuickDataVisItem::updateAxisReversed(bool enable)
+void QQuickGraphsItem::updateAxisReversed(bool enable)
 {
     Q_UNUSED(enable);
 }
 
-int QQuickDataVisItem::findLabelsMaxWidth(const QStringList &labels)
+int QQuickGraphsItem::findLabelsMaxWidth(const QStringList &labels)
 {
     int labelWidth = 0;
     QFontMetrics labelFM(m_controller->activeTheme()->font());
@@ -1477,23 +1477,23 @@ int QQuickDataVisItem::findLabelsMaxWidth(const QStringList &labels)
     return labelWidth;
 }
 
-QVector3D QQuickDataVisItem::calculateCategoryLabelPosition(QAbstract3DAxis *axis, QVector3D labelPosition, int index)
+QVector3D QQuickGraphsItem::calculateCategoryLabelPosition(QAbstract3DAxis *axis, QVector3D labelPosition, int index)
 {
     Q_UNUSED(axis);
     Q_UNUSED(index);
     return labelPosition;
 }
 
-float QQuickDataVisItem::calculateCategoryGridLinePosition(QAbstract3DAxis *axis, int index)
+float QQuickGraphsItem::calculateCategoryGridLinePosition(QAbstract3DAxis *axis, int index)
 {
     Q_UNUSED(axis);
     Q_UNUSED(index);
     return 0.0f;
 }
 
-void QQuickDataVisItem::updateXTitle(const QVector3D &labelRotation, const QVector3D &labelTrans,
-                                     const QQuaternion &totalRotation, float labelsMaxWidth,
-                                     float labelHeight, const QVector3D &scale)
+void QQuickGraphsItem::updateXTitle(const QVector3D &labelRotation, const QVector3D &labelTrans,
+                                    const QQuaternion &totalRotation, float labelsMaxWidth,
+                                    float labelHeight, const QVector3D &scale)
 {
     float scaledFontSize = (0.05 + m_controller->activeTheme()->font().pointSizeF()) / 500.0f;
     float scaleFactor = scaledFontSize / 115.0f;
@@ -1586,15 +1586,15 @@ void QQuickDataVisItem::updateXTitle(const QVector3D &labelRotation, const QVect
     m_titleLabelX->setProperty("LabelHeight", labelHeight);
 }
 
-void QQuickDataVisItem::updateYTitle(const QVector3D &sideLabelRotation,
-                                     const QVector3D &backLabelRotation,
-                                     const QVector3D &sideLabelTrans,
-                                     const QVector3D &backLabelTrans,
-                                     const QQuaternion &totalSideRotation,
-                                     const QQuaternion &totalBackRotation,
-                                     float labelsMaxWidth,
-                                     float labelHeight,
-                                     const QVector3D &scale)
+void QQuickGraphsItem::updateYTitle(const QVector3D &sideLabelRotation,
+                                    const QVector3D &backLabelRotation,
+                                    const QVector3D &sideLabelTrans,
+                                    const QVector3D &backLabelTrans,
+                                    const QQuaternion &totalSideRotation,
+                                    const QQuaternion &totalBackRotation,
+                                    float labelsMaxWidth,
+                                    float labelHeight,
+                                    const QVector3D &scale)
 {
     float scaledFontSize = (0.05 + m_controller->activeTheme()->font().pointSizeF()) / 500.0f;
     float scaleFactor = scaledFontSize / 115.0f;
@@ -1633,9 +1633,9 @@ void QQuickDataVisItem::updateYTitle(const QVector3D &sideLabelRotation,
     m_titleLabelY->setProperty("LabelHeight", labelHeight);
 }
 
-void QQuickDataVisItem::updateZTitle(const QVector3D &labelRotation, const QVector3D &labelTrans,
-                                     const QQuaternion &totalRotation, float labelsMaxWidth,
-                                     float labelHeight, const QVector3D &scale)
+void QQuickGraphsItem::updateZTitle(const QVector3D &labelRotation, const QVector3D &labelTrans,
+                                    const QQuaternion &totalRotation, float labelsMaxWidth,
+                                    float labelHeight, const QVector3D &scale)
 {
     float scaledFontSize = (0.05 + m_controller->activeTheme()->font().pointSizeF()) / 500.0f;
     float scaleFactor = scaledFontSize / 115.0f;
@@ -1713,7 +1713,7 @@ void QQuickDataVisItem::updateZTitle(const QVector3D &labelRotation, const QVect
     m_titleLabelZ->setProperty("LabelHeight", labelHeight);
 }
 
-void QQuickDataVisItem::updateCamera()
+void QQuickGraphsItem::updateCamera()
 {
     float zoom = 720.f / m_controller->scene()->activeCamera()->zoomLevel();
     camera()->setZ(zoom);
@@ -1728,7 +1728,7 @@ void QQuickDataVisItem::updateCamera()
         m_itemLabel->setEulerRotation(rotation);
 }
 
-int QQuickDataVisItem::msaaSamples() const
+int QQuickGraphsItem::msaaSamples() const
 {
     if (m_renderMode == RenderIndirect)
         return m_samples;
@@ -1736,7 +1736,7 @@ int QQuickDataVisItem::msaaSamples() const
         return m_windowSamples;
 }
 
-void QQuickDataVisItem::setMsaaSamples(int samples)
+void QQuickGraphsItem::setMsaaSamples(int samples)
 {
     if (m_renderMode != RenderIndirect) {
         qWarning("Multisampling cannot be adjusted in this render mode");
@@ -1780,12 +1780,12 @@ void QQuickDataVisItem::setMsaaSamples(int samples)
     }
 }
 
-Declarative3DScene *QQuickDataVisItem::scene() const
+Declarative3DScene *QQuickGraphsItem::scene() const
 {
     return static_cast<Declarative3DScene *>(m_controller->scene());
 }
 
-void QQuickDataVisItem::handleWindowChanged(/*QQuickWindow *window*/)
+void QQuickGraphsItem::handleWindowChanged(/*QQuickWindow *window*/)
 {
     auto window = QQuick3DObjectPrivate::get(rootNode())->sceneManager->window();
     checkWindowList(window);
@@ -1804,7 +1804,7 @@ void QQuickDataVisItem::handleWindowChanged(/*QQuickWindow *window*/)
     window->setVisible(previousVisibility);
 #endif
 
-    connect(window, &QObject::destroyed, this, &QQuickDataVisItem::windowDestroyed);
+    connect(window, &QObject::destroyed, this, &QQuickGraphsItem::windowDestroyed);
 
     int oldWindowSamples = m_windowSamples;
     m_windowSamples = window->format().samples();
@@ -1812,7 +1812,7 @@ void QQuickDataVisItem::handleWindowChanged(/*QQuickWindow *window*/)
         m_windowSamples = 0;
 
     connect(window, &QQuickWindow::beforeSynchronizing,
-            this, &QQuickDataVisItem::synchData);
+            this, &QQuickGraphsItem::synchData);
 
     if (m_renderMode == RenderDirectToBackground_NoClear
             || m_renderMode == RenderDirectToBackground) {
@@ -1840,7 +1840,7 @@ void QQuickDataVisItem::handleWindowChanged(/*QQuickWindow *window*/)
 #endif
 }
 
-void QQuickDataVisItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickGraphsItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     QQuickItem::geometryChange(newGeometry, oldGeometry);
 
@@ -1849,13 +1849,13 @@ void QQuickDataVisItem::geometryChange(const QRectF &newGeometry, const QRectF &
     updateWindowParameters();
 }
 
-void QQuickDataVisItem::itemChange(ItemChange change, const ItemChangeData  &value)
+void QQuickGraphsItem::itemChange(ItemChange change, const ItemChangeData  &value)
 {
     QQuick3DViewport::itemChange(change, value);
     updateWindowParameters();
 }
 
-void QQuickDataVisItem::updateWindowParameters()
+void QQuickGraphsItem::updateWindowParameters()
 {
     const QMutexLocker locker(&m_mutex);
 
@@ -1896,85 +1896,85 @@ void QQuickDataVisItem::updateWindowParameters()
     }
 }
 
-void QQuickDataVisItem::handleSelectionModeChange(QAbstract3DGraph::SelectionFlags mode)
+void QQuickGraphsItem::handleSelectionModeChange(QAbstract3DGraph::SelectionFlags mode)
 {
     int intmode = int(mode);
     emit selectionModeChanged(SelectionFlags(intmode));
 }
 
-void QQuickDataVisItem::handleShadowQualityChange(QAbstract3DGraph::ShadowQuality quality)
+void QQuickGraphsItem::handleShadowQualityChange(QAbstract3DGraph::ShadowQuality quality)
 {
     emit shadowQualityChanged(ShadowQuality(quality));
 }
 
-void QQuickDataVisItem::handleSelectedElementChange(QAbstract3DGraph::ElementType type)
+void QQuickGraphsItem::handleSelectedElementChange(QAbstract3DGraph::ElementType type)
 {
     emit selectedElementChanged(ElementType(type));
 }
 
-void QQuickDataVisItem::handleOptimizationHintChange(QAbstract3DGraph::OptimizationHints hints)
+void QQuickGraphsItem::handleOptimizationHintChange(QAbstract3DGraph::OptimizationHints hints)
 {
     int intHints = int(hints);
     emit optimizationHintsChanged(OptimizationHints(intHints));
 }
 
-QAbstract3DInputHandler *QQuickDataVisItem::inputHandler() const
+QAbstract3DInputHandler *QQuickGraphsItem::inputHandler() const
 {
     return m_controller->activeInputHandler();
 }
 
-void QQuickDataVisItem::setInputHandler(QAbstract3DInputHandler *inputHandler)
+void QQuickGraphsItem::setInputHandler(QAbstract3DInputHandler *inputHandler)
 {
     m_controller->setActiveInputHandler(inputHandler);
 }
 
-void QQuickDataVisItem::mouseDoubleClickEvent(QMouseEvent *event)
+void QQuickGraphsItem::mouseDoubleClickEvent(QMouseEvent *event)
 {
     m_controller->mouseDoubleClickEvent(event);
 }
 
-void QQuickDataVisItem::touchEvent(QTouchEvent *event)
+void QQuickGraphsItem::touchEvent(QTouchEvent *event)
 {
     m_controller->touchEvent(event);
     window()->update();
 }
 
-void QQuickDataVisItem::mousePressEvent(QMouseEvent *event)
+void QQuickGraphsItem::mousePressEvent(QMouseEvent *event)
 {
     QPoint mousePos = event->pos();
     handleMousePressedEvent(event);
     m_controller->mousePressEvent(event, mousePos);
 }
 
-void QQuickDataVisItem::mouseReleaseEvent(QMouseEvent *event)
+void QQuickGraphsItem::mouseReleaseEvent(QMouseEvent *event)
 {
     QPoint mousePos = event->pos();
     m_controller->mouseReleaseEvent(event, mousePos);
 }
 
-void QQuickDataVisItem::mouseMoveEvent(QMouseEvent *event)
+void QQuickGraphsItem::mouseMoveEvent(QMouseEvent *event)
 {
     QPoint mousePos = event->pos();
     m_controller->mouseMoveEvent(event, mousePos);
 }
 
 #if QT_CONFIG(wheelevent)
-void QQuickDataVisItem::wheelEvent(QWheelEvent *event)
+void QQuickGraphsItem::wheelEvent(QWheelEvent *event)
 {
     m_controller->wheelEvent(event);
 }
 #endif
 
-void QQuickDataVisItem::checkWindowList(QQuickWindow *window)
+void QQuickGraphsItem::checkWindowList(QQuickWindow *window)
 {
     QQuickWindow *oldWindow = m_graphWindowList.value(this);
     m_graphWindowList[this] = window;
 
     if (oldWindow != window && oldWindow) {
         QObject::disconnect(oldWindow, &QObject::destroyed, this,
-                            &QQuickDataVisItem::windowDestroyed);
+                            &QQuickGraphsItem::windowDestroyed);
         QObject::disconnect(oldWindow, &QQuickWindow::beforeSynchronizing, this,
-                            &QQuickDataVisItem::synchData);
+                            &QQuickGraphsItem::synchData);
         if (!m_controller.isNull()) {
             QObject::disconnect(m_controller.data(), &Abstract3DController::needRender,
                                 oldWindow, &QQuickWindow::update);
@@ -1983,7 +1983,7 @@ void QQuickDataVisItem::checkWindowList(QQuickWindow *window)
 
     QList<QQuickWindow *> windowList;
 
-    foreach (QQuickDataVisItem *graph, m_graphWindowList.keys()) {
+    foreach (QQuickGraphsItem *graph, m_graphWindowList.keys()) {
         if (graph->m_renderMode == RenderDirectToBackground
                 || graph->m_renderMode == RenderDirectToBackground_NoClear) {
             windowList.append(m_graphWindowList.value(graph));
@@ -1996,144 +1996,144 @@ void QQuickDataVisItem::checkWindowList(QQuickWindow *window)
     }
 }
 
-void QQuickDataVisItem::setMeasureFps(bool enable)
+void QQuickGraphsItem::setMeasureFps(bool enable)
 {
     m_controller->setMeasureFps(enable);
     if (enable)
-        QObject::connect(renderStats(), &QQuick3DRenderStats::fpsChanged, this, &QQuickDataVisItem::handleFpsChanged);
+        QObject::connect(renderStats(), &QQuick3DRenderStats::fpsChanged, this, &QQuickGraphsItem::handleFpsChanged);
     else
         QObject::disconnect(renderStats(), 0, this, 0);
 
 }
 
-bool QQuickDataVisItem::measureFps() const
+bool QQuickGraphsItem::measureFps() const
 {
     return m_controller->measureFps();
 }
 
-int QQuickDataVisItem::currentFps() const
+int QQuickGraphsItem::currentFps() const
 {
     return m_controller->currentFps();
 }
 
-void QQuickDataVisItem::setOrthoProjection(bool enable)
+void QQuickGraphsItem::setOrthoProjection(bool enable)
 {
     m_controller->setOrthoProjection(enable);
 }
 
-bool QQuickDataVisItem::isOrthoProjection() const
+bool QQuickGraphsItem::isOrthoProjection() const
 {
     return m_controller->isOrthoProjection();
 }
 
-QQuickDataVisItem::ElementType QQuickDataVisItem::selectedElement() const
+QQuickGraphsItem::ElementType QQuickGraphsItem::selectedElement() const
 {
     return ElementType(m_controller->selectedElement());
 }
 
-void QQuickDataVisItem::setAspectRatio(qreal ratio)
+void QQuickGraphsItem::setAspectRatio(qreal ratio)
 {
     m_controller->setAspectRatio(ratio);
 }
 
-qreal QQuickDataVisItem::aspectRatio() const
+qreal QQuickGraphsItem::aspectRatio() const
 {
     return m_controller->aspectRatio();
 }
 
-void QQuickDataVisItem::setOptimizationHints(OptimizationHints hints)
+void QQuickGraphsItem::setOptimizationHints(OptimizationHints hints)
 {
     int intmode = int(hints);
     m_controller->setOptimizationHints(QAbstract3DGraph::OptimizationHints(intmode));
 }
 
-QQuickDataVisItem::OptimizationHints QQuickDataVisItem::optimizationHints() const
+QQuickGraphsItem::OptimizationHints QQuickGraphsItem::optimizationHints() const
 {
     int intmode = int(m_controller->optimizationHints());
     return OptimizationHints(intmode);
 }
 
-void QQuickDataVisItem::setPolar(bool enable)
+void QQuickGraphsItem::setPolar(bool enable)
 {
     m_controller->setPolar(enable);
 }
 
-bool QQuickDataVisItem::isPolar() const
+bool QQuickGraphsItem::isPolar() const
 {
     return m_controller->isPolar();
 }
 
-void QQuickDataVisItem::setRadialLabelOffset(float offset)
+void QQuickGraphsItem::setRadialLabelOffset(float offset)
 {
     m_controller->setRadialLabelOffset(offset);
 }
 
-float QQuickDataVisItem::radialLabelOffset() const
+float QQuickGraphsItem::radialLabelOffset() const
 {
     return m_controller->radialLabelOffset();
 }
 
-void QQuickDataVisItem::setHorizontalAspectRatio(qreal ratio)
+void QQuickGraphsItem::setHorizontalAspectRatio(qreal ratio)
 {
     m_controller->setHorizontalAspectRatio(ratio);
 }
 
-qreal QQuickDataVisItem::horizontalAspectRatio() const
+qreal QQuickGraphsItem::horizontalAspectRatio() const
 {
     return m_controller->horizontalAspectRatio();
 }
 
-void QQuickDataVisItem::setReflection(bool enable)
+void QQuickGraphsItem::setReflection(bool enable)
 {
     m_controller->setReflection(enable);
 }
 
-bool QQuickDataVisItem::isReflection() const
+bool QQuickGraphsItem::isReflection() const
 {
     return m_controller->reflection();
 }
 
-void QQuickDataVisItem::setReflectivity(qreal reflectivity)
+void QQuickGraphsItem::setReflectivity(qreal reflectivity)
 {
     m_controller->setReflectivity(reflectivity);
 }
 
-qreal QQuickDataVisItem::reflectivity() const
+qreal QQuickGraphsItem::reflectivity() const
 {
     return m_controller->reflectivity();
 }
 
-void QQuickDataVisItem::setLocale(const QLocale &locale)
+void QQuickGraphsItem::setLocale(const QLocale &locale)
 {
     m_controller->setLocale(locale);
 }
 
-QLocale QQuickDataVisItem::locale() const
+QLocale QQuickGraphsItem::locale() const
 {
     return m_controller->locale();
 }
 
-QVector3D QQuickDataVisItem::queriedGraphPosition() const
+QVector3D QQuickGraphsItem::queriedGraphPosition() const
 {
     return m_controller->queriedGraphPosition();
 }
 
-void QQuickDataVisItem::setMargin(qreal margin)
+void QQuickGraphsItem::setMargin(qreal margin)
 {
     m_controller->setMargin(margin);
 }
 
-qreal QQuickDataVisItem::margin() const
+qreal QQuickGraphsItem::margin() const
 {
     return m_controller->margin();
 }
 
-QQuick3DNode *QQuickDataVisItem::rootNode() const
+QQuick3DNode *QQuickGraphsItem::rootNode() const
 {
     return QQuick3DViewport::scene();
 }
 
-void QQuickDataVisItem::changeLabelBackgroundColor(QQuick3DRepeater *repeater, const QColor &color)
+void QQuickGraphsItem::changeLabelBackgroundColor(QQuick3DRepeater *repeater, const QColor &color)
 {
     int count = repeater->count();
     for (int i = 0; i < count; i++) {
@@ -2142,7 +2142,7 @@ void QQuickDataVisItem::changeLabelBackgroundColor(QQuick3DRepeater *repeater, c
     }
 }
 
-void QQuickDataVisItem::changeLabelBackgroundEnabled(QQuick3DRepeater *repeater, const bool &enabled)
+void QQuickGraphsItem::changeLabelBackgroundEnabled(QQuick3DRepeater *repeater, const bool &enabled)
 {
     int count = repeater->count();
     for (int i = 0; i < count; i++) {
@@ -2151,7 +2151,7 @@ void QQuickDataVisItem::changeLabelBackgroundEnabled(QQuick3DRepeater *repeater,
     }
 }
 
-void QQuickDataVisItem::changeLabelBorderEnabled(QQuick3DRepeater *repeater, const bool &enabled)
+void QQuickGraphsItem::changeLabelBorderEnabled(QQuick3DRepeater *repeater, const bool &enabled)
 {
     int count = repeater->count();
     for (int i = 0; i < count; i++) {
@@ -2160,7 +2160,7 @@ void QQuickDataVisItem::changeLabelBorderEnabled(QQuick3DRepeater *repeater, con
     }
 }
 
-void QQuickDataVisItem::changeLabelTextColor(QQuick3DRepeater *repeater, const QColor &color)
+void QQuickGraphsItem::changeLabelTextColor(QQuick3DRepeater *repeater, const QColor &color)
 {
     int count = repeater->count();
     for (int i = 0; i < count; i++) {
@@ -2169,7 +2169,7 @@ void QQuickDataVisItem::changeLabelTextColor(QQuick3DRepeater *repeater, const Q
     }
 }
 
-void QQuickDataVisItem::changeLabelFont(QQuick3DRepeater *repeater, const QFont &font)
+void QQuickGraphsItem::changeLabelFont(QQuick3DRepeater *repeater, const QFont &font)
 {
     int count = repeater->count();
     for (int i = 0; i < count; i++) {
@@ -2178,7 +2178,7 @@ void QQuickDataVisItem::changeLabelFont(QQuick3DRepeater *repeater, const QFont
     }
 }
 
-void QQuickDataVisItem::changeGridLineColor(QQuick3DRepeater *repeater, const QColor &color)
+void QQuickGraphsItem::changeGridLineColor(QQuick3DRepeater *repeater, const QColor &color)
 {
     for (int i = 0; i < repeater->count(); i++) {
         auto lineNode = static_cast<QQuick3DNode *>(repeater->objectAt(i));
@@ -2186,7 +2186,7 @@ void QQuickDataVisItem::changeGridLineColor(QQuick3DRepeater *repeater, const QC
     }
 }
 
-void QQuickDataVisItem::updateTitleLabels()
+void QQuickGraphsItem::updateTitleLabels()
 {
     if (m_controller->m_changeTracker.axisXTitleVisibilityChanged) {
         m_titleLabelX->setVisible(m_controller->axisX()->isTitleVisible());
@@ -2219,7 +2219,7 @@ void QQuickDataVisItem::updateTitleLabels()
     }
 }
 
-void QQuickDataVisItem::updateSliceGraph()
+void QQuickGraphsItem::updateSliceGraph()
 {
     if (!m_sliceEnabled) {
         m_controller->setSlicingActive(false);
@@ -2243,7 +2243,7 @@ void QQuickDataVisItem::updateSliceGraph()
     }
 }
 
-void QQuickDataVisItem::windowDestroyed(QObject *obj)
+void QQuickGraphsItem::windowDestroyed(QObject *obj)
 {
     // Remove destroyed window from window lists
     QQuickWindow *win = static_cast<QQuickWindow *>(obj);
@@ -2253,13 +2253,13 @@ void QQuickDataVisItem::windowDestroyed(QObject *obj)
         m_graphWindowList.remove(this);
 }
 
-QQmlComponent *QQuickDataVisItem::createRepeaterDelegateComponent(const QString &fileName)
+QQmlComponent *QQuickGraphsItem::createRepeaterDelegateComponent(const QString &fileName)
 {
     QQmlComponent component(qmlEngine(this), fileName);
     return qobject_cast<QQmlComponent *>(component.create());
 }
 
-QQuick3DRepeater *QQuickDataVisItem::createRepeater()
+QQuick3DRepeater *QQuickGraphsItem::createRepeater()
 {
     auto engine = qmlEngine(this);
     QQmlComponent repeaterComponent(engine);
@@ -2270,7 +2270,7 @@ QQuick3DRepeater *QQuickDataVisItem::createRepeater()
     return repeater;
 }
 
-QQuick3DNode *QQuickDataVisItem::createTitleLabel()
+QQuick3DNode *QQuickGraphsItem::createTitleLabel()
 {
     QQmlComponent comp(qmlEngine(this), QStringLiteral(":/axis/ItemLabel"));
     auto titleLabel = qobject_cast<QQuick3DNode *>(comp.create());
@@ -2281,26 +2281,26 @@ QQuick3DNode *QQuickDataVisItem::createTitleLabel()
     return titleLabel;
 }
 
-QQuick3DCustomMaterial *QQuickDataVisItem::createQmlCustomMaterial(const QString &fileName)
+QQuick3DCustomMaterial *QQuickGraphsItem::createQmlCustomMaterial(const QString &fileName)
 {
     QQmlComponent component(qmlEngine(this), fileName);
     QQuick3DCustomMaterial *material = qobject_cast<QQuick3DCustomMaterial *>(component.create());
     return material;
 }
 
-QQuick3DPrincipledMaterial *QQuickDataVisItem::createPrincipledMaterial()
+QQuick3DPrincipledMaterial *QQuickGraphsItem::createPrincipledMaterial()
 {
     QQmlComponent component(qmlEngine(this));
     component.setData("import QtQuick3D; PrincipledMaterial{}", QUrl());
     return qobject_cast<QQuick3DPrincipledMaterial *>(component.create());
 }
 
-bool QQuickDataVisItem::event(QEvent *event)
+bool QQuickGraphsItem::event(QEvent *event)
 {
     return QQuickItem::event(event);
 }
 
-void QQuickDataVisItem::createSliceView()
+void QQuickGraphsItem::createSliceView()
 {
     if (m_sliceView)
         return;
@@ -2360,7 +2360,7 @@ void QQuickDataVisItem::createSliceView()
     m_sliceItemLabel->setVisible(false);
 }
 
-void QQuickDataVisItem::updateSliceGrid()
+void QQuickGraphsItem::updateSliceGrid()
 {
     QAbstract3DAxis *horizontalAxis = nullptr;
     QAbstract3DAxis *verticalAxis = m_controller->axisY();
@@ -2405,7 +2405,7 @@ void QQuickDataVisItem::updateSliceGrid()
     if (verticalAxis->type() & QAbstract3DAxis::AxisTypeValue) {
         QValue3DAxis *valueAxis = static_cast<QValue3DAxis *>(verticalAxis);
         m_sliceHorizontalGridRepeater->setModel(valueAxis->gridSize()
-                                              + valueAxis->subGridSize());
+                                                + valueAxis->subGridSize());
     } else if (horizontalAxis->type() & QAbstract3DAxis::AxisTypeCategory) {
         m_sliceHorizontalGridRepeater->setModel(verticalAxis->labels().size());
     }
@@ -2453,7 +2453,7 @@ void QQuickDataVisItem::updateSliceGrid()
     }
 }
 
-void QQuickDataVisItem::updateSliceLabels()
+void QQuickGraphsItem::updateSliceLabels()
 {
     QAbstract3DAxis *horizontalAxis = nullptr;
     QAbstract3DAxis *verticalAxis = m_controller->axisY();
@@ -2645,7 +2645,7 @@ void QQuickDataVisItem::updateSliceLabels()
     m_sliceItemLabel->setProperty("backgroundColor", backgroundColor);
 }
 
-void QQuickDataVisItem::setUpCamera()
+void QQuickGraphsItem::setUpCamera()
 {
     auto useOrtho = m_controller->isOrthoProjection();
     QQuick3DCamera *camera;
@@ -2676,7 +2676,7 @@ void QQuickDataVisItem::setUpCamera()
     setCamera(camera);
 }
 
-void QQuickDataVisItem::setUpLight()
+void QQuickGraphsItem::setUpLight()
 {
     auto light = new QQuick3DDirectionalLight(rootNode());
     QQuick3DObjectPrivate::get(light)->refSceneManager(
diff --git a/src/graphs/qml/qquickdatavisitem_p.h b/src/graphs/qml/qquickgraphsitem_p.h
index dc65ca7a..3e21883f 100644
--- a/src/graphs/qml/qquickdatavisitem_p.h
+++ b/src/graphs/qml/qquickgraphsitem_p.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2023 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#ifndef QQUICKDATAVISITEM_H
-#define QQUICKDATAVISITEM_H
+#ifndef QQUICKGRAPHSITEM_H
+#define QQUICKGRAPHSITEM_H
 
 //
 //  W A R N I N G
@@ -32,7 +32,7 @@ class QQuick3DDirectionalLight;
 class QQuick3DPrincipledMaterial;
 class QQuick3DRepeater;
 
-class QQuickDataVisItem : public QQuick3DViewport
+class QQuickGraphsItem : public QQuick3DViewport
 {
     Q_OBJECT
     Q_PROPERTY(SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged)
@@ -118,19 +118,19 @@ public:
     Q_FLAGS(OptimizationHint OptimizationHints)
 
 public:
-    explicit QQuickDataVisItem(QQuickItem *parent = 0);
-    virtual ~QQuickDataVisItem();
+    explicit QQuickGraphsItem(QQuickItem *parent = 0);
+    virtual ~QQuickGraphsItem();
 
     virtual void setRenderingMode(RenderingMode mode);
-    virtual QQuickDataVisItem::RenderingMode renderingMode() const;
+    virtual QQuickGraphsItem::RenderingMode renderingMode() const;
 
     virtual void setSelectionMode(SelectionFlags mode);
-    virtual QQuickDataVisItem::SelectionFlags selectionMode() const;
+    virtual QQuickGraphsItem::SelectionFlags selectionMode() const;
 
     virtual void setShadowQuality(ShadowQuality quality);
-    virtual QQuickDataVisItem::ShadowQuality shadowQuality() const;
+    virtual QQuickGraphsItem::ShadowQuality shadowQuality() const;
 
-    virtual QQuickDataVisItem::ElementType selectedElement() const;
+    virtual QQuickGraphsItem::ElementType selectedElement() const;
 
     virtual bool shadowsSupported() const;
 
@@ -287,19 +287,19 @@ public Q_SLOTS:
     void windowDestroyed(QObject *obj);
 
 Q_SIGNALS:
-    void selectionModeChanged(QQuickDataVisItem::SelectionFlags mode);
-    void shadowQualityChanged(QQuickDataVisItem::ShadowQuality quality);
+    void selectionModeChanged(QQuickGraphsItem::SelectionFlags mode);
+    void shadowQualityChanged(QQuickGraphsItem::ShadowQuality quality);
     void shadowsSupportedChanged(bool supported);
     void msaaSamplesChanged(int samples);
     void inputHandlerChanged(QAbstract3DInputHandler *inputHandler);
     void themeChanged(Q3DTheme *theme);
-    void renderingModeChanged(QQuickDataVisItem::RenderingMode mode);
+    void renderingModeChanged(QQuickGraphsItem::RenderingMode mode);
     void measureFpsChanged(bool enabled);
     void currentFpsChanged(int fps);
-    void selectedElementChanged(QQuickDataVisItem::ElementType type);
+    void selectedElementChanged(QQuickGraphsItem::ElementType type);
     void orthoProjectionChanged(bool enabled);
     void aspectRatioChanged(qreal ratio);
-    void optimizationHintsChanged(QQuickDataVisItem::OptimizationHints hints);
+    void optimizationHintsChanged(QQuickGraphsItem::OptimizationHints hints);
     void polarChanged(bool enabled);
     void radialLabelOffsetChanged(float offset);
     void horizontalAspectRatioChanged(qreal ratio);
@@ -369,7 +369,7 @@ protected:
     void setSliceActivatedChanged(bool changed) { m_sliceActivatedChanged = changed; }
     virtual void updateSliceGraph();
 
-    virtual void updateShadowQuality(QQuickDataVisItem::ShadowQuality quality);
+    virtual void updateShadowQuality(QQuickGraphsItem::ShadowQuality quality);
     virtual void updateAxisRange(float min, float max);
     virtual void updateAxisReversed(bool enable);
     virtual void updateSingleHighlightColor() {}
@@ -414,7 +414,7 @@ private:
     QQuick3DNode *m_cameraTarget = nullptr;
     QQuick3DDirectionalLight *m_light = nullptr;
     QRectF m_cachedGeometry;
-    QQuickDataVisItem::RenderingMode m_renderMode;
+    QQuickGraphsItem::RenderingMode m_renderMode;
     int m_samples;
     int m_windowSamples;
     QSize m_initialisedSize;
@@ -459,12 +459,12 @@ private:
     void updateCamera();
     QVector3D calculateLabelRotation(float labelAutoAngle);
 
-    QHash<QQuickDataVisItem *, QQuickWindow *> m_graphWindowList = {};
+    QHash<QQuickGraphsItem *, QQuickWindow *> m_graphWindowList = {};
 
     friend class Scatter3DController;
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickDataVisItem::SelectionFlags)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickDataVisItem::OptimizationHints)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickGraphsItem::SelectionFlags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickGraphsItem::OptimizationHints)
 
 QT_END_NAMESPACE
 
diff --git a/src/graphs/qml/qquickdatavisscatter.cpp b/src/graphs/qml/qquickgraphsscatter.cpp
index c047ecce..64769234 100644
--- a/src/graphs/qml/qquickdatavisscatter.cpp
+++ b/src/graphs/qml/qquickgraphsscatter.cpp
@@ -1,14 +1,14 @@
 // Copyright (C) 2023 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include "qml/qquickdatavisscatter_p.h"
+#include "qml/qquickgraphsscatter_p.h"
 #include "qml/declarativescene_p.h"
 #include "data/qscatter3dseries_p.h"
 #include "qvalue3daxis_p.h"
 #include "qcategory3daxis_p.h"
 #include "axis/qvalue3daxisformatter_p.h"
 #include "engine/q3dcamera_p.h"
-#include "engine/datavisquick3dtexturedata_p.h"
+#include "quickgraphstexturedata_p.h"
 
 #include <QtCore/QMutexLocker>
 #include <QColor>
@@ -22,8 +22,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QQuickDataVisScatter::QQuickDataVisScatter(QQuickItem *parent)
-    : QQuickDataVisItem(parent),
+QQuickGraphsScatter::QQuickGraphsScatter(QQuickItem *parent)
+    : QQuickGraphsItem(parent),
       m_scatterController(0)
 {
     setAcceptedMouseButtons(Qt::AllButtons);
@@ -38,10 +38,10 @@ QQuickDataVisScatter::QQuickDataVisScatter(QQuickItem *parent)
     scene->setClearColor(Qt::blue);
 
     QObject::connect(m_scatterController, &Scatter3DController::selectedSeriesChanged,
-                     this, &QQuickDataVisScatter::selectedSeriesChanged);
+                     this, &QQuickGraphsScatter::selectedSeriesChanged);
 }
 
-QQuickDataVisScatter::~QQuickDataVisScatter()
+QQuickGraphsScatter::~QQuickGraphsScatter()
 {
     QMutexLocker locker(m_nodeMutex.data());
     const QMutexLocker locker2(mutex());
@@ -51,43 +51,43 @@ QQuickDataVisScatter::~QQuickDataVisScatter()
         delete m_instancing;
 }
 
-QValue3DAxis *QQuickDataVisScatter::axisX() const
+QValue3DAxis *QQuickGraphsScatter::axisX() const
 {
     return static_cast<QValue3DAxis *>(m_scatterController->axisX());
 }
 
-void QQuickDataVisScatter::setAxisX(QValue3DAxis *axis)
+void QQuickGraphsScatter::setAxisX(QValue3DAxis *axis)
 {
     m_scatterController->setAxisX(axis);
 }
 
-QValue3DAxis *QQuickDataVisScatter::axisY() const
+QValue3DAxis *QQuickGraphsScatter::axisY() const
 {
     return static_cast<QValue3DAxis *>(m_scatterController->axisY());
 }
 
-void QQuickDataVisScatter::setAxisY(QValue3DAxis *axis)
+void QQuickGraphsScatter::setAxisY(QValue3DAxis *axis)
 {
     m_scatterController->setAxisY(axis);
 }
 
-QValue3DAxis *QQuickDataVisScatter::axisZ() const
+QValue3DAxis *QQuickGraphsScatter::axisZ() const
 {
     return static_cast<QValue3DAxis *>(m_scatterController->axisZ());
 }
 
-void QQuickDataVisScatter::setAxisZ(QValue3DAxis *axis)
+void QQuickGraphsScatter::setAxisZ(QValue3DAxis *axis)
 {
     m_scatterController->setAxisZ(axis);
 }
 
 // From seriesvisualizer
-void QQuickDataVisScatter::disconnectSeries(QScatter3DSeries *series)
+void QQuickGraphsScatter::disconnectSeries(QScatter3DSeries *series)
 {
     QObject::disconnect(series, 0, this, 0);
 }
 
-void QQuickDataVisScatter::generatePointsForScatterModel(ScatterModel *graphModel)
+void QQuickGraphsScatter::generatePointsForScatterModel(ScatterModel *graphModel)
 {
     QList<QQuick3DModel *> itemList;
     if (m_scatterController->optimizationHints() == QAbstract3DGraph::OptimizationDefault) {
@@ -111,7 +111,7 @@ void QQuickDataVisScatter::generatePointsForScatterModel(ScatterModel *graphMode
     m_scatterController->markSeriesVisualsDirty();
 }
 
-qsizetype QQuickDataVisScatter::getItemIndex(QQuick3DModel *item)
+qsizetype QQuickGraphsScatter::getItemIndex(QQuick3DModel *item)
 {
     Q_UNUSED(item);
     if (m_scatterController->optimizationHints() == QAbstract3DGraph::OptimizationDefault)
@@ -120,7 +120,7 @@ qsizetype QQuickDataVisScatter::getItemIndex(QQuick3DModel *item)
     return -1;
 }
 
-void QQuickDataVisScatter::resetSelection()
+void QQuickGraphsScatter::resetSelection()
 {
     if (m_selectedIndex != -1) {
         if (m_scatterController->optimizationHints() == QAbstract3DGraph::OptimizationStatic) {
@@ -130,7 +130,7 @@ void QQuickDataVisScatter::resetSelection()
     }
 }
 
-void QQuickDataVisScatter::updateScatterGraphItemPositions(ScatterModel *graphModel)
+void QQuickGraphsScatter::updateScatterGraphItemPositions(ScatterModel *graphModel)
 {
     float itemSize = graphModel->series->itemSize() / m_itemScaler;
     QQuaternion meshRotation = graphModel->series->meshRotation();
@@ -183,7 +183,7 @@ void QQuickDataVisScatter::updateScatterGraphItemPositions(ScatterModel *graphMo
     }
 }
 
-void QQuickDataVisScatter::updateScatterGraphItemVisuals(ScatterModel *graphModel)
+void QQuickGraphsScatter::updateScatterGraphItemVisuals(ScatterModel *graphModel)
 {
     bool useGradient = graphModel->series->d_ptr->isUsingGradient();
     int itemCount = graphModel->series->dataProxy()->itemCount();
@@ -195,7 +195,7 @@ void QQuickDataVisScatter::updateScatterGraphItemVisuals(ScatterModel *graphMode
         }
 
         QLinearGradient gradient = graphModel->series->baseGradient();
-        auto textureData = static_cast<DatavisQuick3DTextureData *>(
+        auto textureData = static_cast<QuickGraphsTextureData *>(
                     graphModel->seriesTexture->textureData());
         textureData->createGradient(gradient);
 
@@ -205,7 +205,7 @@ void QQuickDataVisScatter::updateScatterGraphItemVisuals(ScatterModel *graphMode
         }
 
         QLinearGradient highlightGradient = graphModel->series->singleHighlightGradient();
-        auto highlightTextureData = static_cast<DatavisQuick3DTextureData *>(
+        auto highlightTextureData = static_cast<QuickGraphsTextureData *>(
                     graphModel->highlightTexture->textureData());
         highlightTextureData->createGradient(highlightGradient);
     } else {
@@ -302,7 +302,7 @@ void QQuickDataVisScatter::updateScatterGraphItemVisuals(ScatterModel *graphMode
     }
 }
 
-void QQuickDataVisScatter::updateItemMaterial(QQuick3DModel *item, bool useGradient, bool rangeGradient)
+void QQuickGraphsScatter::updateItemMaterial(QQuick3DModel *item, bool useGradient, bool rangeGradient)
 {
     Q_UNUSED(useGradient);
     QQmlListReference materialsRef(item, "materials");
@@ -334,7 +334,7 @@ void QQuickDataVisScatter::updateItemMaterial(QQuick3DModel *item, bool useGradi
     }
 }
 
-void QQuickDataVisScatter::updateItemInstancedMaterial(QQuick3DModel *item, bool useGradient, bool rangeGradient)
+void QQuickGraphsScatter::updateItemInstancedMaterial(QQuick3DModel *item, bool useGradient, bool rangeGradient)
 {
     Q_UNUSED(useGradient);
     QQmlListReference materialsRef(item, "materials");
@@ -365,7 +365,7 @@ void QQuickDataVisScatter::updateItemInstancedMaterial(QQuick3DModel *item, bool
     }
 }
 
-void QQuickDataVisScatter::updateSelectionIndicatorMaterial(bool useGradient, bool rangeGradient)
+void QQuickGraphsScatter::updateSelectionIndicatorMaterial(bool useGradient, bool rangeGradient)
 {
     Q_UNUSED(useGradient);
     QQmlListReference materialsRef(m_selectionIndicator, "materials");
@@ -397,9 +397,9 @@ void QQuickDataVisScatter::updateSelectionIndicatorMaterial(bool useGradient, bo
     }
 }
 
-void QQuickDataVisScatter::updateInstancedCustomMaterial(QQuick3DModel *model, bool isHighlight,
-                                                         QQuick3DTexture *seriesTexture,
-                                                         QQuick3DTexture *highlightTexture)
+void QQuickGraphsScatter::updateInstancedCustomMaterial(QQuick3DModel *model, bool isHighlight,
+                                                        QQuick3DTexture *seriesTexture,
+                                                        QQuick3DTexture *highlightTexture)
 {
     QQmlListReference materialsRef(model, "materials");
 
@@ -421,7 +421,7 @@ void QQuickDataVisScatter::updateInstancedCustomMaterial(QQuick3DModel *model, b
     }
 }
 
-void QQuickDataVisScatter::updateCustomMaterial(QQuick3DModel *item, QQuick3DTexture *texture)
+void QQuickGraphsScatter::updateCustomMaterial(QQuick3DModel *item, QQuick3DTexture *texture)
 {
     QQmlListReference materialsRef(item, "materials");
     auto customMaterial = static_cast<QQuick3DCustomMaterial *>(materialsRef.at(0));
@@ -435,8 +435,8 @@ void QQuickDataVisScatter::updateCustomMaterial(QQuick3DModel *item, QQuick3DTex
     customMaterial->setProperty("gradientPos", value);
 }
 
-void QQuickDataVisScatter::updatePrincipledMaterial(QQuick3DModel *model, const QColor &color,
-                                                    bool useGradient, QQuick3DTexture *texture)
+void QQuickGraphsScatter::updatePrincipledMaterial(QQuick3DModel *model, const QColor &color,
+                                                   bool useGradient, QQuick3DTexture *texture)
 {
     QQmlListReference materialsRef(model, "materials");
     auto principledMaterial = static_cast<QQuick3DPrincipledMaterial *>(materialsRef.at(0));
@@ -449,14 +449,14 @@ void QQuickDataVisScatter::updatePrincipledMaterial(QQuick3DModel *model, const
     }
 }
 
-QQuick3DTexture *QQuickDataVisScatter::createTexture()
+QQuick3DTexture *QQuickGraphsScatter::createTexture()
 {
     QQuick3DTexture *texture = new QQuick3DTexture();
     texture->setParent(this);
     texture->setRotationUV(-90.0f);
     texture->setHorizontalTiling(QQuick3DTexture::ClampToEdge);
     texture->setVerticalTiling(QQuick3DTexture::ClampToEdge);
-    DatavisQuick3DTextureData *textureData = new DatavisQuick3DTextureData();
+    QuickGraphsTextureData *textureData = new QuickGraphsTextureData();
     textureData->setParent(texture);
     textureData->setParentItem(texture);
     texture->setTextureData(textureData);
@@ -464,7 +464,7 @@ QQuick3DTexture *QQuickDataVisScatter::createTexture()
     return texture;
 }
 
-QQuick3DNode *QQuickDataVisScatter::createSeriesRoot()
+QQuick3DNode *QQuickGraphsScatter::createSeriesRoot()
 {
     auto model = new QQuick3DNode();
 
@@ -472,7 +472,7 @@ QQuick3DNode *QQuickDataVisScatter::createSeriesRoot()
     return model;
 }
 
-QQuick3DModel *QQuickDataVisScatter::createDataItem(const QAbstract3DSeries::Mesh meshType)
+QQuick3DModel *QQuickGraphsScatter::createDataItem(const QAbstract3DSeries::Mesh meshType)
 {
     auto model = new QQuick3DModel();
     model->setParent(this);
@@ -483,25 +483,25 @@ QQuick3DModel *QQuickDataVisScatter::createDataItem(const QAbstract3DSeries::Mes
     return model;
 }
 
-void QQuickDataVisScatter::createInstancingRootItem(QAbstract3DSeries::Mesh meshType)
+void QQuickGraphsScatter::createInstancingRootItem(QAbstract3DSeries::Mesh meshType)
 {
     m_instancingRootItem = createDataItem(meshType);
     m_instancingRootItem->setInstancing(m_instancing);
 }
 
-void QQuickDataVisScatter::createSelectionIndicator(QAbstract3DSeries::Mesh meshType)
+void QQuickGraphsScatter::createSelectionIndicator(QAbstract3DSeries::Mesh meshType)
 {
     m_selectionIndicator = createDataItem(meshType);
 
     m_selectionIndicator->setVisible(false);
 }
 
-void QQuickDataVisScatter::removeDataItems(QList<QQuick3DModel *> &items)
+void QQuickGraphsScatter::removeDataItems(QList<QQuick3DModel *> &items)
 {
     removeDataItems(items, items.count());
 }
 
-void QQuickDataVisScatter::removeDataItems(QList<QQuick3DModel *> &items, qsizetype count)
+void QQuickGraphsScatter::removeDataItems(QList<QQuick3DModel *> &items, qsizetype count)
 {
     for (int i = 0; i < count; ++i) {
         QQuick3DModel *item = items.takeLast();
@@ -514,7 +514,7 @@ void QQuickDataVisScatter::removeDataItems(QList<QQuick3DModel *> &items, qsizet
     }
 }
 
-void QQuickDataVisScatter::recreateDataItems()
+void QQuickGraphsScatter::recreateDataItems()
 {
     QList<QScatter3DSeries *> seriesList = m_scatterController->scatterSeriesList();
     for (auto series : seriesList) {
@@ -527,7 +527,7 @@ void QQuickDataVisScatter::recreateDataItems()
     }
 }
 
-void QQuickDataVisScatter::addPointsToScatterModel(ScatterModel *graphModel, qsizetype count)
+void QQuickGraphsScatter::addPointsToScatterModel(ScatterModel *graphModel, qsizetype count)
 {
     QAbstract3DSeries::Mesh meshType = graphModel->series->mesh();
     for (int i = 0; i < count; i++) {
@@ -539,12 +539,12 @@ void QQuickDataVisScatter::addPointsToScatterModel(ScatterModel *graphModel, qsi
     m_scatterController->setSeriesVisualsDirty();
 }
 
-int QQuickDataVisScatter::sizeDifference(qsizetype size1, qsizetype size2)
+int QQuickGraphsScatter::sizeDifference(qsizetype size1, qsizetype size2)
 {
     return size2 - size1;
 }
 
-QVector3D QQuickDataVisScatter::selectedItemPosition()
+QVector3D QQuickGraphsScatter::selectedItemPosition()
 {
     if (m_selectedIndex == -1)
         return QVector3D();
@@ -558,7 +558,7 @@ QVector3D QQuickDataVisScatter::selectedItemPosition()
     return position;
 }
 
-void QQuickDataVisScatter::fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh meshType)
+void QQuickGraphsScatter::fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh meshType)
 {
     if (meshType != QAbstract3DSeries::MeshSphere && meshType != QAbstract3DSeries::MeshArrow
             && meshType != QAbstract3DSeries::MeshMinimal && meshType != QAbstract3DSeries::MeshPoint) {
@@ -566,12 +566,12 @@ void QQuickDataVisScatter::fixMeshFileName(QString &fileName, QAbstract3DSeries:
     }
 }
 
-QString QQuickDataVisScatter::getMeshFileName(QAbstract3DSeries::Mesh meshType)
+QString QQuickGraphsScatter::getMeshFileName(QAbstract3DSeries::Mesh meshType)
 {
     QString fileName;
     QString smoothString = QStringLiteral("Smooth");
     switch (meshType) {
-        case QAbstract3DSeries::MeshSphere:
+    case QAbstract3DSeries::MeshSphere:
         fileName = QStringLiteral("defaultMeshes/sphereMesh");
         break;
     case QAbstract3DSeries::MeshBar:
@@ -611,19 +611,19 @@ QString QQuickDataVisScatter::getMeshFileName(QAbstract3DSeries::Mesh meshType)
     return fileName;
 }
 
-void QQuickDataVisScatter::handleSeriesChanged(QList<QAbstract3DSeries *> changedSeries)
+void QQuickGraphsScatter::handleSeriesChanged(QList<QAbstract3DSeries *> changedSeries)
 {
     Q_UNUSED(changedSeries)
     // TODO: generate items and remove old items
 }
 
 // ------------------------------------------------------------------------------
-QScatter3DSeries *QQuickDataVisScatter::selectedSeries() const
+QScatter3DSeries *QQuickGraphsScatter::selectedSeries() const
 {
     return m_scatterController->selectedSeries();
 }
 
-void QQuickDataVisScatter::setSelectedItem(int index, QScatter3DSeries *series)
+void QQuickGraphsScatter::setSelectedItem(int index, QScatter3DSeries *series)
 {
     m_scatterController->setSelectedItem(index, series);
 
@@ -631,42 +631,42 @@ void QQuickDataVisScatter::setSelectedItem(int index, QScatter3DSeries *series)
         itemLabel()->setVisible(true);
 }
 
-QQmlListProperty<QScatter3DSeries> QQuickDataVisScatter::seriesList()
+QQmlListProperty<QScatter3DSeries> QQuickGraphsScatter::seriesList()
 {
     return QQmlListProperty<QScatter3DSeries>(this, this,
-                                              &QQuickDataVisScatter::appendSeriesFunc,
-                                              &QQuickDataVisScatter::countSeriesFunc,
-                                              &QQuickDataVisScatter::atSeriesFunc,
-                                              &QQuickDataVisScatter::clearSeriesFunc);
+                                              &QQuickGraphsScatter::appendSeriesFunc,
+                                              &QQuickGraphsScatter::countSeriesFunc,
+                                              &QQuickGraphsScatter::atSeriesFunc,
+                                              &QQuickGraphsScatter::clearSeriesFunc);
 }
 
-void QQuickDataVisScatter::appendSeriesFunc(QQmlListProperty<QScatter3DSeries> *list,
-                                            QScatter3DSeries *series)
+void QQuickGraphsScatter::appendSeriesFunc(QQmlListProperty<QScatter3DSeries> *list,
+                                           QScatter3DSeries *series)
 {
-    reinterpret_cast<QQuickDataVisScatter *>(list->data)->addSeries(series);
+    reinterpret_cast<QQuickGraphsScatter *>(list->data)->addSeries(series);
 }
 
-qsizetype QQuickDataVisScatter::countSeriesFunc(QQmlListProperty<QScatter3DSeries> *list)
+qsizetype QQuickGraphsScatter::countSeriesFunc(QQmlListProperty<QScatter3DSeries> *list)
 {
-    return reinterpret_cast<QQuickDataVisScatter *>(list->data)->m_scatterController->scatterSeriesList().size();
+    return reinterpret_cast<QQuickGraphsScatter *>(list->data)->m_scatterController->scatterSeriesList().size();
 }
 
-QScatter3DSeries *QQuickDataVisScatter::atSeriesFunc(QQmlListProperty<QScatter3DSeries> *list,
-                                                     qsizetype index)
+QScatter3DSeries *QQuickGraphsScatter::atSeriesFunc(QQmlListProperty<QScatter3DSeries> *list,
+                                                    qsizetype index)
 {
-    return reinterpret_cast<QQuickDataVisScatter *>(list->data)->m_scatterController->scatterSeriesList().at(index);
+    return reinterpret_cast<QQuickGraphsScatter *>(list->data)->m_scatterController->scatterSeriesList().at(index);
 }
 
-void QQuickDataVisScatter::clearSeriesFunc(QQmlListProperty<QScatter3DSeries> *list)
+void QQuickGraphsScatter::clearSeriesFunc(QQmlListProperty<QScatter3DSeries> *list)
 {
-    QQuickDataVisScatter *declScatter = reinterpret_cast<QQuickDataVisScatter *>(list->data);
+    QQuickGraphsScatter *declScatter = reinterpret_cast<QQuickGraphsScatter *>(list->data);
     QList<QScatter3DSeries *> realList = declScatter->m_scatterController->scatterSeriesList();
     int count = realList.size();
     for (int i = 0; i < count; i++)
         declScatter->removeSeries(realList.at(i));
 }
 
-void QQuickDataVisScatter::addSeries(QScatter3DSeries *series)
+void QQuickGraphsScatter::addSeries(QScatter3DSeries *series)
 {
     m_scatterController->addSeries(series);
 
@@ -682,7 +682,7 @@ void QQuickDataVisScatter::addSeries(QScatter3DSeries *series)
         setSelectedItem(series->selectedItem(), series);
 }
 
-void QQuickDataVisScatter::removeSeries(QScatter3DSeries *series)
+void QQuickGraphsScatter::removeSeries(QScatter3DSeries *series)
 {
     m_scatterController->removeSeries(series);
     series->setParent(this); // Reparent as removing will leave series parentless
@@ -706,33 +706,33 @@ void QQuickDataVisScatter::removeSeries(QScatter3DSeries *series)
     disconnectSeries(series);
 }
 
-void QQuickDataVisScatter::handleAxisXChanged(QAbstract3DAxis *axis)
+void QQuickGraphsScatter::handleAxisXChanged(QAbstract3DAxis *axis)
 {
     emit axisXChanged(static_cast<QValue3DAxis *>(axis));
 }
 
-void QQuickDataVisScatter::handleAxisYChanged(QAbstract3DAxis *axis)
+void QQuickGraphsScatter::handleAxisYChanged(QAbstract3DAxis *axis)
 {
     emit axisYChanged(static_cast<QValue3DAxis *>(axis));
 }
 
-void QQuickDataVisScatter::handleAxisZChanged(QAbstract3DAxis *axis)
+void QQuickGraphsScatter::handleAxisZChanged(QAbstract3DAxis *axis)
 {
     emit axisZChanged(static_cast<QValue3DAxis *>(axis));
 }
 
-void QQuickDataVisScatter::handleSeriesMeshChanged()
+void QQuickGraphsScatter::handleSeriesMeshChanged()
 {
     recreateDataItems();
 }
 
-void QQuickDataVisScatter::handleMeshSmoothChanged(bool enable)
+void QQuickGraphsScatter::handleMeshSmoothChanged(bool enable)
 {
     m_smooth = enable;
     recreateDataItems();
 }
 
-bool QQuickDataVisScatter::handleMousePressedEvent(QMouseEvent *event)
+bool QQuickGraphsScatter::handleMousePressedEvent(QMouseEvent *event)
 {
     if (Qt::LeftButton == event->button()) {
         if (selectionMode() == QAbstract3DGraph::SelectionItem) {
@@ -763,17 +763,17 @@ bool QQuickDataVisScatter::handleMousePressedEvent(QMouseEvent *event)
     return true;
 }
 
-void QQuickDataVisScatter::connectSeries(QScatter3DSeries *series)
+void QQuickGraphsScatter::connectSeries(QScatter3DSeries *series)
 {
     m_smooth = series->isMeshSmooth();
 
     QObject::connect(series, &QScatter3DSeries::meshChanged, this,
-                     &QQuickDataVisScatter::handleSeriesMeshChanged);
+                     &QQuickGraphsScatter::handleSeriesMeshChanged);
     QObject::connect(series, &QScatter3DSeries::meshSmoothChanged, this,
-                     &QQuickDataVisScatter::handleMeshSmoothChanged);
+                     &QQuickGraphsScatter::handleMeshSmoothChanged);
 }
 
-void QQuickDataVisScatter::calculateSceneScalingFactors()
+void QQuickGraphsScatter::calculateSceneScalingFactors()
 {
     if (m_requestedMargin < 0.0f) {
         if (m_maxItemSize > m_defaultMaxSize)
@@ -822,7 +822,7 @@ void QQuickDataVisScatter::calculateSceneScalingFactors()
     setTranslate({-m_scaleX, -m_scaleY, m_scaleZ});
 }
 
-float QQuickDataVisScatter::calculatePointScaleSize()
+float QQuickGraphsScatter::calculatePointScaleSize()
 {
     QList<QScatter3DSeries *> series = m_scatterController->scatterSeriesList();
     int totalDataSize = 0;
@@ -834,22 +834,22 @@ float QQuickDataVisScatter::calculatePointScaleSize()
     return qBound(m_defaultMinSize, 2.0f / float(qSqrt(qreal(totalDataSize))), m_defaultMaxSize);
 }
 
-void QQuickDataVisScatter::updatePointScaleSize()
+void QQuickGraphsScatter::updatePointScaleSize()
 {
     m_pointScale = calculatePointScaleSize();
 }
 
-void QQuickDataVisScatter::updateShadowQuality(ShadowQuality quality)
+void QQuickGraphsScatter::updateShadowQuality(ShadowQuality quality)
 {
-    QQuickDataVisItem::updateShadowQuality(quality);
+    QQuickGraphsItem::updateShadowQuality(quality);
 }
 
-QQuick3DModel *QQuickDataVisScatter::selected() const
+QQuick3DModel *QQuickGraphsScatter::selected() const
 {
     return m_selected;
 }
 
-void QQuickDataVisScatter::setSelected(QQuick3DModel *newSelected)
+void QQuickGraphsScatter::setSelected(QQuick3DModel *newSelected)
 {
     if (newSelected != m_selected) {
         m_previousSelected = m_selected;
@@ -877,7 +877,7 @@ void QQuickDataVisScatter::setSelected(QQuick3DModel *newSelected)
     }
 }
 
-void QQuickDataVisScatter::setSelected(QQuick3DModel *root, qsizetype index)
+void QQuickGraphsScatter::setSelected(QQuick3DModel *root, qsizetype index)
 {
     if (index != m_scatterController->m_selectedItem) {
         QQuick3DObject *seriesRoot = root->parentItem();
@@ -889,12 +889,12 @@ void QQuickDataVisScatter::setSelected(QQuick3DModel *root, qsizetype index)
     }
 }
 
-void QQuickDataVisScatter::setSelected(qsizetype index)
+void QQuickGraphsScatter::setSelected(qsizetype index)
 {
     m_selectedIndex = index;
 }
 
-void QQuickDataVisScatter::clearSelectionModel()
+void QQuickGraphsScatter::clearSelectionModel()
 {
     setSelectedItem(invalidSelectionIndex(), nullptr);
 
@@ -904,7 +904,7 @@ void QQuickDataVisScatter::clearSelectionModel()
     m_previousSelected = nullptr;
 }
 
-void QQuickDataVisScatter::updateGraph()
+void QQuickGraphsScatter::updateGraph()
 {
     updatePointScaleSize();
     for (auto graphModel : std::as_const(m_scatterGraphs)) {
@@ -939,7 +939,7 @@ void QQuickDataVisScatter::updateGraph()
     }
 }
 
-void QQuickDataVisScatter::synchData()
+void QQuickGraphsScatter::synchData()
 {
     QList<QScatter3DSeries *> seriesList = m_scatterController->scatterSeriesList();
 
@@ -957,7 +957,7 @@ void QQuickDataVisScatter::synchData()
 
     calculateSceneScalingFactors();
     updatePointScaleSize();
-    QQuickDataVisItem::synchData();
+    QQuickGraphsItem::synchData();
     scene()->activeCamera()->d_ptr->setMinYRotation(-90.0f);
 
     QValue3DAxis *aX = axisX();
diff --git a/src/graphs/qml/qquickdatavisscatter_p.h b/src/graphs/qml/qquickgraphsscatter_p.h
index 8dc85ca1..9fe587ef 100644
--- a/src/graphs/qml/qquickdatavisscatter_p.h
+++ b/src/graphs/qml/qquickgraphsscatter_p.h
@@ -9,11 +9,11 @@
 // version without notice, or even be removed.
 //
 // We mean it.
-#ifndef QQUICKDATAVISSCATTER_P_H
-#define QQUICKDATAVISSCATTER_P_H
+#ifndef QQUICKGRAPHSSCATTER_P_H
+#define QQUICKGRAPHSSCATTER_P_H
 
 #include "qscatter3dseries.h"
-#include "qquickdatavisitem_p.h"
+#include "qquickgraphsitem_p.h"
 #include "scatter3dcontroller_p.h"
 #include "scatterinstancing_p.h"
 
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 
 class Q3DScatter;
 
-class QQuickDataVisScatter : public QQuickDataVisItem
+class QQuickGraphsScatter : public QQuickGraphsItem
 {
     Q_OBJECT
     Q_PROPERTY(QValue3DAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
@@ -38,8 +38,8 @@ class QQuickDataVisScatter : public QQuickDataVisItem
     QML_ADDED_IN_VERSION(6, 6)
 
 public:
-    explicit QQuickDataVisScatter(QQuickItem *parent = 0);
-    ~QQuickDataVisScatter();
+    explicit QQuickGraphsScatter(QQuickItem *parent = 0);
+    ~QQuickGraphsScatter();
 
     QValue3DAxis *axisX() const;
     void setAxisX(QValue3DAxis *axis);
@@ -171,7 +171,7 @@ private:
     float calculatePointScaleSize();
     void updatePointScaleSize();
 
-    void updateShadowQuality(QQuickDataVisItem::ShadowQuality quality) override;
+    void updateShadowQuality(QQuickGraphsItem::ShadowQuality quality) override;
 
     void generatePointsForScatterModel(ScatterModel *series);
     void updateScatterGraphItemPositions(ScatterModel *graphModel);
@@ -189,4 +189,4 @@ private:
 };
 
 QT_END_NAMESPACE
-#endif // QQUICKDATAVISSCATTER_P_H
+#endif // QQUICKGRAPHSSCATTER_P_H
diff --git a/src/graphs/qml/qquickdatavissurface.cpp b/src/graphs/qml/qquickgraphssurface.cpp
index 14462b64..30cfe1f3 100644
--- a/src/graphs/qml/qquickdatavissurface.cpp
+++ b/src/graphs/qml/qquickgraphssurface.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2023 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include "qquickdatavissurface_p.h"
+#include "qquickgraphssurface_p.h"
 #include <QtCore/QMutexLocker>
 
 #include "declarativescene_p.h"
@@ -15,8 +15,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QQuickDataVisSurface::QQuickDataVisSurface(QQuickItem *parent)
-    : QQuickDataVisItem(parent),
+QQuickGraphsSurface::QQuickGraphsSurface(QQuickItem *parent)
+    : QQuickGraphsItem(parent),
       m_surfaceController(0)
 {
     setAcceptedMouseButtons(Qt::AllButtons);
@@ -26,12 +26,12 @@ QQuickDataVisSurface::QQuickDataVisSurface(QQuickItem *parent)
     setSharedController(m_surfaceController);
 
     QObject::connect(m_surfaceController, &Surface3DController::selectedSeriesChanged,
-                     this, &QQuickDataVisSurface::selectedSeriesChanged);
+                     this, &QQuickGraphsSurface::selectedSeriesChanged);
     QObject::connect(m_surfaceController, &Surface3DController::flipHorizontalGridChanged,
-                     this, &QQuickDataVisSurface::flipHorizontalGridChanged);
+                     this, &QQuickGraphsSurface::flipHorizontalGridChanged);
 }
 
-QQuickDataVisSurface::~QQuickDataVisSurface()
+QQuickGraphsSurface::~QQuickGraphsSurface()
 {
     QMutexLocker locker(m_nodeMutex.data());
     const QMutexLocker locker2(mutex());
@@ -40,37 +40,37 @@ QQuickDataVisSurface::~QQuickDataVisSurface()
         delete model;
 }
 
-QValue3DAxis *QQuickDataVisSurface::axisX() const
+QValue3DAxis *QQuickGraphsSurface::axisX() const
 {
     return static_cast<QValue3DAxis *>(m_surfaceController->axisX());
 }
 
-void QQuickDataVisSurface::setAxisX(QValue3DAxis *axis)
+void QQuickGraphsSurface::setAxisX(QValue3DAxis *axis)
 {
     m_surfaceController->setAxisX(axis);
 }
 
-QValue3DAxis *QQuickDataVisSurface::axisY() const
+QValue3DAxis *QQuickGraphsSurface::axisY() const
 {
     return static_cast<QValue3DAxis *>(m_surfaceController->axisY());
 }
 
-void QQuickDataVisSurface::setAxisY(QValue3DAxis *axis)
+void QQuickGraphsSurface::setAxisY(QValue3DAxis *axis)
 {
     m_surfaceController->setAxisY(axis);
 }
 
-QValue3DAxis *QQuickDataVisSurface::axisZ() const
+QValue3DAxis *QQuickGraphsSurface::axisZ() const
 {
     return static_cast<QValue3DAxis *>(m_surfaceController->axisZ());
 }
 
-void QQuickDataVisSurface::setAxisZ(QValue3DAxis *axis)
+void QQuickGraphsSurface::setAxisZ(QValue3DAxis *axis)
 {
     m_surfaceController->setAxisZ(axis);
 }
 
-void QQuickDataVisSurface::handleFlatShadingEnabledChanged()
+void QQuickGraphsSurface::handleFlatShadingEnabledChanged()
 {
     auto series = static_cast<QSurface3DSeries *>(sender());
     for (auto model : m_model) {
@@ -81,7 +81,7 @@ void QQuickDataVisSurface::handleFlatShadingEnabledChanged()
     }
 }
 
-void QQuickDataVisSurface::handleWireframeColorChanged()
+void QQuickGraphsSurface::handleWireframeColorChanged()
 {
     for (auto model : m_model) {
         QQmlListReference gridMaterialRef(model->gridModel, "materials");
@@ -97,64 +97,64 @@ void QQuickDataVisSurface::handleWireframeColorChanged()
     }
 }
 
-QSurface3DSeries *QQuickDataVisSurface::selectedSeries() const
+QSurface3DSeries *QQuickGraphsSurface::selectedSeries() const
 {
     return m_surfaceController->selectedSeries();
 }
 
-void QQuickDataVisSurface::setFlipHorizontalGrid(bool flip)
+void QQuickGraphsSurface::setFlipHorizontalGrid(bool flip)
 {
-   m_surfaceController->setFlipHorizontalGrid(flip);
+    m_surfaceController->setFlipHorizontalGrid(flip);
 }
 
-bool QQuickDataVisSurface::flipHorizontalGrid() const
+bool QQuickGraphsSurface::flipHorizontalGrid() const
 {
     return m_surfaceController->flipHorizontalGrid();
 }
 
-QQmlListProperty<QSurface3DSeries> QQuickDataVisSurface::seriesList()
+QQmlListProperty<QSurface3DSeries> QQuickGraphsSurface::seriesList()
 {
     return QQmlListProperty<QSurface3DSeries>(this, this,
-                                              &QQuickDataVisSurface::appendSeriesFunc,
-                                              &QQuickDataVisSurface::countSeriesFunc,
-                                              &QQuickDataVisSurface::atSeriesFunc,
-                                              &QQuickDataVisSurface::clearSeriesFunc);
+                                              &QQuickGraphsSurface::appendSeriesFunc,
+                                              &QQuickGraphsSurface::countSeriesFunc,
+                                              &QQuickGraphsSurface::atSeriesFunc,
+                                              &QQuickGraphsSurface::clearSeriesFunc);
 }
 
-void QQuickDataVisSurface::appendSeriesFunc(QQmlListProperty<QSurface3DSeries> *list,
-                                          QSurface3DSeries *series)
+void QQuickGraphsSurface::appendSeriesFunc(QQmlListProperty<QSurface3DSeries> *list,
+                                           QSurface3DSeries *series)
 {
-    reinterpret_cast<QQuickDataVisSurface *>(list->data)->addSeries(series);
+    reinterpret_cast<QQuickGraphsSurface *>(list->data)->addSeries(series);
 }
 
-qsizetype QQuickDataVisSurface::countSeriesFunc(QQmlListProperty<QSurface3DSeries> *list)
+qsizetype QQuickGraphsSurface::countSeriesFunc(QQmlListProperty<QSurface3DSeries> *list)
 {
-    return reinterpret_cast<QQuickDataVisSurface *>(list->data)->m_surfaceController->surfaceSeriesList().size();
+    return reinterpret_cast<QQuickGraphsSurface *>(list->data)->m_surfaceController->surfaceSeriesList().size();
 }
 
-QSurface3DSeries *QQuickDataVisSurface::atSeriesFunc(QQmlListProperty<QSurface3DSeries> *list,
-                                                   qsizetype index)
+QSurface3DSeries *QQuickGraphsSurface::atSeriesFunc(QQmlListProperty<QSurface3DSeries> *list,
+                                                    qsizetype index)
 {
-    return reinterpret_cast<QQuickDataVisSurface *>(list->data)->m_surfaceController->surfaceSeriesList().at(index);
+    return reinterpret_cast<QQuickGraphsSurface *>(list->data)->m_surfaceController->surfaceSeriesList().at(index);
 }
 
-void QQuickDataVisSurface::clearSeriesFunc(QQmlListProperty<QSurface3DSeries> *list)
+void QQuickGraphsSurface::clearSeriesFunc(QQmlListProperty<QSurface3DSeries> *list)
 {
-    QQuickDataVisSurface *declSurface = reinterpret_cast<QQuickDataVisSurface *>(list->data);
+    QQuickGraphsSurface *declSurface = reinterpret_cast<QQuickGraphsSurface *>(list->data);
     QList<QSurface3DSeries *> realList = declSurface->m_surfaceController->surfaceSeriesList();
     int count = realList.size();
     for (int i = 0; i < count; i++)
         declSurface->removeSeries(realList.at(i));
 }
 
-void QQuickDataVisSurface::addSeries(QSurface3DSeries *series)
+void QQuickGraphsSurface::addSeries(QSurface3DSeries *series)
 {
     m_surfaceController->addSeries(series);
     if (isReady())
         addModel(series);
 }
 
-void QQuickDataVisSurface::removeSeries(QSurface3DSeries *series)
+void QQuickGraphsSurface::removeSeries(QSurface3DSeries *series)
 {
     m_surfaceController->removeSeries(series);
     series->setParent(this); // Reparent as removing will leave series parentless
@@ -169,24 +169,24 @@ void QQuickDataVisSurface::removeSeries(QSurface3DSeries *series)
     }
 }
 
-void QQuickDataVisSurface::handleAxisXChanged(QAbstract3DAxis *axis)
+void QQuickGraphsSurface::handleAxisXChanged(QAbstract3DAxis *axis)
 {
     emit axisXChanged(static_cast<QValue3DAxis *>(axis));
 }
 
-void QQuickDataVisSurface::handleAxisYChanged(QAbstract3DAxis *axis)
+void QQuickGraphsSurface::handleAxisYChanged(QAbstract3DAxis *axis)
 {
     emit axisYChanged(static_cast<QValue3DAxis *>(axis));
 }
 
-void QQuickDataVisSurface::handleAxisZChanged(QAbstract3DAxis *axis)
+void QQuickGraphsSurface::handleAxisZChanged(QAbstract3DAxis *axis)
 {
     emit axisZChanged(static_cast<QValue3DAxis *>(axis));
 }
 
-void QQuickDataVisSurface::componentComplete()
+void QQuickGraphsSurface::componentComplete()
 {
-    QQuickDataVisItem::componentComplete();
+    QQuickGraphsItem::componentComplete();
 
     createSliceView();
 
@@ -227,9 +227,9 @@ void QQuickDataVisSurface::componentComplete()
     setScale({2.0f, 1.0f, 2.0f});
 }
 
-void QQuickDataVisSurface::synchData()
+void QQuickGraphsSurface::synchData()
 {
-    QQuickDataVisItem::synchData();
+    QQuickGraphsItem::synchData();
 
     if (m_surfaceController->isSelectedPointChanged()) {
         if (m_surfaceController->selectionMode().testFlag(QAbstract3DGraph::SelectionItem))
@@ -295,7 +295,7 @@ inline static int binarySearchArray(const QSurfaceDataArray &array, int maxIndex
     return retVal;
 }
 
-void QQuickDataVisSurface::updateGraph()
+void QQuickGraphsSurface::updateGraph()
 {
     if (m_surfaceController->hasChangedSeriesList())
         handleChangedSeries();
@@ -337,7 +337,7 @@ void QQuickDataVisSurface::updateGraph()
     }
 }
 
-void QQuickDataVisSurface::handleChangedSeries()
+void QQuickGraphsSurface::handleChangedSeries()
 {
     auto changedSeries = m_surfaceController->changedSeriesList();
 
@@ -350,7 +350,7 @@ void QQuickDataVisSurface::handleChangedSeries()
     }
 }
 
-void QQuickDataVisSurface::updateModel(SurfaceModel *model)
+void QQuickGraphsSurface::updateModel(SurfaceModel *model)
 {
     const QSurfaceDataArray &array = *(model->series->dataProxy())->array();
 
@@ -524,7 +524,7 @@ void QQuickDataVisSurface::updateModel(SurfaceModel *model)
     }
 }
 
-void QQuickDataVisSurface::updateMaterial(SurfaceModel *model)
+void QQuickGraphsSurface::updateMaterial(SurfaceModel *model)
 {
     auto axisY = m_surfaceController->axisY();
     float maxY = axisY->max();
@@ -578,7 +578,7 @@ void QQuickDataVisSurface::updateMaterial(SurfaceModel *model)
     textureData->setTextureData(imageData);
 }
 
-QVector3D QQuickDataVisSurface::getNormalizedVertex(SurfaceModel *model, const QSurfaceDataItem &data, bool polar, bool flipXZ)
+QVector3D QQuickGraphsSurface::getNormalizedVertex(SurfaceModel *model, const QSurfaceDataItem &data, bool polar, bool flipXZ)
 {
     Q_UNUSED(polar);
     Q_UNUSED(flipXZ);
@@ -610,9 +610,9 @@ inline static QVector3D normal(const QVector3D &a, const QVector3D &b, const QVe
     return normal;
 }
 
-void QQuickDataVisSurface::updateSliceGraph()
+void QQuickGraphsSurface::updateSliceGraph()
 {
-    QQuickDataVisItem::updateSliceGraph();
+    QQuickGraphsItem::updateSliceGraph();
 
     if (!sliceView()->isVisible())
         return;
@@ -704,7 +704,7 @@ void QQuickDataVisSurface::updateSliceGraph()
     }
 }
 
-void QQuickDataVisSurface::createSmoothNormalBodyLine(SurfaceModel *model, int &totalIndex, int column)
+void QQuickGraphsSurface::createSmoothNormalBodyLine(SurfaceModel *model, int &totalIndex, int column)
 {
     int columnCount = model->columnCount;
     int colLimit = columnCount - 1;
@@ -768,7 +768,7 @@ void QQuickDataVisSurface::createSmoothNormalBodyLine(SurfaceModel *model, int &
     }
 }
 
-void QQuickDataVisSurface::createSmoothNormalUpperLine(SurfaceModel *model, int &totalIndex)
+void QQuickGraphsSurface::createSmoothNormalUpperLine(SurfaceModel *model, int &totalIndex)
 {
     int columnCount = model->columnCount;
     int rowCount = model->rowCount;
@@ -833,7 +833,7 @@ void QQuickDataVisSurface::createSmoothNormalUpperLine(SurfaceModel *model, int
     }
 }
 
-void QQuickDataVisSurface::createSmoothIndices(SurfaceModel *model, int x, int y, int endX, int endY)
+void QQuickGraphsSurface::createSmoothIndices(SurfaceModel *model, int x, int y, int endX, int endY)
 {
     int columnCount = model->columnCount;
     int rowCount = model->rowCount;
@@ -888,7 +888,7 @@ void QQuickDataVisSurface::createSmoothIndices(SurfaceModel *model, int x, int y
     }
 }
 
-void QQuickDataVisSurface::createCoarseVertices(SurfaceModel *model, int x, int y, int endX, int endY)
+void QQuickGraphsSurface::createCoarseVertices(SurfaceModel *model, int x, int y, int endX, int endY)
 {
     int columnCount = model->columnCount;
     int rowCount = model->rowCount;
@@ -1012,7 +1012,7 @@ void QQuickDataVisSurface::createCoarseVertices(SurfaceModel *model, int x, int
     }
 }
 
-void QQuickDataVisSurface::createGridlineIndices(SurfaceModel *model, int x, int y, int endX, int endY)
+void QQuickGraphsSurface::createGridlineIndices(SurfaceModel *model, int x, int y, int endX, int endY)
 {
     int columnCount = model->columnCount;
     int rowCount = model->rowCount;
@@ -1047,9 +1047,9 @@ void QQuickDataVisSurface::createGridlineIndices(SurfaceModel *model, int x, int
     }
 }
 
-bool QQuickDataVisSurface::handleMousePressedEvent(QMouseEvent *event)
+bool QQuickGraphsSurface::handleMousePressedEvent(QMouseEvent *event)
 {
-    if (!QQuickDataVisItem::handleMousePressedEvent(event))
+    if (!QQuickGraphsItem::handleMousePressedEvent(event))
         return true;
 
     if (Qt::LeftButton == event->button()) {
@@ -1121,7 +1121,7 @@ bool QQuickDataVisSurface::handleMousePressedEvent(QMouseEvent *event)
     return true;
 }
 
-void QQuickDataVisSurface::updateSelectedPoint()
+void QQuickGraphsSurface::updateSelectedPoint()
 {
     bool labelVisible = false;
     m_instancing->resetPositions();
@@ -1148,8 +1148,8 @@ void QQuickDataVisSurface::updateSelectedPoint()
                 QString y = static_cast<QValue3DAxis *>(m_surfaceController->axisY())->stringForValue(value.y());
                 QString z = static_cast<QValue3DAxis *>(m_surfaceController->axisZ())->stringForValue(value.z());
                 QString label = x + QStringLiteral(", ") +
-                            y + QStringLiteral(", ") +
-                            z;
+                        y + QStringLiteral(", ") +
+                        z;
                 itemLabel()->setPosition(labelPosition);
                 itemLabel()->setProperty("labelText", label);
                 itemLabel()->setEulerRotation(QVector3D(
@@ -1172,7 +1172,7 @@ void QQuickDataVisSurface::updateSelectedPoint()
         sliceItemLabel()->setVisible(labelVisible);
 }
 
-void QQuickDataVisSurface::addModel(QSurface3DSeries *series)
+void QQuickGraphsSurface::addModel(QSurface3DSeries *series)
 {
     auto scene = QQuick3DViewport::scene();
     QQuick3DViewport *sliceParent = sliceView();
@@ -1322,21 +1322,21 @@ void QQuickDataVisSurface::addModel(QSurface3DSeries *series)
     connect(series,
             &QSurface3DSeries::flatShadingEnabledChanged,
             this,
-            &QQuickDataVisSurface::handleFlatShadingEnabledChanged);
+            &QQuickGraphsSurface::handleFlatShadingEnabledChanged);
     connect(series,
             &QSurface3DSeries::wireframeColorChanged,
             this,
-            &QQuickDataVisSurface::handleWireframeColorChanged);
+            &QQuickGraphsSurface::handleWireframeColorChanged);
 }
 
-void QQuickDataVisSurface::updateSingleHighlightColor()
+void QQuickGraphsSurface::updateSingleHighlightColor()
 {
     m_instancing->setColor(m_surfaceController->activeTheme()->singleHighlightColor());
     if (sliceView())
         m_sliceInstancing->setColor(m_surfaceController->activeTheme()->singleHighlightColor());
 }
 
-void QQuickDataVisSurface::handleThemeTypeChange()
+void QQuickGraphsSurface::handleThemeTypeChange()
 {
     for (auto model : m_model)
         updateMaterial(model);
diff --git a/src/graphs/qml/qquickdatavissurface_p.h b/src/graphs/qml/qquickgraphssurface_p.h
index 9e80d9ed..d26d8505 100644
--- a/src/graphs/qml/qquickdatavissurface_p.h
+++ b/src/graphs/qml/qquickgraphssurface_p.h
@@ -11,10 +11,10 @@
 //
 // We mean it.
 
-#ifndef QQUICKDATAVISSURFACE_P_H
-#define QQUICKDATAVISSURFACE_P_H
+#ifndef QQUICKGRAPHSSURFACE_P_H
+#define QQUICKGRAPHSSURFACE_P_H
 
-#include "qquickdatavisitem_p.h"
+#include "qquickgraphsitem_p.h"
 #include "qsurface3dseries.h"
 
 #include <private/graphsglobal_p.h>
@@ -28,7 +28,7 @@ class Surface3DController;
 class SurfaceSelectionInstancing;
 class Q3DSurface;
 
-class QQuickDataVisSurface : public QQuickDataVisItem
+class QQuickGraphsSurface : public QQuickGraphsItem
 {
     Q_OBJECT
     Q_PROPERTY(QValue3DAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
@@ -43,8 +43,8 @@ class QQuickDataVisSurface : public QQuickDataVisItem
     QML_ADDED_IN_VERSION(6, 6)
 
 public:
-    explicit QQuickDataVisSurface(QQuickItem *parent = 0);
-    ~QQuickDataVisSurface();
+    explicit QQuickGraphsSurface(QQuickItem *parent = 0);
+    ~QQuickGraphsSurface();
 
     QValue3DAxis *axisX() const;
     void setAxisX(QValue3DAxis *axis);
@@ -139,4 +139,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQUICKDATAVISSURFACE_P_H
+#endif // QQUICKGRAPHSSURFACE_P_H
diff --git a/src/graphs/engine/datavisquick3dtexturedata.cpp b/src/graphs/qml/quickgraphstexturedata.cpp
index 96cafd14..08981a17 100644
--- a/src/graphs/engine/datavisquick3dtexturedata.cpp
+++ b/src/graphs/qml/quickgraphstexturedata.cpp
@@ -1,17 +1,17 @@
 // Copyright (C) 2023 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
-#include "datavisquick3dtexturedata_p.h"
+#include "quickgraphstexturedata_p.h"
 
-DatavisQuick3DTextureData::DatavisQuick3DTextureData()
+QuickGraphsTextureData::QuickGraphsTextureData()
 {
 }
 
-DatavisQuick3DTextureData::~DatavisQuick3DTextureData()
+QuickGraphsTextureData::~QuickGraphsTextureData()
 {
 }
 
-void DatavisQuick3DTextureData::createGradient(const QLinearGradient &gradient)
+void QuickGraphsTextureData::createGradient(const QLinearGradient &gradient)
 {
     setSize(QSize(m_width, m_height));
     setFormat(QQuick3DTextureData::RGBA8);
@@ -44,7 +44,7 @@ void DatavisQuick3DTextureData::createGradient(const QLinearGradient &gradient)
     setTextureData(imageData);
 }
 
-QColor DatavisQuick3DTextureData::linearInterpolate(QColor startColor, QColor endColor, float value)
+QColor QuickGraphsTextureData::linearInterpolate(QColor startColor, QColor endColor, float value)
 {
     QColor output;
 
diff --git a/src/graphs/engine/datavisquick3dtexturedata_p.h b/src/graphs/qml/quickgraphstexturedata_p.h
index c0adf9e1..aa50fec0 100644
--- a/src/graphs/engine/datavisquick3dtexturedata_p.h
+++ b/src/graphs/qml/quickgraphstexturedata_p.h
@@ -12,19 +12,19 @@
 //
 // We mean it.
 
-#ifndef DATAVISQUICK3DTEXTUREDATA_P_H
-#define DATAVISQUICK3DTEXTUREDATA_P_H
+#ifndef QUICKGRAPHSTEXTUREDATA_P_H
+#define QUICKGRAPHSTEXTUREDATA_P_H
 #include <QtQuick3D/qquick3dtexturedata.h>
 #include <QList>
 #include <QLinearGradient>
 
-class DatavisQuick3DTextureData : public QQuick3DTextureData
+class QuickGraphsTextureData : public QQuick3DTextureData
 {
     Q_OBJECT
 
 public:
-    DatavisQuick3DTextureData();
-    ~DatavisQuick3DTextureData();
+    QuickGraphsTextureData();
+    ~QuickGraphsTextureData();
 
     void createGradient(const QLinearGradient &gradient);
 
@@ -36,4 +36,4 @@ private:
 
 };
 
-#endif // DATAVISQUICK3DTEXTUREDATA_P_H
+#endif // QUICKGRAPHSTEXTUREDATA_P_H
diff --git a/src/graphs/qml/scatterseriesvisualizer.cpp b/src/graphs/qml/scatterseriesvisualizer.cpp
deleted file mode 100644
index 7e71c8a1..00000000
--- a/src/graphs/qml/scatterseriesvisualizer.cpp
+++ /dev/null
@@ -1,728 +0,0 @@
-// Copyright (C) 2023 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
-
-#include "scatter3dcontroller_p.h"
-#include "scatterseriesvisualizer_p.h"
-#include "qquickdatavisitem_p.h"
-#include "qquickdatavisscatter_p.h"
-#include "qvalue3daxis_p.h"
-#include "axishelper_p.h"
-#include "datavisquick3dtexturedata_p.h"
-#include "q3dtheme.h"
-#include <QtCore/QRandomGenerator>
-#include <QtQuick3D/private/qquick3dtexture_p.h>
-#include <QtQuick3D/private/qquick3dprincipledmaterial_p.h>
-#include <QtQuick3D/private/qquick3dcustommaterial_p.h>
-#include <QtQuick3D/private/qquick3dshaderutils_p.h>
-
-const float itemScaler = 3.0f;
-ScatterSeriesVisualizer::ScatterSeriesVisualizer(QObject *parent)
-    : QObject(parent)
-{
-
-}
-
-ScatterSeriesVisualizer::~ScatterSeriesVisualizer()
-{
-    removeDataItems();
-    m_itemList.clear();
-    removeDummyDataItems();
-    m_dummyItemList.clear();
-    m_itemCount = 0;
-
-    if (m_instancing)
-        delete m_instancing;
-}
-
-void ScatterSeriesVisualizer::handleSeriesMeshChanged(QAbstract3DSeries::Mesh mesh)
-{
-    m_meshType = mesh;
-    if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationDefault) {
-        removeDataItems();
-        generatePoints(m_itemCount);
-    } else if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationStatic) {
-        removeDummyDataItems();
-        resetSelection();
-        m_instancingRootItem->setSource(QUrl(getMeshFileName()));
-        m_selectionIndicator->setSource(QUrl(getMeshFileName()));
-        m_controller->markDataDirty();
-        m_controller->markSeriesVisualsDirty();
-        generatePoints(m_itemCount);
-    }
-}
-
-void ScatterSeriesVisualizer::handleOptimizationHintsChanged(QAbstract3DGraph::OptimizationHints hints)
-{
-    Q_UNUSED(hints);
-    setup();
-}
-
-void ScatterSeriesVisualizer::handleMeshSmoothChanged(bool enable)
-{
-    m_smooth = enable;
-
-    if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationDefault) {
-        removeDataItems();
-        generatePoints(m_itemCount);
-    } else if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationStatic) {
-        removeDummyDataItems();
-        resetSelection();
-        m_instancingRootItem->setSource(QUrl(getMeshFileName()));
-        m_selectionIndicator->setSource(QUrl(getMeshFileName()));
-        m_controller->markDataDirty();
-        m_controller->markSeriesVisualsDirty();
-        generatePoints(m_itemCount);
-    }
-}
-
-void ScatterSeriesVisualizer::handleItemCountChanged(int count)
-{
-    m_itemCount = count;
-    removeDataItems();
-    generatePoints(count);
-}
-
-void ScatterSeriesVisualizer::setScaleZ(float newScaleZ)
-{
-    m_scaleZ = newScaleZ;
-}
-
-void ScatterSeriesVisualizer::setScaleY(float newScaleY)
-{
-    m_scaleY = newScaleY;
-}
-
-void ScatterSeriesVisualizer::setScaleX(float newScaleX)
-{
-    m_scaleX = newScaleX;
-}
-
-void ScatterSeriesVisualizer::setDotSizedScale(float newDotSizedScale)
-{
-    m_dotSizedScale = newDotSizedScale;
-}
-
-void ScatterSeriesVisualizer::setQml(QQuickDataVisScatter *newQml)
-{
-    m_qml = newQml;
-}
-
-void ScatterSeriesVisualizer::setController(Scatter3DController *newController)
-{
-    m_controller = newController;
-}
-
-void ScatterSeriesVisualizer::createParent()
-{
-    m_visualizerRoot.reset(new QObject());
-}
-
-bool ScatterSeriesVisualizer::pointsGenerated() const
-{
-    if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationDefault)
-        return m_itemCount == m_itemList.size();
-    else
-        return m_instancingRootItem ? true : false;
-}
-
-void ScatterSeriesVisualizer::setup()
-{
-    if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationHint::OptimizationDefault) {
-        removeDummyDataItems();
-        if (m_instancing)
-            delete m_instancing;
-        if (m_instancingRootItem)
-            delete m_instancingRootItem;
-    } else if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationHint::OptimizationStatic) {
-        removeDataItems();
-        m_instancing = new ScatterInstancing();
-        createInstancingRootItem();
-        createSelectionIndicator();
-    }
-}
-
-void ScatterSeriesVisualizer::connectSeries(QScatter3DSeries *series)
-{
-    m_meshType = series->mesh();
-    m_smooth = series->isMeshSmooth();
-
-    m_seriesRootItem = createSeriesRoot();
-    m_seriesRootItem->setParent(series);
-    QObject::connect(series, &QScatter3DSeries::meshChanged, this, &ScatterSeriesVisualizer::handleSeriesMeshChanged);
-    QObject::connect(series, &QScatter3DSeries::meshSmoothChanged, this, &ScatterSeriesVisualizer::handleMeshSmoothChanged);
-    QObject::connect(m_controller, &Abstract3DController::optimizationHintsChanged, this, &ScatterSeriesVisualizer::handleOptimizationHintsChanged);
-    QObject::connect(series->dataProxy(), &QScatterDataProxy::itemCountChanged, this, &ScatterSeriesVisualizer::handleItemCountChanged);
-}
-
-void ScatterSeriesVisualizer::disconnectSeries(QScatter3DSeries *series)
-{
-    QObject::disconnect(series, 0, this, 0);
-}
-
-void ScatterSeriesVisualizer::generatePoints(int count)
-{
-    if (!m_visualizerRoot)
-        createParent();
-    if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationDefault) {
-        if (count > 0)
-            m_itemList.resize(count);
-
-        for (int i = 0; i < count; i++) {
-            auto item = createDataItem();
-            item->setPickable(true);
-            item->setParentItem(m_seriesRootItem);
-            m_itemList[i] = item;
-        }
-        m_controller->markDataDirty();
-    } else if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationStatic) {
-        if (m_controller->selectionMode() != QAbstract3DGraph::SelectionNone)
-            m_instancingRootItem->setPickable(true);
-    }
-    m_controller->markSeriesVisualsDirty();
-}
-
-qsizetype ScatterSeriesVisualizer::getItemIndex(QQuick3DModel *item)
-{
-    if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationDefault)
-        return m_itemList.indexOf(item);
-
-    return -1;
-}
-
-void ScatterSeriesVisualizer::setSelected(qsizetype index)
-{
-    m_selectedIndex = index;
-}
-
-void ScatterSeriesVisualizer::clearSelection()
-{
-    resetSelection();
-    m_selectedIndex = -1;
-}
-
-void ScatterSeriesVisualizer::resetSelection()
-{
-    if (m_selectedIndex != -1) {
-        if (m_controller->optimizationHints()==QAbstract3DGraph::OptimizationStatic) {
-            m_selectionActive = false;
-            m_selectionIndicator->setVisible(false);
-        }
-    }
-}
-
-void ScatterSeriesVisualizer::updateItemPositions(QScatterDataProxy *dataProxy)
-{
-
-    float itemSize = dataProxy->series()->itemSize() / itemScaler;
-    m_meshRotation = dataProxy->series()->meshRotation();
-
-    if (itemSize == 0.0f)
-        itemSize = m_dotSizedScale;
-
-    if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationDefault) {
-        if (dataProxy->itemCount() != m_itemList.size())
-            qWarning()<<__func__<<"Item count differs from itemList count";
-        for (int i = 0; i < dataProxy->itemCount(); ++i) {
-            auto item = dataProxy->itemAt(i);
-            auto dataPoint = m_itemList.at(i);
-
-            auto dotPos = item->position();
-            auto dotRot = item->rotation();
-            auto posX = m_qml->axisX()->positionAt(dotPos.x()) * m_qml->scale().x() + m_qml->translate().x();
-            auto posY = m_qml->axisY()->positionAt(dotPos.y()) * m_qml->scale().y() + m_qml->translate().y();
-            auto posZ = m_qml->axisZ()->positionAt(dotPos.z()) * m_qml->scale().z() + m_qml->translate().z();
-
-            dataPoint->setPosition(QVector3D(posX, posY, posZ));
-
-            dataPoint->setRotation(dotRot * m_meshRotation);
-            dataPoint->setScale(QVector3D(itemSize, itemSize, itemSize));
-        }
-    } else if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationStatic)  {
-        int count = dataProxy->itemCount();
-        QList<DataItemHolder> positions;
-        positions.resize(count);
-
-        for (int i = 0; i < count; i++) {
-            auto item = dataProxy->itemAt(i);
-            auto dotPos = item->position();
-
-            auto posX = m_qml->axisX()->positionAt(dotPos.x()) * m_qml->scale().x() + m_qml->translate().x();
-            auto posY = m_qml->axisY()->positionAt(dotPos.y()) * m_qml->scale().y() + m_qml->translate().y();
-            auto posZ = m_qml->axisZ()->positionAt(dotPos.z()) * m_qml->scale().z() + m_qml->translate().z();
-
-            DataItemHolder dih;
-            dih.position = {posX,posY,posZ};
-            dih.rotation = item->rotation() * m_meshRotation;
-            dih.scale = {itemSize, itemSize, itemSize};
-
-            if (m_dummyItemList.size() > 0) {
-                // Update dummy item positions as well
-                auto dummyItem = m_dummyItemList.at(i);
-                dummyItem->setPosition({posX,posY,posZ});
-                dummyItem->setRotation(dih.rotation);
-                dummyItem->setScale(dih.scale * 1.05f);
-            }
-            positions[i] = dih;
-        }
-        m_instancing->setDataArray(positions);
-    }
-}
-
-void ScatterSeriesVisualizer::updateItemVisuals(QScatter3DSeries *series)
-{
-    bool useGradient = series->d_ptr->isUsingGradient();
-    auto itemCount = series->dataProxy()->itemCount();
-
-    if (useGradient) {
-        if (!m_hasTexture) {
-            m_texture = createTexture();
-            m_texture->setParent(this);
-            m_hasTexture = true;
-        }
-        auto gradient = series->baseGradient();
-        auto textureData = static_cast<DatavisQuick3DTextureData *>(m_texture->textureData());
-        textureData->createGradient(gradient);
-
-        if (!m_hasHighLightTexture) {
-            m_highlightTexture = createTexture();
-            m_highlightTexture->setParent(this);
-            m_hasHighLightTexture = true;
-        }
-        auto highlightGradient = series->singleHighlightGradient();
-        auto highlightTextureData = static_cast<DatavisQuick3DTextureData *>(m_highlightTexture->textureData());
-        highlightTextureData->createGradient(highlightGradient);
-    } else {
-        if (m_hasTexture) {
-            m_texture->deleteLater();
-            m_hasTexture = false;
-        }
-        if (m_hasHighLightTexture) {
-            m_highlightTexture->deleteLater();
-            m_hasHighLightTexture = false;
-        }
-    }
-
-    bool rangeGradient = (useGradient && series->d_ptr->m_colorStyle == Q3DTheme::ColorStyleRangeGradient) ? true : false;
-
-    if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationDefault) {
-        if (itemCount != m_itemList.size())
-            qWarning()<<__func__<<"Item count differs from itemList count";
-
-        if (!rangeGradient) {
-            for (int i = 0; i < itemCount; i++) {
-                auto obj = static_cast<QQuick3DModel *>(m_itemList.at(i));
-
-                updateItemMaterial(obj, useGradient, rangeGradient);
-
-                updatePrincipledMaterial(obj, series->baseColor(), useGradient);
-            }
-            if (m_selectedIndex != -1) {
-                auto selectedItem = m_itemList.at(m_selectedIndex);
-                updatePrincipledMaterial(selectedItem, series->singleHighlightColor(), useGradient, true);
-            }
-        } else {
-            for (int i = 0; i < itemCount; i++) {
-                auto obj = static_cast<QQuick3DModel *>(m_itemList.at(i));
-                updateItemMaterial(obj, useGradient, rangeGradient);
-                updateCustomMaterial(obj);
-            }
-
-            if (m_selectedIndex != -1) {
-                auto obj = m_itemList.at(m_selectedIndex);
-                auto itemLabel = series->itemLabel();
-
-                updateCustomMaterial(obj, true);
-            }
-        }
-    } else if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationStatic) {
-        updateItemInstancedMaterial(m_instancingRootItem, useGradient, rangeGradient);
-        m_instancing->setRangeGradient(rangeGradient);
-        if (!rangeGradient) {
-            updatePrincipledMaterial(m_instancingRootItem, series->baseColor(), useGradient, rangeGradient);
-        } else {
-            float rangeGradientYScaler = 0.5f / m_scaleY;
-
-            updateInstancedCustomMaterial(m_instancingRootItem);
-
-            QList<float> customData;
-            customData.resize(itemCount);
-
-            QList<DataItemHolder> instancingData = m_instancing->dataArray();
-            for (int i = 0; i < instancingData.size(); i++) {
-                auto dih = instancingData.at(i);
-                float value = (dih.position.y() + m_scaleY) * rangeGradientYScaler;
-                customData[i] = value;
-            }
-            m_instancing->setCustomData(customData);
-        }
-
-        updateSelectionIndicatorMaterial(useGradient, rangeGradient);
-
-        if (!rangeGradient) {
-            updatePrincipledMaterial(m_selectionIndicator, series->singleHighlightColor(), useGradient, true);
-        } else {
-            // Rangegradient
-            updateInstancedCustomMaterial(m_selectionIndicator, true);
-        }
-
-        if (m_selectedIndex != -1 && !m_selectionActive) {
-            auto dih = m_instancing->dataArray().at(m_selectedIndex);
-            m_selectionIndicator->setPosition(dih.position);
-            m_selectionIndicator->setRotation(dih.rotation);
-            m_selectionIndicator->setScale(dih.scale*1.1f);
-            m_selectionIndicator->setVisible(true);
-//            m_qml->m_itemLabel->setPosition(m_selectionIndicator->position());
-            m_selectionActive = true;
-            m_instancing->markDataDirty();
-        }
-    }
-}
-
-void ScatterSeriesVisualizer::updateItemMaterial(QQuick3DModel *item, bool useGradient, bool rangeGradient)
-{
-    Q_UNUSED(useGradient);
-    QQmlListReference materialsRef(item, "materials");
-    if (!rangeGradient) {
-        if (materialsRef.size()) {
-            if (!qobject_cast<QQuick3DPrincipledMaterial *>(materialsRef.at(0))) {
-                auto principledMaterial = new QQuick3DPrincipledMaterial();
-                auto oldCustomMaterial = materialsRef.at(0);
-                materialsRef.replace(0, principledMaterial);
-                delete oldCustomMaterial;
-            }
-        } else {
-            auto principledMaterial = new QQuick3DPrincipledMaterial();
-            materialsRef.append(principledMaterial);
-        }
-    } else {
-        if (materialsRef.size()) {
-            if (!qobject_cast<QQuick3DCustomMaterial *>(materialsRef.at(0))) {
-                auto customMaterial = m_qml->createQmlCustomMaterial(QStringLiteral(":/materials/RangeGradientMaterial"));
-                auto oldPrincipledMaterial = materialsRef.at(0);
-                materialsRef.replace(0, customMaterial);
-                delete oldPrincipledMaterial;
-            }
-        } else {
-            auto customMaterial = m_qml->createQmlCustomMaterial(QStringLiteral(":/materials/RangeGradientMaterial"));
-            materialsRef.append(customMaterial);
-        }
-    }
-}
-
-void ScatterSeriesVisualizer::updateItemInstancedMaterial(QQuick3DModel *item, bool useGradient, bool rangeGradient)
-{
-    Q_UNUSED(useGradient);
-    QQmlListReference materialsRef(item, "materials");
-    if (!rangeGradient) {
-        if (materialsRef.size()) {
-            if (!qobject_cast<QQuick3DPrincipledMaterial *>(materialsRef.at(0))) {
-                auto principledMaterial = new QQuick3DPrincipledMaterial();
-                auto oldCustomMaterial = materialsRef.at(0);
-                materialsRef.replace(0, principledMaterial);
-                delete oldCustomMaterial;
-            }
-        } else {
-            auto principledMaterial = new QQuick3DPrincipledMaterial();
-            materialsRef.append(principledMaterial);
-        }
-    } else {
-        if (materialsRef.size()) {
-            if (!qobject_cast<QQuick3DCustomMaterial *>(materialsRef.at(0))) {
-                auto customMaterial = m_qml->createQmlCustomMaterial(QStringLiteral(":/materials/RangeGradientMaterialInstancing"));
-                auto oldPrincipledMaterial = materialsRef.at(0);
-                materialsRef.replace(0, customMaterial);
-                delete oldPrincipledMaterial;
-            }
-        } else {
-            auto customMaterial = m_qml->createQmlCustomMaterial(QStringLiteral(":/materials/RangeGradientMaterialInstancing"));
-            materialsRef.append(customMaterial);
-        }
-    }
-}
-
-void ScatterSeriesVisualizer::updateSelectionIndicatorMaterial(bool useGradient, bool rangeGradient)
-{
-    Q_UNUSED(useGradient);
-    QQmlListReference materialsRef(m_selectionIndicator, "materials");
-    if (!rangeGradient) {
-        if (materialsRef.size()) {
-            if (!qobject_cast<QQuick3DPrincipledMaterial *>(materialsRef.at(0))) {
-                auto principledMaterial = new QQuick3DPrincipledMaterial();
-                auto old = qobject_cast<QQuick3DCustomMaterial *>(materialsRef.at(0));
-                materialsRef.replace(0, principledMaterial);
-                delete old;
-            }
-        } else {
-            auto material = new QQuick3DPrincipledMaterial();
-            materialsRef.append(material);
-        }
-    } else {
-        // Rangegradient
-        if (materialsRef.size()) {
-            if (!qobject_cast<QQuick3DCustomMaterial *>(materialsRef.at(0))) {
-                auto old = materialsRef.at(0);
-                auto customMaterial = m_qml->createQmlCustomMaterial(QStringLiteral(":/materials/RangeGradientMaterial"));
-                materialsRef.replace(0, customMaterial);
-                delete old;
-            }
-        } else {
-            auto customMaterial = m_qml->createQmlCustomMaterial(QStringLiteral(":/materials/RangeGradientMaterial"));
-            materialsRef.append(customMaterial);
-        }
-    }
-}
-
-void ScatterSeriesVisualizer::updateInstancedCustomMaterial(QQuick3DModel *model, bool isHighlight)
-{
-    QQmlListReference materialsRef(model, "materials");
-
-    // Rangegradient
-    auto customMaterial = static_cast<QQuick3DCustomMaterial *>(materialsRef.at(0));
-
-    QVariant textureInputAsVariant = customMaterial->property("custex");
-    QQuick3DShaderUtilsTextureInput *textureInput = textureInputAsVariant.value<QQuick3DShaderUtilsTextureInput *>();
-
-    if (isHighlight) {
-        textureInput->setTexture(m_highlightTexture);
-
-        if (m_selectedIndex != -1 && !m_selectionActive)
-            m_selectedGradientPos = m_instancing->customData().takeAt(m_selectedIndex);
-
-        customMaterial->setProperty("gradientPos", m_selectedGradientPos);
-    } else {
-        textureInput->setTexture(m_texture);
-    }
-}
-
-void ScatterSeriesVisualizer::updateCustomMaterial(QQuick3DModel *item, bool isHighlight)
-{
-    QQmlListReference materialsRef(item, "materials");
-    auto customMaterial = static_cast<QQuick3DCustomMaterial *>(materialsRef.at(0));
-    QVariant textureInputAsVariant = customMaterial->property("custex");
-    QQuick3DShaderUtilsTextureInput *textureInput = textureInputAsVariant.value<QQuick3DShaderUtilsTextureInput *>();
-
-    if (!isHighlight)
-        textureInput->setTexture(m_texture);
-    else
-        textureInput->setTexture(m_highlightTexture);
-
-    float rangeGradientYScaler = 0.5f / m_scaleY;
-    float value = (item->y() + m_scaleY) * rangeGradientYScaler;
-    customMaterial->setProperty("gradientPos", value);
-}
-
-void ScatterSeriesVisualizer::updatePrincipledMaterial(QQuick3DModel *model, const QColor &color, bool useGradient, bool isHighlight)
-{
-    QQmlListReference materialsRef(model, "materials");
-    auto principledMaterial = static_cast<QQuick3DPrincipledMaterial *>(materialsRef.at(0));
-
-    if (useGradient) {
-        principledMaterial->setBaseColor(QColor(Qt::white));
-        if (!isHighlight)
-            principledMaterial->setBaseColorMap(m_texture);
-        else
-            principledMaterial->setBaseColorMap(m_highlightTexture);
-    } else {
-        principledMaterial->setBaseColor(color);
-    }
-}
-
-void ScatterSeriesVisualizer::createDummyDataItems(int count)
-{
-    if (!dummiesCreated && count > 0) {
-        if (!m_instancingRootItem)
-            qWarning("No instancing root item");
-        m_dummyItemList.resize(count);
-
-        for (int i = 0; i < count; i++) {
-            auto dummyItem = new QQuick3DModel();
-            dummyItem->setParent(m_seriesRootItem);
-            dummyItem->setParentItem(m_seriesRootItem);
-            dummyItem->setSource(m_instancingRootItem->source());
-            dummyItem->setScale(m_instancingRootItem->scale() * 1.05f);
-            dummyItem->setPickable(true);
-            dummyItem->setVisible(false);
-
-            m_dummyItemList[i] = dummyItem;
-        }
-        dummiesCreated = true;
-    }
-}
-
-QQuick3DTexture *ScatterSeriesVisualizer::createTexture()
-{
-    QQuick3DTexture *texture = new QQuick3DTexture();
-    texture->setParent(this);
-    texture->setRotationUV(-90.0f);
-    texture->setHorizontalTiling(QQuick3DTexture::ClampToEdge);
-    texture->setVerticalTiling(QQuick3DTexture::ClampToEdge);
-    DatavisQuick3DTextureData *textureData = new DatavisQuick3DTextureData();
-    textureData->setParent(texture);
-    textureData->setParentItem(texture);
-    texture->setTextureData(textureData);
-
-    return texture;
-}
-
-QQuick3DModel *ScatterSeriesVisualizer::createDataItemModel(QAbstract3DSeries::Mesh meshType)
-{
-    QQmlComponent component(qmlEngine(m_qml));
-    switch (meshType) {
-    case QAbstract3DSeries::MeshSphere:
-        component.loadUrl(QUrl::fromLocalFile((QStringLiteral(":/datapointModels/DatapointSphere"))));
-        break;
-    case QAbstract3DSeries::MeshCube:
-        component.loadUrl(QUrl::fromLocalFile((QStringLiteral(":/datapointModels/DatapointCube"))));
-        break;
-    default:
-        component.loadUrl(QUrl::fromLocalFile((QStringLiteral(":/datapointModels/DatapointSphere"))));
-    }
-    auto item = static_cast<QQuick3DModel *>(component.create());
-    item->setParent(m_seriesRootItem);
-    item->setParentItem(m_seriesRootItem);
-    return item;
-}
-
-QQmlComponent *ScatterSeriesVisualizer::createRepeaterDelegate(QAbstract3DSeries::Mesh meshType)
-{
-    QQmlComponent component(qmlEngine(m_qml));
-    switch (meshType) {
-    case QAbstract3DSeries::MeshSphere:
-        component.loadUrl(QUrl::fromLocalFile((QStringLiteral(":/datapointModels/DatapointSphere"))));
-        break;
-    case QAbstract3DSeries::MeshCube:
-        component.loadUrl(QUrl::fromLocalFile((QStringLiteral(":/datapointModels/DatapointCube"))));
-        break;
-    default:
-        component.loadUrl(QUrl::fromLocalFile((QStringLiteral(":/datapointModels/DatapointSphere"))));
-    }
-
-    return static_cast<QQmlComponent *>(component.create());
-}
-
-QQuick3DNode *ScatterSeriesVisualizer::createSeriesRoot()
-{
-    auto model = new QQuick3DNode();
-
-    model->setParentItem(m_qml->rootNode());
-    return model;
-}
-
-QQuick3DModel *ScatterSeriesVisualizer::createDataItem()
-{
-    auto model = new QQuick3DModel();
-    model->setParent(m_visualizerRoot.get());
-    model->setParentItem(m_seriesRootItem);
-    QString fileName = getMeshFileName();
-
-    model->setSource(QUrl(fileName));
-    return model;
-}
-
-void ScatterSeriesVisualizer::createInstancingRootItem()
-{
-    m_instancingRootItem = createDataItem();
-    m_instancingRootItem->setInstancing(m_instancing);
-}
-
-void ScatterSeriesVisualizer::createSelectionIndicator()
-{
-    m_selectionIndicator = createDataItem();
-
-    m_selectionIndicator->setVisible(false);
-}
-
-void ScatterSeriesVisualizer::removeDataItems()
-{
-    for (const auto &item : std::as_const(m_itemList)) {
-        QQmlListReference materialsRef(item, "materials");
-        if (materialsRef.size()) {
-            auto material = materialsRef.at(0);
-            delete material;
-        }
-        delete item;
-    }
-}
-
-void ScatterSeriesVisualizer::removeDummyDataItems()
-{
-    for (const auto &item : std::as_const(m_dummyItemList))
-        delete item;
-    dummiesCreated = false;
-}
-
-void ScatterSeriesVisualizer::createItemLabel()
-{
-    QQmlComponent component(qmlEngine(m_qml), QStringLiteral(":/axis/ItemLabel"));
-    QQuick3DNode *labelNode = qobject_cast<QQuick3DNode *>(component.create());
-    labelNode->setParent(m_qml->rootNode());
-    labelNode->setParentItem(m_qml->rootNode());
-    m_itemLabel = labelNode;
-}
-
-QVector3D ScatterSeriesVisualizer::selectedItemPosition()
-{
-    if (m_selectedIndex == -1)
-        return QVector3D();
-
-    QVector3D position;
-    if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationDefault)
-        position = m_itemList.at(m_selectedIndex)->position();
-    else if (m_controller->optimizationHints() == QAbstract3DGraph::OptimizationStatic)
-        position = m_selectionIndicator->position();
-
-    return position;
-}
-
-void ScatterSeriesVisualizer::fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh meshType)
-{
-    if (meshType != QAbstract3DSeries::MeshSphere && meshType != QAbstract3DSeries::MeshArrow
-            && meshType != QAbstract3DSeries::MeshMinimal && meshType != QAbstract3DSeries::MeshPoint) {
-        fileName.append(QStringLiteral("Full"));
-    }
-}
-
-QString ScatterSeriesVisualizer::getMeshFileName()
-{
-    QString fileName;
-    QString smoothString = QStringLiteral("Smooth");
-    switch (m_meshType) {
-        case QAbstract3DSeries::MeshSphere:
-        fileName = QStringLiteral("defaultMeshes/sphereMesh");
-        break;
-    case QAbstract3DSeries::MeshBar:
-    case QAbstract3DSeries::MeshCube:
-        fileName = QStringLiteral("defaultMeshes/barMesh");
-        break;
-    case QAbstract3DSeries::MeshPyramid:
-        fileName = QStringLiteral("defaultMeshes/pyramidMesh");
-        break;
-    case QAbstract3DSeries::MeshCone:
-        fileName = QStringLiteral("defaultMeshes/coneMesh");
-        break;
-    case QAbstract3DSeries::MeshCylinder:
-        fileName = QStringLiteral("defaultMeshes/cylinderMesh");
-        break;
-    case QAbstract3DSeries::MeshBevelBar:
-    case QAbstract3DSeries::MeshBevelCube:
-        fileName = QStringLiteral("defaultMeshes/bevelBarMesh");
-        break;
-    case QAbstract3DSeries::MeshMinimal:
-        fileName = QStringLiteral("defaultMeshes/minimalMesh");
-        break;
-    case QAbstract3DSeries::MeshArrow:
-        fileName = QStringLiteral("defaultMeshes/arrowMesh");
-        break;
-    case QAbstract3DSeries::MeshPoint:
-        qWarning("Points not supported yet");
-        break;
-    default:
-        fileName = QStringLiteral("defaultMeshes/sphereMesh");
-    }
-    if (m_smooth && m_meshType != QAbstract3DSeries::MeshPoint)
-        fileName += smoothString;
-
-    fixMeshFileName(fileName, m_meshType);
-
-    return fileName;
-}
diff --git a/src/graphs/qml/scatterseriesvisualizer_p.h b/src/graphs/qml/scatterseriesvisualizer_p.h
deleted file mode 100644
index e31a917c..00000000
--- a/src/graphs/qml/scatterseriesvisualizer_p.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (C) 2023 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the QtGraphs 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 SCATTERSERIESVISUALIZER_H
-#define SCATTERSERIESVISUALIZER_H
-#include "qscatter3dseries_p.h"
-#include "qabstract3dgraph.h"
-#include "scatterinstancing_p.h"
-
-#include <QtQuick3D/private/qquick3dmodel_p.h>
-#include <QtQuick3D/private/qquick3drepeater_p.h>
-#include <QtQuick3D/private/qquick3dinstancing_p.h>
-
-QT_BEGIN_NAMESPACE
-class AbstractDeclarative;
-class Scatter3DController;
-class AxisHelper;
-class QQuick3DTexture;
-class Q3DTheme;
-class QQuickDataVisScatter;
-
-class ScatterSeriesVisualizer : public QObject
-{
-    Q_OBJECT
-public:
-    explicit ScatterSeriesVisualizer(QObject *parent = nullptr);
-    ~ScatterSeriesVisualizer();
-
-    void setup();
-    void connectSeries(QScatter3DSeries *series);
-    void disconnectSeries(QScatter3DSeries *series);
-    void generatePoints(int count);
-    qsizetype getItemIndex(QQuick3DModel *item);
-    void setSelected(qsizetype index);
-    void clearSelection();
-    void updateItemPositions(QScatterDataProxy *dataProxy);
-    void updateItemVisuals(QScatter3DSeries *series);
-    void createItemLabel();
-    QVector3D selectedItemPosition();
-
-    bool pointsGenerated() const;
-
-    void setController(Scatter3DController *newController);
-    void setQml(QQuickDataVisScatter *newQml);
-    void setDotSizedScale(float newDotSizedScale);
-    void setScaleX(float newScaleX);
-    void setScaleY(float newScaleY);
-    void setScaleZ(float newScaleZ);
-
-public Q_SLOTS:
-    void handleSeriesMeshChanged(QAbstract3DSeries::Mesh mesh);
-    void handleOptimizationHintsChanged(QAbstract3DGraph::OptimizationHints hints);
-    void handleMeshSmoothChanged(bool enable);
-    void handleItemCountChanged(int count);
-
-private:
-    QAbstract3DGraph::OptimizationHint optimizationHint = QAbstract3DGraph::OptimizationHint::OptimizationDefault;
-    Scatter3DController *m_controller = nullptr;
-    QAbstract3DSeries::Mesh m_meshType = QAbstract3DSeries::MeshSphere;
-    bool m_smooth = false;
-    ScatterInstancing *m_instancing = nullptr;
-    QQuick3DModel *m_instancingRootItem = nullptr;
-    QQuick3DRepeater *m_repeater = nullptr;
-    QQuick3DNode *m_seriesRootItem = nullptr;
-    QQuick3DMaterial *m_seriesMaterial = nullptr;
-    QQuick3DTexture *m_texture = nullptr;
-    QQuick3DTexture *m_highlightTexture = nullptr;
-    bool m_hasTexture = false;
-    bool m_hasHighLightTexture = false;
-
-    QQuick3DNode *m_itemLabel = nullptr;
-
-    float m_scaleX = 1.0f;
-    float m_scaleY = 1.0f;
-    float m_scaleZ = 1.0f;
-    float m_dotSizedScale = 1.0f;
-    QQuaternion m_meshRotation;
-    QList<QQuick3DModel *> m_itemList;
-    QList<QQuick3DModel *> m_dummyItemList;
-    qsizetype m_selectedIndex = -1;
-    QQuick3DModel *m_selectionIndicator = nullptr;
-    bool m_selectionActive = false;
-    float m_selectedGradientPos = 0.0f;
-    QQuickDataVisScatter *m_qml;
-    bool dummiesCreated = false;
-    QScatter3DSeries *m_series;
-    int m_itemCount = 0;
-
-    QScopedPointer<QObject> m_visualizerRoot;
-
-    void createParent();
-    void resetSelection();
-    void updateItemMaterial(QQuick3DModel *item, bool useGradient, bool rangeGradient);
-    void updateItemInstancedMaterial(QQuick3DModel *item, bool useGradient, bool rangeGradient);
-    void updateInstancedCustomMaterial(QQuick3DModel *model, bool isHighlight = false);
-    void updateSelectionIndicatorMaterial(bool useGradient, bool rangeGradient);
-    void updateCustomMaterial(QQuick3DModel *item, bool isHighlight = false);
-    void updatePrincipledMaterial(QQuick3DModel *model, const QColor &color, bool useGradient, bool isHighlight = false);
-    void createDummyDataItems(int count);
-    QQuick3DTexture *createTexture();
-    QQuick3DModel *createDataItemModel(QAbstract3DSeries::Mesh meshType);
-    QQmlComponent *createRepeaterDelegate(QAbstract3DSeries::Mesh meshType);
-    QQuick3DNode *createSeriesRoot();
-    QQuick3DModel *createDataItem();
-    void createInstancingRootItem();
-    void createSelectionIndicator();
-    void removeDataItems();
-    void removeDummyDataItems();
-    void fixMeshFileName(QString &fileName, QAbstract3DSeries::Mesh meshType);
-    QString getMeshFileName();
-};
-
-QT_END_NAMESPACE
-
-#endif // SCATTERSERIESVISUALIZER_H
diff --git a/src/graphs/theme/q3dtheme.h b/src/graphs/theme/q3dtheme.h
index 9467d0eb..6b2a2c7e 100644
--- a/src/graphs/theme/q3dtheme.h
+++ b/src/graphs/theme/q3dtheme.h
@@ -168,7 +168,7 @@ private:
     friend class Bars3DController;
     friend class AbstractDeclarative;
     friend class Abstract3DController;
-    friend class QQuickDataVisItem;
+    friend class QQuickGraphsItem;
 };
 
 QT_END_NAMESPACE