65 files changed, 200 insertions, 200 deletions
diff --git a/src/quick3d/imports/render/defaults/defaults.pri b/src/quick3d/imports/render/defaults/defaults.pri
index cd658cf2a..5487dac49 100644
--- a/src/quick3d/imports/render/defaults/defaults.pri
+++ b/src/quick3d/imports/render/defaults/defaults.pri
@@ -3,7 +3,7 @@
 # resource file.
 #
 # To have the plugin register them as types, add an entries to the
-# qmldir array in qt3dquick3drendererplugin.cpp
+# qmldir array in qt3dquick3drenderplugin.cpp
 QML_FILES = \
     $$PWD/qml/PhongMaterial.qml \
     $$PWD/qml/DiffuseMapMaterial.qml \
diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
index d6d543ba2..ef5cf5aba 100644
--- a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D.Core 2.0
-import Qt3D.Renderer 2.0
+import Qt3D.Render 2.0
 
 Material {
     id: root
diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
index 9be6951d6..c93618f3c 100644
--- a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D.Core 2.0
-import Qt3D.Renderer 2.0
+import Qt3D.Render 2.0
 
 Material {
     id: root
diff --git a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml
index 6c2b4f923..cdad6bb2d 100644
--- a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml
+++ b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D.Core 2.0
-import Qt3D.Renderer 2.0
+import Qt3D.Render 2.0
 
 TechniqueFilter {
     // Expose camera to allow user to choose which camera to use for rendering
diff --git a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml
index 7128701e7..a12754506 100644
--- a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D.Core 2.0
-import Qt3D.Renderer 2.0
+import Qt3D.Render 2.0
 
 Material {
     id:root
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
index 9981f4b30..2d028bce6 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D.Core 2.0
-import Qt3D.Renderer 2.0
+import Qt3D.Render 2.0
 
 Material {
     id: root
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
index f30f46452..719ac90e7 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D.Core 2.0
-import Qt3D.Renderer 2.0
+import Qt3D.Render 2.0
 
 Material {
     id: root
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
index bc60ade6a..42302f32f 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D.Core 2.0
-import Qt3D.Renderer 2.0
+import Qt3D.Render 2.0
 
 Material {
     id: root
diff --git a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml
index d891b5671..6b8cd57cc 100644
--- a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D.Core 2.0
-import Qt3D.Renderer 2.0
+import Qt3D.Render 2.0
 
 Material {
     id:root
diff --git a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml
index d930561e7..13e4b6f33 100644
--- a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D.Core 2.0
-import Qt3D.Renderer 2.0
+import Qt3D.Render 2.0
 
 Material {
     id:root
diff --git a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml
index a7d5c85fe..99fa247bb 100644
--- a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D.Core 2.0
-import Qt3D.Renderer 2.0
+import Qt3D.Render 2.0
 
 Material {
     id:root
diff --git a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
index 1c6571b09..9763a321a 100644
--- a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
+++ b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D.Core 2.0
-import Qt3D.Renderer 2.0
+import Qt3D.Render 2.0
 
 Entity {
 
diff --git a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
index ce04f60ee..0b7661aff 100644
--- a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 import Qt3D.Core 2.0
-import Qt3D.Renderer 2.0
+import Qt3D.Render 2.0
 
 Material {
     id: root
diff --git a/src/quick3d/imports/render/importsrender.pro b/src/quick3d/imports/render/importsrender.pro
index 00f0538d0..4326356d4 100644
--- a/src/quick3d/imports/render/importsrender.pro
+++ b/src/quick3d/imports/render/importsrender.pro
@@ -1,14 +1,14 @@
 CXX_MODULE = qml
-TARGET = quick3drendererplugin
-TARGETPATH = Qt3D/Renderer
+TARGET = quick3drenderplugin
+TARGETPATH = Qt3D/Render
 
-QT += core-private qml qml-private 3dcore 3drenderer 3dquick 3dquickrenderer-private
+QT += core-private qml qml-private 3dcore 3drender 3dquick 3dquickrender-private
 
 HEADERS += \
-    qt3dquick3drendererplugin.h
+    qt3dquick3drenderplugin.h
 
 SOURCES += \
-    qt3dquick3drendererplugin.cpp
+    qt3dquick3drenderplugin.cpp
 
 OTHER_FILES += qmldir
 
diff --git a/src/quick3d/imports/render/qmldir b/src/quick3d/imports/render/qmldir
index 27e4826df..6654a6a50 100644
--- a/src/quick3d/imports/render/qmldir
+++ b/src/quick3d/imports/render/qmldir
@@ -1,3 +1,3 @@
-module Qt3D.Renderer
-plugin quick3drendererplugin
-classname Qt3DQuick3DRendererPlugin
+module Qt3D.Render
+plugin quick3drenderplugin
+classname Qt3DQuick3DRenderPlugin
diff --git a/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index d5b6e7d37..2225b18d8 100644
--- a/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -35,89 +35,89 @@
 **
 ****************************************************************************/
 
-#include "qt3dquick3drendererplugin.h"
-#include <Qt3DRenderer/qabstractsceneloader.h>
-#include <Qt3DRenderer/qsceneloader.h>
-#include <Qt3DRenderer/qmesh.h>
-#include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qshaderprogram.h>
-#include <Qt3DRenderer/qviewport.h>
-#include <Qt3DRenderer/qrenderpassfilter.h>
-#include <Qt3DRenderer/qtechniquefilter.h>
-#include <Qt3DRenderer/qrendertargetselector.h>
-#include <Qt3DRenderer/qtexture.h>
-#include <Qt3DRenderer/qframegraph.h>
-#include <Qt3DRenderer/qtechnique.h>
-#include <Qt3DRenderer/qcameraselector.h>
-#include <Qt3DRenderer/qeffect.h>
-#include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qannotation.h>
-#include <Qt3DRenderer/qparametermapping.h>
-#include <Qt3DRenderer/qcuboidmesh.h>
-#include <Qt3DRenderer/qcylindermesh.h>
-#include <Qt3DRenderer/qplanemesh.h>
-#include <Qt3DRenderer/qspheremesh.h>
-#include <Qt3DRenderer/qtorusmesh.h>
-#include <Qt3DRenderer/qlayer.h>
-#include <Qt3DRenderer/qlayerfilter.h>
-#include <Qt3DRenderer/qabstractlight.h>
-#include <Qt3DRenderer/qspotlight.h>
-#include <Qt3DRenderer/qdirectionallight.h>
-#include <Qt3DRenderer/qpointlight.h>
-#include <Qt3DRenderer/qopenglfilter.h>
-#include <Qt3DRenderer/qrenderstate.h>
-#include <Qt3DRenderer/qblendstate.h>
-#include <Qt3DRenderer/qblendequation.h>
-#include <Qt3DRenderer/qalphatest.h>
-#include <Qt3DRenderer/qdepthtest.h>
-#include <Qt3DRenderer/qdepthmask.h>
-#include <Qt3DRenderer/qcullface.h>
-#include <Qt3DRenderer/qfrontface.h>
-#include <Qt3DRenderer/qstenciltest.h>
-#include <Qt3DRenderer/qstenciltestseparate.h>
-#include <Qt3DRenderer/qscissortest.h>
-#include <Qt3DRenderer/qdithering.h>
-#include <Qt3DRenderer/qrenderattachment.h>
-#include <Qt3DRenderer/qclearbuffer.h>
-#include <Qt3DRenderer/qsortcriterion.h>
-#include <Qt3DRenderer/qalphacoverage.h>
-#include <Qt3DRenderer/qpolygonoffset.h>
-#include <Qt3DRenderer/qcolormask.h>
-#include <Qt3DRenderer/qshaderdata.h>
-#include <Qt3DRenderer/qnodraw.h>
-#include <Qt3DRenderer/qclipplane.h>
-#include <Qt3DRenderer/qstencilop.h>
-#include <Qt3DRenderer/qstencilopseparate.h>
-#include <Qt3DRenderer/qstencilmask.h>
-#include <Qt3DRenderer/qattribute.h>
-#include <Qt3DRenderer/qbuffer.h>
-#include <Qt3DRenderer/qgeometry.h>
-#include <Qt3DRenderer/qtorusgeometry.h>
-#include <Qt3DRenderer/qspheregeometry.h>
-#include <Qt3DRenderer/qcuboidgeometry.h>
-#include <Qt3DRenderer/qplanegeometry.h>
-#include <Qt3DRenderer/qgeometryrenderer.h>
-#include <Qt3DRenderer/qcylindergeometry.h>
-#include <Qt3DQuickRenderer/quick3dtechnique.h>
-#include <Qt3DQuickRenderer/quick3dmaterial.h>
-#include <Qt3DQuickRenderer/quick3dtechniquefilter.h>
-#include <Qt3DQuickRenderer/quick3dviewport.h>
-#include <Qt3DQuickRenderer/quick3drenderpassfilter.h>
-#include <Qt3DQuickRenderer/quick3drendertarget.h>
-#include <Qt3DQuickRenderer/quick3deffect.h>
-#include <Qt3DQuickRenderer/quick3dscene.h>
-#include <Qt3DQuickRenderer/quick3dtexture.h>
-#include <Qt3DQuickRenderer/private/shaderpropertyparser_p.h>
-#include <Qt3DQuickRenderer/quick3drenderpass.h>
-#include <Qt3DQuickRenderer/quick3dsortmethod.h>
-#include <Qt3DQuickRenderer/quick3dparameter.h>
-#include <Qt3DQuickRenderer/quick3dshaderdata.h>
-#include <Qt3DQuickRenderer/quick3dshaderdataarray.h>
-#include <Qt3DQuickRenderer/quick3dstateset.h>
-#include <Qt3DQuickRenderer/quick3drendertargetselector.h>
-#include <Qt3DQuickRenderer/quick3dgeometry.h>
-#include <Qt3DQuickRenderer/quick3dbuffer.h>
-#include <Qt3DQuickRenderer/private/qt3dquickrenderer_global_p.h>
+#include "qt3dquick3drenderplugin.h"
+#include <Qt3DRender/qabstractsceneloader.h>
+#include <Qt3DRender/qsceneloader.h>
+#include <Qt3DRender/qmesh.h>
+#include <Qt3DRender/qrenderpass.h>
+#include <Qt3DRender/qshaderprogram.h>
+#include <Qt3DRender/qviewport.h>
+#include <Qt3DRender/qrenderpassfilter.h>
+#include <Qt3DRender/qtechniquefilter.h>
+#include <Qt3DRender/qrendertargetselector.h>
+#include <Qt3DRender/qtexture.h>
+#include <Qt3DRender/qframegraph.h>
+#include <Qt3DRender/qtechnique.h>
+#include <Qt3DRender/qcameraselector.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qparameter.h>
+#include <Qt3DRender/qannotation.h>
+#include <Qt3DRender/qparametermapping.h>
+#include <Qt3DRender/qcuboidmesh.h>
+#include <Qt3DRender/qcylindermesh.h>
+#include <Qt3DRender/qplanemesh.h>
+#include <Qt3DRender/qspheremesh.h>
+#include <Qt3DRender/qtorusmesh.h>
+#include <Qt3DRender/qlayer.h>
+#include <Qt3DRender/qlayerfilter.h>
+#include <Qt3DRender/qabstractlight.h>
+#include <Qt3DRender/qspotlight.h>
+#include <Qt3DRender/qdirectionallight.h>
+#include <Qt3DRender/qpointlight.h>
+#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qrenderstate.h>
+#include <Qt3DRender/qblendstate.h>
+#include <Qt3DRender/qblendequation.h>
+#include <Qt3DRender/qalphatest.h>
+#include <Qt3DRender/qdepthtest.h>
+#include <Qt3DRender/qdepthmask.h>
+#include <Qt3DRender/qcullface.h>
+#include <Qt3DRender/qfrontface.h>
+#include <Qt3DRender/qstenciltest.h>
+#include <Qt3DRender/qstenciltestseparate.h>
+#include <Qt3DRender/qscissortest.h>
+#include <Qt3DRender/qdithering.h>
+#include <Qt3DRender/qrenderattachment.h>
+#include <Qt3DRender/qclearbuffer.h>
+#include <Qt3DRender/qsortcriterion.h>
+#include <Qt3DRender/qalphacoverage.h>
+#include <Qt3DRender/qpolygonoffset.h>
+#include <Qt3DRender/qcolormask.h>
+#include <Qt3DRender/qshaderdata.h>
+#include <Qt3DRender/qnodraw.h>
+#include <Qt3DRender/qclipplane.h>
+#include <Qt3DRender/qstencilop.h>
+#include <Qt3DRender/qstencilopseparate.h>
+#include <Qt3DRender/qstencilmask.h>
+#include <Qt3DRender/qattribute.h>
+#include <Qt3DRender/qbuffer.h>
+#include <Qt3DRender/qgeometry.h>
+#include <Qt3DRender/qtorusgeometry.h>
+#include <Qt3DRender/qspheregeometry.h>
+#include <Qt3DRender/qcuboidgeometry.h>
+#include <Qt3DRender/qplanegeometry.h>
+#include <Qt3DRender/qgeometryrenderer.h>
+#include <Qt3DRender/qcylindergeometry.h>
+#include <Qt3DQuickRender/quick3dtechnique.h>
+#include <Qt3DQuickRender/quick3dmaterial.h>
+#include <Qt3DQuickRender/quick3dtechniquefilter.h>
+#include <Qt3DQuickRender/quick3dviewport.h>
+#include <Qt3DQuickRender/quick3drenderpassfilter.h>
+#include <Qt3DQuickRender/quick3drendertarget.h>
+#include <Qt3DQuickRender/quick3deffect.h>
+#include <Qt3DQuickRender/quick3dscene.h>
+#include <Qt3DQuickRender/quick3dtexture.h>
+#include <Qt3DQuickRender/private/shaderpropertyparser_p.h>
+#include <Qt3DQuickRender/quick3drenderpass.h>
+#include <Qt3DQuickRender/quick3dsortmethod.h>
+#include <Qt3DQuickRender/quick3dparameter.h>
+#include <Qt3DQuickRender/quick3dshaderdata.h>
+#include <Qt3DQuickRender/quick3dshaderdataarray.h>
+#include <Qt3DQuickRender/quick3dstateset.h>
+#include <Qt3DQuickRender/quick3drendertargetselector.h>
+#include <Qt3DQuickRender/quick3dgeometry.h>
+#include <Qt3DQuickRender/quick3dbuffer.h>
+#include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 
 static void initResources()
 {
@@ -157,7 +157,7 @@ QVariantList Quick3DShaderDataArrayToVariantListConverter(Qt3DRender::Render::Qu
     return values;
 }
 
-void Qt3DQuick3DRendererPlugin::registerTypes(const char *uri)
+void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
 {
     // Init resources for defaults QML files
     initResources();
diff --git a/src/quick3d/imports/render/qt3dquick3drendererplugin.h b/src/quick3d/imports/render/qt3dquick3drenderplugin.h
index 50105d5ae..05aceab7f 100644
--- a/src/quick3d/imports/render/qt3dquick3drendererplugin.h
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.h
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Qt3DQuick3DRendererPlugin : public QQmlExtensionPlugin
+class Qt3DQuick3DRenderPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
diff --git a/src/quick3d/imports/scene3d/importsscene3d.pro b/src/quick3d/imports/scene3d/importsscene3d.pro
index a2ccf25af..4c0724e20 100644
--- a/src/quick3d/imports/scene3d/importsscene3d.pro
+++ b/src/quick3d/imports/scene3d/importsscene3d.pro
@@ -2,7 +2,7 @@ CXX_MODULE = qml
 TARGET = qtquickscene3dplugin
 TARGETPATH = QtQuick/Scene3D
 
-QT += qml quick 3dcore 3drenderer 3dinput
+QT += qml quick 3dcore 3drender 3dinput
 
 HEADERS += \
     qtquickscene3dplugin.h \
diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp
index 840da7a0d..70866e385 100644
--- a/src/quick3d/imports/scene3d/scene3ditem.cpp
+++ b/src/quick3d/imports/scene3d/scene3ditem.cpp
@@ -38,7 +38,7 @@
 #include "scene3dlogging_p.h"
 
 #include <Qt3DCore/QAspectEngine>
-#include <Qt3DRenderer/QRenderAspect>
+#include <Qt3DRender/QRenderAspect>
 #include <Qt3DInput/QInputAspect>
 
 #include <QOpenGLContext>
diff --git a/src/quick3d/quick3drenderer/items/items.pri b/src/quick3d/quick3drender/items/items.pri
index 881923b59..881923b59 100644
--- a/src/quick3d/quick3drenderer/items/items.pri
+++ b/src/quick3d/quick3drender/items/items.pri
diff --git a/src/quick3d/quick3drenderer/items/quick3dbuffer.cpp b/src/quick3d/quick3drender/items/quick3dbuffer.cpp
index aaa3645c1..aaa3645c1 100644
--- a/src/quick3d/quick3drenderer/items/quick3dbuffer.cpp
+++ b/src/quick3d/quick3drender/items/quick3dbuffer.cpp
diff --git a/src/quick3d/quick3drenderer/items/quick3dbuffer.h b/src/quick3d/quick3drender/items/quick3dbuffer.h
index 7fa3ad8cf..edebb1454 100644
--- a/src/quick3d/quick3drenderer/items/quick3dbuffer.h
+++ b/src/quick3d/quick3drender/items/quick3dbuffer.h
@@ -37,8 +37,8 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DBUFFER_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DBUFFER_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
-#include <Qt3DRenderer/QBuffer>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
+#include <Qt3DRender/QBuffer>
 
 QT_BEGIN_NAMESPACE
 
@@ -55,7 +55,7 @@ namespace Render {
 
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DBuffer : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DBuffer : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QVariant data READ bufferData WRITE setBufferData NOTIFY bufferDataChanged)
diff --git a/src/quick3d/quick3drenderer/items/quick3deffect.cpp b/src/quick3d/quick3drender/items/quick3deffect.cpp
index 435514bd7..b7f6cbed6 100644
--- a/src/quick3d/quick3drenderer/items/quick3deffect.cpp
+++ b/src/quick3d/quick3drender/items/quick3deffect.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "quick3deffect.h"
-#include <Qt3DRenderer/qeffect.h>
+#include <Qt3DRender/qeffect.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/items/quick3deffect.h b/src/quick3d/quick3drender/items/quick3deffect.h
index f7089cfa5..2d4b7a023 100644
--- a/src/quick3d/quick3drenderer/items/quick3deffect.h
+++ b/src/quick3d/quick3drender/items/quick3deffect.h
@@ -37,10 +37,10 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DEFFECT_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DEFFECT_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
 #include <QQmlListProperty>
-#include <Qt3DRenderer/qeffect.h>
-#include <Qt3DRenderer/qtechnique.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qtechnique.h>
 
 
 QT_BEGIN_NAMESPACE
@@ -49,7 +49,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DEffect : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DEffect : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QTechnique> techniques READ techniqueList)
diff --git a/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp b/src/quick3d/quick3drender/items/quick3dgeometry.cpp
index b2af9763b..b2af9763b 100644
--- a/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp
+++ b/src/quick3d/quick3drender/items/quick3dgeometry.cpp
diff --git a/src/quick3d/quick3drenderer/items/quick3dgeometry.h b/src/quick3d/quick3drender/items/quick3dgeometry.h
index 48aee631f..bb95be1d0 100644
--- a/src/quick3d/quick3drenderer/items/quick3dgeometry.h
+++ b/src/quick3d/quick3drender/items/quick3dgeometry.h
@@ -37,9 +37,9 @@
 #ifndef QT3D_QUICK3DGEOMETRY_H
 #define QT3D_QUICK3DGEOMETRY_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
 #include <QQmlListProperty>
-#include <Qt3DRenderer/QGeometry>
+#include <Qt3DRender/QGeometry>
 
 QT_BEGIN_NAMESPACE
 
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DGeometry : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DGeometry : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DCore::QAbstractAttribute> attributes READ attributeList)
diff --git a/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp b/src/quick3d/quick3drender/items/quick3dmaterial.cpp
index 9546e56c9..d66d1b21c 100644
--- a/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp
+++ b/src/quick3d/quick3drender/items/quick3dmaterial.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "quick3dmaterial.h"
-#include <Qt3DRenderer/qtexture.h>
+#include <Qt3DRender/qtexture.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/items/quick3dmaterial.h b/src/quick3d/quick3drender/items/quick3dmaterial.h
index 19c060308..76838418b 100644
--- a/src/quick3d/quick3drenderer/items/quick3dmaterial.h
+++ b/src/quick3d/quick3drender/items/quick3dmaterial.h
@@ -37,9 +37,9 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DMATERIAL_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DMATERIAL_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
-#include <Qt3DRenderer/qmaterial.h>
-#include <Qt3DRenderer/qparameter.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
+#include <Qt3DRender/qmaterial.h>
+#include <Qt3DRender/qparameter.h>
 #include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
@@ -51,7 +51,7 @@ namespace Quick {
 // FIXME - write a custom QML parser and stop mis-using Tag
 // Tags could be replaced by Parameters directly
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DMaterial : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DMaterial : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ qmlParameters)
diff --git a/src/quick3d/quick3drenderer/items/quick3dparameter.cpp b/src/quick3d/quick3drender/items/quick3dparameter.cpp
index fe3e497a3..fe3e497a3 100644
--- a/src/quick3d/quick3drenderer/items/quick3dparameter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dparameter.cpp
diff --git a/src/quick3d/quick3drenderer/items/quick3dparameter.h b/src/quick3d/quick3drender/items/quick3dparameter.h
index 064f21d6f..cb1ccd057 100644
--- a/src/quick3d/quick3drenderer/items/quick3dparameter.h
+++ b/src/quick3d/quick3drender/items/quick3dparameter.h
@@ -37,8 +37,8 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
-#include <Qt3DRenderer/qparameter.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
+#include <Qt3DRender/qparameter.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -48,7 +48,7 @@ namespace Quick {
 
 class Quick3DParameterPrivate;
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DParameter : public QParameter
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DParameter : public QParameter
 {
     Q_OBJECT
 public:
diff --git a/src/quick3d/quick3drenderer/items/quick3dparameter_p.h b/src/quick3d/quick3drender/items/quick3dparameter_p.h
index e4c7874d3..56c1fa6a6 100644
--- a/src/quick3d/quick3drenderer/items/quick3dparameter_p.h
+++ b/src/quick3d/quick3drender/items/quick3dparameter_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qparameter_p.h>
+#include <Qt3DRender/private/qparameter_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
index 3c8f9322d..ff8089f4f 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
@@ -36,7 +36,7 @@
 ****************************************************************************/
 
 #include "quick3drenderpass.h"
-#include <Qt3DRenderer/qparametermapping.h>
+#include <Qt3DRender/qparametermapping.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.h b/src/quick3d/quick3drender/items/quick3drenderpass.h
index 12f1e829c..384d38486 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.h
+++ b/src/quick3d/quick3drender/items/quick3drenderpass.h
@@ -38,8 +38,8 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASS_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASS_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
-#include <Qt3DRenderer/qrenderpass.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
+#include <Qt3DRender/qrenderpass.h>
 #include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
@@ -48,7 +48,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPass : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DRenderPass : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> annotations READ annotationList)
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
index d0dbf7dab..d0dbf7dab 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h b/src/quick3d/quick3drender/items/quick3drenderpassfilter.h
index aefdd8e33..bf98dbdd5 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.h
@@ -38,9 +38,9 @@
 #define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H
 
 #include <Qt3DQuick/quick3dnode.h>
-#include <Qt3DRenderer/qrenderpassfilter.h>
-#include <Qt3DRenderer/qannotation.h>
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
+#include <Qt3DRender/qrenderpassfilter.h>
+#include <Qt3DRender/qannotation.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -48,7 +48,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPassFilter : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DRenderPassFilter : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> includes READ includeList)
diff --git a/src/quick3d/quick3drenderer/items/quick3drendertarget.cpp b/src/quick3d/quick3drender/items/quick3drendertarget.cpp
index 2bd4cfe5b..2bd4cfe5b 100644
--- a/src/quick3d/quick3drenderer/items/quick3drendertarget.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertarget.cpp
diff --git a/src/quick3d/quick3drenderer/items/quick3drendertarget.h b/src/quick3d/quick3drender/items/quick3drendertarget.h
index e494b9895..d61b0ef8b 100644
--- a/src/quick3d/quick3drenderer/items/quick3drendertarget.h
+++ b/src/quick3d/quick3drender/items/quick3drendertarget.h
@@ -37,9 +37,9 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
-#include <Qt3DRenderer/qrendertarget.h>
-#include <Qt3DRenderer/qrenderattachment.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
+#include <Qt3DRender/qrendertarget.h>
+#include <Qt3DRender/qrenderattachment.h>
 #include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
@@ -48,7 +48,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderTarget : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DRenderTarget : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderAttachment> attachments READ qmlAttachments)
diff --git a/src/quick3d/quick3drenderer/items/quick3drendertargetselector.cpp b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
index e09bfd8f5..e09bfd8f5 100644
--- a/src/quick3d/quick3drenderer/items/quick3drendertargetselector.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
diff --git a/src/quick3d/quick3drenderer/items/quick3drendertargetselector.h b/src/quick3d/quick3drender/items/quick3drendertargetselector.h
index 07a725fe8..65bd93eb4 100644
--- a/src/quick3d/quick3drenderer/items/quick3drendertargetselector.h
+++ b/src/quick3d/quick3drender/items/quick3drendertargetselector.h
@@ -37,9 +37,9 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
-#include <Qt3DRenderer/qrenderattachment.h>
-#include <Qt3DRenderer/qrendertargetselector.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
+#include <Qt3DRender/qrenderattachment.h>
+#include <Qt3DRender/qrendertargetselector.h>
 #include <QQmlListProperty>
 #include <QVariantList>
 
@@ -49,7 +49,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderTargetSelector : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DRenderTargetSelector : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QVariantList drawBuffers READ drawBuffers WRITE setDrawBuffers NOTIFY drawBuffersChanged)
diff --git a/src/quick3d/quick3drenderer/items/quick3dscene.cpp b/src/quick3d/quick3drender/items/quick3dscene.cpp
index b28487829..b28487829 100644
--- a/src/quick3d/quick3drenderer/items/quick3dscene.cpp
+++ b/src/quick3d/quick3drender/items/quick3dscene.cpp
diff --git a/src/quick3d/quick3drenderer/items/quick3dscene.h b/src/quick3d/quick3drender/items/quick3dscene.h
index dfe7cbb17..4795de844 100644
--- a/src/quick3d/quick3drenderer/items/quick3dscene.h
+++ b/src/quick3d/quick3drender/items/quick3dscene.h
@@ -37,9 +37,9 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSCENE_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DSCENE_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
 #include <Qt3DQuick/quick3dentity.h>
-#include <Qt3DRenderer/qabstractsceneloader.h>
+#include <Qt3DRender/qabstractsceneloader.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DScene : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DScene : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
index ebc99e93e..714f0fed9 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
@@ -37,7 +37,7 @@
 #include "quick3dshaderdata.h"
 #include <private/qshaderdata_p.h>
 
-#include <Qt3DQuickRenderer/quick3dshaderdataarray.h>
+#include <Qt3DQuickRender/quick3dshaderdataarray.h>
 #include <QMetaProperty>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h b/src/quick3d/quick3drender/items/quick3dshaderdata.h
index 4bc40ad98..fc8f5e18b 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h
+++ b/src/quick3d/quick3drender/items/quick3dshaderdata.h
@@ -37,8 +37,8 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATA_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATA_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
-#include <Qt3DRenderer/qshaderdata.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
+#include <Qt3DRender/qshaderdata.h>
 
 #include <QJSValue>
 #include <QJSValueIterator>
@@ -49,7 +49,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DShaderData : public QShaderData
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DShaderData : public QShaderData
 {
     Q_OBJECT
 public:
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
index 3b863b35e..3b863b35e 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h b/src/quick3d/quick3drender/items/quick3dshaderdataarray.h
index dfe1a2cb0..82bdee7c2 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.h
@@ -38,8 +38,8 @@
 #define QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATAARRAY_H
 
 #include <Qt3DCore/qnode.h>
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
-#include <Qt3DQuickRenderer/quick3dshaderdata.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
+#include <Qt3DQuickRender/quick3dshaderdata.h>
 #include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
@@ -54,7 +54,7 @@ namespace Quick {
 class Quick3DShaderDataArrayPrivate;
 class Quick3DShaderData;
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DShaderDataArray : public Qt3DCore::QNode
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DShaderDataArray : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QShaderData> values READ valuesList)
diff --git a/src/quick3d/quick3drenderer/items/quick3dsortmethod.cpp b/src/quick3d/quick3drender/items/quick3dsortmethod.cpp
index 2c04b054f..2c04b054f 100644
--- a/src/quick3d/quick3drenderer/items/quick3dsortmethod.cpp
+++ b/src/quick3d/quick3drender/items/quick3dsortmethod.cpp
diff --git a/src/quick3d/quick3drenderer/items/quick3dsortmethod.h b/src/quick3d/quick3drender/items/quick3dsortmethod.h
index 17bc73f8e..672f13703 100644
--- a/src/quick3d/quick3drenderer/items/quick3dsortmethod.h
+++ b/src/quick3d/quick3drender/items/quick3dsortmethod.h
@@ -37,9 +37,9 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSORTMETHOD_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DSORTMETHOD_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
-#include <Qt3DRenderer/qsortmethod.h>
-#include <Qt3DRenderer/qsortcriterion.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
+#include <Qt3DRender/qsortmethod.h>
+#include <Qt3DRender/qsortcriterion.h>
 #include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
@@ -48,7 +48,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DSortMethod : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DSortMethod : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QSortCriterion> criteria READ criteriaList)
diff --git a/src/quick3d/quick3drenderer/items/quick3dstateset.cpp b/src/quick3d/quick3drender/items/quick3dstateset.cpp
index c6acec6a7..c6acec6a7 100644
--- a/src/quick3d/quick3drenderer/items/quick3dstateset.cpp
+++ b/src/quick3d/quick3drender/items/quick3dstateset.cpp
diff --git a/src/quick3d/quick3drenderer/items/quick3dstateset.h b/src/quick3d/quick3drender/items/quick3dstateset.h
index 3be605922..bae3bb3d5 100644
--- a/src/quick3d/quick3drenderer/items/quick3dstateset.h
+++ b/src/quick3d/quick3drender/items/quick3dstateset.h
@@ -37,8 +37,8 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSTATESET_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DSTATESET_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
-#include <Qt3DRenderer/qstateset.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
+#include <Qt3DRender/qstateset.h>
 #include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DStateSet : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DStateSet : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderState> renderStates READ renderStateList CONSTANT)
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
index 21690e6fe..21690e6fe 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechnique.h b/src/quick3d/quick3drender/items/quick3dtechnique.h
index f44bdcf98..75de6d530 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechnique.h
+++ b/src/quick3d/quick3drender/items/quick3dtechnique.h
@@ -37,8 +37,8 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUE_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUE_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
-#include <Qt3DRenderer/qtechnique.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
+#include <Qt3DRender/qtechnique.h>
 #include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTechnique : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DTechnique : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> annotations READ annotationList)
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
index 936efc738..936efc738 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h b/src/quick3d/quick3drender/items/quick3dtechniquefilter.h
index 2c4483fb4..489a70c25 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.h
@@ -37,9 +37,9 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
-#include <Qt3DRenderer/qtechniquefilter.h>
-#include <Qt3DRenderer/qannotation.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
+#include <Qt3DRender/qtechniquefilter.h>
+#include <Qt3DRender/qannotation.h>
 #include <Qt3DQuick/quick3dnode.h>
 #include <QQmlListProperty>
 
@@ -49,7 +49,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTechniqueFilter : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DTechniqueFilter : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> requires READ requireList)
diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp b/src/quick3d/quick3drender/items/quick3dtexture.cpp
index bfe899802..bfe899802 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtexture.cpp
diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.h b/src/quick3d/quick3drender/items/quick3dtexture.h
index dcc060203..1369b1610 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtexture.h
+++ b/src/quick3d/quick3drender/items/quick3dtexture.h
@@ -37,9 +37,9 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTEXTURE_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DTEXTURE_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
 #include <Qt3DQuick/quick3dnode.h>
-#include <Qt3DRenderer/qtexture.h>
+#include <Qt3DRender/qtexture.h>
 
 #include <QQmlListProperty>
 #include <QUrl>
@@ -50,7 +50,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTextureExtension : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DTextureExtension : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QAbstractTextureImage> textureImages READ textureImages)
diff --git a/src/quick3d/quick3drenderer/items/quick3dviewport.cpp b/src/quick3d/quick3drender/items/quick3dviewport.cpp
index 0383c578b..0383c578b 100644
--- a/src/quick3d/quick3drenderer/items/quick3dviewport.cpp
+++ b/src/quick3d/quick3drender/items/quick3dviewport.cpp
diff --git a/src/quick3d/quick3drenderer/items/quick3dviewport.h b/src/quick3d/quick3drender/items/quick3dviewport.h
index acef80284..046c67223 100644
--- a/src/quick3d/quick3drenderer/items/quick3dviewport.h
+++ b/src/quick3d/quick3drender/items/quick3dviewport.h
@@ -37,9 +37,9 @@
 #ifndef QT3DRENDER_RENDER_QUICK_QUICK3DVIEWPORT_H
 #define QT3DRENDER_RENDER_QUICK_QUICK3DVIEWPORT_H
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
 #include <Qt3DQuick/quick3dnode.h>
-#include <Qt3DRenderer/qviewport.h>
+#include <Qt3DRender/qviewport.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -49,7 +49,7 @@ namespace Quick {
 
 // TO DO : Check if this is required or if this might as well be removed
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DViewport : public QObject
+class QT3DQUICKRENDERSHARED_EXPORT Quick3DViewport : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/quick3d/quick3drenderer/items/shaderpropertyparser.cpp b/src/quick3d/quick3drender/items/shaderpropertyparser.cpp
index a467cf678..a467cf678 100644
--- a/src/quick3d/quick3drenderer/items/shaderpropertyparser.cpp
+++ b/src/quick3d/quick3drender/items/shaderpropertyparser.cpp
diff --git a/src/quick3d/quick3drenderer/items/shaderpropertyparser_p.h b/src/quick3d/quick3drender/items/shaderpropertyparser_p.h
index 077696cdd..431c2e4b5 100644
--- a/src/quick3d/quick3drenderer/items/shaderpropertyparser_p.h
+++ b/src/quick3d/quick3drender/items/shaderpropertyparser_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
 #include <QtQml/private/qqmlcustomparser_p.h>
 #include <QtQml/private/qv4compileddata_p.h>
 
@@ -58,7 +58,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERERSHARED_EXPORT ShaderPropertyParser : public QQmlCustomParser
+class QT3DQUICKRENDERSHARED_EXPORT ShaderPropertyParser : public QQmlCustomParser
 {
 public:
     ShaderPropertyParser();
diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp b/src/quick3d/quick3drender/qt3dquickrender_global.cpp
index bc46386e2..d1563c691 100644
--- a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp
+++ b/src/quick3d/quick3drender/qt3dquickrender_global.cpp
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#include "qt3dquickrenderer_global_p.h"
-#include "qt3dquickrenderernodefactory_p.h"
+#include "qt3dquickrender_global_p.h"
+#include "qt3dquickrendernodefactory_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.h b/src/quick3d/quick3drender/qt3dquickrender_global.h
index f4e053c69..2d0d77a6f 100644
--- a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.h
+++ b/src/quick3d/quick3drender/qt3dquickrender_global.h
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DQUICKRENDERER_GLOBAL_H
-#define QT3DQUICKRENDERER_GLOBAL_H
+#ifndef QT3DQUICKRENDER_GLOBAL_H
+#define QT3DQUICKRENDER_GLOBAL_H
 
 #include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
 #if defined(QT_SHARED) || !defined(QT_STATIC)
-#  if defined(QT3DQUICKRENDERER_LIBRARY)
-#    define QT3DQUICKRENDERERSHARED_EXPORT Q_DECL_EXPORT
+#  if defined(QT3DQUICKRENDER_LIBRARY)
+#    define QT3DQUICKRENDERSHARED_EXPORT Q_DECL_EXPORT
 #  else
-#    define QT3DQUICKRENDERERSHARED_EXPORT Q_DECL_IMPORT
+#    define QT3DQUICKRENDERSHARED_EXPORT Q_DECL_IMPORT
 #  endif
 #else
-#  define QT3DQUICKRENDERERSHARED_EXPORT
+#  define QT3DQUICKRENDERSHARED_EXPORT
 #endif
 
 QT_END_NAMESPACE
 
-#endif // QT3DQUICKRENDERER_GLOBAL_H
+#endif // QT3DQUICKRENDER_GLOBAL_H
diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderer_global_p.h b/src/quick3d/quick3drender/qt3dquickrender_global_p.h
index be925917e..3ee49561b 100644
--- a/src/quick3d/quick3drenderer/qt3dquickrenderer_global_p.h
+++ b/src/quick3d/quick3drender/qt3dquickrender_global_p.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DQUICKRENDERER_GLOBAL_P_H
-#define QT3DQUICKRENDERER_GLOBAL_P_H
+#ifndef QT3DQUICKRENDER_GLOBAL_P_H
+#define QT3DQUICKRENDER_GLOBAL_P_H
 
 //
 //  W A R N I N G
@@ -49,10 +49,10 @@
 // We mean it.
 //
 
-#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
+#include <Qt3DQuickRender/qt3dquickrender_global.h>
 #include <QtQml/qqml.h>
 
-#define QT3DQUICKSHARED_PRIVATE_EXPORT QT3DQUICKRENDERERSHARED_EXPORT
+#define QT3DQUICKSHARED_PRIVATE_EXPORT QT3DQUICKRENDERSHARED_EXPORT
 
 QT_BEGIN_NAMESPACE
 
@@ -76,4 +76,4 @@ template<class T, class E> void registerExtendedType(const char *className, cons
 
 QT_END_NAMESPACE
 
-#endif // QT3DQUICKRENDERER_GLOBAL_P_H
+#endif // QT3DQUICKRENDER_GLOBAL_P_H
diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp
index 1123062cc..52e9f646e 100644
--- a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp
+++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qt3dquickrenderernodefactory_p.h"
+#include "qt3dquickrendernodefactory_p.h"
 #include <QtQml/private/qqmlmetatype_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
index 7d9f49c7e..7d9f49c7e 100644
--- a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h
+++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
diff --git a/src/quick3d/quick3drenderer/quick3drenderer.pro b/src/quick3d/quick3drender/quick3drender.pro
index b6a9e52ed..ebd332c4e 100644
--- a/src/quick3d/quick3drenderer/quick3drenderer.pro
+++ b/src/quick3d/quick3drender/quick3drender.pro
@@ -1,11 +1,11 @@
-TARGET   = Qt3DQuickRenderer
+TARGET   = Qt3DQuickRender
 
-QT      += core core-private qml qml-private 3dcore 3drenderer 3dquick 3dcore-private 3drenderer-private
+QT      += core core-private qml qml-private 3dcore 3drender 3dquick 3dcore-private 3drender-private
 CONFIG -= precompile_header
 
-DEFINES += QT3DQUICKRENDERER_LIBRARY
+DEFINES += QT3DQUICKRENDER_LIBRARY
 
-MODULE   = 3dquickrenderer
+MODULE   = 3dquickrender
 
 load(qt_module)
 
@@ -16,13 +16,13 @@ gcov {
 }
 
 SOURCES += \
-    qt3dquickrenderer_global.cpp \
-    qt3dquickrenderernodefactory.cpp
+    qt3dquickrender_global.cpp \
+    qt3dquickrendernodefactory.cpp
 
 HEADERS += \
-    qt3dquickrenderer_global.h \
-    qt3dquickrenderer_global_p.h \
-    qt3dquickrenderernodefactory_p.h
+    qt3dquickrendernodefactory_p.h \
+    qt3dquickrender_global_p.h \
+    qt3dquickrender_global.h
 
 !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL