Move Render aspect into the Qt3DRender namespace

Updated examples and tests accordingly.

Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

65 files changed, 300 insertions, 299 deletions

diff --git a/examples/qt3d/anaglyph-rendering/main.cpp b/examples/qt3d/anaglyph-rendering/main.cpp
index 14f76c605..6a7db95e6 100644
--- a/examples/qt3d/anaglyph-rendering/main.cpp
+++ b/examples/qt3d/anaglyph-rendering/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     QVariantMap data;
     data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view)));
diff --git a/examples/qt3d/assimp-cpp/main.cpp b/examples/qt3d/assimp-cpp/main.cpp
index 2b2670c02..a9da29f62 100644
--- a/examples/qt3d/assimp-cpp/main.cpp
+++ b/examples/qt3d/assimp-cpp/main.cpp
@@ -50,20 +50,20 @@
 class SceneWalker : public QObject
 {
 public:
-    SceneWalker(Qt3D::QSceneLoader *loader) : m_loader(loader) { }
+    SceneWalker(Qt3DRender::QSceneLoader *loader) : m_loader(loader) { }
 
     void onStatusChanged();
 
 private:
     void walkEntity(Qt3D::QEntity *e, int depth = 0);
 
-    Qt3D::QSceneLoader *m_loader;
+    Qt3DRender::QSceneLoader *m_loader;
 };
 
 void SceneWalker::onStatusChanged()
 {
     qDebug() << "Status changed:" << m_loader->status();
-    if (m_loader->status() != Qt3D::QSceneLoader::Loaded)
+    if (m_loader->status() != Qt3DRender::QSceneLoader::Loaded)
         return;
 
     // The QSceneLoader instance is a component of an entity. The loaded scene
@@ -108,7 +108,7 @@ int main(int ac, char **av)
 
     Qt3D::QAspectEngine engine;
     Qt3DInput::QInputAspect *inputAspect = new Qt3DInput::QInputAspect();
-    engine.registerAspect(new Qt3D::QRenderAspect());
+    engine.registerAspect(new Qt3DRender::QRenderAspect());
     engine.registerAspect(inputAspect);
     engine.initialize();
     QVariantMap data;
@@ -132,8 +132,8 @@ int main(int ac, char **av)
     inputAspect->setCamera(basicCamera);
 
     // Forward Renderer FrameGraph
-    Qt3D::QFrameGraph *frameGraphComponent = new Qt3D::QFrameGraph(sceneRoot);
-    Qt3D::QForwardRenderer *forwardRenderer = new Qt3D::QForwardRenderer();
+    Qt3DRender::QFrameGraph *frameGraphComponent = new Qt3DRender::QFrameGraph(sceneRoot);
+    Qt3DRender::QForwardRenderer *forwardRenderer = new Qt3DRender::QForwardRenderer();
     forwardRenderer->setCamera(basicCamera);
     forwardRenderer->setClearColor(Qt::black);
     frameGraphComponent->setActiveFrameGraph(forwardRenderer);
@@ -141,9 +141,9 @@ int main(int ac, char **av)
 
     // Scene loader
     Qt3D::QEntity *sceneLoaderEntity = new Qt3D::QEntity(sceneRoot);
-    Qt3D::QSceneLoader *sceneLoader = new Qt3D::QSceneLoader(sceneLoaderEntity);
+    Qt3DRender::QSceneLoader *sceneLoader = new Qt3DRender::QSceneLoader(sceneLoaderEntity);
     SceneWalker sceneWalker(sceneLoader);
-    QObject::connect(sceneLoader, &Qt3D::QSceneLoader::statusChanged, &sceneWalker, &SceneWalker::onStatusChanged);
+    QObject::connect(sceneLoader, &Qt3DRender::QSceneLoader::statusChanged, &sceneWalker, &SceneWalker::onStatusChanged);
     sceneLoaderEntity->addComponent(sceneLoader);
 
     QStringList args = QCoreApplication::arguments();
diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp
index 651766019..729250c13 100644
--- a/examples/qt3d/assimp/main.cpp
+++ b/examples/qt3d/assimp/main.cpp
@@ -49,11 +49,11 @@ class SceneHelper : public QObject
     Q_OBJECT
 
 public:
-    Q_INVOKABLE QObject *findEntity(Qt3D::QSceneLoader *loader, const QString &name);
+    Q_INVOKABLE QObject *findEntity(Qt3DRender::QSceneLoader *loader, const QString &name);
     Q_INVOKABLE void addListEntry(const QVariant &list, QObject *entry);
 };
 
-QObject *SceneHelper::findEntity(Qt3D::QSceneLoader *loader, const QString &name)
+QObject *SceneHelper::findEntity(Qt3DRender::QSceneLoader *loader, const QString &name)
 {
     // The QSceneLoader instance is a component of an entity. The loaded scene
     // tree is added under this entity.
@@ -83,7 +83,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     QVariantMap data;
     data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view)));
diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp
index f3e5a9129..19da31f00 100644
--- a/examples/qt3d/basicshapes-cpp/main.cpp
+++ b/examples/qt3d/basicshapes-cpp/main.cpp
@@ -90,7 +90,7 @@ int main(int argc, char **argv)
     widget->setWindowTitle(QStringLiteral("Basic shapes"));
 
     Qt3D::QAspectEngine engine;
-    engine.registerAspect(new Qt3D::QRenderAspect());
+    engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
     engine.initialize();
@@ -113,8 +113,8 @@ int main(int argc, char **argv)
     input->setCamera(cameraEntity);
 
     // FrameGraph
-    Qt3D::QFrameGraph *frameGraph = new Qt3D::QFrameGraph();
-    Qt3D::QForwardRenderer *forwardRenderer = new Qt3D::QForwardRenderer();
+    Qt3DRender::QFrameGraph *frameGraph = new Qt3DRender::QFrameGraph();
+    Qt3DRender::QForwardRenderer *forwardRenderer = new Qt3DRender::QForwardRenderer();
 
     forwardRenderer->setCamera(cameraEntity);
     forwardRenderer->setClearColor(QColor(QRgb(0x4d4d4f)));
diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
index b5c636b0f..97d8ad4be 100644
--- a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
+++ b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
@@ -44,7 +44,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
 
     // Torus shape data
     //! [0]
-    m_torus = new Qt3D::QTorusMesh();
+    m_torus = new Qt3DRender::QTorusMesh();
     m_torus->setRadius(1.0f);
     m_torus->setMinorRadius(0.4f);
     m_torus->setRings(100);
@@ -69,7 +69,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     //! [1]
 
     //! [2]
-    Qt3D::QPhongMaterial *torusMaterial = new Qt3D::QPhongMaterial();
+    Qt3DRender::QPhongMaterial *torusMaterial = new Qt3DRender::QPhongMaterial();
     torusMaterial->setDiffuse(QColor(QRgb(0xbeb32b)));
     //! [2]
 
@@ -82,7 +82,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     //! [3]
 
     // Cylinder shape data
-    Qt3D::QCylinderMesh *cylinder = new Qt3D::QCylinderMesh();
+    Qt3DRender::QCylinderMesh *cylinder = new Qt3DRender::QCylinderMesh();
     cylinder->setRadius(1);
     cylinder->setLength(3);
     cylinder->setRings(100);
@@ -103,7 +103,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     cylinderTransforms->addTransform(cylinderRotation);
     cylinderTransforms->addTransform(cylinderScale);
 
-    Qt3D::QPhongMaterial *cylinderMaterial = new Qt3D::QPhongMaterial();
+    Qt3DRender::QPhongMaterial *cylinderMaterial = new Qt3DRender::QPhongMaterial();
     cylinderMaterial->setDiffuse(QColor(QRgb(0x928327)));
 
     // Cylinder
@@ -113,7 +113,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     m_cylinderEntity->addComponent(cylinderTransforms);
 
     // Cuboid shape data
-    Qt3D::QCuboidMesh *cuboid = new Qt3D::QCuboidMesh();
+    Qt3DRender::QCuboidMesh *cuboid = new Qt3DRender::QCuboidMesh();
 
     // CuboidMesh Transform
     Qt3D::QScaleTransform *cuboidScale = new Qt3D::QScaleTransform();
@@ -126,7 +126,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     cuboidTransforms->addTransform(cuboidTranslation);
     cuboidTransforms->addTransform(cuboidScale);
 
-    Qt3D::QPhongMaterial *cuboidMaterial = new Qt3D::QPhongMaterial();
+    Qt3DRender::QPhongMaterial *cuboidMaterial = new Qt3DRender::QPhongMaterial();
     cuboidMaterial->setDiffuse(QColor(QRgb(0x665423)));
 
     //Cuboid
@@ -136,7 +136,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     m_cuboidEntity->addComponent(cuboidTransforms);
 
     // Sphere shape data
-    Qt3D::QSphereMesh *sphereMesh = new Qt3D::QSphereMesh();
+    Qt3DRender::QSphereMesh *sphereMesh = new Qt3DRender::QSphereMesh();
     sphereMesh->setRings(20);
     sphereMesh->setSlices(20);
     sphereMesh->setRadius(2);
@@ -152,7 +152,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     sphereTransforms->addTransform(sphereTranslation);
     sphereTransforms->addTransform(sphereScale);
 
-    Qt3D::QPhongMaterial *sphereMaterial = new Qt3D::QPhongMaterial();
+    Qt3DRender::QPhongMaterial *sphereMaterial = new Qt3DRender::QPhongMaterial();
     sphereMaterial->setDiffuse(QColor(QRgb(0xa69929)));
 
     // Sphere
diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.h b/examples/qt3d/basicshapes-cpp/scenemodifier.h
index ba4718401..c85e3e4fb 100644
--- a/examples/qt3d/basicshapes-cpp/scenemodifier.h
+++ b/examples/qt3d/basicshapes-cpp/scenemodifier.h
@@ -67,7 +67,7 @@ public slots:
 
 private:
     Qt3D::QEntity *m_rootEntity;
-    Qt3D::QTorusMesh *m_torus;
+    Qt3DRender::QTorusMesh *m_torus;
     Qt3D::QEntity *m_cylinderEntity;
     Qt3D::QEntity *m_torusEntity;
     Qt3D::QEntity *m_cuboidEntity;
diff --git a/examples/qt3d/bigmodel-qml/main.cpp b/examples/qt3d/bigmodel-qml/main.cpp
index d11e9e5c7..ed45906d6 100644
--- a/examples/qt3d/bigmodel-qml/main.cpp
+++ b/examples/qt3d/bigmodel-qml/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     QVariantMap data;
     data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view)));
diff --git a/examples/qt3d/bigscene-cpp/main.cpp b/examples/qt3d/bigscene-cpp/main.cpp
index 2b347d80b..3b6bc28dc 100644
--- a/examples/qt3d/bigscene-cpp/main.cpp
+++ b/examples/qt3d/bigscene-cpp/main.cpp
@@ -58,6 +58,7 @@
 #include <qmath.h>
 
 using namespace Qt3D;
+using namespace Qt3DRender;
 
 int main(int ac, char **av)
 {
@@ -65,7 +66,7 @@ int main(int ac, char **av)
 
     Window view;
     Qt3D::QAspectEngine engine;
-    engine.registerAspect(new Qt3D::QRenderAspect());
+    engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
     engine.initialize();
diff --git a/examples/qt3d/bigscene-instanced-qml/main.cpp b/examples/qt3d/bigscene-instanced-qml/main.cpp
index bfa959eab..79f5bfdb4 100644
--- a/examples/qt3d/bigscene-instanced-qml/main.cpp
+++ b/examples/qt3d/bigscene-instanced-qml/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     engine.aspectEngine()->initialize();
     QVariantMap data;
diff --git a/examples/qt3d/clip-planes-qml/main.cpp b/examples/qt3d/clip-planes-qml/main.cpp
index e8d6e6505..63c21475e 100644
--- a/examples/qt3d/clip-planes-qml/main.cpp
+++ b/examples/qt3d/clip-planes-qml/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
 
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     engine.aspectEngine()->initialize();
     QVariantMap data;
diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp
index 1745aed42..cb2127b14 100644
--- a/examples/qt3d/cpp_example/main.cpp
+++ b/examples/qt3d/cpp_example/main.cpp
@@ -73,7 +73,7 @@ int main(int ac, char **av)
 
     Window view;
     Qt3D::QAspectEngine engine;
-    engine.registerAspect(new Qt3D::QRenderAspect());
+    engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
     engine.initialize();
@@ -89,7 +89,7 @@ int main(int ac, char **av)
     Qt3D::QEntity *torusEntity = new Qt3D::QEntity(rootEntity);
 
     // Torus shape data
-    Qt3D::QTorusMesh *torus = new Qt3D::QTorusMesh();
+    Qt3DRender::QTorusMesh *torus = new Qt3DRender::QTorusMesh();
     torus->setRadius(40);
     torus->setMinorRadius(15);
 
@@ -109,7 +109,7 @@ int main(int ac, char **av)
 
     // Scene file
     Qt3D::QEntity *sceneEntity = new Qt3D::QEntity(rootEntity);
-    Qt3D::QSceneLoader  *scene = new Qt3D::QSceneLoader();
+    Qt3DRender::QSceneLoader  *scene = new Qt3DRender::QSceneLoader();
     scene->setObjectName(QStringLiteral("scene"));
     Qt3D::QTransform *sceneTransform = new Qt3D::QTransform();
     Qt3D::QTranslateTransform *sceneTranslateTransform = new Qt3D::QTranslateTransform();
@@ -133,16 +133,16 @@ int main(int ac, char **av)
     input->setCamera(cameraEntity);
 
     // FrameGraph
-    Qt3D::QFrameGraph *frameGraph = new Qt3D::QFrameGraph();
-    Qt3D::QTechniqueFilter *techniqueFilter = new Qt3D::QTechniqueFilter();
-    Qt3D::QViewport *viewport = new Qt3D::QViewport(techniqueFilter);
-    Qt3D::QClearBuffer *clearBuffer = new Qt3D::QClearBuffer(viewport);
-    Qt3D::QCameraSelector *cameraSelector = new Qt3D::QCameraSelector(clearBuffer);
-    (void) new Qt3D::QRenderPassFilter(cameraSelector);
+    Qt3DRender::QFrameGraph *frameGraph = new Qt3DRender::QFrameGraph();
+    Qt3DRender::QTechniqueFilter *techniqueFilter = new Qt3DRender::QTechniqueFilter();
+    Qt3DRender::QViewport *viewport = new Qt3DRender::QViewport(techniqueFilter);
+    Qt3DRender::QClearBuffer *clearBuffer = new Qt3DRender::QClearBuffer(viewport);
+    Qt3DRender::QCameraSelector *cameraSelector = new Qt3DRender::QCameraSelector(clearBuffer);
+    (void) new Qt3DRender::QRenderPassFilter(cameraSelector);
 
     // TechiqueFilter and renderPassFilter are not implement yet
     viewport->setRect(QRectF(0, 0, 1, 1));
-    clearBuffer->setBuffers(Qt3D::QClearBuffer::ColorDepthBuffer);
+    clearBuffer->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer);
     cameraSelector->setCamera(cameraEntity);
     frameGraph->setActiveFrameGraph(techniqueFilter);
 
diff --git a/examples/qt3d/custom-mesh-cpp/main.cpp b/examples/qt3d/custom-mesh-cpp/main.cpp
index e26f9827b..6b6bd5c1b 100644
--- a/examples/qt3d/custom-mesh-cpp/main.cpp
+++ b/examples/qt3d/custom-mesh-cpp/main.cpp
@@ -68,7 +68,7 @@ int main(int argc, char* argv[])
     Window view;
 
     Qt3D::QAspectEngine engine;
-    engine.registerAspect(new Qt3D::QRenderAspect());
+    engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
     engine.initialize();
@@ -90,14 +90,14 @@ int main(int argc, char* argv[])
     input->setCamera(cameraEntity);
 
     // FrameGraph
-    Qt3D::QFrameGraph *frameGraph = new Qt3D::QFrameGraph();
-    Qt3D::QForwardRenderer *forwardRenderer = new Qt3D::QForwardRenderer();
+    Qt3DRender::QFrameGraph *frameGraph = new Qt3DRender::QFrameGraph();
+    Qt3DRender::QForwardRenderer *forwardRenderer = new Qt3DRender::QForwardRenderer();
     forwardRenderer->setClearColor(QColor::fromRgbF(0.0, 0.5, 1.0, 1.0));
     forwardRenderer->setCamera(cameraEntity);
     frameGraph->setActiveFrameGraph(forwardRenderer);
 
     // Material
-    Qt3D::QMaterial *material = new Qt3D::QPerVertexColorMaterial(rootEntity);
+    Qt3DRender::QMaterial *material = new Qt3DRender::QPerVertexColorMaterial(rootEntity);
 
     // Torus
     Qt3D::QEntity *customMeshEntity = new Qt3D::QEntity(rootEntity);
@@ -109,11 +109,11 @@ int main(int argc, char* argv[])
     transform->addTransform(scaleTransform);
 
     // Custom Mesh (TetraHedron)
-    Qt3D::QGeometryRenderer *customMeshRenderer = new Qt3D::QGeometryRenderer;
-    Qt3D::QGeometry *customGeometry = new Qt3D::QGeometry(customMeshRenderer);
+    Qt3DRender::QGeometryRenderer *customMeshRenderer = new Qt3DRender::QGeometryRenderer;
+    Qt3DRender::QGeometry *customGeometry = new Qt3DRender::QGeometry(customMeshRenderer);
 
-    Qt3D::QBuffer *vertexDataBuffer = new Qt3D::QBuffer(Qt3D::QBuffer::VertexBuffer, customGeometry);
-    Qt3D::QBuffer *indexDataBuffer = new Qt3D::QBuffer(Qt3D::QBuffer::IndexBuffer, customGeometry);
+    Qt3DRender::QBuffer *vertexDataBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, customGeometry);
+    Qt3DRender::QBuffer *indexDataBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer, customGeometry);
 
     // vec3 for position
     // vec3 for colors
@@ -195,40 +195,40 @@ int main(int argc, char* argv[])
     indexDataBuffer->setData(indexBufferData);
 
     // Attributes
-    Qt3D::QAttribute *positionAttribute = new Qt3D::QAttribute();
-    positionAttribute->setAttributeType(Qt3D::QAttribute::VertexAttribute);
+    Qt3DRender::QAttribute *positionAttribute = new Qt3DRender::QAttribute();
+    positionAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
     positionAttribute->setBuffer(vertexDataBuffer);
-    positionAttribute->setDataType(Qt3D::QAttribute::Float);
+    positionAttribute->setDataType(Qt3DRender::QAttribute::Float);
     positionAttribute->setDataSize(3);
     positionAttribute->setByteOffset(0);
     positionAttribute->setByteStride(9 * sizeof(float));
     positionAttribute->setCount(4);
-    positionAttribute->setName(Qt3D::QAttribute::defaultPositionAttributeName());
+    positionAttribute->setName(Qt3DRender::QAttribute::defaultPositionAttributeName());
 
-    Qt3D::QAttribute *normalAttribute = new Qt3D::QAttribute();
-    normalAttribute->setAttributeType(Qt3D::QAttribute::VertexAttribute);
+    Qt3DRender::QAttribute *normalAttribute = new Qt3DRender::QAttribute();
+    normalAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
     normalAttribute->setBuffer(vertexDataBuffer);
-    normalAttribute->setDataType(Qt3D::QAttribute::Float);
+    normalAttribute->setDataType(Qt3DRender::QAttribute::Float);
     normalAttribute->setDataSize(3);
     normalAttribute->setByteOffset(3 * sizeof(float));
     normalAttribute->setByteStride(9 * sizeof(float));
     normalAttribute->setCount(4);
-    normalAttribute->setName(Qt3D::QAttribute::defaultNormalAttributeName());
+    normalAttribute->setName(Qt3DRender::QAttribute::defaultNormalAttributeName());
 
-    Qt3D::QAttribute *colorAttribute = new Qt3D::QAttribute();
-    colorAttribute->setAttributeType(Qt3D::QAttribute::VertexAttribute);
+    Qt3DRender::QAttribute *colorAttribute = new Qt3DRender::QAttribute();
+    colorAttribute->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
     colorAttribute->setBuffer(vertexDataBuffer);
-    colorAttribute->setDataType(Qt3D::QAttribute::Float);
+    colorAttribute->setDataType(Qt3DRender::QAttribute::Float);
     colorAttribute->setDataSize(3);
     colorAttribute->setByteOffset(6 * sizeof(float));
     colorAttribute->setByteStride(9 * sizeof(float));
     colorAttribute->setCount(4);
-    colorAttribute->setName(Qt3D::QAttribute::defaultColorAttributeName());
+    colorAttribute->setName(Qt3DRender::QAttribute::defaultColorAttributeName());
 
-    Qt3D::QAttribute *indexAttribute = new Qt3D::QAttribute();
-    indexAttribute->setAttributeType(Qt3D::QAttribute::IndexAttribute);
+    Qt3DRender::QAttribute *indexAttribute = new Qt3DRender::QAttribute();
+    indexAttribute->setAttributeType(Qt3DRender::QAttribute::IndexAttribute);
     indexAttribute->setBuffer(indexDataBuffer);
-    indexAttribute->setDataType(Qt3D::QAttribute::UnsignedShort);
+    indexAttribute->setDataType(Qt3DRender::QAttribute::UnsignedShort);
     indexAttribute->setDataSize(1);
     indexAttribute->setByteOffset(0);
     indexAttribute->setByteStride(0);
@@ -242,7 +242,7 @@ int main(int argc, char* argv[])
     customMeshRenderer->setInstanceCount(1);
     customMeshRenderer->setBaseVertex(0);
     customMeshRenderer->setBaseInstance(0);
-    customMeshRenderer->setPrimitiveType(Qt3D::QGeometryRenderer::Triangles);
+    customMeshRenderer->setPrimitiveType(Qt3DRender::QGeometryRenderer::Triangles);
     customMeshRenderer->setGeometry(customGeometry);
     // 4 faces of 3 points
     customMeshRenderer->setPrimitiveCount(12);
diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp
index d8a55c670..35b0be402 100644
--- a/examples/qt3d/cylinder-cpp/main.cpp
+++ b/examples/qt3d/cylinder-cpp/main.cpp
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
 
     Window view;
     Qt3D::QAspectEngine engine;
-    engine.registerAspect(new Qt3D::QRenderAspect());
+    engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
     engine.initialize();
@@ -90,8 +90,8 @@ int main(int argc, char **argv)
     input->setCamera(cameraEntity);
 
     // FrameGraph
-    Qt3D::QFrameGraph *frameGraph = new Qt3D::QFrameGraph();
-    Qt3D::QForwardRenderer * forwardRenderer = new Qt3D::QForwardRenderer();
+    Qt3DRender::QFrameGraph *frameGraph = new Qt3DRender::QFrameGraph();
+    Qt3DRender::QForwardRenderer *forwardRenderer = new Qt3DRender::QForwardRenderer();
 
     // TechiqueFilter and renderPassFilter are not implement yet
     forwardRenderer->setCamera(cameraEntity);
@@ -101,7 +101,7 @@ int main(int argc, char **argv)
 
 
     // Cylinder shape data
-    Qt3D::QCylinderMesh *cylinder = new Qt3D::QCylinderMesh();
+    Qt3DRender::QCylinderMesh *cylinder = new Qt3DRender::QCylinderMesh();
     cylinder->setRadius(1);
     cylinder->setLength(3);
     cylinder->setRings(100);
diff --git a/examples/qt3d/cylinder-qml/main.cpp b/examples/qt3d/cylinder-qml/main.cpp
index 2adbf32d8..d484de44e 100644
--- a/examples/qt3d/cylinder-qml/main.cpp
+++ b/examples/qt3d/cylinder-qml/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
 
     QVariantMap data;
diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
index dc04e0398..29330968b 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
@@ -38,18 +38,18 @@
 
 
 DeferredRenderer::DeferredRenderer(Qt3D::QNode *parent)
-    : Qt3D::QViewport(parent)
-    , m_sceneFilter(new Qt3D::QLayerFilter(this))
-    , m_screenQuadFilter(new Qt3D::QLayerFilter(this))
-    , m_clearScreenQuad(new Qt3D::QClearBuffer(m_screenQuadFilter))
-    , m_gBufferTargetSelector(new Qt3D::QRenderTargetSelector(m_sceneFilter))
-    , m_clearGBuffer(new Qt3D::QClearBuffer(m_gBufferTargetSelector))
-    , m_geometryPassFilter(new Qt3D::QRenderPassFilter(m_clearGBuffer))
-    , m_finalPassFilter(new Qt3D::QRenderPassFilter(m_clearScreenQuad))
-    , m_sceneCameraSelector(new Qt3D::QCameraSelector(m_geometryPassFilter))
+    : Qt3DRender::QViewport(parent)
+    , m_sceneFilter(new Qt3DRender::QLayerFilter(this))
+    , m_screenQuadFilter(new Qt3DRender::QLayerFilter(this))
+    , m_clearScreenQuad(new Qt3DRender::QClearBuffer(m_screenQuadFilter))
+    , m_gBufferTargetSelector(new Qt3DRender::QRenderTargetSelector(m_sceneFilter))
+    , m_clearGBuffer(new Qt3DRender::QClearBuffer(m_gBufferTargetSelector))
+    , m_geometryPassFilter(new Qt3DRender::QRenderPassFilter(m_clearGBuffer))
+    , m_finalPassFilter(new Qt3DRender::QRenderPassFilter(m_clearScreenQuad))
+    , m_sceneCameraSelector(new Qt3DRender::QCameraSelector(m_geometryPassFilter))
 {
-    m_clearGBuffer->setBuffers(Qt3D::QClearBuffer::ColorDepthBuffer);
-    m_clearScreenQuad->setBuffers(Qt3D::QClearBuffer::ColorDepthBuffer);
+    m_clearGBuffer->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer);
+    m_clearScreenQuad->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer);
 }
 
 void DeferredRenderer::setSceneCamera(Qt3D::QEntity *camera)
@@ -57,20 +57,20 @@ void DeferredRenderer::setSceneCamera(Qt3D::QEntity *camera)
     m_sceneCameraSelector->setCamera(camera);
 }
 
-void DeferredRenderer::setGBuffer(Qt3D::QRenderTarget *gBuffer)
+void DeferredRenderer::setGBuffer(Qt3DRender::QRenderTarget *gBuffer)
 {
     m_gBufferTargetSelector->setTarget(gBuffer);
 }
 
-void DeferredRenderer::setGeometryPassCriteria(QList<Qt3D::QAnnotation *> criteria)
+void DeferredRenderer::setGeometryPassCriteria(QList<Qt3DRender::QAnnotation *> criteria)
 {
-    Q_FOREACH (Qt3D::QAnnotation *c, criteria)
+    Q_FOREACH (Qt3DRender::QAnnotation *c, criteria)
         m_geometryPassFilter->addInclude(c);
 }
 
-void DeferredRenderer::setFinalPassCriteria(QList<Qt3D::QAnnotation *> criteria)
+void DeferredRenderer::setFinalPassCriteria(QList<Qt3DRender::QAnnotation *> criteria)
 {
-    Q_FOREACH (Qt3D::QAnnotation *c, criteria)
+    Q_FOREACH (Qt3DRender::QAnnotation *c, criteria)
         c->setParent(m_finalPassFilter);
 }
 
diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
index 34c09175c..201614173 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
@@ -45,27 +45,27 @@
 #include <Qt3DRenderer/QCameraSelector>
 #include <Qt3DRenderer/QAnnotation>
 
-class DeferredRenderer : public Qt3D::QViewport
+class DeferredRenderer : public Qt3DRender::QViewport
 {
 public:
     explicit DeferredRenderer(Qt3D::QNode *parent = 0);
 
     void setSceneCamera(Qt3D::QEntity *camera);
-    void setGBuffer(Qt3D::QRenderTarget *gBuffer);
-    void setGeometryPassCriteria(QList<Qt3D::QAnnotation *> criteria);
-    void setFinalPassCriteria(QList<Qt3D::QAnnotation *> criteria);
+    void setGBuffer(Qt3DRender::QRenderTarget *gBuffer);
+    void setGeometryPassCriteria(QList<Qt3DRender::QAnnotation *> criteria);
+    void setFinalPassCriteria(QList<Qt3DRender::QAnnotation *> criteria);
     void setGBufferLayers(const QStringList &layerName);
     void setScreenQuadLayers(const QStringList &layerName);
 
 private:
-    Qt3D::QLayerFilter *m_sceneFilter;
-    Qt3D::QLayerFilter *m_screenQuadFilter;
-    Qt3D::QClearBuffer *m_clearScreenQuad;
-    Qt3D::QRenderTargetSelector *m_gBufferTargetSelector;
-    Qt3D::QClearBuffer *m_clearGBuffer;
-    Qt3D::QRenderPassFilter *m_geometryPassFilter;
-    Qt3D::QRenderPassFilter *m_finalPassFilter;
-    Qt3D::QCameraSelector *m_sceneCameraSelector;
+    Qt3DRender::QLayerFilter *m_sceneFilter;
+    Qt3DRender::QLayerFilter *m_screenQuadFilter;
+    Qt3DRender::QClearBuffer *m_clearScreenQuad;
+    Qt3DRender::QRenderTargetSelector *m_gBufferTargetSelector;
+    Qt3DRender::QClearBuffer *m_clearGBuffer;
+    Qt3DRender::QRenderPassFilter *m_geometryPassFilter;
+    Qt3DRender::QRenderPassFilter *m_finalPassFilter;
+    Qt3DRender::QCameraSelector *m_sceneCameraSelector;
 };
 
 #endif // DEFERREDRENDERER_H
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
index 96134c297..d12cc1450 100644
--- a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
@@ -41,27 +41,27 @@
 #include <QUrl>
 
 FinalEffect::FinalEffect(Qt3D::QNode *parent)
-    : Qt3D::QEffect(parent)
-    , m_gl3Technique(new Qt3D::QTechnique())
-    , m_gl2Technique(new Qt3D::QTechnique())
-    , m_gl2Pass(new Qt3D::QRenderPass())
-    , m_gl3Pass(new Qt3D::QRenderPass())
-    , m_passCriterion(new Qt3D::QAnnotation(this))
+    : Qt3DRender::QEffect(parent)
+    , m_gl3Technique(new Qt3DRender::QTechnique())
+    , m_gl2Technique(new Qt3DRender::QTechnique())
+    , m_gl2Pass(new Qt3DRender::QRenderPass())
+    , m_gl3Pass(new Qt3DRender::QRenderPass())
+    , m_passCriterion(new Qt3DRender::QAnnotation(this))
 {
-    m_gl3Technique->openGLFilter()->setApi(Qt3D::QOpenGLFilter::Desktop);
+    m_gl3Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
     m_gl3Technique->openGLFilter()->setMajorVersion(3);
     m_gl3Technique->openGLFilter()->setMinorVersion(1);
-    m_gl3Technique->openGLFilter()->setProfile(Qt3D::QOpenGLFilter::Core);
+    m_gl3Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::Core);
 
-    m_gl2Technique->openGLFilter()->setApi(Qt3D::QOpenGLFilter::Desktop);
+    m_gl2Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
     m_gl2Technique->openGLFilter()->setMajorVersion(2);
     m_gl2Technique->openGLFilter()->setMinorVersion(0);
-    m_gl2Technique->openGLFilter()->setProfile(Qt3D::QOpenGLFilter::None);
+    m_gl2Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::None);
 
     m_passCriterion->setName(QStringLiteral("pass"));
     m_passCriterion->setValue(QStringLiteral("final"));
 
-    Qt3D::QShaderProgram *gl3Shader = new Qt3D::QShaderProgram();
+    Qt3DRender::QShaderProgram *gl3Shader = new Qt3DRender::QShaderProgram();
     gl3Shader->setVertexShaderCode(gl3Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl3.vert"))));
     gl3Shader->setFragmentShaderCode(gl3Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl3.frag"))));
 
@@ -69,7 +69,7 @@ FinalEffect::FinalEffect(Qt3D::QNode *parent)
     m_gl3Pass->setShaderProgram(gl3Shader);
     m_gl3Technique->addPass(m_gl3Pass);
 
-    Qt3D::QShaderProgram *gl2Shader = new Qt3D::QShaderProgram();
+    Qt3DRender::QShaderProgram *gl2Shader = new Qt3DRender::QShaderProgram();
     gl2Shader->setVertexShaderCode(gl2Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl2.vert"))));
     gl2Shader->setFragmentShaderCode(gl2Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl2.frag"))));
 
@@ -81,7 +81,7 @@ FinalEffect::FinalEffect(Qt3D::QNode *parent)
     addTechnique(m_gl2Technique);
 }
 
-QList<Qt3D::QAnnotation *> FinalEffect::passCriteria() const
+QList<Qt3DRender::QAnnotation *> FinalEffect::passCriteria() const
 {
-    return QList<Qt3D::QAnnotation *>() << m_passCriterion;
+    return QList<Qt3DRender::QAnnotation *>() << m_passCriterion;
 }
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.h b/examples/qt3d/deferred-renderer-cpp/finaleffect.h
index 11fb4c6f3..9bd48cd9d 100644
--- a/examples/qt3d/deferred-renderer-cpp/finaleffect.h
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.h
@@ -40,21 +40,21 @@
 #include <Qt3DRenderer/QEffect>
 #include <Qt3DRenderer/QTechnique>
 
-class FinalEffect : public Qt3D::QEffect
+class FinalEffect : public Qt3DRender::QEffect
 {
 public:
     explicit FinalEffect(Qt3D::QNode *parent = 0);
 
-    QList<Qt3D::QAnnotation *> passCriteria() const;
-    inline Qt3D::QTechnique *gl3Technique() const { return m_gl3Technique; }
-    inline Qt3D::QTechnique *gl2Technique() const { return m_gl2Technique; }
+    QList<Qt3DRender::QAnnotation *> passCriteria() const;
+    inline Qt3DRender::QTechnique *gl3Technique() const { return m_gl3Technique; }
+    inline Qt3DRender::QTechnique *gl2Technique() const { return m_gl2Technique; }
 
 private :
-    Qt3D::QTechnique *m_gl3Technique;
-    Qt3D::QTechnique *m_gl2Technique;
-    Qt3D::QRenderPass *m_gl2Pass;
-    Qt3D::QRenderPass *m_gl3Pass;
-    Qt3D::QAnnotation *m_passCriterion;
+    Qt3DRender::QTechnique *m_gl3Technique;
+    Qt3DRender::QTechnique *m_gl2Technique;
+    Qt3DRender::QRenderPass *m_gl2Pass;
+    Qt3DRender::QRenderPass *m_gl3Pass;
+    Qt3DRender::QAnnotation *m_passCriterion;
 };
 
 #endif // FINALEFFECT_H
diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
index a05adfc72..ab59cf692 100644
--- a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
@@ -37,20 +37,20 @@
 #include "gbuffer.h"
 
 GBuffer::GBuffer(Qt3D::QNode *parent)
-    : Qt3D::QRenderTarget(parent)
+    : Qt3DRender::QRenderTarget(parent)
 {
-    const Qt3D::QAbstractTextureProvider::TextureFormat formats[AttachmentsCount] = {
-        Qt3D::QAbstractTextureProvider::RGBA32F,
-        Qt3D::QAbstractTextureProvider::RGB32F,
-        Qt3D::QAbstractTextureProvider::RGB16F,
-        Qt3D::QAbstractTextureProvider::D32F
+    const Qt3DRender::QAbstractTextureProvider::TextureFormat formats[AttachmentsCount] = {
+        Qt3DRender::QAbstractTextureProvider::RGBA32F,
+        Qt3DRender::QAbstractTextureProvider::RGB32F,
+        Qt3DRender::QAbstractTextureProvider::RGB16F,
+        Qt3DRender::QAbstractTextureProvider::D32F
     };
 
-    const Qt3D::QRenderAttachment::RenderAttachmentType attachmentTypes[AttachmentsCount] = {
-        Qt3D::QRenderAttachment::ColorAttachment0,
-        Qt3D::QRenderAttachment::ColorAttachment1,
-        Qt3D::QRenderAttachment::ColorAttachment2,
-        Qt3D::QRenderAttachment::DepthAttachment
+    const Qt3DRender::QRenderAttachment::RenderAttachmentType attachmentTypes[AttachmentsCount] = {
+        Qt3DRender::QRenderAttachment::ColorAttachment0,
+        Qt3DRender::QRenderAttachment::ColorAttachment1,
+        Qt3DRender::QRenderAttachment::ColorAttachment2,
+        Qt3DRender::QRenderAttachment::DepthAttachment
     };
 
     const QString attachmentNames[AttachmentsCount] = {
@@ -61,16 +61,16 @@ GBuffer::GBuffer(Qt3D::QNode *parent)
     };
 
     for (int i = 0; i < AttachmentsCount; i++) {
-        Qt3D::QRenderAttachment *attachment = new Qt3D::QRenderAttachment(this);
+        Qt3DRender::QRenderAttachment *attachment = new Qt3DRender::QRenderAttachment(this);
 
-        m_textures[i] = new Qt3D::QTexture2D();
+        m_textures[i] = new Qt3DRender::QTexture2D();
         m_textures[i]->setFormat(formats[i]);
         m_textures[i]->setWidth(1024);
         m_textures[i]->setHeight(1024);
         m_textures[i]->setGenerateMipMaps(false);
-        m_textures[i]->setWrapMode(Qt3D::QTextureWrapMode(Qt3D::QTextureWrapMode::ClampToEdge));
-        m_textures[i]->setMinificationFilter(Qt3D::QAbstractTextureProvider::Linear);
-        m_textures[i]->setMagnificationFilter(Qt3D::QAbstractTextureProvider::Linear);
+        m_textures[i]->setWrapMode(Qt3DRender::QTextureWrapMode(Qt3DRender::QTextureWrapMode::ClampToEdge));
+        m_textures[i]->setMinificationFilter(Qt3DRender::QAbstractTextureProvider::Linear);
+        m_textures[i]->setMagnificationFilter(Qt3DRender::QAbstractTextureProvider::Linear);
 
         attachment->setTexture(m_textures[i]);
         attachment->setType(attachmentTypes[i]);
@@ -80,22 +80,22 @@ GBuffer::GBuffer(Qt3D::QNode *parent)
     }
 }
 
-Qt3D::QAbstractTextureProvider *GBuffer::colorTexture() const
+Qt3DRender::QAbstractTextureProvider *GBuffer::colorTexture() const
 {
     return m_textures[Color];
 }
 
-Qt3D::QAbstractTextureProvider *GBuffer::positionTexture() const
+Qt3DRender::QAbstractTextureProvider *GBuffer::positionTexture() const
 {
     return m_textures[Position];
 }
 
-Qt3D::QAbstractTextureProvider *GBuffer::normalTexture() const
+Qt3DRender::QAbstractTextureProvider *GBuffer::normalTexture() const
 {
     return m_textures[Normal];
 }
 
-Qt3D::QAbstractTextureProvider *GBuffer::depthTexture() const
+Qt3DRender::QAbstractTextureProvider *GBuffer::depthTexture() const
 {
     return m_textures[Depth];
 }
diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.h b/examples/qt3d/deferred-renderer-cpp/gbuffer.h
index 1302fbb66..0f7d20c8f 100644
--- a/examples/qt3d/deferred-renderer-cpp/gbuffer.h
+++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.h
@@ -41,7 +41,7 @@
 #include <Qt3DRenderer/qtexture.h>
 #include <Qt3DRenderer/QRenderAttachment>
 
-class GBuffer : public Qt3D::QRenderTarget
+class GBuffer : public Qt3DRender::QRenderTarget
 {
 public:
     explicit GBuffer(Qt3D::QNode *parent = 0);
@@ -54,14 +54,14 @@ public:
         AttachmentsCount
     };
 
-    Qt3D::QAbstractTextureProvider *colorTexture() const;
-    Qt3D::QAbstractTextureProvider *positionTexture() const;
-    Qt3D::QAbstractTextureProvider *normalTexture() const;
-    Qt3D::QAbstractTextureProvider *depthTexture() const;
+    Qt3DRender::QAbstractTextureProvider *colorTexture() const;
+    Qt3DRender::QAbstractTextureProvider *positionTexture() const;
+    Qt3DRender::QAbstractTextureProvider *normalTexture() const;
+    Qt3DRender::QAbstractTextureProvider *depthTexture() const;
 
 private:
-    Qt3D::QAbstractTextureProvider *m_textures[AttachmentsCount];
-    Qt3D::QRenderAttachment *m_attachments[AttachmentsCount];
+    Qt3DRender::QAbstractTextureProvider *m_textures[AttachmentsCount];
+    Qt3DRender::QRenderAttachment *m_attachments[AttachmentsCount];
 };
 
 #endif // GBUFFER_H
diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp
index 129d3174d..b82353dc1 100644
--- a/examples/qt3d/deferred-renderer-cpp/main.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/main.cpp
@@ -68,7 +68,7 @@ int main(int ac, char **av)
 {
     QGuiApplication app(ac, av);
 
-    Qt3D::QWindow view;
+    Qt3DRender::QWindow view;
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect();
     view.registerAspect(input);
 
@@ -81,22 +81,22 @@ int main(int ac, char **av)
     FinalEffect *finalEffect = new FinalEffect();
     SceneEffect *sceneEffect = new SceneEffect();
 
-    Qt3D::QSphereMesh *sphereMesh = new Qt3D::QSphereMesh();
+    Qt3DRender::QSphereMesh *sphereMesh = new Qt3DRender::QSphereMesh();
     sphereMesh->setRings(50);
     sphereMesh->setSlices(100);
 
-    Qt3D::QLayer *sceneLayer = new Qt3D::QLayer();
+    Qt3DRender::QLayer *sceneLayer = new Qt3DRender::QLayer();
     sceneLayer->setNames(QStringList("scene"));
 
-    Qt3D::QLayer *quadLayer = new Qt3D::QLayer();
+    Qt3DRender::QLayer *quadLayer = new Qt3DRender::QLayer();
     quadLayer->setNames(QStringList("screenQuad"));
 
-    Qt3D::QPlaneMesh *planeMesh = new Qt3D::QPlaneMesh();
+    Qt3DRender::QPlaneMesh *planeMesh = new Qt3DRender::QPlaneMesh();
     planeMesh->setMeshResolution(QSize(2, 2));
     planeMesh->setWidth(2.0f);
     planeMesh->setHeight(2.0f);
 
-    Qt3D::QPointLight *light1 = new Qt3D::QPointLight();
+    Qt3DRender::QPointLight *light1 = new Qt3DRender::QPointLight();
     light1->setColor(Qt::white);
     light1->setIntensity(1.5f);
 
@@ -117,7 +117,7 @@ int main(int ac, char **av)
     input->setCamera(camera);
 
     // FrameGraph
-    Qt3D::QFrameGraph *frameGraph = new Qt3D::QFrameGraph();
+    Qt3DRender::QFrameGraph *frameGraph = new Qt3DRender::QFrameGraph();
     DeferredRenderer *deferredRenderer = new DeferredRenderer();
     deferredRenderer->setClearColor(Qt::black);
     deferredRenderer->setRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f));
@@ -133,17 +133,17 @@ int main(int ac, char **av)
 
     // Scene Content
     Qt3D::QEntity *sphereOne = new Qt3D::QEntity(rootEntity);
-    Qt3D::QMaterial *sphereOneMaterial = new Qt3D::QMaterial();
+    Qt3DRender::QMaterial *sphereOneMaterial = new Qt3DRender::QMaterial();
 
     sphereOneMaterial->setEffect(sceneEffect);
-    sphereOneMaterial->addParameter(new Qt3D::QParameter(QStringLiteral("meshColor"), QColor(Qt::blue)));
+    sphereOneMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("meshColor"), QColor(Qt::blue)));
 
     Qt3D::QTranslateTransform *sphereOneTranslate = new Qt3D::QTranslateTransform();
     sphereOneTranslate->setDx(-10.0f);
     sphereOneTranslate->setDy(0.0f);
     sphereOneTranslate->setDz(25.0f);
 
-    Qt3D::QPointLight *light2 = new Qt3D::QPointLight();
+    Qt3DRender::QPointLight *light2 = new Qt3DRender::QPointLight();
     light2->setColor(Qt::white);
     light2->setIntensity(1.5f);
 
@@ -154,11 +154,11 @@ int main(int ac, char **av)
     sphereOne->addComponent(light2);
 
     Qt3D::QEntity *sphereTwo = new Qt3D::QEntity(rootEntity);
-    Qt3D::QMaterial *sphereTwoMaterial = new Qt3D::QMaterial();
+    Qt3DRender::QMaterial *sphereTwoMaterial = new Qt3DRender::QMaterial();
     sphereTwoMaterial->setEffect(sceneEffect);
-    sphereTwoMaterial->addParameter(new Qt3D::QParameter(QStringLiteral("meshColor"), QColor(Qt::yellow)));
+    sphereTwoMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("meshColor"), QColor(Qt::yellow)));
 
-    Qt3D::QPointLight *light3 = new Qt3D::QPointLight();
+    Qt3DRender::QPointLight *light3 = new Qt3DRender::QPointLight();
     light3->setColor(Qt::blue);
     light3->setIntensity(0.5f);
 
@@ -169,18 +169,18 @@ int main(int ac, char **av)
 
     // Screen Quad
     Qt3D::QEntity *screenQuad = new Qt3D::QEntity(rootEntity);
-    Qt3D::QMaterial *screenQuadMaterial = new Qt3D::QMaterial();
-    screenQuadMaterial->addParameter(new Qt3D::QParameter(QStringLiteral("position"), gBuffer->positionTexture()));
-    screenQuadMaterial->addParameter(new Qt3D::QParameter(QStringLiteral("normal"), gBuffer->normalTexture()));
-    screenQuadMaterial->addParameter(new Qt3D::QParameter(QStringLiteral("color"), gBuffer->colorTexture()));
-    screenQuadMaterial->addParameter(new Qt3D::QParameter(QStringLiteral("winSize"), QSize(1024, 1024)));
+    Qt3DRender::QMaterial *screenQuadMaterial = new Qt3DRender::QMaterial();
+    screenQuadMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("position"), gBuffer->positionTexture()));
+    screenQuadMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("normal"), gBuffer->normalTexture()));
+    screenQuadMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("color"), gBuffer->colorTexture()));
+    screenQuadMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("winSize"), QSize(1024, 1024)));
     PointLightBlock *lightsData = new PointLightBlock(screenQuadMaterial);
     lightsData->addLight(light1);
     lightsData->addLight(light2);
     lightsData->addLight(light3);
 
-    finalEffect->gl3Technique()->addParameter(new Qt3D::QParameter(QStringLiteral("PointLightBlock"), QVariant::fromValue(lightsData)));
-    finalEffect->gl2Technique()->addParameter(new Qt3D::QParameter(QStringLiteral("pointLights"), QVariant::fromValue(lightsData)));
+    finalEffect->gl3Technique()->addParameter(new Qt3DRender::QParameter(QStringLiteral("PointLightBlock"), QVariant::fromValue(lightsData)));
+    finalEffect->gl2Technique()->addParameter(new Qt3DRender::QParameter(QStringLiteral("pointLights"), QVariant::fromValue(lightsData)));
     screenQuadMaterial->setEffect(finalEffect);
 
     Qt3D::QRotateTransform *screenPlaneRotation = new Qt3D::QRotateTransform();
diff --git a/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp b/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
index 07d77fd7a..5186d0f1b 100644
--- a/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
@@ -37,7 +37,7 @@
 #include "pointlightblock.h"
 
 PointLightBlock::PointLightBlock(Qt3D::QNode *parent)
-    : Qt3D::QShaderData(parent)
+    : Qt3DRender::QShaderData(parent)
 {
 
 }
@@ -46,12 +46,12 @@ PointLightBlock::~PointLightBlock()
 {
 }
 
-QList<Qt3D::QShaderData *> PointLightBlock::lights() const
+QList<Qt3DRender::QShaderData *> PointLightBlock::lights() const
 {
     return m_lights;
 }
 
-void PointLightBlock::addLight(Qt3D::QShaderData *light)
+void PointLightBlock::addLight(Qt3DRender::QShaderData *light)
 {
     m_lights.append(light);
     emit lightsChanged();
diff --git a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
index 8fb470504..6e8d3639f 100644
--- a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
+++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
@@ -39,7 +39,7 @@
 
 #include <Qt3DRenderer/QShaderData>
 
-class PointLightBlock : public Qt3D::QShaderData
+class PointLightBlock : public Qt3DRender::QShaderData
 {
     Q_OBJECT
     Q_PROPERTY(QList<QShaderData *> lights READ lights NOTIFY lightsChanged)
@@ -47,14 +47,14 @@ public:
     explicit PointLightBlock(Qt3D::QNode *parent = 0);
     ~PointLightBlock();
 
-    QList<QShaderData *> lights() const;
-    void addLight(QShaderData *light);
+    QList<Qt3DRender::QShaderData *> lights() const;
+    void addLight(Qt3DRender::QShaderData *light);
 
 Q_SIGNALS:
     void lightsChanged();
 
 private:
-    QList<Qt3D::QShaderData *> m_lights;
+    QList<Qt3DRender::QShaderData *> m_lights;
 };
 
 #endif // POINTLIGHTBLOCK_H
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
index 98eb677ed..a4c208905 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
@@ -41,39 +41,39 @@
 #include <QUrl>
 
 SceneEffect::SceneEffect(Qt3D::QNode *parent)
-    : Qt3D::QEffect(parent)
-    , m_gl3Technique(new Qt3D::QTechnique())
-    , m_gl2Technique(new Qt3D::QTechnique())
-    , m_gl2Pass(new Qt3D::QRenderPass())
-    , m_gl3Pass(new Qt3D::QRenderPass())
-    , m_passCriterion(new Qt3D::QAnnotation(this))
+    : Qt3DRender::QEffect(parent)
+    , m_gl3Technique(new Qt3DRender::QTechnique())
+    , m_gl2Technique(new Qt3DRender::QTechnique())
+    , m_gl2Pass(new Qt3DRender::QRenderPass())
+    , m_gl3Pass(new Qt3DRender::QRenderPass())
+    , m_passCriterion(new Qt3DRender::QAnnotation(this))
 {
 
-    m_gl3Technique->openGLFilter()->setProfile(Qt3D::QOpenGLFilter::None);
-    m_gl3Technique->openGLFilter()->setApi(Qt3D::QOpenGLFilter::Desktop);
+    m_gl3Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::None);
+    m_gl3Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
     m_gl3Technique->openGLFilter()->setMajorVersion(3);
     m_gl3Technique->openGLFilter()->setMinorVersion(3);
 
-    m_gl2Technique->openGLFilter()->setApi(Qt3D::QOpenGLFilter::Desktop);
+    m_gl2Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
     m_gl2Technique->openGLFilter()->setMajorVersion(2);
     m_gl2Technique->openGLFilter()->setMinorVersion(0);
-    m_gl2Technique->openGLFilter()->setProfile(Qt3D::QOpenGLFilter::None);
+    m_gl2Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::None);
 
 
     m_passCriterion->setName(QStringLiteral("pass"));
     m_passCriterion->setValue(QStringLiteral("geometry"));
 
-    Qt3D::QShaderProgram *gl3Shader = new Qt3D::QShaderProgram();
-    gl3Shader->setVertexShaderCode(Qt3D::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl3.vert"))));
-    gl3Shader->setFragmentShaderCode(Qt3D::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl3.frag"))));
+    Qt3DRender::QShaderProgram *gl3Shader = new Qt3DRender::QShaderProgram();
+    gl3Shader->setVertexShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl3.vert"))));
+    gl3Shader->setFragmentShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl3.frag"))));
 
     m_gl3Pass->addAnnotation(m_passCriterion);
     m_gl3Pass->setShaderProgram(gl3Shader);
     m_gl3Technique->addPass(m_gl3Pass);
 
-    Qt3D::QShaderProgram *gl2Shader = new Qt3D::QShaderProgram();
-    gl2Shader->setVertexShaderCode(Qt3D::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl2.vert"))));
-    gl2Shader->setFragmentShaderCode(Qt3D::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl2.frag"))));
+    Qt3DRender::QShaderProgram *gl2Shader = new Qt3DRender::QShaderProgram();
+    gl2Shader->setVertexShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl2.vert"))));
+    gl2Shader->setFragmentShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl2.frag"))));
 
     m_gl2Pass->addAnnotation(m_passCriterion);
     m_gl2Pass->setShaderProgram(gl2Shader);
@@ -83,7 +83,7 @@ SceneEffect::SceneEffect(Qt3D::QNode *parent)
     addTechnique(m_gl2Technique);
 }
 
-QList<Qt3D::QAnnotation *> SceneEffect::passCriteria() const
+QList<Qt3DRender::QAnnotation *> SceneEffect::passCriteria() const
 {
-    return QList<Qt3D::QAnnotation *>() << m_passCriterion;
+    return QList<Qt3DRender::QAnnotation *>() << m_passCriterion;
 }
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
index 18a869bfe..9f88aef31 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
@@ -40,19 +40,19 @@
 #include <Qt3DRenderer/QEffect>
 #include <Qt3DRenderer/QTechnique>
 
-class SceneEffect : public Qt3D::QEffect
+class SceneEffect : public Qt3DRender::QEffect
 {
 public:
     explicit SceneEffect(Qt3D::QNode *parent = 0);
 
-    QList<Qt3D::QAnnotation *> passCriteria() const;
+    QList<Qt3DRender::QAnnotation *> passCriteria() const;
 
 private:
-    Qt3D::QTechnique *m_gl3Technique;
-    Qt3D::QTechnique *m_gl2Technique;
-    Qt3D::QRenderPass *m_gl2Pass;
-    Qt3D::QRenderPass *m_gl3Pass;
-    Qt3D::QAnnotation *m_passCriterion;
+    Qt3DRender::QTechnique *m_gl3Technique;
+    Qt3DRender::QTechnique *m_gl2Technique;
+    Qt3DRender::QRenderPass *m_gl2Pass;
+    Qt3DRender::QRenderPass *m_gl3Pass;
+    Qt3DRender::QAnnotation *m_passCriterion;
 };
 
 #endif // SCENEEFFECT_H
diff --git a/examples/qt3d/deferred-renderer-qml/main.cpp b/examples/qt3d/deferred-renderer-qml/main.cpp
index 16145787a..23853de6c 100644
--- a/examples/qt3d/deferred-renderer-qml/main.cpp
+++ b/examples/qt3d/deferred-renderer-qml/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     engine.aspectEngine()->initialize();
     QVariantMap data;
diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.cpp b/examples/qt3d/dynamicscene-cpp/boxentity.cpp
index a3f539564..9b35c2316 100644
--- a/examples/qt3d/dynamicscene-cpp/boxentity.cpp
+++ b/examples/qt3d/dynamicscene-cpp/boxentity.cpp
@@ -42,8 +42,8 @@ BoxEntity::BoxEntity(QNode *parent)
     : Qt3D::QEntity(parent)
     , m_transform(new Qt3D::QTransform())
     , m_translate(new Qt3D::QTranslateTransform())
-    , m_mesh(new Qt3D::QCuboidMesh())
-    , m_material(new Qt3D::QPhongMaterial())
+    , m_mesh(new Qt3DRender::QCuboidMesh())
+    , m_material(new Qt3DRender::QPhongMaterial())
     , m_angle(0.0f)
     , m_radius(1.0f)
 {
diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.h b/examples/qt3d/dynamicscene-cpp/boxentity.h
index 6dcf81aff..ab5b15aac 100644
--- a/examples/qt3d/dynamicscene-cpp/boxentity.h
+++ b/examples/qt3d/dynamicscene-cpp/boxentity.h
@@ -75,8 +75,8 @@ private:
     Qt3D::QTransform *m_transform;
     Qt3D::QTranslateTransform *m_translate;
     Qt3D::QScaleTransform *m_scale;
-    Qt3D::QCuboidMesh *m_mesh;
-    Qt3D::QPhongMaterial *m_material;
+    Qt3DRender::QCuboidMesh *m_mesh;
+    Qt3DRender::QPhongMaterial *m_material;
     float m_angle;
     float m_radius;
 };
diff --git a/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp b/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp
index 3c4fd0758..948252790 100644
--- a/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp
+++ b/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp
@@ -37,14 +37,14 @@
 #include "forwardrenderer.h"
 
 ForwardRenderer::ForwardRenderer(Qt3D::QNode *parent)
-    : Qt3D::QFrameGraph(parent)
-    , m_viewport(new Qt3D::QViewport())
-    , m_cameraSelector(new Qt3D::QCameraSelector())
-    , m_clearBuffer(new Qt3D::QClearBuffer())
+    : Qt3DRender::QFrameGraph(parent)
+    , m_viewport(new Qt3DRender::QViewport())
+    , m_cameraSelector(new Qt3DRender::QCameraSelector())
+    , m_clearBuffer(new Qt3DRender::QClearBuffer())
 {
     m_viewport->setRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f));
     m_viewport->setClearColor(Qt::white);
-    m_clearBuffer->setBuffers(Qt3D::QClearBuffer::ColorDepthBuffer);
+    m_clearBuffer->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer);
     m_cameraSelector->setParent(m_viewport);
     m_clearBuffer->setParent(m_cameraSelector);
     setActiveFrameGraph(m_viewport);
diff --git a/examples/qt3d/dynamicscene-cpp/forwardrenderer.h b/examples/qt3d/dynamicscene-cpp/forwardrenderer.h
index faf6389f9..6df489e29 100644
--- a/examples/qt3d/dynamicscene-cpp/forwardrenderer.h
+++ b/examples/qt3d/dynamicscene-cpp/forwardrenderer.h
@@ -42,7 +42,7 @@
 #include <Qt3DRenderer/QCameraSelector>
 #include <Qt3DRenderer/QClearBuffer>
 
-class ForwardRenderer : public Qt3D::QFrameGraph
+class ForwardRenderer : public Qt3DRender::QFrameGraph
 {
 public:
     ForwardRenderer(Qt3D::QNode *parent);
@@ -50,9 +50,9 @@ public:
     void setCamera(Qt3D::QEntity *camera);
 
 private:
-    Qt3D::QViewport *m_viewport;
-    Qt3D::QCameraSelector *m_cameraSelector;
-    Qt3D::QClearBuffer *m_clearBuffer;
+    Qt3DRender::QViewport *m_viewport;
+    Qt3DRender::QCameraSelector *m_cameraSelector;
+    Qt3DRender::QClearBuffer *m_clearBuffer;
 };
 
 #endif // FORWARDRENDERER_H
diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp
index 27ca086bd..72c302ba1 100644
--- a/examples/qt3d/dynamicscene-cpp/main.cpp
+++ b/examples/qt3d/dynamicscene-cpp/main.cpp
@@ -55,7 +55,7 @@ int main(int argc, char* argv[])
 
     Window view;
     Qt3D::QAspectEngine engine;
-    engine.registerAspect(new Qt3D::QRenderAspect());
+    engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
     engine.initialize();
@@ -77,8 +77,8 @@ int main(int argc, char* argv[])
     input->setCamera(basicCamera);
 
     // Forward Renderer FrameGraph
-    Qt3D::QFrameGraph *frameGraph = new Qt3D::QFrameGraph(sceneRoot);
-    Qt3D::QForwardRenderer *forwardRenderer = new Qt3D::QForwardRenderer();
+    Qt3DRender::QFrameGraph *frameGraph = new Qt3DRender::QFrameGraph(sceneRoot);
+    Qt3DRender::QForwardRenderer *forwardRenderer = new Qt3DRender::QForwardRenderer();
     forwardRenderer->setCamera(basicCamera);
     frameGraph->setActiveFrameGraph(forwardRenderer);
     sceneRoot->addComponent(frameGraph);
diff --git a/examples/qt3d/enabled-qml/main.cpp b/examples/qt3d/enabled-qml/main.cpp
index 6152557a5..40e119231 100644
--- a/examples/qt3d/enabled-qml/main.cpp
+++ b/examples/qt3d/enabled-qml/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
 
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->initialize();
     QVariantMap data;
     data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view)));
diff --git a/examples/qt3d/gltf/main.cpp b/examples/qt3d/gltf/main.cpp
index 112661bef..c32850a20 100644
--- a/examples/qt3d/gltf/main.cpp
+++ b/examples/qt3d/gltf/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
 
     QVariantMap data;
diff --git a/examples/qt3d/gooch-qml/main.cpp b/examples/qt3d/gooch-qml/main.cpp
index eaf35b0a3..7d5e65a85 100644
--- a/examples/qt3d/gooch-qml/main.cpp
+++ b/examples/qt3d/gooch-qml/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
 
     // Expose the window as a context property so we can set the aspect ratio
diff --git a/examples/qt3d/keyboardinput-qml/main.cpp b/examples/qt3d/keyboardinput-qml/main.cpp
index 52bf03e48..9239c9b7e 100644
--- a/examples/qt3d/keyboardinput-qml/main.cpp
+++ b/examples/qt3d/keyboardinput-qml/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     engine.aspectEngine()->initialize();
     QVariantMap data;
diff --git a/examples/qt3d/loader-qml/main.cpp b/examples/qt3d/loader-qml/main.cpp
index bfa959eab..79f5bfdb4 100644
--- a/examples/qt3d/loader-qml/main.cpp
+++ b/examples/qt3d/loader-qml/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     engine.aspectEngine()->initialize();
     QVariantMap data;
diff --git a/examples/qt3d/materials-cpp/barrel.cpp b/examples/qt3d/materials-cpp/barrel.cpp
index 069732254..c89b58d52 100644
--- a/examples/qt3d/materials-cpp/barrel.cpp
+++ b/examples/qt3d/materials-cpp/barrel.cpp
@@ -62,13 +62,13 @@ Barrel::Barrel(Qt3D::QNode *parent)
     , m_bumps(NoBumps)
     , m_diffuseColor(Red)
     , m_specularColor(None)
-    , m_material(new Qt3D::QNormalDiffuseSpecularMapMaterial())
+    , m_material(new Qt3DRender::QNormalDiffuseSpecularMapMaterial())
     , m_diffuseTexture(m_material->diffuse())
     , m_normalTexture(m_material->normal())
     , m_specularTexture(m_material->specular())
-    , m_diffuseTextureImage(new Qt3D::QTextureImage())
-    , m_normalTextureImage(new Qt3D::QTextureImage())
-    , m_specularTextureImage(new Qt3D::QTextureImage())
+    , m_diffuseTextureImage(new Qt3DRender::QTextureImage())
+    , m_normalTextureImage(new Qt3DRender::QTextureImage())
+    , m_specularTextureImage(new Qt3DRender::QTextureImage())
 {
     mesh()->setSource(QUrl(QStringLiteral("qrc:/assets/metalbarrel/metal_barrel.obj")));
     scaleTransform()->setScale(0.03f);
diff --git a/examples/qt3d/materials-cpp/barrel.h b/examples/qt3d/materials-cpp/barrel.h
index 8ff1c32df..0a8b81bde 100644
--- a/examples/qt3d/materials-cpp/barrel.h
+++ b/examples/qt3d/materials-cpp/barrel.h
@@ -82,13 +82,13 @@ private:
     Bumps m_bumps;
     DiffuseColor m_diffuseColor;
     SpecularColor m_specularColor;
-    Qt3D::QNormalDiffuseSpecularMapMaterial *m_material;
-    Qt3D::QAbstractTextureProvider *m_diffuseTexture;
-    Qt3D::QAbstractTextureProvider *m_normalTexture;
-    Qt3D::QAbstractTextureProvider *m_specularTexture;
-    Qt3D::QTextureImage *m_diffuseTextureImage;
-    Qt3D::QTextureImage *m_normalTextureImage;
-    Qt3D::QTextureImage *m_specularTextureImage;
+    Qt3DRender::QNormalDiffuseSpecularMapMaterial *m_material;
+    Qt3DRender::QAbstractTextureProvider *m_diffuseTexture;
+    Qt3DRender::QAbstractTextureProvider *m_normalTexture;
+    Qt3DRender::QAbstractTextureProvider *m_specularTexture;
+    Qt3DRender::QTextureImage *m_diffuseTextureImage;
+    Qt3DRender::QTextureImage *m_normalTextureImage;
+    Qt3DRender::QTextureImage *m_specularTextureImage;
 
     void setNormalTextureSource();
     void setDiffuseTextureSource();
diff --git a/examples/qt3d/materials-cpp/houseplant.cpp b/examples/qt3d/materials-cpp/houseplant.cpp
index c1bea7ecd..df1384486 100644
--- a/examples/qt3d/materials-cpp/houseplant.cpp
+++ b/examples/qt3d/materials-cpp/houseplant.cpp
@@ -58,16 +58,16 @@ HousePlant::HousePlant(Qt3D::QNode *parent)
     , m_pot(new RenderableEntity(this))
     , m_plant(new RenderableEntity(m_pot))
     , m_cover(new RenderableEntity(m_pot))
-    , m_potMaterial(new Qt3D::QNormalDiffuseMapMaterial())
-    , m_plantMaterial(new Qt3D::QNormalDiffuseMapAlphaMaterial())
-    , m_coverMaterial(new Qt3D::QNormalDiffuseMapMaterial())
-    , m_potImage(new Qt3D::QTextureImage())
-
-    , m_potNormalImage(new Qt3D::QTextureImage())
-    , m_plantImage(new Qt3D::QTextureImage())
-    , m_plantNormalImage(new Qt3D::QTextureImage())
-    , m_coverImage(new Qt3D::QTextureImage())
-    , m_coverNormalImage(new Qt3D::QTextureImage())
+    , m_potMaterial(new Qt3DRender::QNormalDiffuseMapMaterial())
+    , m_plantMaterial(new Qt3DRender::QNormalDiffuseMapAlphaMaterial())
+    , m_coverMaterial(new Qt3DRender::QNormalDiffuseMapMaterial())
+    , m_potImage(new Qt3DRender::QTextureImage())
+
+    , m_potNormalImage(new Qt3DRender::QTextureImage())
+    , m_plantImage(new Qt3DRender::QTextureImage())
+    , m_plantNormalImage(new Qt3DRender::QTextureImage())
+    , m_coverImage(new Qt3DRender::QTextureImage())
+    , m_coverNormalImage(new Qt3DRender::QTextureImage())
     , m_plantType(Bamboo)
     , m_potShape(Cross)
 {
diff --git a/examples/qt3d/materials-cpp/houseplant.h b/examples/qt3d/materials-cpp/houseplant.h
index 150984f59..36cb6ca23 100644
--- a/examples/qt3d/materials-cpp/houseplant.h
+++ b/examples/qt3d/materials-cpp/houseplant.h
@@ -86,16 +86,16 @@ private:
     RenderableEntity *m_plant;
     RenderableEntity *m_cover;
 
-    Qt3D::QNormalDiffuseMapMaterial *m_potMaterial;
-    Qt3D::QNormalDiffuseMapAlphaMaterial *m_plantMaterial;
-    Qt3D::QNormalDiffuseMapMaterial *m_coverMaterial;
+    Qt3DRender::QNormalDiffuseMapMaterial *m_potMaterial;
+    Qt3DRender::QNormalDiffuseMapAlphaMaterial *m_plantMaterial;
+    Qt3DRender::QNormalDiffuseMapMaterial *m_coverMaterial;
 
-    Qt3D::QTextureImage *m_potImage;
-    Qt3D::QTextureImage *m_potNormalImage;
-    Qt3D::QTextureImage *m_plantImage;
-    Qt3D::QTextureImage *m_plantNormalImage;
-    Qt3D::QTextureImage *m_coverImage;
-    Qt3D::QTextureImage *m_coverNormalImage;
+    Qt3DRender::QTextureImage *m_potImage;
+    Qt3DRender::QTextureImage *m_potNormalImage;
+    Qt3DRender::QTextureImage *m_plantImage;
+    Qt3DRender::QTextureImage *m_plantNormalImage;
+    Qt3DRender::QTextureImage *m_coverImage;
+    Qt3DRender::QTextureImage *m_coverNormalImage;
 
     Plant m_plantType;
     PotShape m_potShape;
diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp
index 0ea77c728..f18f1f32a 100644
--- a/examples/qt3d/materials-cpp/main.cpp
+++ b/examples/qt3d/materials-cpp/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char* argv[])
 
     Window view;
     Qt3D::QAspectEngine engine;
-    engine.registerAspect(new Qt3D::QRenderAspect());
+    engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
     engine.initialize();
@@ -84,8 +84,8 @@ int main(int argc, char* argv[])
     input->setCamera(basicCamera);
 
     // Forward Renderer FrameGraph
-    Qt3D::QFrameGraph *frameGraphComponent = new Qt3D::QFrameGraph(sceneRoot);
-    Qt3D::QForwardRenderer *forwardRenderer = new Qt3D::QForwardRenderer();
+    Qt3DRender::QFrameGraph *frameGraphComponent = new Qt3DRender::QFrameGraph(sceneRoot);
+    Qt3DRender::QForwardRenderer *forwardRenderer = new Qt3DRender::QForwardRenderer();
     forwardRenderer->setCamera(basicCamera);
     frameGraphComponent->setActiveFrameGraph(forwardRenderer);
     sceneRoot->addComponent(frameGraphComponent);
@@ -96,20 +96,20 @@ int main(int argc, char* argv[])
     planeEntity->mesh()->setWidth(100.0f);
     planeEntity->mesh()->setMeshResolution(QSize(20, 20));
 
-    Qt3D::QNormalDiffuseSpecularMapMaterial *normalDiffuseSpecularMapMaterial = new Qt3D::QNormalDiffuseSpecularMapMaterial();
+    Qt3DRender::QNormalDiffuseSpecularMapMaterial *normalDiffuseSpecularMapMaterial = new Qt3DRender::QNormalDiffuseSpecularMapMaterial();
     normalDiffuseSpecularMapMaterial->setTextureScale(10.0f);
     normalDiffuseSpecularMapMaterial->setShininess(80.0f);
     normalDiffuseSpecularMapMaterial->setAmbient(QColor::fromRgbF(0.2f, 0.2f, 0.2f, 1.0f));
 
-    Qt3D::QTextureImage *diffuseImage = new Qt3D::QTextureImage();
+    Qt3DRender::QTextureImage *diffuseImage = new Qt3DRender::QTextureImage();
     diffuseImage->setSource(QUrl(QStringLiteral("qrc:/assets/textures/pattern_09/diffuse.webp")));
     normalDiffuseSpecularMapMaterial->diffuse()->addTextureImage(diffuseImage);
 
-    Qt3D::QTextureImage *specularImage = new Qt3D::QTextureImage();
+    Qt3DRender::QTextureImage *specularImage = new Qt3DRender::QTextureImage();
     specularImage->setSource(QUrl(QStringLiteral("qrc:/assets/textures/pattern_09/specular.webp")));
     normalDiffuseSpecularMapMaterial->specular()->addTextureImage(specularImage);
 
-    Qt3D::QTextureImage *normalImage = new Qt3D::QTextureImage();
+    Qt3DRender::QTextureImage *normalImage = new Qt3DRender::QTextureImage();
     normalImage->setSource(QUrl((QStringLiteral("qrc:/assets/textures/pattern_09/normal.webp"))));
     normalDiffuseSpecularMapMaterial->normal()->addTextureImage(normalImage);
 
@@ -119,11 +119,11 @@ int main(int argc, char* argv[])
     RenderableEntity *chest = new RenderableEntity(sceneRoot);
     chest->scaleTransform()->setScale(0.03f);
     chest->mesh()->setSource(QUrl(QStringLiteral("qrc:/assets/chest/Chest.obj")));
-    Qt3D::QDiffuseMapMaterial *diffuseMapMaterial = new Qt3D::QDiffuseMapMaterial();
+    Qt3DRender::QDiffuseMapMaterial *diffuseMapMaterial = new Qt3DRender::QDiffuseMapMaterial();
     diffuseMapMaterial->setSpecular(QColor::fromRgbF(0.2f, 0.2f, 0.2f, 1.0f));
     diffuseMapMaterial->setShininess(2.0f);
 
-    Qt3D::QTextureImage *chestDiffuseImage = new Qt3D::QTextureImage();
+    Qt3DRender::QTextureImage *chestDiffuseImage = new Qt3DRender::QTextureImage();
     chestDiffuseImage->setSource(QUrl(QStringLiteral("qrc:/assets/chest/diffuse.webp")));
     diffuseMapMaterial->diffuse()->addTextureImage(chestDiffuseImage);
 
@@ -134,7 +134,7 @@ int main(int argc, char* argv[])
     RotatingTrefoilKnot *trefoil = new RotatingTrefoilKnot(sceneRoot);
     trefoil->translateTransform()->setDy(3.5);
     trefoil->scaleTransform()->setScale(0.5f);
-    Qt3D::QPhongMaterial *phongMaterial = new Qt3D::QPhongMaterial();
+    Qt3DRender::QPhongMaterial *phongMaterial = new Qt3DRender::QPhongMaterial();
     phongMaterial->setDiffuse(QColor(204, 205, 75)); // Safari Yellow #cccd4b
     phongMaterial->setSpecular(Qt::white);
     trefoil->addComponent(phongMaterial);
diff --git a/examples/qt3d/materials-cpp/planeentity.cpp b/examples/qt3d/materials-cpp/planeentity.cpp
index 9854e8ace..3a06bded7 100644
--- a/examples/qt3d/materials-cpp/planeentity.cpp
+++ b/examples/qt3d/materials-cpp/planeentity.cpp
@@ -43,7 +43,7 @@
 
 PlaneEntity::PlaneEntity(Qt3D::QNode *parent)
     : Qt3D::QEntity(new Qt3D::QEntity(parent))
-    , m_mesh(new Qt3D::QPlaneMesh())
+    , m_mesh(new Qt3DRender::QPlaneMesh())
     , m_transform(new Qt3D::QTransform())
     , m_scaleTransform(new Qt3D::QScaleTransform())
     , m_translateTransform(new Qt3D::QTranslateTransform())
@@ -68,7 +68,7 @@ Qt3D::QTranslateTransform *PlaneEntity::translateTransform() const
     return m_translateTransform;
 }
 
-Qt3D::QPlaneMesh *PlaneEntity::mesh() const
+Qt3DRender::QPlaneMesh *PlaneEntity::mesh() const
 {
     return m_mesh;
 }
diff --git a/examples/qt3d/materials-cpp/planeentity.h b/examples/qt3d/materials-cpp/planeentity.h
index 418f3c698..48639b306 100644
--- a/examples/qt3d/materials-cpp/planeentity.h
+++ b/examples/qt3d/materials-cpp/planeentity.h
@@ -51,10 +51,10 @@ public:
 
     Qt3D::QScaleTransform *scaleTransform() const;
     Qt3D::QTranslateTransform *translateTransform() const;
-    Qt3D::QPlaneMesh *mesh() const;
+    Qt3DRender::QPlaneMesh *mesh() const;
 
 private:
-    Qt3D::QPlaneMesh *m_mesh;
+    Qt3DRender::QPlaneMesh *m_mesh;
     Qt3D::QTransform *m_transform;
     Qt3D::QScaleTransform *m_scaleTransform;
     Qt3D::QTranslateTransform *m_translateTransform;
diff --git a/examples/qt3d/materials-cpp/renderableentity.cpp b/examples/qt3d/materials-cpp/renderableentity.cpp
index 0acbdcc00..2e463a607 100644
--- a/examples/qt3d/materials-cpp/renderableentity.cpp
+++ b/examples/qt3d/materials-cpp/renderableentity.cpp
@@ -38,7 +38,7 @@
 
 RenderableEntity::RenderableEntity(Qt3D::QNode *parent)
     : Qt3D::QEntity(parent)
-    , m_mesh(new Qt3D::QMesh())
+    , m_mesh(new Qt3DRender::QMesh())
     , m_transform(new Qt3D::QTransform())
     , m_rotateTransform(new Qt3D::QRotateTransform())
     , m_scaleTransform(new Qt3D::QScaleTransform())
@@ -56,7 +56,7 @@ RenderableEntity::~RenderableEntity()
 
 }
 
-Qt3D::QMesh *RenderableEntity::mesh() const
+Qt3DRender::QMesh *RenderableEntity::mesh() const
 {
     return m_mesh;
 }
diff --git a/examples/qt3d/materials-cpp/renderableentity.h b/examples/qt3d/materials-cpp/renderableentity.h
index c467ffb5c..216ad843f 100644
--- a/examples/qt3d/materials-cpp/renderableentity.h
+++ b/examples/qt3d/materials-cpp/renderableentity.h
@@ -50,13 +50,13 @@ public:
     RenderableEntity(Qt3D::QNode *parent = 0);
     ~RenderableEntity();
 
-    Qt3D::QMesh *mesh() const;
+    Qt3DRender::QMesh *mesh() const;
     Qt3D::QScaleTransform *scaleTransform() const;
     Qt3D::QTranslateTransform *translateTransform() const;
     Qt3D::QRotateTransform *rotateTransform() const;
 
 private:
-    Qt3D::QMesh *m_mesh;
+    Qt3DRender::QMesh *m_mesh;
     Qt3D::QTransform *m_transform;
     Qt3D::QRotateTransform *m_rotateTransform;
     Qt3D::QScaleTransform *m_scaleTransform;
diff --git a/examples/qt3d/materials-cpp/trefoilknot.cpp b/examples/qt3d/materials-cpp/trefoilknot.cpp
index b99c090ea..d71c9944d 100644
--- a/examples/qt3d/materials-cpp/trefoilknot.cpp
+++ b/examples/qt3d/materials-cpp/trefoilknot.cpp
@@ -38,7 +38,7 @@
 
 TrefoilKnot::TrefoilKnot(Qt3D::QNode *parent)
     : Qt3D::QEntity(parent)
-    , m_mesh(new Qt3D::QMesh())
+    , m_mesh(new Qt3DRender::QMesh())
     , m_transform(new Qt3D::QTransform())
     , m_scaleTransform(new Qt3D::QScaleTransform())
     , m_xaxisRotation(new Qt3D::QRotateTransform())
diff --git a/examples/qt3d/materials-cpp/trefoilknot.h b/examples/qt3d/materials-cpp/trefoilknot.h
index a625c874e..6beda9cd1 100644
--- a/examples/qt3d/materials-cpp/trefoilknot.h
+++ b/examples/qt3d/materials-cpp/trefoilknot.h
@@ -56,7 +56,7 @@ public:
     Qt3D::QTranslateTransform *translateTransform() const;
 
 private:
-    Qt3D::QMesh *m_mesh;
+    Qt3DRender::QMesh *m_mesh;
     Qt3D::QTransform *m_transform;
     Qt3D::QScaleTransform *m_scaleTransform;
     Qt3D::QRotateTransform *m_xaxisRotation;
diff --git a/examples/qt3d/materials/main.cpp b/examples/qt3d/materials/main.cpp
index a49c87a1c..7fdc5ceed 100644
--- a/examples/qt3d/materials/main.cpp
+++ b/examples/qt3d/materials/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     engine.aspectEngine()->initialize();
     QVariantMap data;
diff --git a/examples/qt3d/mouseinput-qml/main.cpp b/examples/qt3d/mouseinput-qml/main.cpp
index c06af988d..70e76e944 100644
--- a/examples/qt3d/mouseinput-qml/main.cpp
+++ b/examples/qt3d/mouseinput-qml/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
 
     QVariantMap data;
diff --git a/examples/qt3d/multiviewport/main.cpp b/examples/qt3d/multiviewport/main.cpp
index 3c9fe15fc..857ea6ac5 100644
--- a/examples/qt3d/multiviewport/main.cpp
+++ b/examples/qt3d/multiviewport/main.cpp
@@ -47,7 +47,7 @@ int main(int ac, char **av)
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect);
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect);
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     QVariantMap data;
     data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view)));
diff --git a/examples/qt3d/plasma/main.cpp b/examples/qt3d/plasma/main.cpp
index 5c6bae8aa..3b0a8b4e3 100644
--- a/examples/qt3d/plasma/main.cpp
+++ b/examples/qt3d/plasma/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
 
     // Expose the window as a context property so we can set the aspect ratio
     engine.qmlEngine()->rootContext()->setContextProperty("_window", &view);
diff --git a/examples/qt3d/playground-qml/main.cpp b/examples/qt3d/playground-qml/main.cpp
index 00379f54a..bb78f738a 100644
--- a/examples/qt3d/playground-qml/main.cpp
+++ b/examples/qt3d/playground-qml/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     QVariantMap data;
     data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view)));
diff --git a/examples/qt3d/shadow-map-qml/main.cpp b/examples/qt3d/shadow-map-qml/main.cpp
index f9b744e8c..9c10c866e 100644
--- a/examples/qt3d/shadow-map-qml/main.cpp
+++ b/examples/qt3d/shadow-map-qml/main.cpp
@@ -51,7 +51,7 @@ int main(int argc, char* argv[])
     Qt3D::Quick::QQmlAspectEngine engine;
 
     view.resize(1600, 800);
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     engine.aspectEngine()->initialize();
     QVariantMap data;
diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp
index 2755b37cc..67d4fcbda 100644
--- a/examples/qt3d/simple-cpp/main.cpp
+++ b/examples/qt3d/simple-cpp/main.cpp
@@ -63,7 +63,7 @@
 int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
-    Qt3D::QWindow view;
+    Qt3DRender::QWindow view;
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     view.registerAspect(input);
 
@@ -80,11 +80,11 @@ int main(int argc, char* argv[])
     input->setCamera(cameraEntity);
 
     // Material
-    Qt3D::QMaterial *material = new Qt3D::QPhongMaterial(rootEntity);
+    Qt3DRender::QMaterial *material = new Qt3DRender::QPhongMaterial(rootEntity);
 
     // Torus
     Qt3D::QEntity *torusEntity = new Qt3D::QEntity(rootEntity);
-    Qt3D::QTorusMesh *torusMesh = new Qt3D::QTorusMesh;
+    Qt3DRender::QTorusMesh *torusMesh = new Qt3DRender::QTorusMesh;
     torusMesh->setRadius(5);
     torusMesh->setMinorRadius(1);
     torusMesh->setRings(100);
@@ -108,7 +108,7 @@ int main(int argc, char* argv[])
 
     // Sphere
     Qt3D::QEntity *sphereEntity = new Qt3D::QEntity(rootEntity);
-    Qt3D::QSphereMesh *sphereMesh = new Qt3D::QSphereMesh;
+    Qt3DRender::QSphereMesh *sphereMesh = new Qt3DRender::QSphereMesh;
     sphereMesh->setRadius(3);
 
     Qt3D::QTransform *sphereTransform = new Qt3D::QTransform;
diff --git a/examples/qt3d/simple-qml/main.cpp b/examples/qt3d/simple-qml/main.cpp
index bfa959eab..79f5bfdb4 100644
--- a/examples/qt3d/simple-qml/main.cpp
+++ b/examples/qt3d/simple-qml/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     engine.aspectEngine()->initialize();
     QVariantMap data;
diff --git a/examples/qt3d/simple-shaders-qml/main.cpp b/examples/qt3d/simple-shaders-qml/main.cpp
index 0000a11c0..d3a49ea9b 100644
--- a/examples/qt3d/simple-shaders-qml/main.cpp
+++ b/examples/qt3d/simple-shaders-qml/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     engine.aspectEngine()->initialize();
     QVariantMap data;
diff --git a/examples/qt3d/simple-shaders-qml/main.qml b/examples/qt3d/simple-shaders-qml/main.qml
index 89c2270e3..7dc5a0f53 100644
--- a/examples/qt3d/simple-shaders-qml/main.qml
+++ b/examples/qt3d/simple-shaders-qml/main.qml
@@ -185,7 +185,7 @@ Entity {
                                 vertexShaderCode: loadSource("qrc:/simple-shader.vert")
                                 fragmentShaderCode: loadSource("qrc:/simple-shader.frag")
                             } // ShaderProgram
-                        } // RenderPass
+                        } // namespace RenderPass
                     } // Technique
                 ] // techniques
             } // Effect
diff --git a/examples/qt3d/skybox/main.cpp b/examples/qt3d/skybox/main.cpp
index d58eb8a9c..6dcecff5d 100644
--- a/examples/qt3d/skybox/main.cpp
+++ b/examples/qt3d/skybox/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
 
     QVariantMap data;
diff --git a/examples/qt3d/tessellation-modes/main.cpp b/examples/qt3d/tessellation-modes/main.cpp
index bc2b79cd9..038a77571 100644
--- a/examples/qt3d/tessellation-modes/main.cpp
+++ b/examples/qt3d/tessellation-modes/main.cpp
@@ -51,7 +51,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
 
     QVariantMap data;
diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp
index 22762a24c..a3ee77d29 100644
--- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp
+++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp
@@ -40,14 +40,14 @@
 #include <Qt3DRenderer/qbuffer.h>
 #include <Qt3DRenderer/qgeometry.h>
 
-class TessellatedGeometry : public Qt3D::QGeometry
+class TessellatedGeometry : public Qt3DRender::QGeometry
 {
     Q_OBJECT
 public:
     TessellatedGeometry(Qt3D::QNode *parent = Q_NULLPTR)
-        : Qt3D::QGeometry(parent)
-        , m_positionAttribute(new Qt3D::QAttribute(this))
-        , m_vertexBuffer(new Qt3D::QBuffer(Qt3D::QBuffer::VertexBuffer, this))
+        : Qt3DRender::QGeometry(parent)
+        , m_positionAttribute(new Qt3DRender::QAttribute(this))
+        , m_vertexBuffer(new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, this))
     {
         const float positionData[] = {
             -0.8f, -0.8f, 0.0f,
@@ -64,8 +64,8 @@ public:
 
         m_vertexBuffer->setData(positionBytes);
 
-        m_positionAttribute->setName(Qt3D::QAttribute::defaultPositionAttributeName());
-        m_positionAttribute->setDataType(Qt3D::QAttribute::Float);
+        m_positionAttribute->setName(Qt3DRender::QAttribute::defaultPositionAttributeName());
+        m_positionAttribute->setDataType(Qt3DRender::QAttribute::Float);
         m_positionAttribute->setDataSize(3);
         m_positionAttribute->setCount(nVerts);
         m_positionAttribute->setByteStride(3 * sizeof(float));
@@ -76,14 +76,14 @@ public:
     }
 
 private:
-    Qt3D::QAttribute *m_positionAttribute;
-    Qt3D::QBuffer *m_vertexBuffer;
+    Qt3DRender::QAttribute *m_positionAttribute;
+    Qt3DRender::QBuffer *m_vertexBuffer;
 };
 
 TessellatedQuadMesh::TessellatedQuadMesh(Qt3D::QNode *parent)
-    : Qt3D::QGeometryRenderer(parent)
+    : Qt3DRender::QGeometryRenderer(parent)
 {
-    setPrimitiveType(Qt3D::QGeometryRenderer::Patches);
+    setPrimitiveType(Qt3DRender::QGeometryRenderer::Patches);
     setGeometry(new TessellatedGeometry(this));
 }
 
diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.h b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h
index 6c4992183..5f34e2400 100644
--- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.h
+++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h
@@ -39,7 +39,7 @@
 
 #include <Qt3DRenderer/qgeometryrenderer.h>
 
-class TessellatedQuadMesh : public Qt3D::QGeometryRenderer
+class TessellatedQuadMesh : public Qt3DRender::QGeometryRenderer
 {
     Q_OBJECT
 public:
diff --git a/examples/qt3d/torus-qml/main.cpp b/examples/qt3d/torus-qml/main.cpp
index f2e3f76ab..d76264d7b 100644
--- a/examples/qt3d/torus-qml/main.cpp
+++ b/examples/qt3d/torus-qml/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     QVariantMap data;
     data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view)));
diff --git a/examples/qt3d/transparency-qml/main.cpp b/examples/qt3d/transparency-qml/main.cpp
index 9034e7f4a..6f5ffd6b4 100644
--- a/examples/qt3d/transparency-qml/main.cpp
+++ b/examples/qt3d/transparency-qml/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
 
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     engine.aspectEngine()->initialize();
     QVariantMap data;
diff --git a/examples/qt3d/wave/main.cpp b/examples/qt3d/wave/main.cpp
index 802eef8ea..fb2f499f1 100644
--- a/examples/qt3d/wave/main.cpp
+++ b/examples/qt3d/wave/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
 
     // Expose the window as a context property so we can set the aspect ratio
diff --git a/examples/qt3d/wireframe/main.cpp b/examples/qt3d/wireframe/main.cpp
index 21d971c79..f561cb52b 100644
--- a/examples/qt3d/wireframe/main.cpp
+++ b/examples/qt3d/wireframe/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
     Window view;
     Qt3D::Quick::QQmlAspectEngine engine;
 
-    engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect());
+    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
 
     // Expose the window as a context property so we can set the aspect ratio