Move Render aspect into the Qt3DRender namespace

Updated examples and tests accordingly.

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

518 files changed, 3851 insertions, 3919 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
diff --git a/src/collision/qgeometrycollider.cpp b/src/collision/qgeometrycollider.cpp
index 5d243705b..86d8bb8aa 100644
--- a/src/collision/qgeometrycollider.cpp
+++ b/src/collision/qgeometrycollider.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 /*!
-    \class Qt3D::QGeometryColliderPrivate
+    \class Qt3DRender::QGeometryColliderPrivate
     \internal
 */
 QGeometryColliderPrivate::QGeometryColliderPrivate()
@@ -51,7 +51,7 @@ QGeometryColliderPrivate::QGeometryColliderPrivate()
 }
 
 /*!
-    \class Qt3D::QGeometryCollider
+    \class Qt3DRender::QGeometryCollider
     \inmodule Qt3DCollision
     \since 5.5
     \brief Represents a geometric mesh used for collision detection
@@ -60,7 +60,7 @@ QGeometryColliderPrivate::QGeometryColliderPrivate()
 /*!
     \qmltype GeometryCollider
     \inqmlmodule Qt3D.Collision
-    \instantiates Qt3D::QGeometryCollider
+    \instantiates Qt3DRender::QGeometryCollider
     \inherits Component3D
     \since 5.5
 */
diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp
index 60817ac5a..b68c845e5 100644
--- a/src/core/nodes/qcomponent.cpp
+++ b/src/core/nodes/qcomponent.cpp
@@ -108,7 +108,7 @@ void QComponentPrivate::removeEntity(QEntity *entity)
     Qt3D::QComponent subclasses are often aggregated in groups that impart useful
     behavior to the aggregating entity. For example, to have an Entity that gets
     drawn by the Qt3D renderer aspect, an entity would most likely aggregate
-    Qt3D::QTransform, Qt3D::QMesh, and Qt3D::QMaterial components.
+    Qt3D::QTransform, Qt3DRender::QMesh, and Qt3DRender::QMaterial components.
 
     \sa Qt3D::QEntity
 */
diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h
index cce0cb72c..f65a89515 100644
--- a/src/core/nodes/qnode.h
+++ b/src/core/nodes/qnode.h
@@ -59,7 +59,7 @@ typedef QSharedPointer<QNode> QNodePtr;
 
 #define QT3D_QUOTE(str) #str
 #define QT3D_CLONEABLE(Class)                \
-    friend class QAbstractNodeFactory;       \
+    friend class Qt3D::QAbstractNodeFactory;       \
     QNode *doClone() const Q_DECL_OVERRIDE { \
         Class *clone_ = Qt3D::QAbstractNodeFactory::createNode<Class>(QT3D_QUOTE(Class)); \
         clone_->copy(this);                   \
diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h
index 5afc3607e..2126f1624 100644
--- a/src/core/resources/qresourcemanager_p.h
+++ b/src/core/resources/qresourcemanager_p.h
@@ -116,6 +116,7 @@ enum
 };
 
 #define Q_DECLARE_RESOURCE_INFO(TYPE, FLAGS) \
+    namespace Qt3D { \
     template<> \
     struct QResourceInfo<TYPE > \
 { \
@@ -123,7 +124,8 @@ enum
 { \
     needsCleanup = ((FLAGS & Q_REQUIRES_CLEANUP) == 0) \
 }; \
-}
+}; \
+} // namespace Qt3D
 
 template <int v>
 struct Int2Type
diff --git a/src/plugins/sceneparsers/assimp/assimphelpers.cpp b/src/plugins/sceneparsers/assimp/assimphelpers.cpp
index 345bb79bc..7d7c93266 100644
--- a/src/plugins/sceneparsers/assimp/assimphelpers.cpp
+++ b/src/plugins/sceneparsers/assimp/assimphelpers.cpp
@@ -44,10 +44,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace AssimpHelper {
 /*!
- *  \class Qt3D::AssimpHelper::AssimpIOStream
+ *  \class Qt3DRender::AssimpHelper::AssimpIOStream
  *
  *  \internal
  *
@@ -222,7 +222,7 @@ void AssimpIOSystem::Close(Assimp::IOStream *pFile)
     delete pFile;
 }
 
-} // AssimpHelper namespace
-} // Qt3D namespace
+} // namespace AssimpHelper
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/plugins/sceneparsers/assimp/assimphelpers_p.h b/src/plugins/sceneparsers/assimp/assimphelpers_p.h
index 53f6d22ef..5ac1019e4 100644
--- a/src/plugins/sceneparsers/assimp/assimphelpers_p.h
+++ b/src/plugins/sceneparsers/assimp/assimphelpers_p.h
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace AssimpHelper {
 
 //CUSTOM FILE STREAM
@@ -82,8 +82,8 @@ private:
     QMap<QByteArray, QIODevice::OpenMode> m_openModeMaps;
 };
 
-} // AssimpHelper namespace
-} // Qt3D namespace
+} // namespace AssimpHelper
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp
index 50feb4b83..63a4f0b32 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp
@@ -61,10 +61,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::AssimpParser
+    \class Qt3DRender::AssimpParser
     \since 5.5
 
     \brief Provides a generic way of loading various 3D assets
@@ -156,9 +158,9 @@ QString texturePath(const aiString &path)
 }
 
 /*!
- * Returns the Qt3D::QParameter with named \a name if contained by the material
+ * Returns the Qt3DRender::QParameter with named \a name if contained by the material
  * \a material. If the material doesn't contain the named parameter, a new
- * Qt3D::QParameter is created and inserted into the material.
+ * Qt3DRender::QParameter is created and inserted into the material.
  */
 QParameter *findNamedParameter(const QString &name, QMaterial *material)
 {
@@ -318,7 +320,7 @@ bool AssimpParser::isAssimpPath(const QString &path)
  */
 void AssimpParser::setSource(const QUrl &source)
 {
-    const QString path = QUrlHelper::urlToLocalFileOrQrc(source);
+    const QString path = Qt3D::QUrlHelper::urlToLocalFileOrQrc(source);
     QFileInfo file(path);
     m_sceneDir = file.absoluteDir();
     if (!file.exists()) {
@@ -334,7 +336,7 @@ void AssimpParser::setSource(const QUrl &source)
  */
 bool AssimpParser::isExtensionSupported(const QUrl &source) const
 {
-    const QString path = QUrlHelper::urlToLocalFileOrQrc(source);
+    const QString path = Qt3D::QUrlHelper::urlToLocalFileOrQrc(source);
     return AssimpParser::isAssimpPath(path);
 }
 
@@ -345,7 +347,7 @@ bool AssimpParser::isExtensionSupported(const QUrl &source) const
  *
  * Returns \c Q_NULLPTR if \a id was specified but no node matching it was found.
  */
-QEntity *AssimpParser::scene(const QString &id)
+Qt3D::QEntity *AssimpParser::scene(const QString &id)
 {
     // m_aiScene shouldn't be null.
     // If it is either, the file failed to be imported or
@@ -370,7 +372,7 @@ QEntity *AssimpParser::scene(const QString &id)
  *  Returns a Node from the scene identified by \a id.
  *  Returns \c Q_NULLPTR if the node was not found.
  */
-QEntity *AssimpParser::node(const QString &id)
+Qt3D::QEntity *AssimpParser::node(const QString &id)
 {
     if (m_scene == Q_NULLPTR || m_scene->m_aiScene == Q_NULLPTR)
         return Q_NULLPTR;
@@ -382,7 +384,7 @@ QEntity *AssimpParser::node(const QString &id)
 /*!
  * Returns a Node from an Assimp aiNode \a node.
  */
-QEntity *AssimpParser::node(aiNode *node)
+Qt3D::QEntity *AssimpParser::node(aiNode *node)
 {
     if (node == Q_NULLPTR)
         return Q_NULLPTR;
@@ -413,7 +415,7 @@ QEntity *AssimpParser::node(aiNode *node)
 
     // Add Transformations
     const QMatrix4x4 qTransformMatrix = aiMatrix4x4ToQMatrix4x4(node->mTransformation);
-    QTransform *transform = new QTransform(new QMatrixTransform(qTransformMatrix));
+    Qt3D::QTransform *transform = new Qt3D::QTransform(new QMatrixTransform(qTransformMatrix));
     entityNode->addComponent(transform);
 
     // Add Camera
@@ -722,7 +724,7 @@ void AssimpParser::loadCamera(uint cameraIndex)
                                    assimpCamera->mClipPlaneFar);
     camera->addComponent(lens);
 
-    QTransform *transform = new QTransform();
+    Qt3D::QTransform *transform = new Qt3D::QTransform();
     QLookAtTransform *lookAt = new QLookAtTransform();
     lookAt->setPosition(QVector3D(assimpCamera->mPosition.x, assimpCamera->mPosition.y, assimpCamera->mPosition.z));
     lookAt->setViewCenter(QVector3D(assimpCamera->mLookAt.x, assimpCamera->mLookAt.y, assimpCamera->mLookAt.z));
@@ -920,7 +922,7 @@ AssimpParser::SceneImporter::~SceneImporter()
     delete m_importer;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/plugins/sceneparsers/assimp/assimpparser_p.h b/src/plugins/sceneparsers/assimp/assimpparser_p.h
index 250cb9ec3..89fbb5c89 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser_p.h
+++ b/src/plugins/sceneparsers/assimp/assimpparser_p.h
@@ -54,11 +54,14 @@ QT_BEGIN_NAMESPACE
 class QFile;
 
 namespace Qt3D {
+class QCamera;
+}
+
+namespace Qt3DRender {
 
 class QMaterial;
 class QShaderProgram;
 class QEffect;
-class QCamera;
 class QAbstractTextureProvider;
 class QMesh;
 class QGeometryRenderer;
@@ -77,14 +80,14 @@ public:
     // SceneParserInterface interface
     void setSource(const QUrl& source) Q_DECL_OVERRIDE;
     bool isExtensionSupported(const QUrl &source) const Q_DECL_OVERRIDE;
-    QEntity *scene(const QString &id = QString()) Q_DECL_OVERRIDE;
-    QEntity *node(const QString &id) Q_DECL_OVERRIDE;
+    Qt3D::QEntity *scene(const QString &id = QString()) Q_DECL_OVERRIDE;
+    Qt3D::QEntity *node(const QString &id) Q_DECL_OVERRIDE;
 
 private:
     static bool isAssimpPath(const QString &path);
     static QStringList assimpSupportedFormats();
 
-    QEntity *node(aiNode *node);
+    Qt3D::QEntity *node(aiNode *node);
 
     void readSceneFile(const QString &file);
 
@@ -120,7 +123,7 @@ private:
         QMap<uint, QEffect *> m_effects;
         QMap<uint, QAbstractTextureProvider *> m_embeddedTextures;
         QMap<QString, QAbstractTextureProvider *> m_materialTextures;
-        QMap<aiNode*, QEntity*> m_cameras;
+        QMap<aiNode*, Qt3D::QEntity*> m_cameras;
         QHash<aiTextureType, QString> m_textureToParameterName;
 //    QMap<aiNode*, Light*> m_lights;
     };
@@ -131,7 +134,7 @@ private:
     static QStringList assimpSupportedFormatsList;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp
index 762760a77..a32dd7f45 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp
@@ -75,7 +75,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 Q_LOGGING_CATEGORY(GLTFParserLog, "Qt3D.GLTFParser")
 
@@ -183,7 +185,7 @@ bool GLTFParser::setJSON(const QJsonDocument &json )
  */
 void GLTFParser::setSource(const QUrl &source)
 {
-    const QString path = QUrlHelper::urlToLocalFileOrQrc(source);
+    const QString path = Qt3D::QUrlHelper::urlToLocalFileOrQrc(source);
     QFileInfo finfo(path);
     if (!finfo.exists()) {
         qCWarning(GLTFParserLog) << "missing file:" << path;
@@ -211,11 +213,11 @@ void GLTFParser::setSource(const QUrl &source)
  */
 bool GLTFParser::isExtensionSupported(const QUrl &source) const
 {
-    const QString path = QUrlHelper::urlToLocalFileOrQrc(source);
+    const QString path = Qt3D::QUrlHelper::urlToLocalFileOrQrc(source);
     return GLTFParser::isGLTFPath(path);
 }
 
-QEntity* GLTFParser::node(const QString &id)
+Qt3D::QEntity* GLTFParser::node(const QString &id)
 {
     QJsonObject nodes = m_json.object().value(KEY_NODES).toObject();
     if (!nodes.contains(id)) {
@@ -282,7 +284,7 @@ QEntity* GLTFParser::node(const QString &id)
         }
 
         // ADD MATRIX TRANSFORM COMPONENT TO ENTITY
-        QTransform *trans = new QTransform();
+        Qt3D::QTransform *trans = new Qt3D::QTransform();
         trans->addTransform(new QMatrixTransform(m));
         result->addComponent(trans);
     }
@@ -300,7 +302,7 @@ QEntity* GLTFParser::node(const QString &id)
     return result;
 }
 
-QEntity* GLTFParser::scene(const QString &id)
+Qt3D::QEntity* GLTFParser::scene(const QString &id)
 {
     parse();
 
@@ -457,7 +459,7 @@ QParameter *GLTFParser::parameterFromTechnique(QTechnique *technique, const QStr
     return Q_NULLPTR;
 }
 
-QEntity* GLTFParser::defaultScene()
+Qt3D::QEntity* GLTFParser::defaultScene()
 {
     if (m_defaultScene.isEmpty()) {
         qCWarning(GLTFParserLog) << Q_FUNC_INFO << "no default scene";
@@ -776,8 +778,8 @@ void GLTFParser::processJSONProgram(const QString &id, const QJsonObject &jsonOb
         return;
     }
 
-    prog->setFragmentShaderCode(Qt3D::QShaderProgram::loadSource(QUrl::fromLocalFile(m_shaderPaths[fragName])));
-    prog->setVertexShaderCode(Qt3D::QShaderProgram::loadSource(QUrl::fromLocalFile(m_shaderPaths[vertName])));
+    prog->setFragmentShaderCode(QShaderProgram::loadSource(QUrl::fromLocalFile(m_shaderPaths[fragName])));
+    prog->setVertexShaderCode(QShaderProgram::loadSource(QUrl::fromLocalFile(m_shaderPaths[vertName])));
     m_programs[id] = prog;
 }
 
@@ -1407,6 +1409,6 @@ QRenderState* GLTFParser::buildState(const QString& functionName, const QJsonVal
     return Q_NULLPTR;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/plugins/sceneparsers/gltf/gltfparser_p.h b/src/plugins/sceneparsers/gltf/gltfparser_p.h
index 73048bebd..4b9c238c0 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser_p.h
+++ b/src/plugins/sceneparsers/gltf/gltfparser_p.h
@@ -51,17 +51,20 @@ QT_BEGIN_NAMESPACE
 class QFile;
 
 namespace Qt3D {
+class QCamera;
+class QCameraLens;
+class QEntity;
+}
+
+namespace Qt3DRender {
 
 class QMaterial;
 class QShaderProgram;
 class QEffect;
-class QCamera;
-class QCameraLens;
 class QAbstractTextureProvider;
 class QRenderState;
 class QTechnique;
 class QParameter;
-class QEntity;
 class QGeometryRenderer;
 
 Q_DECLARE_LOGGING_CATEGORY(GLTFParserLog)
@@ -81,8 +84,8 @@ public:
     // SceneParserInterface interface
     void setSource(const QUrl &source) Q_DECL_FINAL;
     bool isExtensionSupported(const QUrl &source) const Q_DECL_FINAL;
-    QEntity *node(const QString &id) Q_DECL_FINAL;
-    QEntity *scene(const QString &id = QString()) Q_DECL_FINAL;
+    Qt3D::QEntity *node(const QString &id) Q_DECL_FINAL;
+    Qt3D::QEntity *scene(const QString &id = QString()) Q_DECL_FINAL;
 
 private:
     class BufferData
@@ -128,9 +131,9 @@ private:
     static QString standardAttributeNameFromSemantic(const QString &semantic);
     static QParameter *parameterFromTechnique(QTechnique *technique, const QString &parameterName);
 
-    QEntity *defaultScene();
+    Qt3D::QEntity *defaultScene();
     QMaterial *material(const QString &id);
-    QCameraLens *camera(const QString &id) const;
+    Qt3D::QCameraLens *camera(const QString &id) const;
 
     void parse();
     void cleanup();
@@ -151,7 +154,7 @@ private:
     QFile* resolveLocalData(QString path) const;
 
     QVariant parameterValueFromJSON(int type, const QJsonValue &value) const;
-    static QAbstractAttribute::DataType accessorTypeFromJSON(int componentType);
+    static Qt3D::QAbstractAttribute::DataType accessorTypeFromJSON(int componentType);
     static uint accessorDataSizeFromJson(const QString &type);
 
     static QRenderState *buildStateEnable(int state);
@@ -187,7 +190,7 @@ private:
     QMap<QString, QString> m_imagePaths;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp b/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp
index 36649c708..bef34eec0 100644
--- a/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp
@@ -141,12 +141,12 @@ static const struct {
     { "SkyboxEntity", 2, 0 }
 };
 
-QVariantList Quick3DShaderDataArrayToVariantListConverter(Qt3D::Render::Quick::Quick3DShaderDataArray *array)
+QVariantList Quick3DShaderDataArrayToVariantListConverter(Qt3DRender::Render::Quick::Quick3DShaderDataArray *array)
 {
-    QList<Qt3D::QShaderData *> arrayValues = array->values();
+    QList<Qt3DRender::QShaderData *> arrayValues = array->values();
     QVariantList values;
     values.reserve(arrayValues.size());
-    Q_FOREACH (Qt3D::QShaderData *data, arrayValues)
+    Q_FOREACH (Qt3DRender::QShaderData *data, arrayValues)
         values.append(QVariant::fromValue(data));
     return values;
 }
@@ -156,113 +156,113 @@ void Qt3DQuick3DRendererPlugin::registerTypes(const char *uri)
     // Init resources for defaults QML files
     initResources();
 
-    Qt3D::Quick::Quick3DRenderer_initialize();
+    Qt3DRender::Quick::Quick3DRenderer_initialize();
 
     // Converters
-    QMetaType::registerConverter<Qt3D::Render::Quick::Quick3DShaderDataArray*, QVariantList>(Quick3DShaderDataArrayToVariantListConverter);
+    QMetaType::registerConverter<Qt3DRender::Render::Quick::Quick3DShaderDataArray*, QVariantList>(Quick3DShaderDataArrayToVariantListConverter);
 
     // @uri Qt3D.Renderer
-    qmlRegisterUncreatableType<Qt3D::Render::QAbstractSceneLoader>(uri, 2, 0, "QAbstractSceneLoader", "QAbstractScene is abstract");
-    Qt3D::Quick::registerExtendedType<Qt3D::QSceneLoader, Qt3D::Render::Quick::Quick3DScene>("QSceneLoader", "Qt3D.Renderer/SceneLoader", uri, 2, 0, "SceneLoader");
-//    qmlRegisterCustomType<Qt3D::Effect>(uri, 2, 0, "Effect", new Qt3D::Render::Quick::ShaderPropertyParser());
-    Qt3D::Quick::registerExtendedType<Qt3D::QEffect, Qt3D::Render::Quick::Quick3DEffect>("QEffect", "Qt3D.Renderer/Effect", uri, 2, 0, "Effect");
-    Qt3D::Quick::registerExtendedType<Qt3D::QTechnique, Qt3D::Render::Quick::Quick3DTechnique>("QTechnique", "Qt3D.Renderer/Technique", uri, 2, 0, "Technique");
-    qmlRegisterType<Qt3D::QAnnotation>(uri, 2, 0, "Annotation");
-    qmlRegisterType<Qt3D::QOpenGLFilter>(uri, 2, 0, "OpenGLFilter");
-    qmlRegisterUncreatableType<Qt3D::QParameter>(uri, 2, 0, "QParameter", "Quick3D should instantiate Quick3DParameter only");
-    qmlRegisterType<Qt3D::Render::Quick::Quick3DParameter>(uri, 2, 0, "Parameter");
-    qmlRegisterType<Qt3D::QParameterMapping>(uri, 2, 0, "ParameterMapping");
-    Qt3D::Quick::registerExtendedType<Qt3D::QMaterial, Qt3D::Render::Quick::Quick3DMaterial>("QMaterial", "Qt3D.Renderer/Material", uri, 2, 0, "Material");
-    Qt3D::Quick::registerExtendedType<Qt3D::QRenderPass, Qt3D::Render::Quick::Quick3DRenderPass>("QRenderPass", "Qt3D.Renderer/RenderPass", uri, 2, 0, "RenderPass");
-    qmlRegisterType<Qt3D::QShaderProgram>(uri, 2, 0, "ShaderProgram");
-    qmlRegisterUncreatableType<Qt3D::QShaderData>(uri, 2, 0, "QShaderData", "Quick3D should instantiate Quick3DShaderData only");
-    qmlRegisterType<Qt3D::Render::Quick::Quick3DShaderDataArray>(uri, 2, 0, "ShaderDataArray");
-    qmlRegisterType<Qt3D::Render::Quick::Quick3DShaderData>(uri, 2, 0, "ShaderData");
+    qmlRegisterUncreatableType<Qt3DRender::QAbstractSceneLoader>(uri, 2, 0, "QAbstractSceneLoader", "QAbstractScene is abstract");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QSceneLoader, Qt3DRender::Render::Quick::Quick3DScene>("QSceneLoader", "Qt3D.Renderer/SceneLoader", uri, 2, 0, "SceneLoader");
+//    qmlRegisterCustomType<Qt3DRender::Effect>(uri, 2, 0, "Effect", new Qt3DRender::Render::Quick::ShaderPropertyParser());
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QEffect, Qt3DRender::Render::Quick::Quick3DEffect>("QEffect", "Qt3D.Renderer/Effect", uri, 2, 0, "Effect");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTechnique, Qt3DRender::Render::Quick::Quick3DTechnique>("QTechnique", "Qt3D.Renderer/Technique", uri, 2, 0, "Technique");
+    qmlRegisterType<Qt3DRender::QAnnotation>(uri, 2, 0, "Annotation");
+    qmlRegisterType<Qt3DRender::QOpenGLFilter>(uri, 2, 0, "OpenGLFilter");
+    qmlRegisterUncreatableType<Qt3DRender::QParameter>(uri, 2, 0, "QParameter", "Quick3D should instantiate Quick3DParameter only");
+    qmlRegisterType<Qt3DRender::Render::Quick::Quick3DParameter>(uri, 2, 0, "Parameter");
+    qmlRegisterType<Qt3DRender::QParameterMapping>(uri, 2, 0, "ParameterMapping");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QMaterial, Qt3DRender::Render::Quick::Quick3DMaterial>("QMaterial", "Qt3D.Renderer/Material", uri, 2, 0, "Material");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QRenderPass, Qt3DRender::Render::Quick::Quick3DRenderPass>("QRenderPass", "Qt3D.Renderer/RenderPass", uri, 2, 0, "RenderPass");
+    qmlRegisterType<Qt3DRender::QShaderProgram>(uri, 2, 0, "ShaderProgram");
+    qmlRegisterUncreatableType<Qt3DRender::QShaderData>(uri, 2, 0, "QShaderData", "Quick3D should instantiate Quick3DShaderData only");
+    qmlRegisterType<Qt3DRender::Render::Quick::Quick3DShaderDataArray>(uri, 2, 0, "ShaderDataArray");
+    qmlRegisterType<Qt3DRender::Render::Quick::Quick3DShaderData>(uri, 2, 0, "ShaderData");
 
     // Textures
-    qmlRegisterType<Qt3D::QTextureWrapMode>(uri, 2, 0, "WrapMode");//, QStringLiteral("QTextureWrapMode cannot be created from QML"));
-    qmlRegisterUncreatableType<Qt3D::QAbstractTextureProvider>(uri, 2, 0, "Texture", QStringLiteral("Texture should be created from one of the subclasses"));
-    Qt3D::Quick::registerExtendedType<Qt3D::QTexture1D, Qt3D::Render::Quick::Quick3DTextureExtension>("QTexture1D", "Qt3D.Renderer/Texture1D", uri, 2, 0, "Texture1D");
-    Qt3D::Quick::registerExtendedType<Qt3D::QTexture1DArray, Qt3D::Render::Quick::Quick3DTextureExtension>("QTexture1DArray", "Qt3D.Renderer/Texture1DArray", uri, 2, 0, "Texture1DArray");
-    Qt3D::Quick::registerExtendedType<Qt3D::QTexture2D, Qt3D::Render::Quick::Quick3DTextureExtension>("QTexture2D", "Qt3D.Renderer/Texture2D", uri, 2, 0, "Texture2D");
-    Qt3D::Quick::registerExtendedType<Qt3D::QTexture2DArray, Qt3D::Render::Quick::Quick3DTextureExtension>("QTexture2DArray", "Qt3D.Renderer/Texture2DArray", uri, 2, 0, "Texture2DArray");
-    Qt3D::Quick::registerExtendedType<Qt3D::QTexture3D, Qt3D::Render::Quick::Quick3DTextureExtension>("QTexture3D", "Qt3D.Renderer/Texture3D", uri, 2, 0, "Texture3D");
-    Qt3D::Quick::registerExtendedType<Qt3D::QTextureCubeMap, Qt3D::Render::Quick::Quick3DTextureExtension>("QTextureCubeMap", "Qt3D.Renderer/TextureCubeMap", uri, 2, 0, "TextureCubeMap");
-    Qt3D::Quick::registerExtendedType<Qt3D::QTextureCubeMapArray, Qt3D::Render::Quick::Quick3DTextureExtension>("QTextureCubeMapArray", "Qt3D.Renderer/TextureCubeMapArray", uri, 2, 0, "TextureCubeMapArray");
-    Qt3D::Quick::registerExtendedType<Qt3D::QTexture2DMultisample, Qt3D::Render::Quick::Quick3DTextureExtension>("QTexture2DMultisample", "Qt3D.Renderer/Texture2DMultisample", uri, 2, 0, "Texture2DMultisample");
-    Qt3D::Quick::registerExtendedType<Qt3D::QTexture2DMultisampleArray, Qt3D::Render::Quick::Quick3DTextureExtension>("QTexture2DMultisampleArray", "Qt3D.Renderer/Texture2DMultisampleArray", uri, 2, 0, "Texture2DMultisampleArray");
-    Qt3D::Quick::registerExtendedType<Qt3D::QTextureRectangle, Qt3D::Render::Quick::Quick3DTextureExtension>("QTextureRectangle", "Qt3D.Renderer/TextureRectangle", uri, 2, 0, "TextureRectangle");
-    Qt3D::Quick::registerExtendedType<Qt3D::QTextureBuffer, Qt3D::Render::Quick::Quick3DTextureExtension>("QTextureBuffer", "Qt3D.Renderer/TextureBuffer", uri, 2, 0, "TextureBuffer");
-    qmlRegisterUncreatableType<Qt3D::QAbstractTextureImage>(uri, 2, 0, "QAbstractTextureImage", QStringLiteral("QAbstractTextureImage is abstract"));
-    qmlRegisterType<Qt3D::QTextureImage>(uri, 2, 0, "TextureImage");
+    qmlRegisterType<Qt3DRender::QTextureWrapMode>(uri, 2, 0, "WrapMode");//, QStringLiteral("QTextureWrapMode cannot be created from QML"));
+    qmlRegisterUncreatableType<Qt3DRender::QAbstractTextureProvider>(uri, 2, 0, "Texture", QStringLiteral("Texture should be created from one of the subclasses"));
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTexture1D, Qt3DRender::Render::Quick::Quick3DTextureExtension>("QTexture1D", "Qt3D.Renderer/Texture1D", uri, 2, 0, "Texture1D");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTexture1DArray, Qt3DRender::Render::Quick::Quick3DTextureExtension>("QTexture1DArray", "Qt3D.Renderer/Texture1DArray", uri, 2, 0, "Texture1DArray");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTexture2D, Qt3DRender::Render::Quick::Quick3DTextureExtension>("QTexture2D", "Qt3D.Renderer/Texture2D", uri, 2, 0, "Texture2D");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTexture2DArray, Qt3DRender::Render::Quick::Quick3DTextureExtension>("QTexture2DArray", "Qt3D.Renderer/Texture2DArray", uri, 2, 0, "Texture2DArray");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTexture3D, Qt3DRender::Render::Quick::Quick3DTextureExtension>("QTexture3D", "Qt3D.Renderer/Texture3D", uri, 2, 0, "Texture3D");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTextureCubeMap, Qt3DRender::Render::Quick::Quick3DTextureExtension>("QTextureCubeMap", "Qt3D.Renderer/TextureCubeMap", uri, 2, 0, "TextureCubeMap");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTextureCubeMapArray, Qt3DRender::Render::Quick::Quick3DTextureExtension>("QTextureCubeMapArray", "Qt3D.Renderer/TextureCubeMapArray", uri, 2, 0, "TextureCubeMapArray");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTexture2DMultisample, Qt3DRender::Render::Quick::Quick3DTextureExtension>("QTexture2DMultisample", "Qt3D.Renderer/Texture2DMultisample", uri, 2, 0, "Texture2DMultisample");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTexture2DMultisampleArray, Qt3DRender::Render::Quick::Quick3DTextureExtension>("QTexture2DMultisampleArray", "Qt3D.Renderer/Texture2DMultisampleArray", uri, 2, 0, "Texture2DMultisampleArray");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTextureRectangle, Qt3DRender::Render::Quick::Quick3DTextureExtension>("QTextureRectangle", "Qt3D.Renderer/TextureRectangle", uri, 2, 0, "TextureRectangle");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTextureBuffer, Qt3DRender::Render::Quick::Quick3DTextureExtension>("QTextureBuffer", "Qt3D.Renderer/TextureBuffer", uri, 2, 0, "TextureBuffer");
+    qmlRegisterUncreatableType<Qt3DRender::QAbstractTextureImage>(uri, 2, 0, "QAbstractTextureImage", QStringLiteral("QAbstractTextureImage is abstract"));
+    qmlRegisterType<Qt3DRender::QTextureImage>(uri, 2, 0, "TextureImage");
 
     // Geometry
     qmlRegisterUncreatableType<Qt3D::QAbstractAttribute>(uri, 2, 0, "QAbstractAttribute", QStringLiteral("QAbstractAttribute is abstract"));
     qmlRegisterUncreatableType<Qt3D::QAbstractBuffer>(uri, 2, 0, "QAbstractBuffer", QStringLiteral("QAbstractBuffer is abstract"));
-    qmlRegisterType<Qt3D::QAttribute>(uri, 2, 0, "Attribute");
-    qmlRegisterType<Qt3D::QBuffer>(uri, 2, 0, "Buffer");
-    Qt3D::Quick::registerExtendedType<Qt3D::QGeometry, Qt3D::Render::Quick::Quick3DGeometry>("QGeometry", "Qt3D.Renderer/Geometry", uri, 2, 0, "Geometry");
-    qmlRegisterType<Qt3D::QGeometryRenderer>(uri, 2, 0, "GeometryRenderer");
+    qmlRegisterType<Qt3DRender::QAttribute>(uri, 2, 0, "Attribute");
+    qmlRegisterType<Qt3DRender::QBuffer>(uri, 2, 0, "Buffer");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QGeometry, Qt3DRender::Render::Quick::Quick3DGeometry>("QGeometry", "Qt3D.Renderer/Geometry", uri, 2, 0, "Geometry");
+    qmlRegisterType<Qt3DRender::QGeometryRenderer>(uri, 2, 0, "GeometryRenderer");
 
     // Meshes
-    qmlRegisterType<Qt3D::QMesh>(uri, 2, 0, "Mesh");
-    qmlRegisterType<Qt3D::QCuboidMesh>(uri, 2, 0, "CuboidMesh");
-    qmlRegisterType<Qt3D::QCylinderMesh>(uri, 2, 0, "CylinderMesh");
-    qmlRegisterType<Qt3D::QPlaneMesh>(uri, 2, 0, "PlaneMesh");
-    qmlRegisterType<Qt3D::QTorusMesh>(uri, 2, 0, "TorusMesh");
-    qmlRegisterType<Qt3D::QSphereMesh>(uri, 2, 0, "SphereMesh");
+    qmlRegisterType<Qt3DRender::QMesh>(uri, 2, 0, "Mesh");
+    qmlRegisterType<Qt3DRender::QCuboidMesh>(uri, 2, 0, "CuboidMesh");
+    qmlRegisterType<Qt3DRender::QCylinderMesh>(uri, 2, 0, "CylinderMesh");
+    qmlRegisterType<Qt3DRender::QPlaneMesh>(uri, 2, 0, "PlaneMesh");
+    qmlRegisterType<Qt3DRender::QTorusMesh>(uri, 2, 0, "TorusMesh");
+    qmlRegisterType<Qt3DRender::QSphereMesh>(uri, 2, 0, "SphereMesh");
 
     // Layers
-    qmlRegisterType<Qt3D::QLayer>(uri, 2, 0, "Layer");
-    qmlRegisterType<Qt3D::QLayerFilter>(uri, 2, 0, "LayerFilter");
+    qmlRegisterType<Qt3DRender::QLayer>(uri, 2, 0, "Layer");
+    qmlRegisterType<Qt3DRender::QLayerFilter>(uri, 2, 0, "LayerFilter");
 
     // Lights
-    qmlRegisterUncreatableType<Qt3D::QAbstractLight>(uri, 2, 0, "QAbstractLight", QStringLiteral("QAbstractLight is abstract"));
-    qmlRegisterType<Qt3D::QPointLight>(uri, 2, 0, "PointLight");
-    qmlRegisterType<Qt3D::QDirectionalLight>(uri, 2, 0, "DirectionalLight");
-    qmlRegisterType<Qt3D::QSpotLight>(uri, 2, 0, "SpotLight");
+    qmlRegisterUncreatableType<Qt3DRender::QAbstractLight>(uri, 2, 0, "QAbstractLight", QStringLiteral("QAbstractLight is abstract"));
+    qmlRegisterType<Qt3DRender::QPointLight>(uri, 2, 0, "PointLight");
+    qmlRegisterType<Qt3DRender::QDirectionalLight>(uri, 2, 0, "DirectionalLight");
+    qmlRegisterType<Qt3DRender::QSpotLight>(uri, 2, 0, "SpotLight");
 
     // FrameGraph
-    Qt3D::Quick::registerExtendedType<Qt3D::QCameraSelector, Qt3D::Quick::Quick3DNode>("QCameraSelector", "Qt3D.Renderer/CameraSelector", uri, 2, 0, "CameraSelector");
-    Qt3D::Quick::registerExtendedType<Qt3D::QRenderPassFilter, Qt3D::Render::Quick::Quick3DRenderPassFilter>("QRenderPassFilter", "Qt3D.Renderer/RenderPassFilter", uri, 2, 0, "RenderPassFilter");
-    Qt3D::Quick::registerExtendedType<Qt3D::QTechniqueFilter, Qt3D::Render::Quick::Quick3DTechniqueFilter>("QTechniqueFilter", "Qt3D.Renderer/TechniqueFilter", uri, 2, 0, "TechniqueFilter");
-    Qt3D::Quick::registerExtendedType<Qt3D::QViewport, Qt3D::Render::Quick::Quick3DViewport>("QViewport", "Qt3D.Renderer/Viewport", uri, 2, 0, "Viewport");
-    Qt3D::Quick::registerExtendedType<Qt3D::QRenderTargetSelector, Qt3D::Render::Quick::Quick3DRenderTargetSelector>("QRenderTargetSelector", "Qt3D.Renderer/RenderTargetSelector", uri, 2, 0, "RenderTargetSelector");
-    qmlRegisterType<Qt3D::QClearBuffer>(uri, 2, 0, "ClearBuffer");
-    qmlRegisterUncreatableType<Qt3D::QFrameGraphNode>(uri, 2, 0, "FrameGraphNode", QStringLiteral("FrameGraphNode is a base class"));
-    Qt3D::Quick::registerExtendedType<Qt3D::QStateSet, Qt3D::Render::Quick::Quick3DStateSet>("QStateSet", "Qt3D.Renderer/StateSet", uri, 2, 0, "StateSet");
-    qmlRegisterType<Qt3D::QNoDraw>(uri, 2, 0, "NoDraw");
-    qmlRegisterType<Qt3D::QFrameGraph>(uri, 2, 0, "FrameGraph");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QCameraSelector, Qt3D::Quick::Quick3DNode>("QCameraSelector", "Qt3D.Renderer/CameraSelector", uri, 2, 0, "CameraSelector");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QRenderPassFilter, Qt3DRender::Render::Quick::Quick3DRenderPassFilter>("QRenderPassFilter", "Qt3D.Renderer/RenderPassFilter", uri, 2, 0, "RenderPassFilter");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTechniqueFilter, Qt3DRender::Render::Quick::Quick3DTechniqueFilter>("QTechniqueFilter", "Qt3D.Renderer/TechniqueFilter", uri, 2, 0, "TechniqueFilter");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QViewport, Qt3DRender::Render::Quick::Quick3DViewport>("QViewport", "Qt3D.Renderer/Viewport", uri, 2, 0, "Viewport");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QRenderTargetSelector, Qt3DRender::Render::Quick::Quick3DRenderTargetSelector>("QRenderTargetSelector", "Qt3D.Renderer/RenderTargetSelector", uri, 2, 0, "RenderTargetSelector");
+    qmlRegisterType<Qt3DRender::QClearBuffer>(uri, 2, 0, "ClearBuffer");
+    qmlRegisterUncreatableType<Qt3DRender::QFrameGraphNode>(uri, 2, 0, "FrameGraphNode", QStringLiteral("FrameGraphNode is a base class"));
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QStateSet, Qt3DRender::Render::Quick::Quick3DStateSet>("QStateSet", "Qt3D.Renderer/StateSet", uri, 2, 0, "StateSet");
+    qmlRegisterType<Qt3DRender::QNoDraw>(uri, 2, 0, "NoDraw");
+    qmlRegisterType<Qt3DRender::QFrameGraph>(uri, 2, 0, "FrameGraph");
 
     // RenderTarget
-    qmlRegisterType<Qt3D::QRenderAttachment>(uri, 2, 0, "RenderAttachment");
-    Qt3D::Quick::registerExtendedType<Qt3D::QRenderTarget, Qt3D::Render::Quick::Quick3DRenderTarget>("QRenderTarget", "Qt3D.Renderer/RenderTarget", uri, 2, 0, "RenderTarget");
+    qmlRegisterType<Qt3DRender::QRenderAttachment>(uri, 2, 0, "RenderAttachment");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QRenderTarget, Qt3DRender::Render::Quick::Quick3DRenderTarget>("QRenderTarget", "Qt3D.Renderer/RenderTarget", uri, 2, 0, "RenderTarget");
 
     // Sorting
-    qmlRegisterType<Qt3D::QSortCriterion>(uri, 2, 0, "SortCriterion");
-    Qt3D::Quick::registerExtendedType<Qt3D::QSortMethod, Qt3D::Render::Quick::Quick3DSortMethod>("QSortMethod", "Qt3D.Renderer/SortMethod", uri, 2, 0, "SortMethod");
+    qmlRegisterType<Qt3DRender::QSortCriterion>(uri, 2, 0, "SortCriterion");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QSortMethod, Qt3DRender::Render::Quick::Quick3DSortMethod>("QSortMethod", "Qt3D.Renderer/SortMethod", uri, 2, 0, "SortMethod");
 
     // RenderStates
-    qmlRegisterUncreatableType<Qt3D::QRenderState>(uri, 2, 0, "RenderState", QStringLiteral("QRenderState is a base class"));
-    qmlRegisterType<Qt3D::QBlendState>(uri, 2, 0, "BlendState");
-    qmlRegisterType<Qt3D::QBlendStateSeparate>(uri, 2, 0, "BlendStateSeparate");
-    qmlRegisterType<Qt3D::QBlendEquation>(uri, 2, 0, "BlendEquation");
-    qmlRegisterType<Qt3D::QAlphaTest>(uri, 2, 0, "AlphaTest");
-    qmlRegisterType<Qt3D::QDepthTest>(uri, 2, 0, "DepthTest");
-    qmlRegisterType<Qt3D::QDepthMask>(uri, 2, 0, "DepthMask");
-    qmlRegisterType<Qt3D::QCullFace>(uri, 2, 0, "CullFace");
-    qmlRegisterType<Qt3D::QFrontFace>(uri, 2, 0, "FrontFace");
-    qmlRegisterUncreatableType<Qt3D::QStencilTestSeparate>(uri, 2, 0, "StencilTestSeparate", QStringLiteral("QStencilTestSeparate cannot be instantiated on its own"));
-    qmlRegisterType<Qt3D::QStencilTest>(uri, 2, 0, "StencilTest");
-    qmlRegisterType<Qt3D::QScissorTest>(uri, 2, 0, "ScissorTest");
-    qmlRegisterType<Qt3D::QDithering>(uri, 2, 0, "Dithering");
-    qmlRegisterType<Qt3D::QAlphaCoverage>(uri, 2, 0, "AlphaCoverage");
-    qmlRegisterType<Qt3D::QPolygonOffset>(uri, 2, 0, "PolygonOffset");
-    qmlRegisterType<Qt3D::QColorMask>(uri, 2, 0, "ColorMask");
-    qmlRegisterType<Qt3D::QClipPlane>(uri, 2, 0, "ClipPlane");
-    qmlRegisterUncreatableType<Qt3D::QStencilOpSeparate>(uri, 2, 0, "StencilOpSeparate", QStringLiteral("StencilOpSeparate cannot be instanciated on its own"));
-    qmlRegisterType<Qt3D::QStencilOp>(uri, 2, 0, "StencilOp");
-    qmlRegisterType<Qt3D::QStencilMask>(uri, 2, 0, "StencilMask");
+    qmlRegisterUncreatableType<Qt3DRender::QRenderState>(uri, 2, 0, "RenderState", QStringLiteral("QRenderState is a base class"));
+    qmlRegisterType<Qt3DRender::QBlendState>(uri, 2, 0, "BlendState");
+    qmlRegisterType<Qt3DRender::QBlendStateSeparate>(uri, 2, 0, "BlendStateSeparate");
+    qmlRegisterType<Qt3DRender::QBlendEquation>(uri, 2, 0, "BlendEquation");
+    qmlRegisterType<Qt3DRender::QAlphaTest>(uri, 2, 0, "AlphaTest");
+    qmlRegisterType<Qt3DRender::QDepthTest>(uri, 2, 0, "DepthTest");
+    qmlRegisterType<Qt3DRender::QDepthMask>(uri, 2, 0, "DepthMask");
+    qmlRegisterType<Qt3DRender::QCullFace>(uri, 2, 0, "CullFace");
+    qmlRegisterType<Qt3DRender::QFrontFace>(uri, 2, 0, "FrontFace");
+    qmlRegisterUncreatableType<Qt3DRender::QStencilTestSeparate>(uri, 2, 0, "StencilTestSeparate", QStringLiteral("QStencilTestSeparate cannot be instantiated on its own"));
+    qmlRegisterType<Qt3DRender::QStencilTest>(uri, 2, 0, "StencilTest");
+    qmlRegisterType<Qt3DRender::QScissorTest>(uri, 2, 0, "ScissorTest");
+    qmlRegisterType<Qt3DRender::QDithering>(uri, 2, 0, "Dithering");
+    qmlRegisterType<Qt3DRender::QAlphaCoverage>(uri, 2, 0, "AlphaCoverage");
+    qmlRegisterType<Qt3DRender::QPolygonOffset>(uri, 2, 0, "PolygonOffset");
+    qmlRegisterType<Qt3DRender::QColorMask>(uri, 2, 0, "ColorMask");
+    qmlRegisterType<Qt3DRender::QClipPlane>(uri, 2, 0, "ClipPlane");
+    qmlRegisterUncreatableType<Qt3DRender::QStencilOpSeparate>(uri, 2, 0, "StencilOpSeparate", QStringLiteral("StencilOpSeparate cannot be instanciated on its own"));
+    qmlRegisterType<Qt3DRender::QStencilOp>(uri, 2, 0, "StencilOp");
+    qmlRegisterType<Qt3DRender::QStencilMask>(uri, 2, 0, "StencilMask");
 
     // Register types provided as QML files compiled into the plugin
     for (int i = 0; i < int(sizeof(qmldir) / sizeof(qmldir[0])); i++) {
diff --git a/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp b/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp
index 65836bdcf..a1aa4945a 100644
--- a/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp
+++ b/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 
 void QtQuickScene3DPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterType<Qt3D::Scene3DItem>(uri, 2, 0, "Scene3D");
+    qmlRegisterType<Qt3DRender::Scene3DItem>(uri, 2, 0, "Scene3D");
 }
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp
index 72506c8aa..7daca94ad 100644
--- a/src/quick3d/imports/scene3d/scene3ditem.cpp
+++ b/src/quick3d/imports/scene3d/scene3ditem.cpp
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class ContextSaver
 {
@@ -148,7 +148,7 @@ class Scene3DRenderer : public QObject
 public:
     Scene3DRenderer(Scene3DItem *item,
                     Qt3D::QAspectEngine *aspectEngine,
-                    Qt3D::QRenderAspect *renderAspect)
+                    QRenderAspect *renderAspect)
         : QObject()
         , m_item(item)
         , m_aspectEngine(aspectEngine)
@@ -249,7 +249,7 @@ public Q_SLOTS:
 private:
     Scene3DItem *m_item; // Will be released by the QQuickWindow/QML Engine
     Qt3D::QAspectEngine *m_aspectEngine; // Will be released by the Scene3DRendererCleaner
-    Qt3D::QRenderAspect *m_renderAspect; // Will be released by the aspectEngine
+    QRenderAspect *m_renderAspect; // Will be released by the aspectEngine
     QScopedPointer<QOpenGLFramebufferObject> m_multisampledFBO;
     QScopedPointer<QOpenGLFramebufferObject> m_finalFBO;
     QScopedPointer<QSGTexture> m_texture;
@@ -464,7 +464,7 @@ Scene3DItem::Scene3DItem(QQuickItem *parent)
     : QQuickItem(parent)
     , m_entity(Q_NULLPTR)
     , m_aspectEngine(new Qt3D::QAspectEngine())
-    , m_renderAspect(new Qt3D::QRenderAspect(Qt3D::QRenderAspect::Synchronous))
+    , m_renderAspect(new QRenderAspect(QRenderAspect::Synchronous))
     , m_renderer(Q_NULLPTR)
     , m_rendererCleaner(new Scene3DCleaner())
     , m_multisample(true)
@@ -723,7 +723,7 @@ void Scene3DCleaner::cleanup()
     deleteLater();
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/imports/scene3d/scene3ditem_p.h b/src/quick3d/imports/scene3d/scene3ditem_p.h
index 3b620ec7f..1f0eaafc1 100644
--- a/src/quick3d/imports/scene3d/scene3ditem_p.h
+++ b/src/quick3d/imports/scene3d/scene3ditem_p.h
@@ -41,12 +41,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D
-{
+namespace Qt3D {
 class QAspectEngine;
 class QEntity;
-class QRenderAspect;
+}
 
+namespace Qt3DRender {
+
+class QRenderAspect;
 class Scene3DRenderer;
 class Scene3DCleaner;
 
@@ -86,14 +88,14 @@ private:
     Qt3D::QEntity *m_entity;
 
     Qt3D::QAspectEngine *m_aspectEngine;
-    Qt3D::QRenderAspect *m_renderAspect;
+    QRenderAspect *m_renderAspect;
     Scene3DRenderer *m_renderer;
     Scene3DCleaner *m_rendererCleaner;
 
     bool m_multisample;
 };
 
-} // Qt3D
+} // Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/imports/scene3d/scene3dlogging.cpp b/src/quick3d/imports/scene3d/scene3dlogging.cpp
index 344d9250d..c7bdc32b3 100644
--- a/src/quick3d/imports/scene3d/scene3dlogging.cpp
+++ b/src/quick3d/imports/scene3d/scene3dlogging.cpp
@@ -38,10 +38,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 Q_LOGGING_CATEGORY(Scene3D, "Qt3D.Scene3D")
 
-} // Qt3D
+} // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/scene3d/scene3dlogging_p.h b/src/quick3d/imports/scene3d/scene3dlogging_p.h
index 2bec6f8f1..94066547d 100644
--- a/src/quick3d/imports/scene3d/scene3dlogging_p.h
+++ b/src/quick3d/imports/scene3d/scene3dlogging_p.h
@@ -41,11 +41,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 Q_DECLARE_LOGGING_CATEGORY(Scene3D)
 
-} // Qt3D
+} // Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/items/quick3deffect.cpp b/src/quick3d/quick3drenderer/items/quick3deffect.cpp
index 93e588945..435514bd7 100644
--- a/src/quick3d/quick3drenderer/items/quick3deffect.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3deffect.cpp
@@ -39,10 +39,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 Quick3DEffect::Quick3DEffect(QObject *parent)
@@ -61,11 +59,11 @@ QQmlListProperty<QTechnique> Quick3DEffect::techniqueList()
 
 QQmlListProperty<QParameter> Quick3DEffect::parameterList()
 {
-    return QQmlListProperty<Qt3D::QParameter>(this, 0,
-                                             &Quick3DEffect::appendParameter,
-                                             &Quick3DEffect::parametersCount,
-                                             &Quick3DEffect::parameterAt,
-                                             &Quick3DEffect::clearParameterList);
+    return QQmlListProperty<QParameter>(this, 0,
+                                        &Quick3DEffect::appendParameter,
+                                        &Quick3DEffect::parametersCount,
+                                        &Quick3DEffect::parameterAt,
+                                        &Quick3DEffect::clearParameterList);
 }
 
 void Quick3DEffect::appendTechnique(QQmlListProperty<QTechnique> *list, QTechnique *bar)
@@ -128,10 +126,8 @@ void Quick3DEffect::clearParameterList(QQmlListProperty<QParameter> *list)
         qobject_cast<QEffect *>(effect->parentEffect())->removeParameter(p);
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3deffect.h b/src/quick3d/quick3drenderer/items/quick3deffect.h
index 84cda7770..f7089cfa5 100644
--- a/src/quick3d/quick3drenderer/items/quick3deffect.h
+++ b/src/quick3d/quick3drenderer/items/quick3deffect.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DEFFECT_H
-#define QT3D_RENDER_QUICK_QUICK3DEFFECT_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DEFFECT_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DEFFECT_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <QQmlListProperty>
@@ -45,25 +45,23 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DEffect : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QTechnique> techniques READ techniqueList)
-    Q_PROPERTY(QQmlListProperty<Qt3D::QParameter> parameters READ parameterList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QTechnique> techniques READ techniqueList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList)
 
 public:
     explicit Quick3DEffect(QObject *parent = 0);
 
     inline QEffect *parentEffect() const { return qobject_cast<QEffect*>(parent()); }
 
-    QQmlListProperty<Qt3D::QTechnique> techniqueList();
-    QQmlListProperty<Qt3D::QParameter> parameterList();
+    QQmlListProperty<QTechnique> techniqueList();
+    QQmlListProperty<QParameter> parameterList();
 
 private:
     static void appendTechnique(QQmlListProperty<QTechnique> *list, QTechnique *bar);
@@ -77,12 +75,10 @@ private:
     static void clearParameterList(QQmlListProperty<QParameter> *list);
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QUICK_QUICK3DEFFECT_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DEFFECT_H
diff --git a/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp b/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp
index 67f39e851..c0961ab6c 100644
--- a/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp
@@ -38,10 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 Quick3DGeometry::Quick3DGeometry(QObject *parent)
@@ -49,47 +47,45 @@ Quick3DGeometry::Quick3DGeometry(QObject *parent)
 {
 }
 
-QQmlListProperty<QAbstractAttribute> Quick3DGeometry::attributeList()
+QQmlListProperty<Qt3D::QAbstractAttribute> Quick3DGeometry::attributeList()
 {
-    return QQmlListProperty<QAbstractAttribute>(this, 0,
-                                                &Quick3DGeometry::appendAttribute,
-                                                &Quick3DGeometry::attributesCount,
-                                                &Quick3DGeometry::attributeAt,
-                                                &Quick3DGeometry::clearAttributes);
+    return QQmlListProperty<Qt3D::QAbstractAttribute>(this, 0,
+                                                      &Quick3DGeometry::appendAttribute,
+                                                      &Quick3DGeometry::attributesCount,
+                                                      &Quick3DGeometry::attributeAt,
+                                                      &Quick3DGeometry::clearAttributes);
 }
 
-void Quick3DGeometry::appendAttribute(QQmlListProperty<QAbstractAttribute> *list, QAbstractAttribute *attribute)
+void Quick3DGeometry::appendAttribute(QQmlListProperty<Qt3D::QAbstractAttribute> *list, Qt3D::QAbstractAttribute *attribute)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
     geometry->m_managedAttributes.append(attribute);
     geometry->parentGeometry()->addAttribute(attribute);
 }
 
-QAbstractAttribute *Quick3DGeometry::attributeAt(QQmlListProperty<QAbstractAttribute> *list, int index)
+Qt3D::QAbstractAttribute *Quick3DGeometry::attributeAt(QQmlListProperty<Qt3D::QAbstractAttribute> *list, int index)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
     return geometry->parentGeometry()->attributes().at(index);
 }
 
-int Quick3DGeometry::attributesCount(QQmlListProperty<QAbstractAttribute> *list)
+int Quick3DGeometry::attributesCount(QQmlListProperty<Qt3D::QAbstractAttribute> *list)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
     return geometry->parentGeometry()->attributes().count();
 }
 
-void Quick3DGeometry::clearAttributes(QQmlListProperty<QAbstractAttribute> *list)
+void Quick3DGeometry::clearAttributes(QQmlListProperty<Qt3D::QAbstractAttribute> *list)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
-    QVector<QAbstractAttribute *> &managedAttributes = geometry->m_managedAttributes;
-    Q_FOREACH (QAbstractAttribute *attribute, managedAttributes)
+    QVector<Qt3D::QAbstractAttribute *> &managedAttributes = geometry->m_managedAttributes;
+    Q_FOREACH (Qt3D::QAbstractAttribute *attribute, managedAttributes)
         geometry->parentGeometry()->removeAttribute(attribute);
     managedAttributes.clear();
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3D
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3dgeometry.h b/src/quick3d/quick3drenderer/items/quick3dgeometry.h
index a5e275f6a..85b01554e 100644
--- a/src/quick3d/quick3drenderer/items/quick3dgeometry.h
+++ b/src/quick3d/quick3drenderer/items/quick3dgeometry.h
@@ -43,38 +43,34 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DGeometry : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<QAbstractAttribute> attributes READ attributeList)
+    Q_PROPERTY(QQmlListProperty<Qt3D::QAbstractAttribute> attributes READ attributeList)
     Q_CLASSINFO("DefaultProperty", "attributeProviders")
 
 public:
     explicit Quick3DGeometry(QObject *parent = 0);
     inline QGeometry *parentGeometry() const { return qobject_cast<QGeometry *>(parent()); }
 
-    QQmlListProperty<QAbstractAttribute> attributeList();
+    QQmlListProperty<Qt3D::QAbstractAttribute> attributeList();
 
 private:
-    static void appendAttribute(QQmlListProperty<QAbstractAttribute> *list, QAbstractAttribute *provider);
-    static QAbstractAttribute *attributeAt(QQmlListProperty<QAbstractAttribute> *list, int index);
-    static int attributesCount(QQmlListProperty<QAbstractAttribute> *list);
-    static void clearAttributes(QQmlListProperty<QAbstractAttribute> *list);
+    static void appendAttribute(QQmlListProperty<Qt3D::QAbstractAttribute> *list, Qt3D::QAbstractAttribute *provider);
+    static Qt3D::QAbstractAttribute *attributeAt(QQmlListProperty<Qt3D::QAbstractAttribute> *list, int index);
+    static int attributesCount(QQmlListProperty<Qt3D::QAbstractAttribute> *list);
+    static void clearAttributes(QQmlListProperty<Qt3D::QAbstractAttribute> *list);
 
-    QVector<QAbstractAttribute *> m_managedAttributes;
+    QVector<Qt3D::QAbstractAttribute *> m_managedAttributes;
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3D
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp b/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp
index 16fc06fc9..9546e56c9 100644
--- a/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dmaterial.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -96,7 +96,7 @@ void Quick3DMaterial::clearParameters(QQmlListProperty<QParameter> *list)
 
 } // Quick
 
-} // Render
+} // namespace Render
 
 } // Qt3D
 
diff --git a/src/quick3d/quick3drenderer/items/quick3dmaterial.h b/src/quick3d/quick3drenderer/items/quick3dmaterial.h
index bb17d5905..19c060308 100644
--- a/src/quick3d/quick3drenderer/items/quick3dmaterial.h
+++ b/src/quick3d/quick3drenderer/items/quick3dmaterial.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DMATERIAL_H
-#define QT3D_RENDER_QUICK_QUICK3DMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DMATERIAL_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DMATERIAL_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DRenderer/qmaterial.h>
@@ -44,10 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 // FIXME - write a custom QML parser and stop mis-using Tag
@@ -56,7 +54,7 @@ namespace Quick {
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DMaterial : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QParameter> parameters READ qmlParameters)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ qmlParameters)
 
 public:
     explicit Quick3DMaterial(QObject *parent = 0);
@@ -75,12 +73,10 @@ private:
     static void clearParameters(QQmlListProperty<QParameter> *list);
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QUICK_QUICK3DMATERIAL_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DMATERIAL_H
diff --git a/src/quick3d/quick3drenderer/items/quick3dparameter.cpp b/src/quick3d/quick3drenderer/items/quick3dparameter.cpp
index 6f3b66212..fe3e497a3 100644
--- a/src/quick3d/quick3drenderer/items/quick3dparameter.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dparameter.cpp
@@ -42,16 +42,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 namespace {
-
 const int qjsValueTypeId = qMetaTypeId<QJSValue>();
-
 }
 
 Quick3DParameterPrivate::Quick3DParameterPrivate()
@@ -81,11 +77,9 @@ Quick3DParameter::Quick3DParameter(Quick3DParameterPrivate &dd, QNode *parent)
 {
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/items/quick3dparameter.h b/src/quick3d/quick3drenderer/items/quick3dparameter.h
index 53f4dd1b6..064f21d6f 100644
--- a/src/quick3d/quick3drenderer/items/quick3dparameter.h
+++ b/src/quick3d/quick3drenderer/items/quick3dparameter.h
@@ -34,18 +34,16 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DPARAMETER_H
-#define QT3D_RENDER_QUICK_QUICK3DPARAMETER_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DRenderer/qparameter.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class Quick3DParameterPrivate;
@@ -64,12 +62,10 @@ protected:
     QT3D_CLONEABLE(Quick3DParameter)
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QUICK_QUICK3DPARAMETER_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_H
diff --git a/src/quick3d/quick3drenderer/items/quick3dparameter_p.h b/src/quick3d/quick3drenderer/items/quick3dparameter_p.h
index bc715b49c..04d983a82 100644
--- a/src/quick3d/quick3drenderer/items/quick3dparameter_p.h
+++ b/src/quick3d/quick3drenderer/items/quick3dparameter_p.h
@@ -34,17 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DPARAMETER_P_H
-#define QT3D_RENDER_QUICK_QUICK3DPARAMETER_P_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_P_H
 
 #include <Qt3DRenderer/private/qparameter_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class Quick3DParameter;
@@ -59,12 +57,10 @@ public:
     void setValue(const QVariant &value) Q_DECL_OVERRIDE;
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QUICK_QUICK3DPARAMETER_P_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DPARAMETER_P_H
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp b/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
index 8dfc483e1..3c8f9322d 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
@@ -40,10 +40,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 Quick3DRenderPass::Quick3DRenderPass(QObject *parent)
@@ -53,38 +51,38 @@ Quick3DRenderPass::Quick3DRenderPass(QObject *parent)
 
 QQmlListProperty<QAnnotation> Quick3DRenderPass::annotationList()
 {
-    return QQmlListProperty<Qt3D::QAnnotation>(this, 0,
-                                              &Quick3DRenderPass::appendAnnotation,
-                                              &Quick3DRenderPass::annotationsCount,
-                                              &Quick3DRenderPass::annotationAt,
-                                              &Quick3DRenderPass::clearAnnotations);
+    return QQmlListProperty<QAnnotation>(this, 0,
+                                         &Quick3DRenderPass::appendAnnotation,
+                                         &Quick3DRenderPass::annotationsCount,
+                                         &Quick3DRenderPass::annotationAt,
+                                         &Quick3DRenderPass::clearAnnotations);
 }
 
 QQmlListProperty<QParameterMapping> Quick3DRenderPass::bindingList()
 {
-    return QQmlListProperty<Qt3D::QParameterMapping>(this, 0,
-                                                    &Quick3DRenderPass::appendBinding,
-                                                    &Quick3DRenderPass::bindingsCount,
-                                                    &Quick3DRenderPass::bindingAt,
-                                                    &Quick3DRenderPass::clearBindings);
+    return QQmlListProperty<QParameterMapping>(this, 0,
+                                               &Quick3DRenderPass::appendBinding,
+                                               &Quick3DRenderPass::bindingsCount,
+                                               &Quick3DRenderPass::bindingAt,
+                                               &Quick3DRenderPass::clearBindings);
 }
 
 QQmlListProperty<QRenderState> Quick3DRenderPass::renderStateList()
 {
-    return QQmlListProperty<Qt3D::QRenderState>(this, 0,
-                                              &Quick3DRenderPass::appendRenderState,
-                                              &Quick3DRenderPass::renderStateCount,
-                                              &Quick3DRenderPass::renderStateAt,
-                                              &Quick3DRenderPass::clearRenderStates);
+    return QQmlListProperty<QRenderState>(this, 0,
+                                          &Quick3DRenderPass::appendRenderState,
+                                          &Quick3DRenderPass::renderStateCount,
+                                          &Quick3DRenderPass::renderStateAt,
+                                          &Quick3DRenderPass::clearRenderStates);
 }
 
 QQmlListProperty<QParameter> Quick3DRenderPass::parameterList()
 {
-    return QQmlListProperty<Qt3D::QParameter>(this, 0,
-                                             &Quick3DRenderPass::appendParameter,
-                                             &Quick3DRenderPass::parametersCount,
-                                             &Quick3DRenderPass::parameterAt,
-                                             &Quick3DRenderPass::clearParameterList);
+    return QQmlListProperty<QParameter>(this, 0,
+                                        &Quick3DRenderPass::appendParameter,
+                                        &Quick3DRenderPass::parametersCount,
+                                        &Quick3DRenderPass::parameterAt,
+                                        &Quick3DRenderPass::clearParameterList);
 }
 
 void Quick3DRenderPass::appendAnnotation(QQmlListProperty<QAnnotation> *list, QAnnotation *annotation)
@@ -188,10 +186,8 @@ void Quick3DRenderPass::clearParameterList(QQmlListProperty<QParameter> *list)
 }
 
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.h b/src/quick3d/quick3drenderer/items/quick3drenderpass.h
index 5e968870d..a8354c27d 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.h
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DRENDERPASS_H
-#define QT3D_RENDER_QUICK_QUICK3DRENDERPASS_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASS_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASS_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DRenderer/qrenderpass.h>
@@ -44,44 +44,42 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPass : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> annotations READ annotationList)
-    Q_PROPERTY(QQmlListProperty<Qt3D::QParameterMapping> bindings READ bindingList)
-    Q_PROPERTY(QQmlListProperty<Qt3D::QRenderState> renderStates READ renderStateList)
-    Q_PROPERTY(QQmlListProperty<Qt3D::QParameter> parameters READ parameterList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> annotations READ annotationList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameterMapping> bindings READ bindingList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderState> renderStates READ renderStateList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList)
 public:
     explicit Quick3DRenderPass(QObject *parent = 0);
 
-    QQmlListProperty<Qt3D::QAnnotation> annotationList();
-    QQmlListProperty<Qt3D::QParameterMapping> bindingList();
-    QQmlListProperty<Qt3D::QRenderState> renderStateList();
-    QQmlListProperty<Qt3D::QParameter> parameterList();
+    QQmlListProperty<QAnnotation> annotationList();
+    QQmlListProperty<QParameterMapping> bindingList();
+    QQmlListProperty<QRenderState> renderStateList();
+    QQmlListProperty<QParameter> parameterList();
 
     inline QRenderPass *parentRenderPass() const { return qobject_cast<QRenderPass *>(parent()); }
 
 private:
-    static void appendAnnotation(QQmlListProperty<Qt3D::QAnnotation> *list, QAnnotation *criterion);
-    static QAnnotation *annotationAt(QQmlListProperty<Qt3D::QAnnotation> *list, int index);
-    static int annotationsCount(QQmlListProperty<Qt3D::QAnnotation> *list);
-    static void clearAnnotations(QQmlListProperty<Qt3D::QAnnotation> *list);
+    static void appendAnnotation(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion);
+    static QAnnotation *annotationAt(QQmlListProperty<QAnnotation> *list, int index);
+    static int annotationsCount(QQmlListProperty<QAnnotation> *list);
+    static void clearAnnotations(QQmlListProperty<QAnnotation> *list);
 
-    static void appendBinding(QQmlListProperty<Qt3D::QParameterMapping> *list, QParameterMapping *binding);
-    static QParameterMapping *bindingAt(QQmlListProperty<Qt3D::QParameterMapping> *list, int index);
-    static int bindingsCount(QQmlListProperty<Qt3D::QParameterMapping> *list);
-    static void clearBindings(QQmlListProperty<Qt3D::QParameterMapping> *list);
+    static void appendBinding(QQmlListProperty<QParameterMapping> *list, QParameterMapping *binding);
+    static QParameterMapping *bindingAt(QQmlListProperty<QParameterMapping> *list, int index);
+    static int bindingsCount(QQmlListProperty<QParameterMapping> *list);
+    static void clearBindings(QQmlListProperty<QParameterMapping> *list);
 
-    static void appendRenderState(QQmlListProperty<Qt3D::QRenderState> *list, QRenderState *state);
-    static QRenderState *renderStateAt(QQmlListProperty<Qt3D::QRenderState> *list, int index);
-    static int renderStateCount(QQmlListProperty<Qt3D::QRenderState> *list);
-    static void clearRenderStates(QQmlListProperty<Qt3D::QRenderState> *list);
+    static void appendRenderState(QQmlListProperty<QRenderState> *list, QRenderState *state);
+    static QRenderState *renderStateAt(QQmlListProperty<QRenderState> *list, int index);
+    static int renderStateCount(QQmlListProperty<QRenderState> *list);
+    static void clearRenderStates(QQmlListProperty<QRenderState> *list);
 
     static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *param);
     static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index);
@@ -89,12 +87,10 @@ private:
     static void clearParameterList(QQmlListProperty<QParameter> *list);
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3D
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QUICK_QUICK3DRENDERPASS_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASS_H
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp
index 3b31f696b..d0dbf7dab 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp
@@ -38,10 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 Quick3DRenderPassFilter::Quick3DRenderPassFilter(QObject *parent)
@@ -51,20 +49,20 @@ Quick3DRenderPassFilter::Quick3DRenderPassFilter(QObject *parent)
 
 QQmlListProperty<QAnnotation> Quick3DRenderPassFilter::includeList()
 {
-    return QQmlListProperty<Qt3D::QAnnotation>(this, 0,
-                                               &Quick3DRenderPassFilter::appendInclude,
-                                               &Quick3DRenderPassFilter::includesCount,
-                                               &Quick3DRenderPassFilter::includeAt,
-                                               &Quick3DRenderPassFilter::clearIncludes);
+    return QQmlListProperty<QAnnotation>(this, 0,
+                                         &Quick3DRenderPassFilter::appendInclude,
+                                         &Quick3DRenderPassFilter::includesCount,
+                                         &Quick3DRenderPassFilter::includeAt,
+                                         &Quick3DRenderPassFilter::clearIncludes);
 }
 
 QQmlListProperty<QParameter> Quick3DRenderPassFilter::parameterList()
 {
-    return QQmlListProperty<Qt3D::QParameter>(this, 0,
-                                              &Quick3DRenderPassFilter::appendParameter,
-                                              &Quick3DRenderPassFilter::parametersCount,
-                                              &Quick3DRenderPassFilter::parameterAt,
-                                              &Quick3DRenderPassFilter::clearParameterList);
+    return QQmlListProperty<QParameter>(this, 0,
+                                        &Quick3DRenderPassFilter::appendParameter,
+                                        &Quick3DRenderPassFilter::parametersCount,
+                                        &Quick3DRenderPassFilter::parameterAt,
+                                        &Quick3DRenderPassFilter::clearParameterList);
 
 }
 
@@ -127,10 +125,8 @@ void Quick3DRenderPassFilter::clearParameterList(QQmlListProperty<QParameter> *l
         rPassFilter->parentRenderPassFilter()->removeParameter(p);
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h b/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h
index 4b22568ad..aefdd8e33 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H
-#define QT3D_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H
 
 #include <Qt3DQuick/quick3dnode.h>
 #include <Qt3DRenderer/qrenderpassfilter.h>
@@ -44,25 +44,23 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPassFilter : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> includes READ includeList)
-    Q_PROPERTY(QQmlListProperty<Qt3D::QParameter> parameters READ parameterList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> includes READ includeList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList)
 
 public:
     explicit Quick3DRenderPassFilter(QObject *parent = 0);
 
-    QQmlListProperty<Qt3D::QAnnotation> includeList();
-    QQmlListProperty<Qt3D::QParameter> parameterList();
+    QQmlListProperty<QAnnotation> includeList();
+    QQmlListProperty<QParameter> parameterList();
 
-    inline QRenderPassFilter *parentRenderPassFilter() const { return qobject_cast<Qt3D::QRenderPassFilter*>(parent()); }
+    inline QRenderPassFilter *parentRenderPassFilter() const { return qobject_cast<Qt3DRender::QRenderPassFilter*>(parent()); }
 
 private:
     static void appendInclude(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion);
@@ -76,12 +74,10 @@ private:
     static void clearParameterList(QQmlListProperty<QParameter> *list);
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H
diff --git a/src/quick3d/quick3drenderer/items/quick3drendertarget.cpp b/src/quick3d/quick3drenderer/items/quick3drendertarget.cpp
index 6e08ca022..2bd4cfe5b 100644
--- a/src/quick3d/quick3drenderer/items/quick3drendertarget.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3drendertarget.cpp
@@ -38,10 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 Quick3DRenderTarget::Quick3DRenderTarget(QObject * parent)
@@ -90,10 +88,8 @@ void Quick3DRenderTarget::clearRenderAttachments(QQmlListProperty<QRenderAttachm
     }
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3drendertarget.h b/src/quick3d/quick3drenderer/items/quick3drendertarget.h
index 4b66e07b8..e494b9895 100644
--- a/src/quick3d/quick3drenderer/items/quick3drendertarget.h
+++ b/src/quick3d/quick3drenderer/items/quick3drendertarget.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DRENDERTARGET_H
-#define QT3D_RENDER_QUICK_QUICK3DRENDERTARGET_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DRenderer/qrendertarget.h>
@@ -44,16 +44,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderTarget : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QRenderAttachment> attachments READ qmlAttachments)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderAttachment> attachments READ qmlAttachments)
 public:
     explicit Quick3DRenderTarget(QObject *parent = 0);
 
@@ -67,12 +65,10 @@ private:
     static void clearRenderAttachments(QQmlListProperty<QRenderAttachment> *list);
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QUICK_QUICK3DRENDERTARGET_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_H
diff --git a/src/quick3d/quick3drenderer/items/quick3drendertargetselector.cpp b/src/quick3d/quick3drenderer/items/quick3drendertargetselector.cpp
index 808d05a46..e09bfd8f5 100644
--- a/src/quick3d/quick3drenderer/items/quick3drendertargetselector.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3drendertargetselector.cpp
@@ -38,10 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 Quick3DRenderTargetSelector::Quick3DRenderTargetSelector(QObject *parent)
@@ -76,10 +74,8 @@ void Quick3DRenderTargetSelector::setDrawBuffers(const QVariantList &buffers)
     }
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3drendertargetselector.h b/src/quick3d/quick3drenderer/items/quick3drendertargetselector.h
index e801dd811..07a725fe8 100644
--- a/src/quick3d/quick3drenderer/items/quick3drendertargetselector.h
+++ b/src/quick3d/quick3drenderer/items/quick3drendertargetselector.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_H
-#define QT3D_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETSELECTOR_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DRenderer/qrenderattachment.h>
@@ -45,10 +45,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderTargetSelector : public QObject
@@ -68,11 +66,9 @@ Q_SIGNALS:
     void drawBuffersChanged();
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/items/quick3dscene.cpp b/src/quick3d/quick3drenderer/items/quick3dscene.cpp
index fe4075e79..b28487829 100644
--- a/src/quick3d/quick3drenderer/items/quick3dscene.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dscene.cpp
@@ -38,10 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 Quick3DScene::Quick3DScene(QObject *parent)
@@ -49,10 +47,8 @@ Quick3DScene::Quick3DScene(QObject *parent)
 {
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3dscene.h b/src/quick3d/quick3drenderer/items/quick3dscene.h
index d2b6a9891..dfe7cbb17 100644
--- a/src/quick3d/quick3drenderer/items/quick3dscene.h
+++ b/src/quick3d/quick3drenderer/items/quick3dscene.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DSCENE_H
-#define QT3D_RENDER_QUICK_QUICK3DSCENE_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSCENE_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DSCENE_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DQuick/quick3dentity.h>
@@ -43,10 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DScene : public QObject
@@ -58,12 +56,10 @@ public:
     inline QAbstractSceneLoader *parentScene() const { return qobject_cast<QAbstractSceneLoader *>(parent()); }
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QUICK_QUICK3DSCENE_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSCENE_H
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp b/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp
index 58587ba2e..a84e71ac5 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp
@@ -42,10 +42,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 namespace {
@@ -83,7 +81,7 @@ public:
             }
             return innerValues;
         } else if (v.userType() == quick3DShaderDataTypeId) {
-            QNodeId id;
+            Qt3D::QNodeId id;
             QShaderData *shaderData = v.value<Quick3DShaderData *>();
             if (shaderData)
                 id = shaderData->id();
@@ -99,10 +97,8 @@ Quick3DShaderData::Quick3DShaderData(QNode *parent)
 {
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3D
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h b/src/quick3d/quick3drenderer/items/quick3dshaderdata.h
index 56bd143f9..31beee39d 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h
+++ b/src/quick3d/quick3drenderer/items/quick3dshaderdata.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DSHADERDATA_H
-#define QT3D_RENDER_QUICK_QUICK3DSHADERDATA_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATA_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATA_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DRenderer/qshaderdata.h>
@@ -45,10 +45,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DShaderData : public QShaderData
@@ -61,14 +59,12 @@ private:
     QT3D_CLONEABLE(Quick3DShaderData)
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3D
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::Render::Quick::Quick3DShaderData*)
+Q_DECLARE_METATYPE(Qt3DRender::Render::Quick::Quick3DShaderData*)
 
-#endif // QT3D_RENDER_QUICK_QUICK3DSHADERDATA_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATA_H
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp
index b5f0bc8de..c85f6d62e 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp
@@ -39,13 +39,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
-class Quick3DShaderDataArrayPrivate : public QNodePrivate
+class Quick3DShaderDataArrayPrivate : public Qt3D::QNodePrivate
 {
 public:
     Quick3DShaderDataArrayPrivate()
@@ -112,10 +110,8 @@ void Quick3DShaderDataArray::clearValues(QQmlListProperty<QShaderData> *list)
     static_cast<Quick3DShaderDataArrayPrivate *>(Quick3DShaderDataArrayPrivate::get(self))->m_values.clear();
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h
index c9fa3d58d..aa0a0da5c 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h
+++ b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DSHADERDATAARRAY_H
-#define QT3D_RENDER_QUICK_QUICK3DSHADERDATAARRAY_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATAARRAY_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATAARRAY_H
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
@@ -44,30 +44,30 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QShaderData;
 
 namespace Render {
-
 namespace Quick {
 
 class Quick3DShaderDataArrayPrivate;
 class Quick3DShaderData;
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DShaderDataArray : public QNode
+class QT3DQUICKRENDERERSHARED_EXPORT Quick3DShaderDataArray : public Qt3D::QNode
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QShaderData> values READ valuesList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QShaderData> values READ valuesList)
     Q_CLASSINFO("DefaultProperty", "values")
+
 public:
-    explicit Quick3DShaderDataArray(QNode *parent = 0);
+    explicit Quick3DShaderDataArray(Qt3D::QNode *parent = 0);
     ~Quick3DShaderDataArray();
     QQmlListProperty<QShaderData> valuesList();
     QList<QShaderData *> values() const;
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     static void appendValue(QQmlListProperty<QShaderData> *list, QShaderData *bar);
@@ -78,14 +78,12 @@ private:
     QT3D_CLONEABLE(Quick3DShaderDataArray)
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::Render::Quick::Quick3DShaderDataArray*)
+Q_DECLARE_METATYPE(Qt3DRender::Render::Quick::Quick3DShaderDataArray*)
 
-#endif // QT3D_RENDER_QUICK_QUICK3DSHADERDATAARRAY_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSHADERDATAARRAY_H
diff --git a/src/quick3d/quick3drenderer/items/quick3dsortmethod.cpp b/src/quick3d/quick3drenderer/items/quick3dsortmethod.cpp
index 17b049c26..2c04b054f 100644
--- a/src/quick3d/quick3drenderer/items/quick3dsortmethod.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dsortmethod.cpp
@@ -38,10 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 Quick3DSortMethod::Quick3DSortMethod(QObject *parent)
@@ -90,10 +88,8 @@ void Quick3DSortMethod::clearCriteria(QQmlListProperty<QSortCriterion> *list)
     }
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3dsortmethod.h b/src/quick3d/quick3drenderer/items/quick3dsortmethod.h
index 388860782..17bc73f8e 100644
--- a/src/quick3d/quick3drenderer/items/quick3dsortmethod.h
+++ b/src/quick3d/quick3drenderer/items/quick3dsortmethod.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DSORTMETHOD_H
-#define QT3D_RENDER_QUICK_QUICK3DSORTMETHOD_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSORTMETHOD_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DSORTMETHOD_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DRenderer/qsortmethod.h>
@@ -44,22 +44,20 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DSortMethod : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QSortCriterion> criteria READ criteriaList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QSortCriterion> criteria READ criteriaList)
 public:
     explicit Quick3DSortMethod(QObject *parent = 0);
 
     inline QSortMethod *parentSortMethod() const { return qobject_cast<QSortMethod *>(parent()); }
 
-    QQmlListProperty<Qt3D::QSortCriterion> criteriaList();
+    QQmlListProperty<QSortCriterion> criteriaList();
 
 private:
     static void appendCriterion(QQmlListProperty<QSortCriterion> *list, QSortCriterion *criterion);
@@ -68,12 +66,10 @@ private:
     static void clearCriteria(QQmlListProperty<QSortCriterion> *list);
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QUICK3DSORTMETHOD_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSORTMETHOD_H
diff --git a/src/quick3d/quick3drenderer/items/quick3dstateset.cpp b/src/quick3d/quick3drenderer/items/quick3dstateset.cpp
index fe51cb495..c6acec6a7 100644
--- a/src/quick3d/quick3drenderer/items/quick3dstateset.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dstateset.cpp
@@ -38,10 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 Quick3DStateSet::Quick3DStateSet(QObject *parent)
@@ -55,11 +53,11 @@ Quick3DStateSet::~Quick3DStateSet()
 
 QQmlListProperty<QRenderState> Quick3DStateSet::renderStateList()
 {
-    return QQmlListProperty<Qt3D::QRenderState>(this, 0,
-                                              &Quick3DStateSet::appendRenderState,
-                                              &Quick3DStateSet::renderStateCount,
-                                              &Quick3DStateSet::renderStateAt,
-                                              &Quick3DStateSet::clearRenderStates);
+    return QQmlListProperty<QRenderState>(this, 0,
+                                          &Quick3DStateSet::appendRenderState,
+                                          &Quick3DStateSet::renderStateCount,
+                                          &Quick3DStateSet::renderStateAt,
+                                          &Quick3DStateSet::clearRenderStates);
 
 }
 
@@ -88,11 +86,9 @@ void Quick3DStateSet::clearRenderStates(QQmlListProperty<QRenderState> *list)
         stateSet->parentStateSet()->removeRenderState(s);
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/items/quick3dstateset.h b/src/quick3d/quick3drenderer/items/quick3dstateset.h
index 6a352b21a..3be605922 100644
--- a/src/quick3d/quick3drenderer/items/quick3dstateset.h
+++ b/src/quick3d/quick3drenderer/items/quick3dstateset.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DSTATESET_H
-#define QT3D_RENDER_QUICK_QUICK3DSTATESET_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DSTATESET_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DSTATESET_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DRenderer/qstateset.h>
@@ -43,36 +43,32 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DStateSet : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QRenderState> renderStates READ renderStateList CONSTANT)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderState> renderStates READ renderStateList CONSTANT)
 public:
     explicit Quick3DStateSet(QObject *parent = 0);
     ~Quick3DStateSet();
 
-    QQmlListProperty<Qt3D::QRenderState> renderStateList();
+    QQmlListProperty<QRenderState> renderStateList();
     inline QStateSet *parentStateSet() const { return qobject_cast<QStateSet *>(parent()); }
 
 private:
-    static void appendRenderState(QQmlListProperty<Qt3D::QRenderState> *list, QRenderState *state);
-    static QRenderState *renderStateAt(QQmlListProperty<Qt3D::QRenderState> *list, int index);
-    static int renderStateCount(QQmlListProperty<Qt3D::QRenderState> *list);
-    static void clearRenderStates(QQmlListProperty<Qt3D::QRenderState> *list);
+    static void appendRenderState(QQmlListProperty<QRenderState> *list, QRenderState *state);
+    static QRenderState *renderStateAt(QQmlListProperty<QRenderState> *list, int index);
+    static int renderStateCount(QQmlListProperty<QRenderState> *list);
+    static void clearRenderStates(QQmlListProperty<QRenderState> *list);
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QUICK_QUICK3DSTATESET_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DSTATESET_H
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp b/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp
index 3c09aac53..21690e6fe 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp
@@ -38,10 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 Quick3DTechnique::Quick3DTechnique(QObject *parent)
@@ -49,22 +47,22 @@ Quick3DTechnique::Quick3DTechnique(QObject *parent)
 {
 }
 
-QQmlListProperty<Qt3D::QRenderPass> Quick3DTechnique::renderPassList()
+QQmlListProperty<QRenderPass> Quick3DTechnique::renderPassList()
 {
-    return QQmlListProperty<Qt3D::QRenderPass>(this, 0,
-                                              &Quick3DTechnique::appendRenderPass,
-                                              &Quick3DTechnique::renderPassCount,
-                                              &Quick3DTechnique::renderPassAt,
-                                              &Quick3DTechnique::clearRenderPasses);
+    return QQmlListProperty<QRenderPass>(this, 0,
+                                         &Quick3DTechnique::appendRenderPass,
+                                         &Quick3DTechnique::renderPassCount,
+                                         &Quick3DTechnique::renderPassAt,
+                                         &Quick3DTechnique::clearRenderPasses);
 }
 
 QQmlListProperty<QParameter> Quick3DTechnique::parameterList()
 {
-    return QQmlListProperty<Qt3D::QParameter>(this, 0,
-                                             &Quick3DTechnique::appendParameter,
-                                             &Quick3DTechnique::parametersCount,
-                                             &Quick3DTechnique::parameterAt,
-                                             &Quick3DTechnique::clearParameterList);
+    return QQmlListProperty<QParameter>(this, 0,
+                                        &Quick3DTechnique::appendParameter,
+                                        &Quick3DTechnique::parametersCount,
+                                        &Quick3DTechnique::parameterAt,
+                                        &Quick3DTechnique::clearParameterList);
 }
 
 void Quick3DTechnique::appendParameter(QQmlListProperty<QParameter> *list, QParameter *param)
@@ -125,13 +123,13 @@ void Quick3DTechnique::clearRenderPasses(QQmlListProperty<QRenderPass> *list)
     }
 }
 
-QQmlListProperty<Qt3D::QAnnotation> Quick3DTechnique::annotationList()
+QQmlListProperty<QAnnotation> Quick3DTechnique::annotationList()
 {
-    return QQmlListProperty<Qt3D::QAnnotation>(this, 0,
-                                       &Quick3DTechnique::appendAnnotation,
-                                       &Quick3DTechnique::annotationCount,
-                                       &Quick3DTechnique::annotationAt,
-                                       &Quick3DTechnique::clearAnnotationList);
+    return QQmlListProperty<QAnnotation>(this, 0,
+                                         &Quick3DTechnique::appendAnnotation,
+                                         &Quick3DTechnique::annotationCount,
+                                         &Quick3DTechnique::annotationAt,
+                                         &Quick3DTechnique::clearAnnotationList);
 }
 
 void Quick3DTechnique::appendAnnotation(QQmlListProperty<QAnnotation> *list, QAnnotation *annotation)
@@ -169,10 +167,8 @@ void Quick3DTechnique::clearAnnotationList(QQmlListProperty<QAnnotation> *list)
     }
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechnique.h b/src/quick3d/quick3drenderer/items/quick3dtechnique.h
index 8333a8404..f44bdcf98 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechnique.h
+++ b/src/quick3d/quick3drenderer/items/quick3dtechnique.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DTECHNIQUE_H
-#define QT3D_RENDER_QUICK_QUICK3DTECHNIQUE_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUE_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUE_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DRenderer/qtechnique.h>
@@ -43,24 +43,22 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTechnique : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> annotations READ annotationList)
-    Q_PROPERTY(QQmlListProperty<Qt3D::QRenderPass> renderPasses READ renderPassList)
-    Q_PROPERTY(QQmlListProperty<Qt3D::QParameter> parameters READ parameterList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> annotations READ annotationList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderPass> renderPasses READ renderPassList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList)
 public:
     explicit Quick3DTechnique(QObject *parent = 0);
 
-    QQmlListProperty<Qt3D::QAnnotation> annotationList();
-    QQmlListProperty<Qt3D::QRenderPass> renderPassList();
-    QQmlListProperty<Qt3D::QParameter> parameterList();
+    QQmlListProperty<QAnnotation> annotationList();
+    QQmlListProperty<QRenderPass> renderPassList();
+    QQmlListProperty<QParameter> parameterList();
 
     // Use QAbstractTechnique when it has been properly defined
     inline QTechnique *parentTechnique() const { return qobject_cast<QTechnique*>(parent()); }
@@ -83,12 +81,10 @@ private:
     static void clearRenderPasses( QQmlListProperty<QRenderPass> *list);
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QUICK3DTECHNIQUE_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUE_H
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp
index 978a8486f..936efc738 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp
@@ -38,10 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 Quick3DTechniqueFilter::Quick3DTechniqueFilter(QObject *parent)
@@ -49,22 +47,22 @@ Quick3DTechniqueFilter::Quick3DTechniqueFilter(QObject *parent)
 {
 }
 
-QQmlListProperty<Qt3D::QAnnotation> Quick3DTechniqueFilter::requireList()
+QQmlListProperty<QAnnotation> Quick3DTechniqueFilter::requireList()
 {
-    return QQmlListProperty<Qt3D::QAnnotation>(this, 0,
-                                               &Quick3DTechniqueFilter::appendRequire,
-                                               &Quick3DTechniqueFilter::requiresCount,
-                                               &Quick3DTechniqueFilter::requireAt,
-                                               &Quick3DTechniqueFilter::clearRequires);
+    return QQmlListProperty<QAnnotation>(this, 0,
+                                         &Quick3DTechniqueFilter::appendRequire,
+                                         &Quick3DTechniqueFilter::requiresCount,
+                                         &Quick3DTechniqueFilter::requireAt,
+                                         &Quick3DTechniqueFilter::clearRequires);
 }
 
 QQmlListProperty<QParameter> Quick3DTechniqueFilter::parameterList()
 {
-    return QQmlListProperty<Qt3D::QParameter>(this, 0,
-                                             &Quick3DTechniqueFilter::appendParameter,
-                                             &Quick3DTechniqueFilter::parametersCount,
-                                             &Quick3DTechniqueFilter::parameterAt,
-                                             &Quick3DTechniqueFilter::clearParameterList);
+    return QQmlListProperty<QParameter>(this, 0,
+                                        &Quick3DTechniqueFilter::appendParameter,
+                                        &Quick3DTechniqueFilter::parametersCount,
+                                        &Quick3DTechniqueFilter::parameterAt,
+                                        &Quick3DTechniqueFilter::clearParameterList);
 }
 
 void Quick3DTechniqueFilter::appendRequire(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion)
@@ -126,10 +124,8 @@ void Quick3DTechniqueFilter::clearParameterList(QQmlListProperty<QParameter> *li
         techniqueFilter->parentTechniqueFilter()->removeParameter(p);
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h b/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h
index 849c4c4f2..2c4483fb4 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h
+++ b/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_H
-#define QT3D_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DRenderer/qtechniquefilter.h>
@@ -45,25 +45,23 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTechniqueFilter : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> requires READ requireList)
-    Q_PROPERTY(QQmlListProperty<Qt3D::QParameter> parameters READ parameterList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> requires READ requireList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList)
 
 public:
     explicit Quick3DTechniqueFilter(QObject *parent = 0);
 
-    QQmlListProperty<Qt3D::QAnnotation> requireList();
-    QQmlListProperty<Qt3D::QParameter> parameterList();
+    QQmlListProperty<QAnnotation> requireList();
+    QQmlListProperty<QParameter> parameterList();
 
-    inline QTechniqueFilter *parentTechniqueFilter() const { return qobject_cast<Qt3D::QTechniqueFilter*>(parent()); }
+    inline QTechniqueFilter *parentTechniqueFilter() const { return qobject_cast<QTechniqueFilter*>(parent()); }
 
 private:
     static void appendRequire(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion);
@@ -77,12 +75,10 @@ private:
     static void clearParameterList(QQmlListProperty<QParameter> *list);
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DTECHNIQUEFILTER_H
diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
index 9f29cd4b1..bfe899802 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp
@@ -39,10 +39,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 Quick3DTextureExtension::Quick3DTextureExtension(QObject *parent)
@@ -90,10 +88,8 @@ void Quick3DTextureExtension::clearTextureImageList(QQmlListProperty<QAbstractTe
             self->parentTexture()->removeTextureImage(img);
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.h b/src/quick3d/quick3drenderer/items/quick3dtexture.h
index 67c3e228d..dcc060203 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtexture.h
+++ b/src/quick3d/quick3drenderer/items/quick3dtexture.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DTEXTURE_H
-#define QT3D_RENDER_QUICK_QUICK3DTEXTURE_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DTEXTURE_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DTEXTURE_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DQuick/quick3dnode.h>
@@ -46,16 +46,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTextureExtension : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QAbstractTextureImage> textureImages READ textureImages)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QAbstractTextureImage> textureImages READ textureImages)
     Q_CLASSINFO("DefaultProperty", "textureImages")
 
 public:
@@ -71,12 +69,10 @@ private:
     static void clearTextureImageList(QQmlListProperty<QAbstractTextureImage> *list);
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QUICK3DTEXTURE_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DTEXTURE_H
diff --git a/src/quick3d/quick3drenderer/items/quick3dviewport.cpp b/src/quick3d/quick3drenderer/items/quick3dviewport.cpp
index 2edc97108..0383c578b 100644
--- a/src/quick3d/quick3drenderer/items/quick3dviewport.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dviewport.cpp
@@ -38,10 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 Quick3DViewport::Quick3DViewport(QObject *parent)
@@ -49,10 +47,8 @@ Quick3DViewport::Quick3DViewport(QObject *parent)
 {
 }
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3dviewport.h b/src/quick3d/quick3drenderer/items/quick3dviewport.h
index 6907404ed..acef80284 100644
--- a/src/quick3d/quick3drenderer/items/quick3dviewport.h
+++ b/src/quick3d/quick3drenderer/items/quick3dviewport.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_QUICK3DVIEWPORT_H
-#define QT3D_RENDER_QUICK_QUICK3DVIEWPORT_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DVIEWPORT_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DVIEWPORT_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DQuick/quick3dnode.h>
@@ -43,10 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 // TO DO : Check if this is required or if this might as well be removed
@@ -58,13 +56,11 @@ public:
     explicit Quick3DViewport(QObject *parent = 0);
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QUICK_QUICK3DVIEWPORT_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DVIEWPORT_H
 
diff --git a/src/quick3d/quick3drenderer/items/shaderpropertyparser.cpp b/src/quick3d/quick3drenderer/items/shaderpropertyparser.cpp
index 3f0438cb5..a467cf678 100644
--- a/src/quick3d/quick3drenderer/items/shaderpropertyparser.cpp
+++ b/src/quick3d/quick3drenderer/items/shaderpropertyparser.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -88,7 +88,7 @@ void ShaderPropertyParser::applyBindings(QObject *, QQmlCompiledData *, const QL
 
 } // Quick
 
-} // Render
+} // namespace Render
 
 } // Qt3D
 
diff --git a/src/quick3d/quick3drenderer/items/shaderpropertyparser_p.h b/src/quick3d/quick3drenderer/items/shaderpropertyparser_p.h
index 1364df22f..1a414e29c 100644
--- a/src/quick3d/quick3drenderer/items/shaderpropertyparser_p.h
+++ b/src/quick3d/quick3drenderer/items/shaderpropertyparser_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUICK_SHADERPROPERTYPARSER_H
-#define QT3D_RENDER_QUICK_SHADERPROPERTYPARSER_H
+#ifndef QT3DRENDER_RENDER_QUICK_SHADERPROPERTYPARSER_H
+#define QT3DRENDER_RENDER_QUICK_SHADERPROPERTYPARSER_H
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <QtQml/private/qqmlcustomparser_p.h>
@@ -43,10 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
-
 namespace Quick {
 
 class QT3DQUICKRENDERERSHARED_EXPORT ShaderPropertyParser : public QQmlCustomParser
@@ -61,12 +59,10 @@ public:
     void applyBindings(QObject *, QQmlCompiledData *, const QList<const QV4::CompiledData::Binding *> &) Q_DECL_OVERRIDE;
 };
 
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QUICK_SHADERPROPERTYPARSER_H
+#endif // QT3DRENDER_RENDER_QUICK_SHADERPROPERTYPARSER_H
diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp b/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp
index 77e85282c..6fdbf4ea4 100644
--- a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp
+++ b/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp
@@ -40,13 +40,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Quick {
 
 void Quick3DRenderer_initialize()
 {
-    QAbstractNodeFactory::registerNodeFactory(QuickRendererNodeFactory::instance());
+    Qt3D::QAbstractNodeFactory::registerNodeFactory(QuickRendererNodeFactory::instance());
 }
 
 void Quick3DRenderer_registerType(const char *className, const char *quickName, int major, int minor)
@@ -54,8 +53,7 @@ void Quick3DRenderer_registerType(const char *className, const char *quickName,
     QuickRendererNodeFactory::instance()->registerType(className, quickName, major, minor);
 }
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderer_global_p.h b/src/quick3d/quick3drenderer/qt3dquickrenderer_global_p.h
index 85e920167..4a8b2ceda 100644
--- a/src/quick3d/quick3drenderer/qt3dquickrenderer_global_p.h
+++ b/src/quick3d/quick3drenderer/qt3dquickrenderer_global_p.h
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Quick {
 
diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp
index 754afb48e..0694882e2 100644
--- a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp
+++ b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 Q_GLOBAL_STATIC(QuickRendererNodeFactory, quick_renderer_node_factory)
 
@@ -53,7 +53,7 @@ void QuickRendererNodeFactory::registerType(const char *className, const char *q
     m_types.insert(className, Type(quickName, major, minor));
 }
 
-QNode *QuickRendererNodeFactory::createNode(const char *type)
+Qt3D::QNode *QuickRendererNodeFactory::createNode(const char *type)
 {
     if (!m_types.contains(type))
         return Q_NULLPTR;
@@ -65,9 +65,9 @@ QNode *QuickRendererNodeFactory::createNode(const char *type)
         typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second);
     }
 
-    return typeInfo.t ? qobject_cast<QNode *>(typeInfo.t->create()) : Q_NULLPTR;
+    return typeInfo.t ? qobject_cast<Qt3D::QNode *>(typeInfo.t->create()) : Q_NULLPTR;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h
index 39a2e1b9a..029c9fd7c 100644
--- a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h
+++ b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h
@@ -44,12 +44,12 @@ QT_BEGIN_NAMESPACE
 
 class QQmlType;
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QuickRendererNodeFactory : public QAbstractNodeFactory
+class QuickRendererNodeFactory : public Qt3D::QAbstractNodeFactory
 {
 public:
-    QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+    Qt3D::QNode *createNode(const char *type) Q_DECL_OVERRIDE;
 
     void registerType(const char *className, const char *quickName, int major, int minor);
 
diff --git a/src/render/backend/attachmentpack.cpp b/src/render/backend/attachmentpack.cpp
index 95bdb3c0c..705240104 100644
--- a/src/render/backend/attachmentpack.cpp
+++ b/src/render/backend/attachmentpack.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -74,8 +74,8 @@ Attachment::Attachment()
 {
 }
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/attachmentpack_p.h b/src/render/backend/attachmentpack_p.h
index 74c5d6430..e30d77705 100644
--- a/src/render/backend/attachmentpack_p.h
+++ b/src/render/backend/attachmentpack_p.h
@@ -34,16 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_ATTACHMENTPACK_P_H
-#define QT3D_RENDER_ATTACHMENTPACK_P_H
+#ifndef QT3DRENDER_RENDER_ATTACHMENTPACK_P_H
+#define QT3DRENDER_RENDER_ATTACHMENTPACK_P_H
 
 #include <Qt3DRenderer/qrenderattachment.h>
 #include <QVector>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
 
 struct Attachment
@@ -52,7 +51,7 @@ struct Attachment
     QString m_name;
     int m_mipLevel;
     int m_layer;
-    QNodeId m_textureUuid;
+    Qt3D::QNodeId m_textureUuid;
     QRenderAttachment::RenderAttachmentType m_type;
     QRenderAttachment::CubeMapFace m_face;
 };
@@ -73,10 +72,9 @@ private:
     QList<QRenderAttachment::RenderAttachmentType> m_drawBuffers;
 };
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_ATTACHMENTPACK_P_H
+#endif // QT3DRENDER_RENDER_ATTACHMENTPACK_P_H
diff --git a/src/render/backend/buffermanager.cpp b/src/render/backend/buffermanager.cpp
index bcf25086d..e8411fe02 100644
--- a/src/render/backend/buffermanager.cpp
+++ b/src/render/backend/buffermanager.cpp
@@ -38,9 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
-
+namespace Qt3DRender {
 namespace Render {
 
 BufferManager::BufferManager()
@@ -51,21 +49,20 @@ BufferManager::~BufferManager()
 {
 }
 
-void BufferManager::addDirtyBuffer(const QNodeId &bufferId)
+void BufferManager::addDirtyBuffer(const Qt3D::QNodeId &bufferId)
 {
     if (!m_dirtyBuffers.contains(bufferId))
         m_dirtyBuffers.push_back(bufferId);
 }
 
-QVector<QNodeId> BufferManager::dirtyBuffers()
+QVector<Qt3D::QNodeId> BufferManager::dirtyBuffers()
 {
-    QVector<QNodeId> vector(m_dirtyBuffers);
+    QVector<Qt3D::QNodeId> vector(m_dirtyBuffers);
     m_dirtyBuffers.clear();
     return vector;
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/buffermanager_p.h b/src/render/backend/buffermanager_p.h
index c7d397ff2..297050857 100644
--- a/src/render/backend/buffermanager_p.h
+++ b/src/render/backend/buffermanager_p.h
@@ -34,21 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_BUFFERMANAGER_H
-#define QT3D_RENDER_BUFFERMANAGER_H
+#ifndef QT3DRENDER_RENDER_BUFFERMANAGER_H
+#define QT3DRENDER_RENDER_BUFFERMANAGER_H
 
 #include <Qt3DCore/private/qresourcemanager_p.h>
 #include <Qt3DRenderer/private/renderbuffer_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
-class BufferManager : public QResourceManager<
+class BufferManager : public Qt3D::QResourceManager<
         RenderBuffer,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -58,20 +58,19 @@ public:
     ~BufferManager();
 
     // Aspect Thread
-    void addDirtyBuffer(const QNodeId &bufferId);
-    QVector<QNodeId> dirtyBuffers();
+    void addDirtyBuffer(const Qt3D::QNodeId &bufferId);
+    QVector<Qt3D::QNodeId> dirtyBuffers();
 
 private:
-    QVector<QNodeId> m_dirtyBuffers;
+    QVector<Qt3D::QNodeId> m_dirtyBuffers;
 };
 
-} // Render
+} // namespace Render
+} // namespace Qt3DRender
 
-Q_DECLARE_RESOURCE_INFO(Render::RenderBuffer, Q_REQUIRES_CLEANUP);
-
-} // Qt3D
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderBuffer, Q_REQUIRES_CLEANUP)
 
 QT_END_NAMESPACE
 
 
-#endif // QT3D_RENDER_BUFFERMANAGER_H
+#endif // QT3DRENDER_RENDER_BUFFERMANAGER_H
diff --git a/src/render/backend/framegraph/cameraselectornode.cpp b/src/render/backend/framegraph/cameraselectornode.cpp
index 7d2833b16..527147842 100644
--- a/src/render/backend/framegraph/cameraselectornode.cpp
+++ b/src/render/backend/framegraph/cameraselectornode.cpp
@@ -45,8 +45,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 CameraSelector::CameraSelector()
@@ -54,7 +55,7 @@ CameraSelector::CameraSelector()
 {
 }
 
-void CameraSelector::updateFromPeer(QNode *peer)
+void CameraSelector::updateFromPeer(Qt3D::QNode *peer)
 {
     QCameraSelector *selector = static_cast<QCameraSelector *>(peer);
     m_cameraUuid = QNodeId();
@@ -63,7 +64,7 @@ void CameraSelector::updateFromPeer(QNode *peer)
     setEnabled(selector->isEnabled());
 }
 
-void CameraSelector::sceneChangeEvent(const QSceneChangePtr &e)
+void CameraSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     qCDebug(Render::Framegraph) << Q_FUNC_INFO;
     if (e->type() == NodeUpdated) {
@@ -80,8 +81,7 @@ QNodeId CameraSelector::cameraUuid() const
     return m_cameraUuid;
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/framegraph/cameraselectornode_p.h b/src/render/backend/framegraph/cameraselectornode_p.h
index 3eb10987c..cfe29f36d 100644
--- a/src/render/backend/framegraph/cameraselectornode_p.h
+++ b/src/render/backend/framegraph/cameraselectornode_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_CAMERASELECTOR_H
-#define QT3D_RENDER_CAMERASELECTOR_H
+#ifndef QT3DRENDER_RENDER_CAMERASELECTOR_H
+#define QT3DRENDER_RENDER_CAMERASELECTOR_H
 
 #include <Qt3DRenderer/private/framegraphnode_p.h>
 #include <Qt3DCore/qnodeid.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEntity;
 class QCameraSelector;
@@ -56,18 +56,18 @@ class CameraSelector : public FrameGraphNode
 public:
     CameraSelector();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    QNodeId cameraUuid() const;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    Qt3D::QNodeId cameraUuid() const;
 
 private:
-    QNodeId m_cameraUuid;
+    Qt3D::QNodeId m_cameraUuid;
 };
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_CAMERASELECTOR_H
+#endif // QT3DRENDER_RENDER_CAMERASELECTOR_H
diff --git a/src/render/backend/framegraph/clearbuffer.cpp b/src/render/backend/framegraph/clearbuffer.cpp
index a4286ac14..47982d5f0 100644
--- a/src/render/backend/framegraph/clearbuffer.cpp
+++ b/src/render/backend/framegraph/clearbuffer.cpp
@@ -39,8 +39,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 ClearBuffer::ClearBuffer()
@@ -49,14 +50,14 @@ ClearBuffer::ClearBuffer()
 {
 }
 
-void ClearBuffer::updateFromPeer(QNode *peer)
+void ClearBuffer::updateFromPeer(Qt3D::QNode *peer)
 {
     QClearBuffer *clearBuffer = static_cast<QClearBuffer *>(peer);
     m_type = clearBuffer->buffers();
     setEnabled(clearBuffer->isEnabled());
 }
 
-void ClearBuffer::sceneChangeEvent(const QSceneChangePtr &e)
+void ClearBuffer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
@@ -72,8 +73,7 @@ QClearBuffer::BufferType ClearBuffer::type() const
     return m_type;
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/framegraph/clearbuffer_p.h b/src/render/backend/framegraph/clearbuffer_p.h
index 2f58a5951..1883e8134 100644
--- a/src/render/backend/framegraph/clearbuffer_p.h
+++ b/src/render/backend/framegraph/clearbuffer_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_CLEARBUFFER_P_H
-#define QT3D_RENDER_CLEARBUFFER_P_H
+#ifndef QT3DRENDER_RENDER_CLEARBUFFER_P_H
+#define QT3DRENDER_RENDER_CLEARBUFFER_P_H
 
 #include <Qt3DRenderer/private/framegraphnode_p.h>
 #include <Qt3DRenderer/qclearbuffer.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -53,18 +53,18 @@ class ClearBuffer : public FrameGraphNode
 public:
     ClearBuffer();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     QClearBuffer::BufferType type() const;
 
 private:
     QClearBuffer::BufferType m_type;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_CLEARBUFFER_P_H
+#endif // QT3DRENDER_RENDER_CLEARBUFFER_P_H
diff --git a/src/render/backend/framegraph/framegraphnode.cpp b/src/render/backend/framegraph/framegraphnode.cpp
index 8742399ed..b001fd675 100644
--- a/src/render/backend/framegraph/framegraphnode.cpp
+++ b/src/render/backend/framegraph/framegraphnode.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 FrameGraphNode::FrameGraphNode()
@@ -139,7 +139,7 @@ FrameGraphComponentFunctor::FrameGraphComponentFunctor(Renderer *renderer)
 {
 }
 
-QBackendNode *FrameGraphComponentFunctor::create(QNode *frontend, const QBackendNodeFactory *) const
+Qt3D::QBackendNode *FrameGraphComponentFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *) const
 {
     // TO DO: Ideally we should have a RenderFrameGraph component and use its setPeer method
     // to do that
@@ -149,18 +149,18 @@ QBackendNode *FrameGraphComponentFunctor::create(QNode *frontend, const QBackend
     return Q_NULLPTR;
 }
 
-QBackendNode *FrameGraphComponentFunctor::get(const QNodeId &id) const
+Qt3D::QBackendNode *FrameGraphComponentFunctor::get(const Qt3D::QNodeId &id) const
 {
     Q_UNUSED(id);
     return Q_NULLPTR;
 }
 
-void FrameGraphComponentFunctor::destroy(const QNodeId &id) const
+void FrameGraphComponentFunctor::destroy(const Qt3D::QNodeId &id) const
 {
     Q_UNUSED(id);
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/framegraph/framegraphnode_p.h b/src/render/backend/framegraph/framegraphnode_p.h
index b17401ede..f5683a58e 100644
--- a/src/render/backend/framegraph/framegraphnode_p.h
+++ b/src/render/backend/framegraph/framegraphnode_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_FRAMEGRAPHNODE_H
-#define QT3D_RENDER_FRAMEGRAPHNODE_H
+#ifndef QT3DRENDER_RENDER_FRAMEGRAPHNODE_H
+#define QT3DRENDER_RENDER_FRAMEGRAPHNODE_H
 
 #include <Qt3DCore/qhandle.h>
 #include <Qt3DCore/qnode.h>
@@ -47,11 +47,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
-class FrameGraphNode : public QBackendNode
+class FrameGraphNode : public Qt3D::QBackendNode
 {
 public:
     FrameGraphNode();
@@ -105,7 +105,7 @@ private:
 };
 
 template<typename Backend, typename Frontend>
-class FrameGraphNodeFunctor : public QBackendNodeFunctor
+class FrameGraphNodeFunctor : public Qt3D::QBackendNodeFunctor
 {
 public:
     explicit FrameGraphNodeFunctor(FrameGraphManager *manager)
@@ -113,12 +113,12 @@ public:
     {
     }
 
-    QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE
+    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE
     {
         return createBackendFrameGraphNode(frontend, factory);
     }
 
-    QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE
+    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE
     {
         FrameGraphNode **node = m_manager->lookupResource(id);
         if (node != Q_NULLPTR)
@@ -126,13 +126,13 @@ public:
         return Q_NULLPTR;
     }
 
-    void destroy(const QNodeId &id) const Q_DECL_OVERRIDE
+    void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE
     {
         m_manager->releaseResource(id);
     }
 
 protected:
-    Backend *createBackendFrameGraphNode(QNode *n, const QBackendNodeFactory *factory) const
+    Backend *createBackendFrameGraphNode(Qt3D::QNode *n, const Qt3D::QBackendNodeFactory *factory) const
     {
         Frontend *f = qobject_cast<Frontend *>(n);
         if (f != Q_NULLPTR) {
@@ -159,21 +159,21 @@ private:
     FrameGraphManager *m_manager;
 };
 
-class FrameGraphComponentFunctor : public QBackendNodeFunctor
+class FrameGraphComponentFunctor : public Qt3D::QBackendNodeFunctor
 {
 public:
     explicit FrameGraphComponentFunctor(Renderer *renderer);
-    QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
-    QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE;
-    void destroy(const QNodeId &id) const Q_DECL_OVERRIDE;
+    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE;
 
 private:
     Renderer *m_renderer;
 };
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_FRAMEGRAPHNODE_H
+#endif // QT3DRENDER_RENDER_FRAMEGRAPHNODE_H
diff --git a/src/render/backend/framegraph/framegraphsubtreeselector.cpp b/src/render/backend/framegraph/framegraphsubtreeselector.cpp
index dae7180b5..5fa060d37 100644
--- a/src/render/backend/framegraph/framegraphsubtreeselector.cpp
+++ b/src/render/backend/framegraph/framegraphsubtreeselector.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -53,18 +53,18 @@ FrameGraphSubtreeSelector::~FrameGraphSubtreeSelector()
 {
 }
 
-void FrameGraphSubtreeSelector::updateFromPeer(QNode *peer)
+void FrameGraphSubtreeSelector::updateFromPeer(Qt3D::QNode *peer)
 {
     QFrameGraphSelector *selector = static_cast<QFrameGraphSelector *>(peer);
     setEnabled(selector->isEnabled());
 }
 
-void FrameGraphSubtreeSelector::sceneChangeEvent(const QSceneChangePtr &)
+void FrameGraphSubtreeSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &)
 {
 }
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/framegraph/framegraphsubtreeselector_p.h b/src/render/backend/framegraph/framegraphsubtreeselector_p.h
index 9744c2148..8f3cd9ea2 100644
--- a/src/render/backend/framegraph/framegraphsubtreeselector_p.h
+++ b/src/render/backend/framegraph/framegraphsubtreeselector_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_FRAMEGRAPHSUBTREESELECTOR_H
-#define QT3D_RENDER_FRAMEGRAPHSUBTREESELECTOR_H
+#ifndef QT3DRENDER_RENDER_FRAMEGRAPHSUBTREESELECTOR_H
+#define QT3DRENDER_RENDER_FRAMEGRAPHSUBTREESELECTOR_H
 
 #include <Qt3DRenderer/private/framegraphnode_p.h>
 #include <Qt3DRenderer/qframegraphselector.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -52,14 +52,14 @@ public:
     FrameGraphSubtreeSelector();
     ~FrameGraphSubtreeSelector();
 
-    void updateFromPeer(QNode *peer) Q_DECL_FINAL;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_FINAL;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_FRAMEGRAPHSUBTREESELECTOR_H
+#endif // QT3DRENDER_RENDER_FRAMEGRAPHSUBTREESELECTOR_H
diff --git a/src/render/backend/framegraph/framegraphvisitor.cpp b/src/render/backend/framegraph/framegraphvisitor.cpp
index bfaf861d3..e9b825815 100644
--- a/src/render/backend/framegraph/framegraphvisitor.cpp
+++ b/src/render/backend/framegraph/framegraphvisitor.cpp
@@ -41,7 +41,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 namespace Render {
 
 FrameGraphVisitor::FrameGraphVisitor()
@@ -54,7 +56,7 @@ FrameGraphVisitor::FrameGraphVisitor()
 
 void FrameGraphVisitor::traverse(FrameGraphNode *root,
                                  Renderer *renderer,
-                                 QVector<QAspectJobPtr> *jobs)
+                                 QVector<Qt3D::QAspectJobPtr> *jobs)
 {
     m_renderer = renderer;
     m_jobs = jobs;
@@ -92,6 +94,6 @@ void FrameGraphVisitor::visit(Render::FrameGraphNode *node)
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/framegraph/framegraphvisitor_p.h b/src/render/backend/framegraph/framegraphvisitor_p.h
index 60205b36b..560aa9787 100644
--- a/src/render/backend/framegraph/framegraphvisitor_p.h
+++ b/src/render/backend/framegraph/framegraphvisitor_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_FRAMEGRAPHVISITOR_H
-#define QT3D_RENDER_FRAMEGRAPHVISITOR_H
+#ifndef QT3DRENDER_RENDER_FRAMEGRAPHVISITOR_H
+#define QT3DRENDER_RENDER_FRAMEGRAPHVISITOR_H
 
 #include <qglobal.h>
 
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 class FrameGraphNode;
@@ -58,19 +58,19 @@ public:
 
     void traverse(FrameGraphNode *root,
                   Renderer *renderer,
-                  QVector<QAspectJobPtr> *jobs);
+                  QVector<Qt3D::QAspectJobPtr> *jobs);
 
 private:
     void visit(Render::FrameGraphNode *node);
 
     Renderer *m_renderer;
-    QVector<QAspectJobPtr> *m_jobs;
+    QVector<Qt3D::QAspectJobPtr> *m_jobs;
     int m_renderviewIndex;
 };
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_FRAMEGRAPHVISITOR_H
+#endif // QT3DRENDER_RENDER_FRAMEGRAPHVISITOR_H
diff --git a/src/render/backend/framegraph/layerfilternode.cpp b/src/render/backend/framegraph/layerfilternode.cpp
index 3541a36c1..4c9ee50ad 100644
--- a/src/render/backend/framegraph/layerfilternode.cpp
+++ b/src/render/backend/framegraph/layerfilternode.cpp
@@ -40,8 +40,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 LayerFilterNode::LayerFilterNode()
@@ -49,14 +50,14 @@ LayerFilterNode::LayerFilterNode()
 {
 }
 
-void LayerFilterNode::updateFromPeer(QNode *peer)
+void LayerFilterNode::updateFromPeer(Qt3D::QNode *peer)
 {
     QLayerFilter *layerFilter = static_cast<QLayerFilter *>(peer);
     m_layers = layerFilter->layers();
     setEnabled(layerFilter->isEnabled());
 }
 
-void LayerFilterNode::sceneChangeEvent(const QSceneChangePtr &e)
+void LayerFilterNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
@@ -77,8 +78,7 @@ void LayerFilterNode::setLayers(const QStringList &list)
     m_layers = list;
 }
 
-} // Render
-
-} //Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/framegraph/layerfilternode_p.h b/src/render/backend/framegraph/layerfilternode_p.h
index 17d040288..fcbf54c77 100644
--- a/src/render/backend/framegraph/layerfilternode_p.h
+++ b/src/render/backend/framegraph/layerfilternode_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_LAYERFILTERNODE_H
-#define QT3D_RENDER_LAYERFILTERNODE_H
+#ifndef QT3DRENDER_RENDER_LAYERFILTERNODE_H
+#define QT3DRENDER_RENDER_LAYERFILTERNODE_H
 
 #include <Qt3DRenderer/private/framegraphnode_p.h>
 #include <QStringList>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QLayerFilter;
 
@@ -55,8 +55,8 @@ class LayerFilterNode : public FrameGraphNode
 public:
     LayerFilterNode();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     QStringList layers() const;
     void setLayers(const QStringList &list);
 
@@ -64,10 +64,10 @@ private:
     QStringList m_layers;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_LAYERFILTERNODE_H
+#endif // QT3DRENDER_RENDER_LAYERFILTERNODE_H
diff --git a/src/render/backend/framegraph/nodraw.cpp b/src/render/backend/framegraph/nodraw.cpp
index 018ed4330..0822779f8 100644
--- a/src/render/backend/framegraph/nodraw.cpp
+++ b/src/render/backend/framegraph/nodraw.cpp
@@ -40,8 +40,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 NoDraw::NoDraw()
@@ -53,13 +54,13 @@ NoDraw::~NoDraw()
 {
 }
 
-void NoDraw::updateFromPeer(QNode *peer)
+void NoDraw::updateFromPeer(Qt3D::QNode *peer)
 {
     QNoDraw *noDraw = static_cast<QNoDraw *>(peer);
     setEnabled(noDraw->isEnabled());
 }
 
-void NoDraw::sceneChangeEvent(const QSceneChangePtr &e)
+void NoDraw::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
 
@@ -76,8 +77,7 @@ void NoDraw::sceneChangeEvent(const QSceneChangePtr &e)
     }
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/framegraph/nodraw_p.h b/src/render/backend/framegraph/nodraw_p.h
index 1d9a53a1c..068143252 100644
--- a/src/render/backend/framegraph/nodraw_p.h
+++ b/src/render/backend/framegraph/nodraw_p.h
@@ -36,12 +36,12 @@
 
 #include <Qt3DRenderer/private/framegraphnode_p.h>
 
-#ifndef QT3D_RENDER_NODRAW_H
-#define QT3D_RENDER_NODRAW_H
+#ifndef QT3DRENDER_RENDER_NODRAW_H
+#define QT3DRENDER_RENDER_NODRAW_H
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -51,16 +51,16 @@ public:
     NoDraw();
     ~NoDraw();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
 protected:
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_NODRAW_H
+#endif // QT3DRENDER_RENDER_NODRAW_H
diff --git a/src/render/backend/framegraph/renderpassfilternode.cpp b/src/render/backend/framegraph/renderpassfilternode.cpp
index dd2e87060..10c0352d8 100644
--- a/src/render/backend/framegraph/renderpassfilternode.cpp
+++ b/src/render/backend/framegraph/renderpassfilternode.cpp
@@ -42,7 +42,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 namespace Render {
 
 RenderPassFilter::RenderPassFilter()
@@ -50,7 +52,7 @@ RenderPassFilter::RenderPassFilter()
 {
 }
 
-void RenderPassFilter::updateFromPeer(QNode *peer)
+void RenderPassFilter::updateFromPeer(Qt3D::QNode *peer)
 {
     QRenderPassFilter *filter = static_cast<QRenderPassFilter *>(peer);
     m_filters.clear();
@@ -62,7 +64,7 @@ void RenderPassFilter::updateFromPeer(QNode *peer)
         m_parameterPack.appendParameter(p->id());
 }
 
-QList<QNodeId> RenderPassFilter::filters() const
+QList<Qt3D::QNodeId> RenderPassFilter::filters() const
 {
     return m_filters;
 }
@@ -73,17 +75,17 @@ void RenderPassFilter::appendFilter(QAnnotation *criterion)
         m_filters.append(criterion->id());
 }
 
-void RenderPassFilter::removeFilter(const QNodeId &criterionId)
+void RenderPassFilter::removeFilter(const Qt3D::QNodeId &criterionId)
 {
     m_filters.removeOne(criterionId);
 }
 
-QList<QNodeId> RenderPassFilter::parameters() const
+QList<Qt3D::QNodeId> RenderPassFilter::parameters() const
 {
     return m_parameterPack.parameters();
 }
 
-void RenderPassFilter::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderPassFilter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
 
@@ -114,6 +116,6 @@ void RenderPassFilter::sceneChangeEvent(const QSceneChangePtr &e)
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/framegraph/renderpassfilternode_p.h b/src/render/backend/framegraph/renderpassfilternode_p.h
index 80e577cc9..009794488 100644
--- a/src/render/backend/framegraph/renderpassfilternode_p.h
+++ b/src/render/backend/framegraph/renderpassfilternode_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERPASSFILTER_H
-#define QT3D_RENDER_RENDERPASSFILTER_H
+#ifndef QT3DRENDER_RENDER_RENDERPASSFILTER_H
+#define QT3DRENDER_RENDER_RENDERPASSFILTER_H
 
 #include <Qt3DRenderer/private/framegraphnode_p.h>
 #include <Qt3DRenderer/private/parameterpack_p.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAnnotation;
 class QRenderPassFilter;
@@ -59,21 +59,21 @@ class RenderPassFilter
 public:
     RenderPassFilter();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
-    QList<QNodeId> filters() const;
-    QList<QNodeId> parameters() const;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    QList<Qt3D::QNodeId> filters() const;
+    QList<Qt3D::QNodeId> parameters() const;
     void appendFilter(QAnnotation *criterion);
-    void removeFilter(const QNodeId &criterionId);
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void removeFilter(const Qt3D::QNodeId &criterionId);
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
-    QList<QNodeId> m_filters;
+    QList<Qt3D::QNodeId> m_filters;
     ParameterPack m_parameterPack;
 };
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERPASSFILTER_H
+#endif // QT3DRENDER_RENDER_RENDERPASSFILTER_H
diff --git a/src/render/backend/framegraph/rendertargetselectornode.cpp b/src/render/backend/framegraph/rendertargetselectornode.cpp
index d8f696913..ddd565d57 100644
--- a/src/render/backend/framegraph/rendertargetselectornode.cpp
+++ b/src/render/backend/framegraph/rendertargetselectornode.cpp
@@ -46,7 +46,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 namespace Render {
 
 RenderTargetSelector::RenderTargetSelector() :
@@ -54,7 +56,7 @@ RenderTargetSelector::RenderTargetSelector() :
 {
 }
 
-void RenderTargetSelector::updateFromPeer(QNode *peer)
+void RenderTargetSelector::updateFromPeer(Qt3D::QNode *peer)
 {
     QRenderTargetSelector *selector = static_cast<QRenderTargetSelector *>(peer);
     m_renderTargetUuid = QNodeId();
@@ -64,7 +66,7 @@ void RenderTargetSelector::updateFromPeer(QNode *peer)
     m_drawBuffers = selector->drawBuffers();
 }
 
-void RenderTargetSelector::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderTargetSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     qCDebug(Render::Framegraph) << Q_FUNC_INFO;
     if (e->type() == NodeUpdated) {
@@ -74,11 +76,11 @@ void RenderTargetSelector::sceneChangeEvent(const QSceneChangePtr &e)
         else if (propertyChange->propertyName() == QByteArrayLiteral("enabled"))
             setEnabled(propertyChange->value().toBool());
         else if (propertyChange->propertyName() == QByteArrayLiteral("drawBuffers"))
-            m_drawBuffers = propertyChange->value().value<QList<Qt3D::QRenderAttachment::RenderAttachmentType> >();
+            m_drawBuffers = propertyChange->value().value<QList<Qt3DRender::QRenderAttachment::RenderAttachmentType> >();
     }
 }
 
-QNodeId RenderTargetSelector::renderTargetUuid() const
+Qt3D::QNodeId RenderTargetSelector::renderTargetUuid() const
 {
     return m_renderTargetUuid;
 }
@@ -88,7 +90,7 @@ QList<QRenderAttachment::RenderAttachmentType> RenderTargetSelector::drawBuffers
     return m_drawBuffers;
 }
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/framegraph/rendertargetselectornode_p.h b/src/render/backend/framegraph/rendertargetselectornode_p.h
index adbd8b041..9b3e4199b 100644
--- a/src/render/backend/framegraph/rendertargetselectornode_p.h
+++ b/src/render/backend/framegraph/rendertargetselectornode_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERTARGETSELECTOR_H
-#define QT3D_RENDER_RENDERTARGETSELECTOR_H
+#ifndef QT3DRENDER_RENDER_RENDERTARGETSELECTOR_H
+#define QT3DRENDER_RENDER_RENDERTARGETSELECTOR_H
 
 #include <Qt3DRenderer/private/framegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QRenderTargetSelector;
 
@@ -52,19 +52,19 @@ class RenderTargetSelector : public FrameGraphNode
 public:
     RenderTargetSelector();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    QNodeId renderTargetUuid() const;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    Qt3D::QNodeId renderTargetUuid() const;
     QList<QRenderAttachment::RenderAttachmentType> drawBuffers() const;
 
 private:
-    QNodeId m_renderTargetUuid;
+    Qt3D::QNodeId m_renderTargetUuid;
     QList<QRenderAttachment::RenderAttachmentType> m_drawBuffers;
 };
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERTARGETSELECTOR_H
+#endif // QT3DRENDER_RENDER_RENDERTARGETSELECTOR_H
diff --git a/src/render/backend/framegraph/sortcriterion.cpp b/src/render/backend/framegraph/sortcriterion.cpp
index b1cc73ed9..97db75c9f 100644
--- a/src/render/backend/framegraph/sortcriterion.cpp
+++ b/src/render/backend/framegraph/sortcriterion.cpp
@@ -40,8 +40,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 SortCriterion::SortCriterion()
@@ -54,7 +55,7 @@ void SortCriterion::cleanup()
 {
 }
 
-void SortCriterion::updateFromPeer(QNode *peer)
+void SortCriterion::updateFromPeer(Qt3D::QNode *peer)
 {
     QSortCriterion *criterion = static_cast<QSortCriterion *>(peer);
     m_type = criterion->sort();
@@ -65,7 +66,7 @@ QSortCriterion::SortType SortCriterion::sortType() const
     return m_type;
 }
 
-void SortCriterion::sceneChangeEvent(const QSceneChangePtr &e)
+void SortCriterion::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (e->type() == NodeUpdated && propertyChange->propertyName() == QByteArrayLiteral("sort")) {
@@ -73,8 +74,7 @@ void SortCriterion::sceneChangeEvent(const QSceneChangePtr &e)
     }
 }
 
-}
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/framegraph/sortcriterion_p.h b/src/render/backend/framegraph/sortcriterion_p.h
index 234140148..982c3a50c 100644
--- a/src/render/backend/framegraph/sortcriterion_p.h
+++ b/src/render/backend/framegraph/sortcriterion_p.h
@@ -34,40 +34,40 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_SORTCRITERION_P_H
-#define QT3D_RENDER_SORTCRITERION_P_H
+#ifndef QT3DRENDER_RENDER_SORTCRITERION_P_H
+#define QT3DRENDER_RENDER_SORTCRITERION_P_H
 
 #include <Qt3DRenderer/qsortcriterion.h>
 #include <Qt3DCore/qbackendnode.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 class SortCriterionManager;
 
-class SortCriterion : public QBackendNode
+class SortCriterion : public Qt3D::QBackendNode
 {
 public:
     SortCriterion();
 
     void cleanup();
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
     QSortCriterion::SortType sortType() const;
 
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
     QSortCriterion::SortType m_type;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_SORTCRITERION_P_H
+#endif // QT3DRENDER_RENDER_SORTCRITERION_P_H
diff --git a/src/render/backend/framegraph/sortmethod.cpp b/src/render/backend/framegraph/sortmethod.cpp
index 078399b52..4f67eb08f 100644
--- a/src/render/backend/framegraph/sortmethod.cpp
+++ b/src/render/backend/framegraph/sortmethod.cpp
@@ -40,8 +40,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 SortMethod::SortMethod()
@@ -49,7 +50,7 @@ SortMethod::SortMethod()
 {
 }
 
-void SortMethod::updateFromPeer(QNode *peer)
+void SortMethod::updateFromPeer(Qt3D::QNode *peer)
 {
     QSortMethod *sortMethod = static_cast<QSortMethod *>(peer);
     m_criteria.clear();
@@ -58,7 +59,7 @@ void SortMethod::updateFromPeer(QNode *peer)
     setEnabled(sortMethod->isEnabled());
 }
 
-void SortMethod::sceneChangeEvent(const QSceneChangePtr &e)
+void SortMethod::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (propertyChange->propertyName() == QByteArrayLiteral("sortCriterion")) {
@@ -79,8 +80,7 @@ QList<QNodeId> SortMethod::criteria() const
     return m_criteria;
 }
 
-} // Render
-
-} // Qt3D
+} // namepace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/framegraph/sortmethod_p.h b/src/render/backend/framegraph/sortmethod_p.h
index b8f95f647..b9d26d2a3 100644
--- a/src/render/backend/framegraph/sortmethod_p.h
+++ b/src/render/backend/framegraph/sortmethod_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_SORTMETHOD_P_H
-#define QT3D_RENDER_SORTMETHOD_P_H
+#ifndef QT3DRENDER_RENDER_SORTMETHOD_P_H
+#define QT3DRENDER_RENDER_SORTMETHOD_P_H
 
 #include <Qt3DRenderer/private/framegraphnode_p.h>
 #include <Qt3DRenderer/qsortmethod.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -51,19 +51,19 @@ class SortMethod : public FrameGraphNode
 public:
     SortMethod();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
-    QList<QNodeId> criteria() const;
+    QList<Qt3D::QNodeId> criteria() const;
 
 private:
-    QList<QNodeId> m_criteria;
+    QList<Qt3D::QNodeId> m_criteria;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_SORTMETHOD_P_H
+#endif // QT3DRENDER_RENDER_SORTMETHOD_P_H
diff --git a/src/render/backend/framegraph/statesetnode.cpp b/src/render/backend/framegraph/statesetnode.cpp
index 181e31fa4..0082602df 100644
--- a/src/render/backend/framegraph/statesetnode.cpp
+++ b/src/render/backend/framegraph/statesetnode.cpp
@@ -42,8 +42,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 StateSetNode::StateSetNode()
@@ -55,7 +56,7 @@ StateSetNode::~StateSetNode()
 {
 }
 
-void StateSetNode::updateFromPeer(QNode *peer)
+void StateSetNode::updateFromPeer(Qt3D::QNode *peer)
 {
     QStateSet *stateSet = static_cast<QStateSet*>(peer);
 
@@ -69,7 +70,7 @@ QList<RenderState *> StateSetNode::renderStates() const
     return m_renderStates.values();
 }
 
-void StateSetNode::sceneChangeEvent(const QSceneChangePtr &e)
+void StateSetNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     switch (e->type()) {
@@ -93,19 +94,19 @@ void StateSetNode::sceneChangeEvent(const QSceneChangePtr &e)
     }
 }
 
-void StateSetNode::appendRenderState(const QNodeId &id, RenderState *renderState)
+void StateSetNode::appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState)
 {
     if (!m_renderStates.contains(id))
         m_renderStates[id] = renderState;
 }
 
-void StateSetNode::removeRenderState(const QNodeId &renderStateId)
+void StateSetNode::removeRenderState(const Qt3D::QNodeId &renderStateId)
 {
     m_renderStates.remove(renderStateId);
 }
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/framegraph/statesetnode_p.h b/src/render/backend/framegraph/statesetnode_p.h
index af6de5e8c..d5d2921f2 100644
--- a/src/render/backend/framegraph/statesetnode_p.h
+++ b/src/render/backend/framegraph/statesetnode_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_STATESETNODE_H
-#define QT3D_RENDER_STATESETNODE_H
+#ifndef QT3DRENDER_RENDER_STATESETNODE_H
+#define QT3DRENDER_RENDER_STATESETNODE_H
 
 #include <Qt3DRenderer/private/framegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -51,23 +51,23 @@ public:
     StateSetNode();
     ~StateSetNode();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
     QList<RenderState *> renderStates() const;
 
 protected:
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
-    void appendRenderState(const QNodeId &id, RenderState *renderState);
-    void removeRenderState(const QNodeId &renderStateId);
+    void appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState);
+    void removeRenderState(const Qt3D::QNodeId &renderStateId);
 
-    QHash<QNodeId, RenderState *> m_renderStates;
+    QHash<Qt3D::QNodeId, RenderState *> m_renderStates;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_STATESETNODE_H
+#endif // QT3DRENDER_RENDER_STATESETNODE_H
diff --git a/src/render/backend/framegraph/techniquefilternode.cpp b/src/render/backend/framegraph/techniquefilternode.cpp
index 9f8bd3c78..547ed077b 100644
--- a/src/render/backend/framegraph/techniquefilternode.cpp
+++ b/src/render/backend/framegraph/techniquefilternode.cpp
@@ -43,7 +43,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 namespace Render {
 
 TechniqueFilter::TechniqueFilter()
@@ -51,7 +53,7 @@ TechniqueFilter::TechniqueFilter()
 {
 }
 
-void TechniqueFilter::updateFromPeer(QNode *peer)
+void TechniqueFilter::updateFromPeer(Qt3D::QNode *peer)
 {
     QTechniqueFilter *filter = static_cast<QTechniqueFilter *>(peer);
     m_filters.clear();
@@ -63,12 +65,12 @@ void TechniqueFilter::updateFromPeer(QNode *peer)
     setEnabled(filter->isEnabled());
 }
 
-QList<QNodeId> TechniqueFilter::parameters() const
+QList<Qt3D::QNodeId> TechniqueFilter::parameters() const
 {
     return m_parameterPack.parameters();
 }
 
-QList<QNodeId> TechniqueFilter::filters() const
+QList<Qt3D::QNodeId> TechniqueFilter::filters() const
 {
     return m_filters;
 }
@@ -79,12 +81,12 @@ void TechniqueFilter::appendFilter(QAnnotation *criterion)
         m_filters.append(criterion->id());
 }
 
-void TechniqueFilter::removeFilter(const QNodeId &criterionId)
+void TechniqueFilter::removeFilter(const Qt3D::QNodeId &criterionId)
 {
     m_filters.removeOne(criterionId);
 }
 
-void TechniqueFilter::sceneChangeEvent(const QSceneChangePtr &e)
+void TechniqueFilter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
 
@@ -114,8 +116,7 @@ void TechniqueFilter::sceneChangeEvent(const QSceneChangePtr &e)
     }
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/framegraph/techniquefilternode_p.h b/src/render/backend/framegraph/techniquefilternode_p.h
index af32e991c..afcf7c1d8 100644
--- a/src/render/backend/framegraph/techniquefilternode_p.h
+++ b/src/render/backend/framegraph/techniquefilternode_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_TECHNIQUEFILTER_H
-#define QT3D_RENDER_TECHNIQUEFILTER_H
+#ifndef QT3DRENDER_RENDER_TECHNIQUEFILTER_H
+#define QT3DRENDER_RENDER_TECHNIQUEFILTER_H
 
 #include <Qt3DRenderer/private/framegraphnode_p.h>
 #include <Qt3DRenderer/private/parameterpack_p.h>
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAnnotation;
 class QTechniqueFilter;
@@ -61,25 +61,25 @@ class TechniqueFilter
 {
 public:
     TechniqueFilter();
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
-    QList<QNodeId> parameters() const;
+    QList<Qt3D::QNodeId> parameters() const;
 
-    QList<QNodeId> filters() const;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    QList<Qt3D::QNodeId> filters() const;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
     void appendFilter(QAnnotation *criterion);
-    void removeFilter(const QNodeId &criterionId);
+    void removeFilter(const Qt3D::QNodeId &criterionId);
 
-    QList<QNodeId> m_filters;
+    QList<Qt3D::QNodeId> m_filters;
     ParameterPack m_parameterPack;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_TECHNIQUEFILTER_H
+#endif // QT3DRENDER_RENDER_TECHNIQUEFILTER_H
diff --git a/src/render/backend/framegraph/viewportnode.cpp b/src/render/backend/framegraph/viewportnode.cpp
index da1a63040..29751068c 100644
--- a/src/render/backend/framegraph/viewportnode.cpp
+++ b/src/render/backend/framegraph/viewportnode.cpp
@@ -40,7 +40,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 namespace Render {
 
 ViewportNode::ViewportNode()
@@ -52,7 +54,7 @@ ViewportNode::ViewportNode()
 {
 }
 
-void ViewportNode::updateFromPeer(QNode *peer)
+void ViewportNode::updateFromPeer(Qt3D::QNode *peer)
 {
     QViewport *viewport = static_cast<QViewport *>(peer);
     setXMin(viewport->rect().x());
@@ -105,7 +107,7 @@ QColor ViewportNode::clearColor() const
     return m_clearColor;
 }
 
-void ViewportNode::sceneChangeEvent(const QSceneChangePtr &e)
+void ViewportNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
@@ -141,7 +143,7 @@ QRectF computeViewport(const QRectF &childViewport, const ViewportNode *parentVi
     }
 }
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/framegraph/viewportnode_p.h b/src/render/backend/framegraph/viewportnode_p.h
index 8e0d3e084..35a1110c2 100644
--- a/src/render/backend/framegraph/viewportnode_p.h
+++ b/src/render/backend/framegraph/viewportnode_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_VIEWPORTNODE_H
-#define QT3D_RENDER_VIEWPORTNODE_H
+#ifndef QT3DRENDER_RENDER_VIEWPORTNODE_H
+#define QT3DRENDER_RENDER_VIEWPORTNODE_H
 
 #include <Qt3DRenderer/private/framegraphnode_p.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QViewport;
 
@@ -55,7 +55,7 @@ class ViewportNode : public FrameGraphNode
 public:
     ViewportNode();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
     float xMin() const;
     void setXMin(float xMin);
@@ -71,7 +71,7 @@ public:
 
     QColor clearColor() const;
 
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
     float m_xMin;
@@ -83,9 +83,9 @@ private:
 
 QRectF computeViewport(const QRectF &childViewport, const ViewportNode *parentViewport);
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_VIEWPORTNODE_H
+#endif // QT3DRENDER_RENDER_VIEWPORTNODE_H
diff --git a/src/render/backend/genericstate_p.h b/src/render/backend/genericstate_p.h
index afd6f37c7..0235b8a50 100644
--- a/src/render/backend/genericstate_p.h
+++ b/src/render/backend/genericstate_p.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_STATE_IMPLS_H
-#define QT3D_RENDER_STATE_IMPLS_H
+#ifndef QT3DRENDER_RENDER_STATE_IMPLS_H
+#define QT3DRENDER_RENDER_STATE_IMPLS_H
 
 #include <QList>
 
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 template <typename Derived, typename T>
@@ -147,8 +147,8 @@ protected:
     Z m_6;
 };
 
-} // Render
-} // Qt3D of namespace
+} // namespace Render
+} // namespace Qt3DRender of namespace
 
 QT_END_NAMESPACE
 
diff --git a/src/render/backend/geometryrenderermanager.cpp b/src/render/backend/geometryrenderermanager.cpp
index 9baaecb26..9acbfcd8f 100644
--- a/src/render/backend/geometryrenderermanager.cpp
+++ b/src/render/backend/geometryrenderermanager.cpp
@@ -38,9 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
-
+namespace Qt3DRender {
 namespace Render {
 
 GeometryRendererManager::GeometryRendererManager()
@@ -51,21 +49,20 @@ GeometryRendererManager::~GeometryRendererManager()
 {
 }
 
-void GeometryRendererManager::addDirtyGeometryRenderer(const QNodeId &bufferId)
+void GeometryRendererManager::addDirtyGeometryRenderer(const Qt3D::QNodeId &bufferId)
 {
     if (!m_dirtyGeometryRenderers.contains(bufferId))
         m_dirtyGeometryRenderers.push_back(bufferId);
 }
 
-QVector<QNodeId> GeometryRendererManager::dirtyGeometryRenderers()
+QVector<Qt3D::QNodeId> GeometryRendererManager::dirtyGeometryRenderers()
 {
-    QVector<QNodeId> vector(m_dirtyGeometryRenderers);
+    QVector<Qt3D::QNodeId> vector(m_dirtyGeometryRenderers);
     m_dirtyGeometryRenderers.clear();
     return vector;
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/geometryrenderermanager_p.h b/src/render/backend/geometryrenderermanager_p.h
index 0fa26d5d7..f302b2c86 100644
--- a/src/render/backend/geometryrenderermanager_p.h
+++ b/src/render/backend/geometryrenderermanager_p.h
@@ -34,21 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_GEOMETRYRENDERERMANAGER_H
-#define QT3D_RENDER_GEOMETRYRENDERERMANAGER_H
+#ifndef QT3DRENDER_RENDER_GEOMETRYRENDERERMANAGER_H
+#define QT3DRENDER_RENDER_GEOMETRYRENDERERMANAGER_H
 
 #include <Qt3DCore/private/qresourcemanager_p.h>
 #include <Qt3DRenderer/private/rendergeometryrenderer_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
-class GeometryRendererManager : public QResourceManager<
+class GeometryRendererManager : public Qt3D::QResourceManager<
         RenderGeometryRenderer,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -58,20 +58,19 @@ public:
     ~GeometryRendererManager();
 
     // Aspect Thread
-    void addDirtyGeometryRenderer(const QNodeId &bufferId);
-    QVector<QNodeId> dirtyGeometryRenderers();
+    void addDirtyGeometryRenderer(const Qt3D::QNodeId &bufferId);
+    QVector<Qt3D::QNodeId> dirtyGeometryRenderers();
 
 private:
-    QVector<QNodeId> m_dirtyGeometryRenderers;
+    QVector<Qt3D::QNodeId> m_dirtyGeometryRenderers;
 };
 
-} // Render
+} // namespace Render
+} // namespace Qt3DRender
 
-Q_DECLARE_RESOURCE_INFO(Render::RenderGeometryRenderer, Q_REQUIRES_CLEANUP);
-
-} // Qt3D
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderGeometryRenderer, Q_REQUIRES_CLEANUP)
 
 QT_END_NAMESPACE
 
 
-#endif // QT3D_RENDER_GEOMETRYRENDERERMANAGER_H
+#endif // QT3DRENDER_RENDER_GEOMETRYRENDERERMANAGER_H
diff --git a/src/render/backend/handle_types_p.h b/src/render/backend/handle_types_p.h
index 5681d6e3d..c2f071b45 100644
--- a/src/render/backend/handle_types_p.h
+++ b/src/render/backend/handle_types_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_HANDLE_TYPES_P_H
-#define QT3D_RENDER_HANDLE_TYPES_P_H
+#ifndef QT3DRENDER_RENDER_HANDLE_TYPES_P_H
+#define QT3DRENDER_RENDER_HANDLE_TYPES_P_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qhandle.h>
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 class QMatrix4x4;
 class QOpenGLVertexArrayObject;
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class TexImageData;
 
@@ -74,37 +74,37 @@ class RenderAttribute;
 class RenderGeometry;
 class RenderGeometryRenderer;
 
-typedef QHandle<RenderAttachment, 16> HAttachment;
-typedef QHandle<RenderCameraLens, 8> HCamera;
-typedef QHandle<RenderAnnotation, 16> HCriterion;
-typedef QHandle<RenderEffect, 16> HEffect;
-typedef QHandle<RenderEntity, 16> HEntity;
-typedef QHandle<FrameGraphNode *, 8> HFrameGraphNode;
-typedef QHandle<RenderLayer, 16> HLayer;
-typedef QHandle<RenderMaterial, 16> HMaterial;
-typedef QHandle<QMatrix4x4, 16> HMatrix;
-typedef QHandle<RenderShader, 16> HShader;
-typedef QHandle<QOpenGLVertexArrayObject*, 16> HVao;
-typedef QHandle<RenderShader, 16> HShader;
-typedef QHandle<SortCriterion, 8> HSortCriterion;
-typedef QHandle<RenderTechnique, 16> HTechnique;
-typedef QHandle<RenderTexture, 16> HTexture;
-typedef QHandle<RenderTransform, 16> HTransform;
-typedef QHandle<RenderTarget, 8> HTarget;
-typedef QHandle<RenderRenderPass, 16> HRenderPass;
-typedef QHandle<TexImageData, 16> HTextureData;
-typedef QHandle<RenderParameter, 16> HParameter;
-typedef QHandle<RenderShaderData, 16> HShaderData;
-typedef QHandle<RenderTextureImage, 16> HTextureImage;
-typedef QHandle<RenderBuffer, 16> HBuffer;
-typedef QHandle<RenderAttribute, 16> HAttribute;
-typedef QHandle<RenderGeometry, 16> HGeometry;
-typedef QHandle<RenderGeometryRenderer, 16> HGeometryRenderer;
+typedef Qt3D::QHandle<RenderAttachment, 16> HAttachment;
+typedef Qt3D::QHandle<RenderCameraLens, 8> HCamera;
+typedef Qt3D::QHandle<RenderAnnotation, 16> HCriterion;
+typedef Qt3D::QHandle<RenderEffect, 16> HEffect;
+typedef Qt3D::QHandle<RenderEntity, 16> HEntity;
+typedef Qt3D::QHandle<FrameGraphNode *, 8> HFrameGraphNode;
+typedef Qt3D::QHandle<RenderLayer, 16> HLayer;
+typedef Qt3D::QHandle<RenderMaterial, 16> HMaterial;
+typedef Qt3D::QHandle<QMatrix4x4, 16> HMatrix;
+typedef Qt3D::QHandle<RenderShader, 16> HShader;
+typedef Qt3D::QHandle<QOpenGLVertexArrayObject*, 16> HVao;
+typedef Qt3D::QHandle<RenderShader, 16> HShader;
+typedef Qt3D::QHandle<SortCriterion, 8> HSortCriterion;
+typedef Qt3D::QHandle<RenderTechnique, 16> HTechnique;
+typedef Qt3D::QHandle<RenderTexture, 16> HTexture;
+typedef Qt3D::QHandle<RenderTransform, 16> HTransform;
+typedef Qt3D::QHandle<RenderTarget, 8> HTarget;
+typedef Qt3D::QHandle<RenderRenderPass, 16> HRenderPass;
+typedef Qt3D::QHandle<TexImageData, 16> HTextureData;
+typedef Qt3D::QHandle<RenderParameter, 16> HParameter;
+typedef Qt3D::QHandle<RenderShaderData, 16> HShaderData;
+typedef Qt3D::QHandle<RenderTextureImage, 16> HTextureImage;
+typedef Qt3D::QHandle<RenderBuffer, 16> HBuffer;
+typedef Qt3D::QHandle<RenderAttribute, 16> HAttribute;
+typedef Qt3D::QHandle<RenderGeometry, 16> HGeometry;
+typedef Qt3D::QHandle<RenderGeometryRenderer, 16> HGeometryRenderer;
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_HANDLE_TYPES_P_H
+#endif // QT3DRENDER_RENDER_HANDLE_TYPES_P_H
diff --git a/src/render/backend/jobs/framecleanupjob.cpp b/src/render/backend/jobs/framecleanupjob.cpp
index b1d909626..91aa3bef2 100644
--- a/src/render/backend/jobs/framecleanupjob.cpp
+++ b/src/render/backend/jobs/framecleanupjob.cpp
@@ -43,8 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
 
 FrameCleanupJob::FrameCleanupJob(Renderer *renderer)
@@ -59,7 +58,7 @@ FrameCleanupJob::~FrameCleanupJob()
 void FrameCleanupJob::run()
 {
     // set each RenderShaderData to not need an update
-    Q_FOREACH (const QNodeId &id, RenderShaderData::updatedShaderDataList()) {
+    Q_FOREACH (const Qt3D::QNodeId &id, RenderShaderData::updatedShaderDataList()) {
         RenderShaderData *shaderData = m_renderer->shaderDataManager()->lookupResource(id);
         if (shaderData != Q_NULLPTR)
             shaderData->clearUpdate();
@@ -71,8 +70,7 @@ void FrameCleanupJob::run()
     textureDataManager->cleanup();
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/framecleanupjob_p.h b/src/render/backend/jobs/framecleanupjob_p.h
index 5e435cdd8..f200130e8 100644
--- a/src/render/backend/jobs/framecleanupjob_p.h
+++ b/src/render/backend/jobs/framecleanupjob_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_FRAMECLEANUPJOB_H
-#define QT3D_RENDER_FRAMECLEANUPJOB_H
+#ifndef QT3DRENDER_RENDER_FRAMECLEANUPJOB_H
+#define QT3DRENDER_RENDER_FRAMECLEANUPJOB_H
 
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -64,10 +64,10 @@ private:
 
 typedef QSharedPointer<FrameCleanupJob> FrameCleanupJobPtr;
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_FRAMECLEANUPJOB_H
+#endif // QT3DRENDER_RENDER_FRAMECLEANUPJOB_H
diff --git a/src/render/backend/jobs/framepreparationjob.cpp b/src/render/backend/jobs/framepreparationjob.cpp
index c402783cc..b573a5fdf 100644
--- a/src/render/backend/jobs/framepreparationjob.cpp
+++ b/src/render/backend/jobs/framepreparationjob.cpp
@@ -42,8 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
 
 FramePreparationJob::FramePreparationJob(RenderEntity *root)
@@ -64,11 +63,11 @@ void FramePreparationJob::run()
 void FramePreparationJob::parseNodeTree(RenderEntity *node)
 {
     // Initialize worldBoundingVolume if Mesh associated
-    Qt3D::Render::RenderGeometryRenderer *mesh = Q_NULLPTR;
+    Qt3DRender::Render::RenderGeometryRenderer *mesh = Q_NULLPTR;
     if ((node->localBoundingVolume()->isNull())
             && (mesh = node->renderComponent<RenderGeometryRenderer>()) != Q_NULLPTR) {
         //        if (!mesh->meshDataHandle().isNull()) {
-        //            Qt3D::QMeshData *meshData = mesh->meshData();
+        //            Qt3DRender::QMeshData *meshData = mesh->meshData();
         //            if (meshData != Q_NULLPTR) {
         //                const QAxisAlignedBoundingBox box = meshData->boundingBox();
         //                node->localBoundingVolume()->setCenter(box.center());
@@ -90,8 +89,7 @@ void FramePreparationJob::parseNodeTree(RenderEntity *node)
         parseNodeTree(child);
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/framepreparationjob_p.h b/src/render/backend/jobs/framepreparationjob_p.h
index 3ed69ad63..5de978639 100644
--- a/src/render/backend/jobs/framepreparationjob_p.h
+++ b/src/render/backend/jobs/framepreparationjob_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_FRAMEPREPARATIONJOB_H
-#define QT3D_RENDER_FRAMEPREPARATIONJOB_H
+#ifndef QT3DRENDER_RENDER_FRAMEPREPARATIONJOB_H
+#define QT3DRENDER_RENDER_FRAMEPREPARATIONJOB_H
 
 #include <Qt3DCore/qaspectjob.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -65,10 +65,10 @@ private:
 
 typedef QSharedPointer<FramePreparationJob> FramePreparationJobPtr;
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_FRAMEPREPARATIONJOB_H
+#endif // QT3DRENDER_RENDER_FRAMEPREPARATIONJOB_H
diff --git a/src/render/backend/jobs/loadbufferjob.cpp b/src/render/backend/jobs/loadbufferjob.cpp
index 8bcdf4347..278dac9ff 100644
--- a/src/render/backend/jobs/loadbufferjob.cpp
+++ b/src/render/backend/jobs/loadbufferjob.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -65,8 +65,8 @@ void LoadBufferJob::run()
     buffer->executeFunctor();
 }
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/loadbufferjob_p.h b/src/render/backend/jobs/loadbufferjob_p.h
index b8e342b90..7ad43a8a0 100644
--- a/src/render/backend/jobs/loadbufferjob_p.h
+++ b/src/render/backend/jobs/loadbufferjob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_LOADBUFFERJOB_H
-#define QT3D_RENDER_LOADBUFFERJOB_H
+#ifndef QT3DRENDER_RENDER_LOADBUFFERJOB_H
+#define QT3DRENDER_RENDER_LOADBUFFERJOB_H
 
 #include <QSharedPointer>
 #include <Qt3DCore/qaspectjob.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -65,10 +65,10 @@ protected:
 
 typedef QSharedPointer<LoadBufferJob> LoadBufferJobPtr;
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_LOADBUFFERJOB_H
+#endif // QT3DRENDER_RENDER_LOADBUFFERJOB_H
diff --git a/src/render/backend/jobs/loadgeometryjob.cpp b/src/render/backend/jobs/loadgeometryjob.cpp
index a5efb5d00..895ac3c34 100644
--- a/src/render/backend/jobs/loadgeometryjob.cpp
+++ b/src/render/backend/jobs/loadgeometryjob.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -61,8 +61,8 @@ void LoadGeometryJob::run()
         geometryRenderer->executeFunctor();
 }
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/loadgeometryjob_p.h b/src/render/backend/jobs/loadgeometryjob_p.h
index 6203e7d8a..493b1b694 100644
--- a/src/render/backend/jobs/loadgeometryjob_p.h
+++ b/src/render/backend/jobs/loadgeometryjob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_LOADGEOMETRYJOB_H
-#define QT3D_RENDER_LOADGEOMETRYJOB_H
+#ifndef QT3DRENDER_RENDER_LOADGEOMETRYJOB_H
+#define QT3DRENDER_RENDER_LOADGEOMETRYJOB_H
 
 #include <QSharedPointer>
 #include <Qt3DCore/qaspectjob.h>
@@ -43,13 +43,13 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 class Renderer;
 
-class LoadGeometryJob : public QAspectJob
+class LoadGeometryJob : public Qt3D::QAspectJob
 {
 public:
     explicit LoadGeometryJob(const HGeometryRenderer &handle);
@@ -65,10 +65,10 @@ protected:
 
 typedef QSharedPointer<LoadGeometryJob> LoadGeometryJobPtr;
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_LOADGEOMETRYJOB_H
+#endif // QT3DRENDER_RENDER_LOADGEOMETRYJOB_H
diff --git a/src/render/backend/jobs/loadscenejob.cpp b/src/render/backend/jobs/loadscenejob.cpp
index 169804e19..bae7afcc2 100644
--- a/src/render/backend/jobs/loadscenejob.cpp
+++ b/src/render/backend/jobs/loadscenejob.cpp
@@ -42,11 +42,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
 
-LoadSceneJob::LoadSceneJob(const QUrl &source, const QNodeId &m_sceneComponent)
+LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &m_sceneComponent)
     : QAspectJob()
     , m_renderer(Q_NULLPTR)
     , m_source(source)
@@ -56,7 +55,7 @@ LoadSceneJob::LoadSceneJob(const QUrl &source, const QNodeId &m_sceneComponent)
 
 void LoadSceneJob::run()
 {
-    QEntity *sceneTree = m_renderer->sceneManager()->sceneTreeFromSource(m_source);
+    Qt3D::QEntity *sceneTree = m_renderer->sceneManager()->sceneTreeFromSource(m_source);
     if (sceneTree == Q_NULLPTR) {
         Q_FOREACH (AbstractSceneParser *parser, m_renderer->sceneParsers()) {
             if (parser->isExtensionSupported(m_source)) {
@@ -71,8 +70,7 @@ void LoadSceneJob::run()
     scene->setSceneSubtree(sceneTree);
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/loadscenejob_p.h b/src/render/backend/jobs/loadscenejob_p.h
index 1497f7c9f..d4831d7ed 100644
--- a/src/render/backend/jobs/loadscenejob_p.h
+++ b/src/render/backend/jobs/loadscenejob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_LOADSCENEJOB_H
-#define QT3D_RENDER_LOADSCENEJOB_H
+#ifndef QT3DRENDER_RENDER_LOADSCENEJOB_H
+#define QT3DRENDER_RENDER_LOADSCENEJOB_H
 
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DCore/qnodeid.h>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -53,7 +53,7 @@ class Renderer;
 class LoadSceneJob : public Qt3D::QAspectJob
 {
 public:
-    explicit LoadSceneJob(const QUrl &source, const QNodeId &sceneComponent);
+    explicit LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &sceneComponent);
     void setRenderer(Renderer *renderer) { m_renderer = renderer; }
 
 protected:
@@ -62,14 +62,14 @@ protected:
 private:
     Renderer *m_renderer;
     QUrl m_source;
-    QNodeId m_sceneComponent;
+    Qt3D::QNodeId m_sceneComponent;
 };
 
 typedef QSharedPointer<LoadSceneJob> LoadSceneJobPtr;
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/backend/jobs/loadtexturedatajob.cpp b/src/render/backend/jobs/loadtexturedatajob.cpp
index 7176f7ae2..ceb83cf53 100644
--- a/src/render/backend/jobs/loadtexturedatajob.cpp
+++ b/src/render/backend/jobs/loadtexturedatajob.cpp
@@ -42,11 +42,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
 
-LoadTextureDataJob::LoadTextureDataJob(const QNodeId &textureId)
+LoadTextureDataJob::LoadTextureDataJob(const Qt3D::QNodeId &textureId)
     : m_textureId(textureId)
 {
 }
@@ -127,8 +126,7 @@ void LoadTextureDataJob::run()
     }
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/loadtexturedatajob_p.h b/src/render/backend/jobs/loadtexturedatajob_p.h
index 7e3af054b..15b32c79b 100644
--- a/src/render/backend/jobs/loadtexturedatajob_p.h
+++ b/src/render/backend/jobs/loadtexturedatajob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_LOADTEXTUREDATAJOB_H
-#define QT3D_RENDER_LOADTEXTUREDATAJOB_H
+#ifndef QT3DRENDER_RENDER_LOADTEXTUREDATAJOB_H
+#define QT3DRENDER_RENDER_LOADTEXTUREDATAJOB_H
 
 #include <Qt3DCore/qnodeid.h>
 #include <Qt3DCore/qaspectjob.h>
@@ -43,16 +43,16 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 class Renderer;
 
-class LoadTextureDataJob : public QAspectJob
+class LoadTextureDataJob : public Qt3D::QAspectJob
 {
 public:
-    LoadTextureDataJob(const QNodeId &textureId);
+    LoadTextureDataJob(const Qt3D::QNodeId &textureId);
     ~LoadTextureDataJob();
     inline void setRenderer(Renderer *renderer) { m_renderer = renderer; }
 
@@ -60,16 +60,16 @@ protected:
     void run() Q_DECL_FINAL;
 
 private:
-    QNodeId m_textureId;
+    Qt3D::QNodeId m_textureId;
     Renderer *m_renderer;
 };
 
 typedef QSharedPointer<LoadTextureDataJob> LoadTextureDataJobPtr;
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_LOADTEXTUREDATAJOB_H
+#endif // QT3DRENDER_RENDER_LOADTEXTUREDATAJOB_H
diff --git a/src/render/backend/jobs/renderviewjob.cpp b/src/render/backend/jobs/renderviewjob.cpp
index 6819aed38..962bcaaa7 100644
--- a/src/render/backend/jobs/renderviewjob.cpp
+++ b/src/render/backend/jobs/renderviewjob.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 void RenderViewJob::run()
@@ -53,7 +53,7 @@ void RenderViewJob::run()
     // Create a RenderView object
     // The RenderView are created from a QFrameAllocator stored in the current Thread local storage
 
-    QFrameAllocator *currentFrameAllocator = m_renderer->currentFrameAllocator();
+    Qt3D::QFrameAllocator *currentFrameAllocator = m_renderer->currentFrameAllocator();
     RenderView *renderView = currentFrameAllocator->allocate<RenderView>();
 
     // RenderView should allocate heap resources using only the currentFrameAllocator
@@ -77,6 +77,6 @@ void RenderViewJob::run()
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/renderviewjob_p.h b/src/render/backend/jobs/renderviewjob_p.h
index bbaa494b9..281928500 100644
--- a/src/render/backend/jobs/renderviewjob_p.h
+++ b/src/render/backend/jobs/renderviewjob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERVIEWJOB_H
-#define QT3D_RENDER_RENDERVIEWJOB_H
+#ifndef QT3DRENDER_RENDER_RENDERVIEWJOB_H
+#define QT3DRENDER_RENDER_RENDERVIEWJOB_H
 
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DCore/qframeallocator.h>
@@ -44,14 +44,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 class Renderer;
 class FrameGraphNode;
 
-class RenderViewJob : public QAspectJob
+class RenderViewJob : public Qt3D::QAspectJob
 {
 public:
     RenderViewJob()
@@ -88,8 +88,8 @@ private:
 typedef QSharedPointer<RenderViewJob> RenderViewJobPtr;
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERVIEWJOB_H
+#endif // QT3DRENDER_RENDER_RENDERVIEWJOB_H
diff --git a/src/render/backend/jobs/renderviewjobutils.cpp b/src/render/backend/jobs/renderviewjobutils.cpp
index 3cbb07d69..c4b2168f1 100644
--- a/src/render/backend/jobs/renderviewjobutils.cpp
+++ b/src/render/backend/jobs/renderviewjobutils.cpp
@@ -60,7 +60,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 namespace Render {
 
 /*!
@@ -322,7 +324,7 @@ ParameterInfoList::iterator findParamInfo(ParameterInfoList *params, const QStri
 }
 
 void addParametersForIds(ParameterInfoList *params, ParameterManager *manager,
-                                const QList<QNodeId> &parameterIds)
+                                const QList<Qt3D::QNodeId> &parameterIds)
 {
     Q_FOREACH (const QNodeId &paramId, parameterIds) {
         RenderParameter *param = manager->lookupResource(paramId);
@@ -434,6 +436,6 @@ void UniformBlockValueBuilder::buildActiveUniformNameValueMapStructHelper(Render
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/renderviewjobutils_p.h b/src/render/backend/jobs/renderviewjobutils_p.h
index 6ac2c6b75..78ba67ff3 100644
--- a/src/render/backend/jobs/renderviewjobutils_p.h
+++ b/src/render/backend/jobs/renderviewjobutils_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDERVIEWJOBUTILS_P_H
-#define QT3D_RENDERVIEWJOBUTILS_P_H
+#ifndef QT3DRENDER_RENDERVIEWJOBUTILS_P_H
+#define QT3DRENDER_RENDERVIEWJOBUTILS_P_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qnodeid.h>
@@ -45,9 +45,10 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
-
 class QFrameAllocator;
+}
 
+namespace Qt3DRender {
 namespace Render {
 
 class FrameGraphNode;
@@ -102,7 +103,7 @@ Q_AUTOTEST_EXPORT void parametersFromMaterialEffectTechnique(ParameterInfoList *
                                                              RenderTechnique *technique);
 
 Q_AUTOTEST_EXPORT void addParametersForIds(ParameterInfoList *params, ParameterManager *manager,
-                                           const QList<QNodeId> &parameterIds);
+                                           const QList<Qt3D::QNodeId> &parameterIds);
 
 template<class T>
 void parametersFromParametersProvider(ParameterInfoList *infoList,
@@ -117,7 +118,7 @@ Q_AUTOTEST_EXPORT ParameterInfoList::iterator findParamInfo(ParameterInfoList *i
                                                             const QString &name);
 
 Q_AUTOTEST_EXPORT RenderStateSet *buildRenderStateSet(const QList<RenderState*> &states,
-                                                      QFrameAllocator *allocator);
+                                                      Qt3D::QFrameAllocator *allocator);
 
 
 struct Q_AUTOTEST_EXPORT UniformBlockValueBuilder
@@ -139,10 +140,10 @@ struct Q_AUTOTEST_EXPORT UniformBlockValueBuilder
 };
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
-Q_DECLARE_TYPEINFO(Qt3D::Render::ParameterInfo, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Qt3DRender::Render::ParameterInfo, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDERVIEWJOBUTILS_P_H
+#endif // QT3DRENDER_RENDERVIEWJOBUTILS_P_H
diff --git a/src/render/backend/jobs/updateboundingvolumejob.cpp b/src/render/backend/jobs/updateboundingvolumejob.cpp
index 49ddc9cc1..a346a0bee 100644
--- a/src/render/backend/jobs/updateboundingvolumejob.cpp
+++ b/src/render/backend/jobs/updateboundingvolumejob.cpp
@@ -47,14 +47,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 namespace {
 
-void expandWorldBoundingVolume(Qt3D::Render::RenderEntity *node)
+void expandWorldBoundingVolume(Qt3DRender::Render::RenderEntity *node)
 {
-    Qt3D::Render::RenderEntity *currentNode = node;
+    Qt3DRender::Render::RenderEntity *currentNode = node;
     QStack<int> childIndexStack;
     forever {
 
@@ -68,15 +68,15 @@ void expandWorldBoundingVolume(Qt3D::Render::RenderEntity *node)
             return;
 
         // Initialize parent bounding volume to be equal to that of the first child
-        Qt3D::Render::RenderEntity *parentNode = currentNode->parent();
-        Qt3D::Sphere *parentBoundingVolume = parentNode->worldBoundingVolume();
+        Qt3DRender::Render::RenderEntity *parentNode = currentNode->parent();
+        Qt3DRender::Sphere *parentBoundingVolume = parentNode->worldBoundingVolume();
         *(parentBoundingVolume) = *(currentNode->worldBoundingVolume());
 
         // Expand the parent bounding volume by each of remaining the siblings
         QVector<RenderEntity *> siblings = parentNode->children();
         const int siblingCount = siblings.count();
         for (int i = 1; i < siblingCount; ++i) {
-            Qt3D::Sphere *siblingBoundingVolume = siblings.at(i)->worldBoundingVolume();
+            Qt3DRender::Sphere *siblingBoundingVolume = siblings.at(i)->worldBoundingVolume();
             parentBoundingVolume->expandToContain(*siblingBoundingVolume);
         }
 
@@ -111,6 +111,6 @@ void UpdateBoundingVolumeJob::run()
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/updateboundingvolumejob_p.h b/src/render/backend/jobs/updateboundingvolumejob_p.h
index 52dca97c1..349ce1c13 100644
--- a/src/render/backend/jobs/updateboundingvolumejob_p.h
+++ b/src/render/backend/jobs/updateboundingvolumejob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
-#define QT3D_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
+#ifndef QT3DRENDER_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
+#define QT3DRENDER_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
 
 #include <Qt3DCore/qaspectjob.h>
 
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 class RenderEntity;
@@ -63,8 +63,8 @@ private:
 typedef QSharedPointer<UpdateBoundingVolumeJob> UpdateBoundingVolumeJobPtr;
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
+#endif // QT3DRENDER_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
diff --git a/src/render/backend/jobs/updateworldtransformjob.cpp b/src/render/backend/jobs/updateworldtransformjob.cpp
index d019bb7d6..42ead834c 100644
--- a/src/render/backend/jobs/updateworldtransformjob.cpp
+++ b/src/render/backend/jobs/updateworldtransformjob.cpp
@@ -45,12 +45,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 namespace {
 
-void updateWorldTransformAndBounds(Qt3D::Render::RenderEntity *node, const QMatrix4x4 &parentTransform)
+void updateWorldTransformAndBounds(Qt3DRender::Render::RenderEntity *node, const QMatrix4x4 &parentTransform)
 {
     QMatrix4x4 worldTransform(parentTransform);
     RenderTransform *nodeTransform = node->renderComponent<RenderTransform>();
@@ -60,7 +60,7 @@ void updateWorldTransformAndBounds(Qt3D::Render::RenderEntity *node, const QMatr
     *(node->worldTransform()) = worldTransform;
     *(node->worldBoundingVolume()) = node->localBoundingVolume()->transformed(worldTransform);
 
-    Q_FOREACH (Qt3D::Render::RenderEntity *child, node->children())
+    Q_FOREACH (Qt3DRender::Render::RenderEntity *child, node->children())
         updateWorldTransformAndBounds(child, worldTransform);
 }
 
@@ -93,6 +93,6 @@ void UpdateWorldTransformJob::run()
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/jobs/updateworldtransformjob_p.h b/src/render/backend/jobs/updateworldtransformjob_p.h
index d863ef79c..168792dfc 100644
--- a/src/render/backend/jobs/updateworldtransformjob_p.h
+++ b/src/render/backend/jobs/updateworldtransformjob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_UPDATEWORLDTRANSFORMJOB_H
-#define QT3D_RENDER_UPDATEWORLDTRANSFORMJOB_H
+#ifndef QT3DRENDER_RENDER_UPDATEWORLDTRANSFORMJOB_H
+#define QT3DRENDER_RENDER_UPDATEWORLDTRANSFORMJOB_H
 
 #include <Qt3DCore/qaspectjob.h>
 
@@ -43,12 +43,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 class RenderEntity;
 
-class UpdateWorldTransformJob : public QAspectJob
+class UpdateWorldTransformJob : public Qt3D::QAspectJob
 {
 public:
     explicit UpdateWorldTransformJob(RenderEntity *node);
@@ -63,8 +63,8 @@ private:
 typedef QSharedPointer<UpdateWorldTransformJob> UpdateWorldTransformJobPtr;
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_UPDATEWORLDTRANSFORMJOB_H
+#endif // QT3DRENDER_RENDER_UPDATEWORLDTRANSFORMJOB_H
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index 7f156688c..c1de8c707 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_MANAGERS_P_H
-#define QT3D_RENDER_MANAGERS_P_H
+#ifndef QT3DRENDER_RENDER_MANAGERS_P_H
+#define QT3DRENDER_RENDER_MANAGERS_P_H
 
 #include <Qt3DCore/private/qresourcemanager_p.h>
 #include <Qt3DRenderer/private/renderattachment_p.h>
@@ -62,13 +62,13 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
-class AttachmentManager : public QResourceManager<
+class AttachmentManager : public Qt3D::QResourceManager<
         RenderAttachment,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -77,9 +77,9 @@ public:
     AttachmentManager() {}
 };
 
-class CameraManager : public QResourceManager<
+class CameraManager : public Qt3D::QResourceManager<
         RenderCameraLens,
-        QNodeId,
+        Qt3D::QNodeId,
         8,
         Qt3D::ArrayAllocatingPolicy>
 {
@@ -87,9 +87,9 @@ public:
     CameraManager() {}
 };
 
-class CriterionManager : public QResourceManager<
+class CriterionManager : public Qt3D::QResourceManager<
         RenderAnnotation,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -99,9 +99,9 @@ public:
     CriterionManager() {}
 };
 
-class EffectManager : public QResourceManager<
+class EffectManager : public Qt3D::QResourceManager<
         RenderEffect,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -110,15 +110,15 @@ public:
     EffectManager() {}
 };
 
-class EntityManager : public QResourceManager<RenderEntity, QNodeId, 16>
+class EntityManager : public Qt3D::QResourceManager<RenderEntity, Qt3D::QNodeId, 16>
 {
 public:
     EntityManager() {}
 };
 
-class FrameGraphManager : public QResourceManager<
+class FrameGraphManager : public Qt3D::QResourceManager<
         FrameGraphNode *,
-        QNodeId,
+        Qt3D::QNodeId,
         8,
         Qt3D::ArrayAllocatingPolicy>
 {
@@ -126,9 +126,9 @@ public:
     FrameGraphManager() {}
 };
 
-class LayerManager : public QResourceManager<
+class LayerManager : public Qt3D::QResourceManager<
         RenderLayer,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -137,9 +137,9 @@ public:
     LayerManager() {}
 };
 
-class MaterialManager : public QResourceManager<
+class MaterialManager : public Qt3D::QResourceManager<
         RenderMaterial,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -148,15 +148,15 @@ public:
     MaterialManager() {}
 };
 
-class MatrixManager : public QResourceManager<QMatrix4x4, QNodeId, 16>
+class MatrixManager : public Qt3D::QResourceManager<QMatrix4x4, Qt3D::QNodeId, 16>
 {
 public:
     MatrixManager() {}
 };
 
-class ShaderManager : public QResourceManager<
+class ShaderManager : public Qt3D::QResourceManager<
         RenderShader,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -165,9 +165,9 @@ public:
     ShaderManager() {}
 };
 
-class SortCriterionManager : public QResourceManager<
+class SortCriterionManager : public Qt3D::QResourceManager<
         SortCriterion,
-        QNodeId,
+        Qt3D::QNodeId,
         8,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -176,9 +176,9 @@ public:
     SortCriterionManager() {}
 };
 
-class TechniqueManager : public QResourceManager<
+class TechniqueManager : public Qt3D::QResourceManager<
         RenderTechnique,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -187,9 +187,9 @@ public:
     TechniqueManager() {}
 };
 
-class TextureManager : public QResourceManager<
+class TextureManager : public Qt3D::QResourceManager<
         RenderTexture,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -198,9 +198,9 @@ public:
     TextureManager() {}
 };
 
-class TransformManager : public QResourceManager<
+class TransformManager : public Qt3D::QResourceManager<
         RenderTransform,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -209,7 +209,7 @@ public:
     TransformManager() {}
 };
 
-class VAOManager : public QResourceManager<
+class VAOManager : public Qt3D::QResourceManager<
         QOpenGLVertexArrayObject *,
         QPair<HGeometry, HShader>,
         16>
@@ -218,9 +218,9 @@ public:
     VAOManager() {}
 };
 
-class RenderTargetManager : public QResourceManager<
+class RenderTargetManager : public Qt3D::QResourceManager<
         RenderTarget,
-        QNodeId,
+        Qt3D::QNodeId,
         8,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -229,9 +229,9 @@ public:
     RenderTargetManager() {}
 };
 
-class RenderPassManager : public QResourceManager<
+class RenderPassManager : public Qt3D::QResourceManager<
         RenderRenderPass,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -241,9 +241,9 @@ public:
 };
 
 
-class ParameterManager : public QResourceManager<
+class ParameterManager : public Qt3D::QResourceManager<
         RenderParameter,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -252,9 +252,9 @@ public:
     ParameterManager() {}
 };
 
-class ShaderDataManager : public QResourceManager<
+class ShaderDataManager : public Qt3D::QResourceManager<
         RenderShaderData,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
@@ -263,7 +263,7 @@ public:
     ShaderDataManager() {}
 };
 
-class UBOManager : public QResourceManager<
+class UBOManager : public Qt3D::QResourceManager<
         UniformBuffer,
         ShaderDataShaderUboKey,
         16,
@@ -272,53 +272,52 @@ class UBOManager : public QResourceManager<
 {
 };
 
-class TextureImageManager : public QResourceManager<
+class TextureImageManager : public Qt3D::QResourceManager<
         RenderTextureImage,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
 {
 };
 
-class AttributeManager : public QResourceManager<
+class AttributeManager : public Qt3D::QResourceManager<
         RenderAttribute,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
 {
 };
 
-class GeometryManager : public QResourceManager<
+class GeometryManager : public Qt3D::QResourceManager<
         RenderGeometry,
-        QNodeId,
+        Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
         Qt3D::ObjectLevelLockingPolicy>
 {
 };
 
-} // Render
-
-Q_DECLARE_RESOURCE_INFO(Render::RenderAnnotation, Q_REQUIRES_CLEANUP);
-Q_DECLARE_RESOURCE_INFO(Render::RenderEffect, Q_REQUIRES_CLEANUP);
-Q_DECLARE_RESOURCE_INFO(Render::RenderEntity, Q_REQUIRES_CLEANUP);
-Q_DECLARE_RESOURCE_INFO(Render::RenderLayer, Q_REQUIRES_CLEANUP);
-Q_DECLARE_RESOURCE_INFO(Render::RenderMaterial, Q_REQUIRES_CLEANUP);
-Q_DECLARE_RESOURCE_INFO(Render::RenderShader, Q_REQUIRES_CLEANUP);
-Q_DECLARE_RESOURCE_INFO(Render::SortCriterion, Q_REQUIRES_CLEANUP);
-Q_DECLARE_RESOURCE_INFO(Render::RenderTarget, Q_REQUIRES_CLEANUP);
-Q_DECLARE_RESOURCE_INFO(Render::RenderTechnique, Q_REQUIRES_CLEANUP);
-Q_DECLARE_RESOURCE_INFO(Render::RenderTexture, Q_REQUIRES_CLEANUP);
-Q_DECLARE_RESOURCE_INFO(Render::RenderRenderPass, Q_REQUIRES_CLEANUP);
-Q_DECLARE_RESOURCE_INFO(Render::RenderTextureImage, Q_REQUIRES_CLEANUP);
-Q_DECLARE_RESOURCE_INFO(Render::RenderAttribute, Q_REQUIRES_CLEANUP);
-Q_DECLARE_RESOURCE_INFO(Render::RenderGeometry, Q_REQUIRES_CLEANUP);
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
+
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderAnnotation, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderEffect, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderEntity, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderLayer, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderMaterial, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderShader, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::SortCriterion, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTarget, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTechnique, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTexture, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderRenderPass, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTextureImage, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderAttribute, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderGeometry, Q_REQUIRES_CLEANUP)
 
 QT_END_NAMESPACE
 
 
-#endif // QT3D_RENDER_MANAGERS_P_H
+#endif // QT3DRENDER_RENDER_MANAGERS_P_H
diff --git a/src/render/backend/parameterpack.cpp b/src/render/backend/parameterpack.cpp
index cd846760c..3d6553363 100644
--- a/src/render/backend/parameterpack.cpp
+++ b/src/render/backend/parameterpack.cpp
@@ -39,8 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
 
 ParameterPack::ParameterPack()
@@ -56,25 +55,24 @@ void ParameterPack::clear()
     m_peers.clear();
 }
 
-void ParameterPack::appendParameter(const QNodeId &parameterId)
+void ParameterPack::appendParameter(const Qt3D::QNodeId &parameterId)
 {
     if (!m_peers.contains(parameterId)) {
         m_peers.append(parameterId);
     }
 }
 
-void ParameterPack::removeParameter(const QNodeId &parameterId)
+void ParameterPack::removeParameter(const Qt3D::QNodeId &parameterId)
 {
     m_peers.removeOne(parameterId);
 }
 
-QList<QNodeId> ParameterPack::parameters() const
+QList<Qt3D::QNodeId> ParameterPack::parameters() const
 {
     return m_peers;
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/parameterpack_p.h b/src/render/backend/parameterpack_p.h
index 64ed7d46a..fc52a1df0 100644
--- a/src/render/backend/parameterpack_p.h
+++ b/src/render/backend/parameterpack_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_PARAMETERPACK_H
-#define QT3D_RENDER_PARAMETERPACK_H
+#ifndef QT3DRENDER_RENDER_PARAMETERPACK_H
+#define QT3DRENDER_RENDER_PARAMETERPACK_H
 
 #include <Qt3DCore/qnodeid.h>
 #include <QList>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -52,18 +52,18 @@ public:
     ParameterPack();
     ~ParameterPack();
     void clear();
-    void appendParameter(const QNodeId &parameterId);
-    void removeParameter(const QNodeId &parameterId);
-    QList<QNodeId> parameters() const;
+    void appendParameter(const Qt3D::QNodeId &parameterId);
+    void removeParameter(const Qt3D::QNodeId &parameterId);
+    QList<Qt3D::QNodeId> parameters() const;
 
 private:
-    QList<QNodeId> m_peers;
+    QList<Qt3D::QNodeId> m_peers;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_PARAMETERPACK_H
+#endif // QT3DRENDER_RENDER_PARAMETERPACK_H
diff --git a/src/render/backend/platformsurfacefilter.cpp b/src/render/backend/platformsurfacefilter.cpp
index 596d3845d..fec56ee3e 100644
--- a/src/render/backend/platformsurfacefilter.cpp
+++ b/src/render/backend/platformsurfacefilter.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 PlatformSurfaceFilter::PlatformSurfaceFilter(Renderer *renderer,
@@ -113,6 +113,6 @@ void PlatformSurfaceFilter::setRendererSurface(QSurface *surface)
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/platformsurfacefilter_p.h b/src/render/backend/platformsurfacefilter_p.h
index 70ef03f24..187feb637 100644
--- a/src/render/backend/platformsurfacefilter_p.h
+++ b/src/render/backend/platformsurfacefilter_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_PLATFORMSURFACEFILTER_H
-#define QT3D_RENDER_PLATFORMSURFACEFILTER_H
+#ifndef QT3DRENDER_RENDER_PLATFORMSURFACEFILTER_H
+#define QT3DRENDER_RENDER_PLATFORMSURFACEFILTER_H
 
 #include <QtCore/qobject.h>
 #include <QtGui/qsurface.h>
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 class QOffscreenSurface;
 class QWindow;
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 class Renderer;
@@ -89,8 +89,8 @@ private:
 };
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_PLATFORMSURFACEFILTER_H
+#endif // QT3DRENDER_RENDER_PLATFORMSURFACEFILTER_H
diff --git a/src/render/backend/qgraphicscontext.cpp b/src/render/backend/qgraphicscontext.cpp
index 846f240c7..1de6fb67f 100644
--- a/src/render/backend/qgraphicscontext.cpp
+++ b/src/render/backend/qgraphicscontext.cpp
@@ -72,7 +72,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 static QHash<unsigned int, QGraphicsContext*> static_contexts;
@@ -1085,7 +1085,7 @@ GLint QGraphicsContext::glDataTypeFromAttributeDataType(QAttribute::DataType dat
     return GL_FLOAT;
 }
 
-} // Render
-} // Qt3D of namespace
+} // namespace Render
+} // namespace Qt3DRender of namespace
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/qgraphicscontext_p.h b/src/render/backend/qgraphicscontext_p.h
index afffbf4ec..66376984e 100644
--- a/src/render/backend/qgraphicscontext_p.h
+++ b/src/render/backend/qgraphicscontext_p.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QGRAPHICSCONTEXT_H
-#define QT3D_RENDER_QGRAPHICSCONTEXT_H
+#ifndef QT3DRENDER_RENDER_QGRAPHICSCONTEXT_H
+#define QT3DRENDER_RENDER_QGRAPHICSCONTEXT_H
 
 #include <QOpenGLContext>
 #include <QOpenGLFunctions>
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 class QOpenGLShaderProgram;
 class QAbstractOpenGLFunctions;
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QOpenGLFilter;
 
@@ -216,7 +216,7 @@ private:
     RenderShader *m_activeShader;
     QHash<ProgramDNA, RenderShader *> m_renderShaderHash;
     QHash<RenderBuffer *, QOpenGLBuffer> m_renderBufferHash;
-    QHash<QNodeId, GLuint> m_renderTargets;
+    QHash<Qt3D::QNodeId, GLuint> m_renderTargets;
     QHash<GLuint, QSize> m_renderTargetsSize;
 
     // active textures, indexed by texture unit
@@ -243,9 +243,9 @@ private:
     bool m_supportsVAO;
 };
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QGRAPHICSCONTEXT_H
+#endif // QT3DRENDER_RENDER_QGRAPHICSCONTEXT_H
diff --git a/src/render/backend/qgraphicshelperes2.cpp b/src/render/backend/qgraphicshelperes2.cpp
index 9484c6162..4d4b38578 100644
--- a/src/render/backend/qgraphicshelperes2.cpp
+++ b/src/render/backend/qgraphicshelperes2.cpp
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 #define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
 #endif
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 QGraphicsHelperES2::QGraphicsHelperES2() :
@@ -554,7 +554,7 @@ QSize QGraphicsHelperES2::getTextureDimensions(GLuint textureId, GLenum target,
     return QSize(0, 0);
 }
 
-} // Render
-} //Qt3D
+} // namespace Render
+} // namespace Qt3D
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/qgraphicshelperes2_p.h b/src/render/backend/qgraphicshelperes2_p.h
index 843cc3d20..21d53a166 100644
--- a/src/render/backend/qgraphicshelperes2_p.h
+++ b/src/render/backend/qgraphicshelperes2_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QGRAPHICSHELPERES2_H
-#define QT3D_RENDER_QGRAPHICSHELPERES2_H
+#ifndef QT3DRENDER_RENDER_QGRAPHICSHELPERES2_H
+#define QT3DRENDER_RENDER_QGRAPHICSHELPERES2_H
 
 #include <Qt3DRenderer/private/qgraphicshelperinterface_p.h>
 #include <QOpenGLContext>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 class QGraphicsHelperES2 : public QGraphicsHelperInterface
@@ -99,9 +99,9 @@ private:
     bool m_isES3;
 };
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QGRAPHICSHELPERES2_H
+#endif // QT3DRENDER_RENDER_QGRAPHICSHELPERES2_H
diff --git a/src/render/backend/qgraphicshelpergl2.cpp b/src/render/backend/qgraphicshelpergl2.cpp
index 51f2dc32c..f737cde78 100644
--- a/src/render/backend/qgraphicshelpergl2.cpp
+++ b/src/render/backend/qgraphicshelpergl2.cpp
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 QGraphicsHelperGL2::QGraphicsHelperGL2()
@@ -560,8 +560,8 @@ QSize QGraphicsHelperGL2::getTextureDimensions(GLuint textureId, GLenum target,
     return QSize(width, height);
 }
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/backend/qgraphicshelpergl2_p.h b/src/render/backend/qgraphicshelpergl2_p.h
index 105c9aeb6..af35496f6 100644
--- a/src/render/backend/qgraphicshelpergl2_p.h
+++ b/src/render/backend/qgraphicshelpergl2_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QGRAPHICSHELPERGL2_H
-#define QT3D_RENDER_QGRAPHICSHELPERGL2_H
+#ifndef QT3DRENDER_RENDER_QGRAPHICSHELPERGL2_H
+#define QT3DRENDER_RENDER_QGRAPHICSHELPERGL2_H
 
 #include <Qt3DRenderer/private/qgraphicshelperinterface_p.h>
 
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 class QOpenGLFunctions_2_0;
 class QOpenGLExtension_ARB_framebuffer_object;
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 class QGraphicsHelperGL2 : public QGraphicsHelperInterface
@@ -101,11 +101,11 @@ private:
     QOpenGLExtension_ARB_framebuffer_object *m_fboFuncs;
 };
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
 #endif // !QT_OPENGL_ES_2
 
-#endif // QT3D_RENDER_QGRAPHICSHELPERGL2_H
+#endif // QT3DRENDER_RENDER_QGRAPHICSHELPERGL2_H
diff --git a/src/render/backend/qgraphicshelpergl3.cpp b/src/render/backend/qgraphicshelpergl3.cpp
index bc792ad1e..9a81a967f 100644
--- a/src/render/backend/qgraphicshelpergl3.cpp
+++ b/src/render/backend/qgraphicshelpergl3.cpp
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 QGraphicsHelperGL3::QGraphicsHelperGL3()
@@ -921,8 +921,8 @@ QSize QGraphicsHelperGL3::getTextureDimensions(GLuint textureId, GLenum target,
     return QSize(width, height);
 }
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/backend/qgraphicshelpergl3_3.cpp b/src/render/backend/qgraphicshelpergl3_3.cpp
index 9190dcf1f..7d849b7f4 100644
--- a/src/render/backend/qgraphicshelpergl3_3.cpp
+++ b/src/render/backend/qgraphicshelpergl3_3.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 QGraphicsHelperGL3_3::QGraphicsHelperGL3_3()
@@ -918,8 +918,8 @@ QSize QGraphicsHelperGL3_3::getTextureDimensions(GLuint textureId, GLenum target
     return QSize(width, height);
 }
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/backend/qgraphicshelpergl3_3_p.h b/src/render/backend/qgraphicshelpergl3_3_p.h
index feeadde08..e91adbb1b 100644
--- a/src/render/backend/qgraphicshelpergl3_3_p.h
+++ b/src/render/backend/qgraphicshelpergl3_3_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QGRAPHICSHELPERGL3_3_P_H
-#define QT3D_RENDER_QGRAPHICSHELPERGL3_3_P_H
+#ifndef QT3DRENDER_RENDER_QGRAPHICSHELPERGL3_3_P_H
+#define QT3DRENDER_RENDER_QGRAPHICSHELPERGL3_3_P_H
 
 #include <Qt3DRenderer/private/qgraphicshelperinterface_p.h>
 #include <QtCore/qscopedpointer.h>
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 class QOpenGLFunctions_3_3_Core;
 class QOpenGLExtension_ARB_tessellation_shader;
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 class QGraphicsHelperGL3_3 : public QGraphicsHelperInterface
@@ -102,11 +102,11 @@ private:
     QScopedPointer<QOpenGLExtension_ARB_tessellation_shader> m_tessFuncs;
 };
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
 #endif // !QT_OPENGL_ES_2
 
-#endif // QT3D_RENDER_QGRAPHICSHELPERGL3_3_P_H
+#endif // QT3DRENDER_RENDER_QGRAPHICSHELPERGL3_3_P_H
diff --git a/src/render/backend/qgraphicshelpergl3_p.h b/src/render/backend/qgraphicshelpergl3_p.h
index 4b4c8f408..55f46cdec 100644
--- a/src/render/backend/qgraphicshelpergl3_p.h
+++ b/src/render/backend/qgraphicshelpergl3_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QGRAPHICSHELPERGL3_H
-#define QT3D_RENDER_QGRAPHICSHELPERGL3_H
+#ifndef QT3DRENDER_RENDER_QGRAPHICSHELPERGL3_H
+#define QT3DRENDER_RENDER_QGRAPHICSHELPERGL3_H
 
 #include <Qt3DRenderer/private/qgraphicshelperinterface_p.h>
 #include <QtCore/qscopedpointer.h>
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 class QOpenGLFunctions_3_2_Core;
 class QOpenGLExtension_ARB_tessellation_shader;
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 class QGraphicsHelperGL3 : public QGraphicsHelperInterface
@@ -102,11 +102,11 @@ private:
     QScopedPointer<QOpenGLExtension_ARB_tessellation_shader> m_tessFuncs;
 };
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
 #endif // !QT_OPENGL_ES_2
 
-#endif // QT3D_RENDER_QGRAPHICSHELPERGL3_H
+#endif // QT3DRENDER_RENDER_QGRAPHICSHELPERGL3_H
diff --git a/src/render/backend/qgraphicshelpergl4.cpp b/src/render/backend/qgraphicshelpergl4.cpp
index 18df9accd..0f998c556 100644
--- a/src/render/backend/qgraphicshelpergl4.cpp
+++ b/src/render/backend/qgraphicshelpergl4.cpp
@@ -49,7 +49,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 QGraphicsHelperGL4::QGraphicsHelperGL4()
@@ -905,8 +905,8 @@ QSize QGraphicsHelperGL4::getTextureDimensions(GLuint textureId, GLenum target,
     return QSize(width, height);
 }
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/backend/qgraphicshelpergl4_p.h b/src/render/backend/qgraphicshelpergl4_p.h
index 32b300bde..26a40ec4c 100644
--- a/src/render/backend/qgraphicshelpergl4_p.h
+++ b/src/render/backend/qgraphicshelpergl4_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QGRAPHICSHELPERGL4_H
-#define QT3D_RENDER_QGRAPHICSHELPERGL4_H
+#ifndef QT3DRENDER_RENDER_QGRAPHICSHELPERGL4_H
+#define QT3DRENDER_RENDER_QGRAPHICSHELPERGL4_H
 
 #include <Qt3DRenderer/private/qgraphicshelperinterface_p.h>
 #include <QtCore/qscopedpointer.h>
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 class QOpenGLFunctions_4_3_Core;
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 class QGraphicsHelperGL4 : public QGraphicsHelperInterface
@@ -100,11 +100,11 @@ private:
     QOpenGLFunctions_4_3_Core *m_funcs;
 };
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
 #endif // !QT_OPENGL_ES_2
 
-#endif // QT3D_RENDER_QGRAPHICSHELPERGL4_H
+#endif // QT3DRENDER_RENDER_QGRAPHICSHELPERGL4_H
diff --git a/src/render/backend/qgraphicshelperinterface_p.h b/src/render/backend/qgraphicshelperinterface_p.h
index db2684dce..5a0ff8a43 100644
--- a/src/render/backend/qgraphicshelperinterface_p.h
+++ b/src/render/backend/qgraphicshelperinterface_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QGRAPHICSHELPERINTERFACE_H
-#define QT3D_RENDER_QGRAPHICSHELPERINTERFACE_H
+#ifndef QT3DRENDER_RENDER_QGRAPHICSHELPERINTERFACE_H
+#define QT3DRENDER_RENDER_QGRAPHICSHELPERINTERFACE_H
 
 #include <QOpenGLFunctions>
 #include <QOpenGLTexture>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 struct Attachment;
@@ -106,9 +106,9 @@ public:
 };
 
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QGRAPHICSHELPERINTERFACE_H
+#endif // QT3DRENDER_RENDER_QGRAPHICSHELPERINTERFACE_H
diff --git a/src/render/backend/qgraphicsutils_p.h b/src/render/backend/qgraphicsutils_p.h
index 9bb98e4a8..42ab19204 100644
--- a/src/render/backend/qgraphicsutils_p.h
+++ b/src/render/backend/qgraphicsutils_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QGRAPHICSUTILS_P_H
-#define QT3D_RENDER_QGRAPHICSUTILS_P_H
+#ifndef QT3DRENDER_RENDER_QGRAPHICSUTILS_P_H
+#define QT3DRENDER_RENDER_QGRAPHICSUTILS_P_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/private/shadervariables_p.h>
@@ -49,7 +49,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -387,10 +387,10 @@ public:
 
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QGRAPHICSUTILS_P_H
+#endif // QT3DRENDER_RENDER_QGRAPHICSUTILS_P_H
diff --git a/src/render/backend/qraycastingservice.cpp b/src/render/backend/qraycastingservice.cpp
index 56566f19a..ccfbb34a6 100644
--- a/src/render/backend/qraycastingservice.cpp
+++ b/src/render/backend/qraycastingservice.cpp
@@ -48,10 +48,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
-QCollisionQueryResult QRayCastingServicePrivate::collides(const QRay3D &ray, QBoundingVolumeProvider *provider,
-                                                          QAbstractCollisionQueryService::QueryMode mode, const QQueryHandle &handle)
+namespace Qt3DRender {
+
+QCollisionQueryResult QRayCastingServicePrivate::collides(const Qt3D::QRay3D &ray, Qt3D::QBoundingVolumeProvider *provider,
+                                                          Qt3D::QAbstractCollisionQueryService::QueryMode mode, const Qt3D::QQueryHandle &handle)
 {
     Q_Q(QRayCastingService);
 
@@ -95,13 +97,13 @@ QRayCastingServicePrivate::QRayCastingServicePrivate(const QString &description,
 {
 }
 
-QRayCastingService::QRayCastingService(QBoundingVolumeProvider *provider)
+QRayCastingService::QRayCastingService(Qt3D::QBoundingVolumeProvider *provider)
     : QAbstractCollisionQueryService(*new QRayCastingServicePrivate(QStringLiteral("Collision detection service using Ray Casting"),
                                                                     provider))
 {
 }
 
-QQueryHandle QRayCastingService::query(const QRay3D &ray, QAbstractCollisionQueryService::QueryMode mode)
+Qt3D::QQueryHandle QRayCastingService::query(const Qt3D::QRay3D &ray, QAbstractCollisionQueryService::QueryMode mode)
 {
     Q_D(QRayCastingService);
 
@@ -115,14 +117,14 @@ QQueryHandle QRayCastingService::query(const QRay3D &ray, QAbstractCollisionQuer
     return handle;
 }
 
-QCollisionQueryResult QRayCastingService::fetchResult(const QQueryHandle &handle)
+Qt3D::QCollisionQueryResult QRayCastingService::fetchResult(const Qt3D::QQueryHandle &handle)
 {
     Q_D(QRayCastingService);
 
     return d->m_results.value(handle).result();
 }
 
-QVector<QCollisionQueryResult> QRayCastingService::fetchAllResults() const
+QVector<Qt3D::QCollisionQueryResult> QRayCastingService::fetchAllResults() const
 {
     Q_D(const QRayCastingService);
 
@@ -136,6 +138,6 @@ QVector<QCollisionQueryResult> QRayCastingService::fetchAllResults() const
     return results;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/qraycastingservice.h b/src/render/backend/qraycastingservice.h
index 4ae2b817e..0dbb93863 100644
--- a/src/render/backend/qraycastingservice.h
+++ b/src/render/backend/qraycastingservice.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QRAYCASTINGSERVICE_H
-#define QT3D_RENDER_QRAYCASTINGSERVICE_H
+#ifndef QT3DRENDER_RENDER_QRAYCASTINGSERVICE_H
+#define QT3DRENDER_RENDER_QRAYCASTINGSERVICE_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
@@ -44,19 +44,22 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
-
 class QBoundingVolumeProvider;
+}
+
+namespace Qt3DRender {
+
 class QRayCastingServicePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QRayCastingService : public QAbstractCollisionQueryService
+class QT3DRENDERERSHARED_EXPORT QRayCastingService : public Qt3D::QAbstractCollisionQueryService
 {
 public:
-    explicit QRayCastingService(QBoundingVolumeProvider *provider);
+    explicit QRayCastingService(Qt3D::QBoundingVolumeProvider *provider);
 
-    QQueryHandle query(const QRay3D &ray, QueryMode mode) Q_DECL_OVERRIDE;
+    Qt3D::QQueryHandle query(const Qt3D::QRay3D &ray, QueryMode mode) Q_DECL_OVERRIDE;
 
-    QCollisionQueryResult fetchResult(const QQueryHandle &handle) Q_DECL_OVERRIDE;
-    QVector<QCollisionQueryResult> fetchAllResults() const Q_DECL_OVERRIDE;
+    Qt3D::QCollisionQueryResult fetchResult(const Qt3D::QQueryHandle &handle) Q_DECL_OVERRIDE;
+    QVector<Qt3D::QCollisionQueryResult> fetchAllResults() const Q_DECL_OVERRIDE;
 
 protected:
     QRayCastingService(QRayCastingServicePrivate &dd);
@@ -66,8 +69,8 @@ private:
     Q_DECLARE_PRIVATE(QRayCastingService)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QRAYCASTINGSERVICE_H
+#endif // QT3DRENDER_RENDER_QRAYCASTINGSERVICE_H
diff --git a/src/render/backend/qraycastingservice_p.h b/src/render/backend/qraycastingservice_p.h
index d9ed92323..90afe64ca 100644
--- a/src/render/backend/qraycastingservice_p.h
+++ b/src/render/backend/qraycastingservice_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRAYCASTINGSERVICE_P_H
-#define QT3D_QRAYCASTINGSERVICE_P_H
+#ifndef QT3DRENDER_QRAYCASTINGSERVICE_P_H
+#define QT3DRENDER_QRAYCASTINGSERVICE_P_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qabstractcollisionqueryservice.h>
@@ -49,36 +49,41 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
-
-class QBoundingVolumeProvider;
 class QBoundingVolume;
-typedef QFuture<QCollisionQueryResult> FutureQueryResult;
+class QBoundingVolumeProvider;
+}
+
+namespace Qt3DRender {
+
+typedef QFuture<Qt3D::QCollisionQueryResult> FutureQueryResult;
 
-class QRayCastingServicePrivate : public QAbstractCollisionQueryServicePrivate
+class QRayCastingServicePrivate : public Qt3D::QAbstractCollisionQueryServicePrivate
 {
 public:
-    QRayCastingServicePrivate(const QString &description, QBoundingVolumeProvider *provider);
+    QRayCastingServicePrivate(const QString &description, Qt3D::QBoundingVolumeProvider *provider);
 
-    QCollisionQueryResult collides(const QRay3D &ray, QBoundingVolumeProvider *provider,
-                                   QAbstractCollisionQueryService::QueryMode mode, const QQueryHandle &handle);
+    Qt3D::QCollisionQueryResult collides(const Qt3D::QRay3D &ray,
+                                         Qt3D::QBoundingVolumeProvider *provider,
+                                         Qt3D::QAbstractCollisionQueryService::QueryMode mode,
+                                         const Qt3D::QQueryHandle &handle);
 
     Q_DECLARE_PUBLIC(QRayCastingService)
 
     struct Query
     {
-        QQueryHandle handle;
-        QRay3D ray;
+        Qt3D::QQueryHandle handle;
+        Qt3D::QRay3D ray;
         QRayCastingService::QueryMode mode;
     };
 
-    QHash<QQueryHandle, FutureQueryResult> m_results;
+    QHash<Qt3D::QQueryHandle, FutureQueryResult> m_results;
     QAtomicInt m_handlesCount;
 
-    QBoundingVolumeProvider *m_boundingProvider;
+    Qt3D::QBoundingVolumeProvider *m_boundingProvider;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QRAYCASTINGSERVICE_P_H
+#endif // QT3DRENDER_QRAYCASTINGSERVICE_P_H
diff --git a/src/render/backend/qrenderaspect.cpp b/src/render/backend/qrenderaspect.cpp
index 1c68454f5..b24e0445b 100644
--- a/src/render/backend/qrenderaspect.cpp
+++ b/src/render/backend/qrenderaspect.cpp
@@ -121,7 +121,9 @@ static void initResources()
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
     \class Qt3D::QRenderAspectPrivate
@@ -136,7 +138,7 @@ QRenderAspectPrivate::QRenderAspectPrivate(QRenderAspect::RenderType type)
     , m_initialized(false)
 {
     initResources();
-    m_aspectType = QAbstractAspect::AspectRenderer;
+    m_aspectType = Qt3D::QAbstractAspect::AspectRenderer;
 }
 
 void QRenderAspectPrivate::setSurface(QSurface *surface)
@@ -199,18 +201,18 @@ QRenderAspect::QRenderAspect(QRenderAspectPrivate &dd, QObject *parent)
 void QRenderAspect::registerBackendTypes()
 {
     Q_D(QRenderAspect);
-    registerBackendType<QEntity>(QBackendNodeFunctorPtr(new Render::RenderEntityFunctor(d->m_renderer)));
-    registerBackendType<QTransform>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderTransform, Render::TransformManager>(d->m_renderer->transformManager())));
+    registerBackendType<Qt3D::QEntity>(QBackendNodeFunctorPtr(new Render::RenderEntityFunctor(d->m_renderer)));
+    registerBackendType<Qt3D::QTransform>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderTransform, Render::TransformManager>(d->m_renderer->transformManager())));
     registerBackendType<QMaterial>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderMaterial, Render::MaterialManager>(d->m_renderer->materialManager())));
     registerBackendType<QTechnique>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderTechnique, Render::TechniqueManager>(d->m_renderer->techniqueManager())));
     registerBackendType<QAbstractTextureProvider>(QBackendNodeFunctorPtr(new Render::RenderTextureFunctor(d->m_renderer->textureManager(), d->m_renderer->textureImageManager(), d->m_renderer->textureDataManager())));
     registerBackendType<QShaderProgram>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderShader, Render::ShaderManager>(d->m_renderer->shaderManager())));
     registerBackendType<QEffect>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderEffect, Render::EffectManager>(d->m_renderer->effectManager())));
     registerBackendType<QAnnotation>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderAnnotation, Render::CriterionManager>(d->m_renderer->criterionManager())));
-    registerBackendType<QCameraLens>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderCameraLens, Render::CameraManager>(d->m_renderer->cameraManager())));
+    registerBackendType<Qt3D::QCameraLens>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderCameraLens, Render::CameraManager>(d->m_renderer->cameraManager())));
     registerBackendType<QLayer>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderLayer, Render::LayerManager>(d->m_renderer->layerManager())));
     registerBackendType<QRenderPass>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderRenderPass, Render::RenderPassManager>(d->m_renderer->renderPassManager())));
-    registerBackendType<Render::QAbstractSceneLoader>(QBackendNodeFunctorPtr(new Render::RenderSceneFunctor(d->m_renderer->sceneManager())));
+    registerBackendType<QAbstractSceneLoader>(QBackendNodeFunctorPtr(new Render::RenderSceneFunctor(d->m_renderer->sceneManager())));
     registerBackendType<QRenderTarget>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderTarget, Render::RenderTargetManager>(d->m_renderer->renderTargetManager())));
     registerBackendType<QRenderAttachment>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderAttachment, Render::AttachmentManager>(d->m_renderer->attachmentManager())));
     registerBackendType<QSortCriterion>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::SortCriterion, Render::SortCriterionManager>(d->m_renderer->sortCriterionManager())));
@@ -256,7 +258,7 @@ void QRenderAspect::renderShutdown()
     d->m_renderer->shutdown();
 }
 
-QVector<QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time)
+QVector<Qt3D::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time)
 {
     Q_D(QRenderAspect);
     d->m_time = time;
@@ -319,7 +321,7 @@ QVector<QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time)
     return jobs;
 }
 
-void QRenderAspect::sceneNodeAdded(QSceneChangePtr &e)
+void QRenderAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
@@ -328,7 +330,7 @@ void QRenderAspect::sceneNodeAdded(QSceneChangePtr &e)
     visitor.traverse(n, this, &QRenderAspect::visitNode);
 }
 
-void QRenderAspect::sceneNodeRemoved(QSceneChangePtr &e)
+void QRenderAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
@@ -342,7 +344,7 @@ qint64 QRenderAspect::time() const
     return d->m_time;
 }
 
-void QRenderAspect::setRootEntity(QEntity *rootObject)
+void QRenderAspect::setRootEntity(Qt3D::QEntity *rootObject)
 {
     // setSceneGraphRoot is synchronized using the Renderer's mutex
     Q_D(QRenderAspect);
@@ -360,7 +362,7 @@ void QRenderAspect::onInitialize(const QVariantMap &data)
 
         // Register the VSyncFrameAdvanceService to drive the aspect manager loop
         // depending on the vsync
-        services()->registerServiceProvider(QServiceLocator::FrameAdvanceService,
+        services()->registerServiceProvider(Qt3D::QServiceLocator::FrameAdvanceService,
                                             d->m_renderer->vsyncFrameAdvanceService());
 
         d->m_renderer->setQRenderAspect(this);
@@ -392,13 +394,13 @@ void QRenderAspect::onCleanup()
     d->m_renderer = Q_NULLPTR;
 }
 
-void QRenderAspect::visitNode(QNode *node)
+void QRenderAspect::visitNode(Qt3D::QNode *node)
 {
     QAbstractAspect::createBackendNode(node);
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-QT3D_REGISTER_NAMESPACED_ASPECT("render", QT_PREPEND_NAMESPACE(Qt3D), QRenderAspect)
+QT3D_REGISTER_NAMESPACED_ASPECT("render", QT_PREPEND_NAMESPACE(Qt3DRender), QRenderAspect)
diff --git a/src/render/backend/qrenderaspect.h b/src/render/backend/qrenderaspect.h
index 047498fc0..180424565 100644
--- a/src/render/backend/qrenderaspect.h
+++ b/src/render/backend/qrenderaspect.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRENDERASPECT_H
-#define QT3D_QRENDERASPECT_H
+#ifndef QT3DRENDER_QRENDERASPECT_H
+#define QT3DRENDER_QRENDERASPECT_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qabstractaspect.h>
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
 
 class QOpenGLContext;
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 class Renderer;
@@ -52,7 +52,7 @@ class Renderer;
 
 class QRenderAspectPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QRenderAspect : public QAbstractAspect
+class QT3DRENDERERSHARED_EXPORT QRenderAspect : public Qt3D::QAbstractAspect
 {
     Q_OBJECT
 public:
@@ -68,10 +68,10 @@ public:
     void renderSynchronous();
     void renderShutdown();
 
-    QVector<QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
+    QVector<Qt3D::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
 
-    void sceneNodeAdded(QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void sceneNodeRemoved(QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneNodeAdded(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneNodeRemoved(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     qint64 time() const;
 
@@ -79,13 +79,13 @@ protected:
     void registerBackendTypes();
 
 private:
-    void setRootEntity(QEntity *rootObject) Q_DECL_OVERRIDE;
+    void setRootEntity(Qt3D::QEntity *rootObject) Q_DECL_OVERRIDE;
     void onInitialize(const QVariantMap &data) Q_DECL_OVERRIDE;
     void onStartup() Q_DECL_OVERRIDE;
     void onShutdown() Q_DECL_OVERRIDE;
     void onCleanup() Q_DECL_OVERRIDE;
 
-    void visitNode(QNode *node);
+    void visitNode(Qt3D::QNode *node);
 
     Q_DECLARE_PRIVATE(QRenderAspect)
     QRenderAspect(QRenderAspectPrivate &dd, QObject *parent);
@@ -97,4 +97,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QRENDERASPECT_H
+#endif // QT3DRENDER_QRENDERASPECT_H
diff --git a/src/render/backend/qrenderaspect_p.h b/src/render/backend/qrenderaspect_p.h
index 610015ff5..2de526f41 100644
--- a/src/render/backend/qrenderaspect_p.h
+++ b/src/render/backend/qrenderaspect_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRENDERASPECT_P_H
-#define QT3D_QRENDERASPECT_P_H
+#ifndef QT3DRENDER_QRENDERASPECT_P_H
+#define QT3DRENDER_QRENDERASPECT_P_H
 
 #include <Qt3DCore/private/qabstractaspect_p.h>
 #include <Qt3DRenderer/qrenderaspect.h>
@@ -49,13 +49,13 @@ QT_BEGIN_NAMESPACE
 
 class QSurface;
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 class Renderer;
 }
 
-class QRenderAspectPrivate : public QAbstractAspectPrivate
+class QRenderAspectPrivate : public Qt3D::QAbstractAspectPrivate
 {
     QRenderAspectPrivate(QRenderAspect::RenderType type);
 
@@ -82,4 +82,4 @@ class QRenderAspectPrivate : public QAbstractAspectPrivate
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QRENDERASPECT_P_H
+#endif // QT3DRENDER_QRENDERASPECT_P_H
diff --git a/src/render/backend/quniformvalue.cpp b/src/render/backend/quniformvalue.cpp
index d88798765..ae355e83d 100644
--- a/src/render/backend/quniformvalue.cpp
+++ b/src/render/backend/quniformvalue.cpp
@@ -49,14 +49,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 QUniformValue::QUniformValue()
 {
 }
 
-QUniformValue *QUniformValue::fromVariant(const QVariant &v, QFrameAllocator *allocator)
+QUniformValue *QUniformValue::fromVariant(const QVariant &v, Qt3D::QFrameAllocator *allocator)
 {
     QUniformValue *u = allocator->allocate<QUniformValue>();
     u->m_var = v;
@@ -88,7 +88,7 @@ void QUniformPack::setUniform(const QString &glslName, const QUniformValue *val)
     m_uniforms.insert(glslName, val);
 }
 
-void QUniformPack::setTexture(const QString &glslName, const QNodeId &texId)
+void QUniformPack::setTexture(const QString &glslName, const Qt3D::QNodeId &texId)
 {
     for (int t=0; t<m_textures.size(); ++t) {
         if (m_textures[t].glslName != glslName) {
@@ -125,6 +125,6 @@ void TextureUniform::apply(QGraphicsContext *ctx, const ShaderUniform &descripti
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/quniformvalue_p.h b/src/render/backend/quniformvalue_p.h
index 4669ddcda..6f4b96624 100644
--- a/src/render/backend/quniformvalue_p.h
+++ b/src/render/backend/quniformvalue_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QUNIFORMVALUE_H
-#define QT3D_RENDER_QUNIFORMVALUE_H
+#ifndef QT3DRENDER_RENDER_QUNIFORMVALUE_H
+#define QT3DRENDER_RENDER_QUNIFORMVALUE_H
 
 #include <QVariant>
 #include <QByteArray>
@@ -51,9 +51,10 @@ QT_BEGIN_NAMESPACE
 class QOpenGLShaderProgram;
 
 namespace Qt3D {
-
 class QFrameAllocator;
+}
 
+namespace Qt3DRender {
 namespace Render {
 
 class QGraphicsContext;
@@ -67,7 +68,7 @@ public:
     QUniformValue();
     virtual ~QUniformValue() {}
 
-    static QUniformValue *fromVariant(const QVariant &v, QFrameAllocator *allocator);
+    static QUniformValue *fromVariant(const QVariant &v, Qt3D::QFrameAllocator *allocator);
 
     virtual bool operator ==(const QUniformValue &other);
     bool operator !=(const QUniformValue &other);
@@ -97,12 +98,12 @@ public :
         return true;
     }
 
-    void setTextureId(const QNodeId &id)
+    void setTextureId(const Qt3D::QNodeId &id)
     {
         m_textureId = id;
     }
 
-    QNodeId textureId() const { return m_textureId; }
+    Qt3D::QNodeId textureId() const { return m_textureId; }
 
     bool operator ==(const QUniformValue &other) Q_DECL_OVERRIDE
     {
@@ -119,13 +120,13 @@ public :
     void apply(QGraphicsContext *ctx, const ShaderUniform &description) const Q_DECL_OVERRIDE;
 
 private:
-    QNodeId m_textureId;
+    Qt3D::QNodeId m_textureId;
     int m_textureUnit;
 };
 
 struct BlockToUBO {
     int m_blockIndex;
-    QNodeId m_shaderDataID;
+    Qt3D::QNodeId m_shaderDataID;
     bool m_needsUpdate;
     QHash<QString, QVariant> m_updatedProperties;
 };
@@ -136,7 +137,7 @@ public:
     ~QUniformPack();
 
     void setUniform(const QString &glslName, const QUniformValue *val);
-    void setTexture(const QString &glslName, const QNodeId &id);
+    void setTexture(const QString &glslName, const Qt3D::QNodeId &id);
     void setUniformBuffer(const BlockToUBO &blockToUBO);
 
     inline const QHash<QString, const QUniformValue* > &uniforms() const { return m_uniforms; }
@@ -145,13 +146,13 @@ public:
     struct NamedTexture
     {
         NamedTexture() {}
-        NamedTexture(const QString &nm, const QNodeId &t)
+        NamedTexture(const QString &nm, const Qt3D::QNodeId &t)
             : glslName(nm)
             , texId(t)
         { }
 
         QString glslName;
-        QNodeId texId;
+        Qt3D::QNodeId texId;
     };
 
     inline QVector<NamedTexture> textures() const { return m_textures; }
@@ -166,9 +167,9 @@ private:
     friend class RenderView;
 };
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QUNIFORMVALUE_H
+#endif // QT3DRENDER_RENDER_QUNIFORMVALUE_H
diff --git a/src/render/backend/renderannotation.cpp b/src/render/backend/renderannotation.cpp
index d8832090d..bf14552a0 100644
--- a/src/render/backend/renderannotation.cpp
+++ b/src/render/backend/renderannotation.cpp
@@ -39,8 +39,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 RenderAnnotation::RenderAnnotation()
@@ -57,7 +58,7 @@ void RenderAnnotation::cleanup()
 {
 }
 
-void RenderAnnotation::updateFromPeer(QNode *peer)
+void RenderAnnotation::updateFromPeer(Qt3D::QNode *peer)
 {
     QAnnotation *criterion = static_cast<QAnnotation *>(peer);
 
@@ -77,7 +78,7 @@ QString RenderAnnotation::criterionName() const
     return m_name;
 }
 
-void RenderAnnotation::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderAnnotation::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (propertyChange->propertyName() == QByteArrayLiteral("value"))
@@ -99,8 +100,7 @@ bool RenderAnnotation::operator !=(const RenderAnnotation &other)
     return !operator ==(other);
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderannotation_p.h b/src/render/backend/renderannotation_p.h
index 70f6641ce..18fc6c0c8 100644
--- a/src/render/backend/renderannotation_p.h
+++ b/src/render/backend/renderannotation_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERANNOTATION_P_H
-#define QT3D_RENDER_RENDERANNOTATION_P_H
+#ifndef QT3DRENDER_RENDER_RENDERANNOTATION_P_H
+#define QT3DRENDER_RENDER_RENDERANNOTATION_P_H
 
 #include <Qt3DRenderer/qannotation.h>
 #include <Qt3DCore/qbackendnode.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAnnotation;
 
@@ -50,17 +50,17 @@ namespace Render {
 
 class CriterionManager;
 
-class RenderAnnotation : public QBackendNode
+class RenderAnnotation : public Qt3D::QBackendNode
 {
 public:
     RenderAnnotation();
     ~RenderAnnotation();
     void cleanup();
-    void updateFromPeer(QNode *criterion) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *criterion) Q_DECL_OVERRIDE;
 
     QVariant criterionValue() const;
     QString criterionName() const;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     bool operator ==(const RenderAnnotation &other);
     bool operator !=(const RenderAnnotation &other);
 
@@ -69,10 +69,10 @@ private:
     QString m_name;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERANNOTATION_P_H
+#endif // QT3DRENDER_RENDER_RENDERANNOTATION_P_H
diff --git a/src/render/backend/renderattachment.cpp b/src/render/backend/renderattachment.cpp
index 295872a17..a62ae76a5 100644
--- a/src/render/backend/renderattachment.cpp
+++ b/src/render/backend/renderattachment.cpp
@@ -41,8 +41,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 RenderAttachment::RenderAttachment()
@@ -50,7 +51,7 @@ RenderAttachment::RenderAttachment()
 {
 }
 
-void RenderAttachment::updateFromPeer(QNode *peer)
+void RenderAttachment::updateFromPeer(Qt3D::QNode *peer)
 {
     QRenderAttachment *attachment = static_cast<QRenderAttachment *>(peer);
 
@@ -63,7 +64,7 @@ void RenderAttachment::updateFromPeer(QNode *peer)
         m_attachmentData.m_textureUuid = attachment->texture()->id();
 }
 
-QNodeId RenderAttachment::textureUuid() const
+Qt3D::QNodeId RenderAttachment::textureUuid() const
 {
     return m_attachmentData.m_textureUuid;
 }
@@ -93,7 +94,7 @@ QRenderAttachment::RenderAttachmentType RenderAttachment::type() const
     return m_attachmentData.m_type;
 }
 
-void RenderAttachment::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderAttachment::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (e->type() == NodeUpdated) {
@@ -123,8 +124,7 @@ Attachment RenderAttachment::attachment() const
     return m_attachmentData;
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderattachment_p.h b/src/render/backend/renderattachment_p.h
index 8014ba10f..35a9d55cb 100644
--- a/src/render/backend/renderattachment_p.h
+++ b/src/render/backend/renderattachment_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERATTACHMENT_H
-#define QT3D_RENDER_RENDERATTACHMENT_H
+#ifndef QT3DRENDER_RENDER_RENDERATTACHMENT_H
+#define QT3DRENDER_RENDER_RENDERATTACHMENT_H
 
 #include <Qt3DRenderer/qrenderattachment.h>
 #include <Qt3DRenderer/private/attachmentpack_p.h>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QRenderAttachment;
 
@@ -52,31 +52,31 @@ namespace Render {
 
 class AttachmentManager;
 
-class RenderAttachment : public QBackendNode
+class RenderAttachment : public Qt3D::QBackendNode
 {
 public:
     RenderAttachment();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
-    QNodeId textureUuid() const;
+    Qt3D::QNodeId textureUuid() const;
     int mipLevel() const;
     int layer() const;
     QString name() const;
     QRenderAttachment::CubeMapFace face() const;
     QRenderAttachment::RenderAttachmentType type() const;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     Attachment attachment() const;
 
 private:
-    QNodeId m_attachmentUuid;
+    Qt3D::QNodeId m_attachmentUuid;
     Attachment m_attachmentData;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERATTACHMENT_H
+#endif // QT3DRENDER_RENDER_RENDERATTACHMENT_H
diff --git a/src/render/backend/renderattribute.cpp b/src/render/backend/renderattribute.cpp
index 4a717849d..4224dee92 100644
--- a/src/render/backend/renderattribute.cpp
+++ b/src/render/backend/renderattribute.cpp
@@ -40,19 +40,20 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 RenderAttribute::RenderAttribute()
     : QBackendNode(ReadOnly)
-    , m_dataType(QAbstractAttribute::Float)
+    , m_dataType(Qt3D::QAbstractAttribute::Float)
     , m_dataSize(1)
     , m_count(0)
     , m_byteStride(0)
     , m_byteOffset(0)
     , m_divisor(0)
-    , m_attributeType(QAbstractAttribute::VertexAttribute)
+    , m_attributeType(Qt3D::QAbstractAttribute::VertexAttribute)
     , m_attributeDirty(false)
 {
 }
@@ -63,19 +64,19 @@ RenderAttribute::~RenderAttribute()
 
 void RenderAttribute::cleanup()
 {
-    m_dataType = QAbstractAttribute::Float;
+    m_dataType = Qt3D::QAbstractAttribute::Float;
     m_dataSize = 1;
     m_count = 0;
     m_byteStride = 0;
     m_byteOffset = 0;
     m_divisor = 0;
-    m_attributeType = QAbstractAttribute::VertexAttribute;
-    m_bufferId = QNodeId();
+    m_attributeType = Qt3D::QAbstractAttribute::VertexAttribute;
+    m_bufferId = Qt3D::QNodeId();
     m_name.clear();
     m_attributeDirty = false;
 }
 
-void RenderAttribute::updateFromPeer(QNode *peer)
+void RenderAttribute::updateFromPeer(Qt3D::QNode *peer)
 {
     QAttribute *attribute = static_cast<QAttribute *>(peer);
     if (attribute) {
@@ -93,7 +94,7 @@ void RenderAttribute::updateFromPeer(QNode *peer)
     }
 }
 
-void RenderAttribute::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderAttribute::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     QByteArray propertyName = propertyChange->propertyName();
@@ -155,8 +156,7 @@ void RenderAttribute::unsetDirty()
     m_attributeDirty = false;
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderattribute_p.h b/src/render/backend/renderattribute_p.h
index 92eefe67c..d266c5559 100644
--- a/src/render/backend/renderattribute_p.h
+++ b/src/render/backend/renderattribute_p.h
@@ -34,19 +34,19 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERATTRIBUTE_H
-#define QT3D_RENDER_RENDERATTRIBUTE_H
+#ifndef QT3DRENDER_RENDER_RENDERATTRIBUTE_H
+#define QT3DRENDER_RENDER_RENDERATTRIBUTE_H
 
 #include <Qt3DCore/qbackendnode.h>
 #include <Qt3DRenderer/qattribute.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
-class Q_AUTOTEST_EXPORT RenderAttribute : public QBackendNode
+class Q_AUTOTEST_EXPORT RenderAttribute : public Qt3D::QBackendNode
 {
 public:
     RenderAttribute();
@@ -54,38 +54,38 @@ public:
 
     void cleanup();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
-    inline QNodeId bufferId() const { return m_bufferId; }
+    inline Qt3D::QNodeId bufferId() const { return m_bufferId; }
     inline QString name() const { return m_name; }
-    inline QAbstractAttribute::DataType dataType() const { return m_dataType; }
+    inline Qt3D::QAbstractAttribute::DataType dataType() const { return m_dataType; }
     inline uint dataSize() const { return m_dataSize; }
     inline uint count() const { return m_count; }
     inline uint byteStride() const { return m_byteStride; }
     inline uint byteOffset() const { return m_byteOffset; }
     inline uint divisor() const { return m_divisor; }
-    inline QAbstractAttribute::AttributeType attributeType() const { return m_attributeType; }
+    inline Qt3D::QAbstractAttribute::AttributeType attributeType() const { return m_attributeType; }
     inline bool isDirty() const { return m_attributeDirty; }
     void unsetDirty();
 
 private:
-    QNodeId m_bufferId;
+    Qt3D::QNodeId m_bufferId;
     QString m_name;
-    QAbstractAttribute::DataType m_dataType;
+    Qt3D::QAbstractAttribute::DataType m_dataType;
     uint m_dataSize;
     uint m_count;
     uint m_byteStride;
     uint m_byteOffset;
     uint m_divisor;
-    QAbstractAttribute::AttributeType m_attributeType;
+    Qt3D::QAbstractAttribute::AttributeType m_attributeType;
     bool m_attributeDirty;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERATTRIBUTE_H
+#endif // QT3DRENDER_RENDER_RENDERATTRIBUTE_H
diff --git a/src/render/backend/renderbuffer.cpp b/src/render/backend/renderbuffer.cpp
index d7ff4bca4..08bf23fd3 100644
--- a/src/render/backend/renderbuffer.cpp
+++ b/src/render/backend/renderbuffer.cpp
@@ -40,8 +40,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 RenderBuffer::RenderBuffer()
@@ -80,7 +81,7 @@ void RenderBuffer::executeFunctor()
     m_data = (*m_functor)();
 }
 
-void RenderBuffer::updateFromPeer(QNode *peer)
+void RenderBuffer::updateFromPeer(Qt3D::QNode *peer)
 {
     QBuffer *buffer = static_cast<QBuffer *>(peer);
     if (buffer != Q_NULLPTR) {
@@ -95,7 +96,7 @@ void RenderBuffer::updateFromPeer(QNode *peer)
     }
 }
 
-void RenderBuffer::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderBuffer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
@@ -130,7 +131,7 @@ RenderBufferFunctor::RenderBufferFunctor(BufferManager *manager)
 {
 }
 
-QBackendNode *RenderBufferFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const
+Qt3D::QBackendNode *RenderBufferFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
 {
     RenderBuffer *buffer = m_manager->getOrCreateResource(frontend->id());
     buffer->setFactory(factory);
@@ -139,18 +140,17 @@ QBackendNode *RenderBufferFunctor::create(QNode *frontend, const QBackendNodeFac
     return buffer;
 }
 
-QBackendNode *RenderBufferFunctor::get(const QNodeId &id) const
+Qt3D::QBackendNode *RenderBufferFunctor::get(const Qt3D::QNodeId &id) const
 {
     return m_manager->lookupResource(id);
 }
 
-void RenderBufferFunctor::destroy(const QNodeId &id) const
+void RenderBufferFunctor::destroy(const Qt3D::QNodeId &id) const
 {
     return m_manager->releaseResource(id);
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderbuffer_p.h b/src/render/backend/renderbuffer_p.h
index 698ad8084..b5fba6f93 100644
--- a/src/render/backend/renderbuffer_p.h
+++ b/src/render/backend/renderbuffer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERBUFFER_H
-#define QT3D_RENDER_RENDERBUFFER_H
+#ifndef QT3DRENDER_RENDER_RENDERBUFFER_H
+#define QT3DRENDER_RENDER_RENDERBUFFER_H
 
 #include <Qt3DCore/qbackendnode.h>
 #include <Qt3DRenderer/qbuffer.h>
@@ -43,21 +43,21 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 class BufferManager;
 
-class Q_AUTOTEST_EXPORT RenderBuffer : public QBackendNode
+class Q_AUTOTEST_EXPORT RenderBuffer : public Qt3D::QBackendNode
 {
 public:
     RenderBuffer();
     ~RenderBuffer();
     void cleanup();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     void setManager(BufferManager *manager);
     void executeFunctor();
@@ -78,21 +78,21 @@ private:
     BufferManager *m_manager;
 };
 
-class RenderBufferFunctor : public QBackendNodeFunctor
+class RenderBufferFunctor : public Qt3D::QBackendNodeFunctor
 {
 public:
     explicit RenderBufferFunctor(BufferManager *manager);
-    QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
-    QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE;
-    void destroy(const QNodeId &id) const Q_DECL_OVERRIDE;
+    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE;
 private:
     BufferManager *m_manager;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERBUFFER_H
+#endif // QT3DRENDER_RENDER_RENDERBUFFER_H
diff --git a/src/render/backend/rendercameralens.cpp b/src/render/backend/rendercameralens.cpp
index efcf5d7ef..5da56ef26 100644
--- a/src/render/backend/rendercameralens.cpp
+++ b/src/render/backend/rendercameralens.cpp
@@ -46,7 +46,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 namespace Render {
 
 RenderCameraLens::RenderCameraLens()
@@ -65,7 +67,7 @@ void RenderCameraLens::cleanup()
 
 }
 
-void RenderCameraLens::updateFromPeer(QNode *peer)
+void RenderCameraLens::updateFromPeer(Qt3D::QNode *peer)
 {
     QCameraLens *lens = static_cast<QCameraLens *>(peer);
     setProjection(lens->projectionMatrix());
@@ -77,7 +79,7 @@ void RenderCameraLens::setProjection(const QMatrix4x4 &projection)
     m_projection = projection;
 }
 
-void RenderCameraLens::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderCameraLens::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     switch (e->type()) {
     case NodeUpdated: {
@@ -97,7 +99,7 @@ void RenderCameraLens::sceneChangeEvent(const QSceneChangePtr &e)
     }
 }
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/rendercameralens_p.h b/src/render/backend/rendercameralens_p.h
index 84edd6b6a..523de9d23 100644
--- a/src/render/backend/rendercameralens_p.h
+++ b/src/render/backend/rendercameralens_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERCAMERA_H
-#define QT3D_RENDER_RENDERCAMERA_H
+#ifndef QT3DRENDER_RENDER_RENDERCAMERA_H
+#define QT3DRENDER_RENDER_RENDERCAMERA_H
 
 #include <Qt3DCore/qbackendnode.h>
 #include <QMatrix4x4>
@@ -43,20 +43,20 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 class CameraManager;
 
-class RenderCameraLens : public QBackendNode
+class RenderCameraLens : public Qt3D::QBackendNode
 {
 public:
     RenderCameraLens();
     ~RenderCameraLens();
     void cleanup();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
     void setClearColor();
     QVector4D clearColor() const { return m_clearColor; }
@@ -66,7 +66,7 @@ public:
 
     inline bool isEnabled() const { return m_enabled; }
 
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
     QVector4D m_clearColor;
@@ -74,9 +74,9 @@ private:
     bool m_enabled;
 };
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERCAMERA_H
+#endif // QT3DRENDER_RENDER_RENDERCAMERA_H
diff --git a/src/render/backend/rendercommand.cpp b/src/render/backend/rendercommand.cpp
index 3e9a1c52e..8f748ac27 100644
--- a/src/render/backend/rendercommand.cpp
+++ b/src/render/backend/rendercommand.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 RenderCommand::RenderCommand()
@@ -53,6 +53,6 @@ bool compareCommands(RenderCommand *r1, RenderCommand *r2)
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/rendercommand_p.h b/src/render/backend/rendercommand_p.h
index 9d0e2d856..827b08fe9 100644
--- a/src/render/backend/rendercommand_p.h
+++ b/src/render/backend/rendercommand_p.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERCOMMAND_H
-#define QT3D_RENDER_RENDERCOMMAND_H
+#ifndef QT3DRENDER_RENDER_RENDERCOMMAND_H
+#define QT3DRENDER_RENDER_RENDERCOMMAND_H
 
 #include <qglobal.h>
 #include <Qt3DRenderer/private/quniformvalue_p.h>
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 class QOpenGLVertexArrayObject;
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -87,10 +87,10 @@ public:
 
 bool compareCommands(RenderCommand *r1, RenderCommand *r2);
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERCOMMAND_H
+#endif // QT3DRENDER_RENDER_RENDERCOMMAND_H
diff --git a/src/render/backend/renderconfiguration.cpp b/src/render/backend/renderconfiguration.cpp
index f15a7e747..ad350cb7b 100644
--- a/src/render/backend/renderconfiguration.cpp
+++ b/src/render/backend/renderconfiguration.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 RenderConfiguration::RenderConfiguration()
@@ -46,6 +46,6 @@ RenderConfiguration::RenderConfiguration()
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderconfiguration_p.h b/src/render/backend/renderconfiguration_p.h
index a48e1687d..7dda15ccb 100644
--- a/src/render/backend/renderconfiguration_p.h
+++ b/src/render/backend/renderconfiguration_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERCONFIGURATION_H
-#define QT3D_RENDER_RENDERCONFIGURATION_H
+#ifndef QT3DRENDER_RENDER_RENDERCONFIGURATION_H
+#define QT3DRENDER_RENDER_RENDERCONFIGURATION_H
 
 #include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 class RenderConfiguration
@@ -51,8 +51,8 @@ public:
 };
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERCONFIGURATION_H
+#endif // QT3DRENDER_RENDER_RENDERCONFIGURATION_H
diff --git a/src/render/backend/rendereffect.cpp b/src/render/backend/rendereffect.cpp
index 4689d39a6..96a9ce3f4 100644
--- a/src/render/backend/rendereffect.cpp
+++ b/src/render/backend/rendereffect.cpp
@@ -45,8 +45,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 RenderEffect::RenderEffect()
@@ -63,7 +64,7 @@ void RenderEffect::cleanup()
 {
 }
 
-void RenderEffect::updateFromPeer(QNode *peer)
+void RenderEffect::updateFromPeer(Qt3D::QNode *peer)
 {
     QEffect *effect = static_cast<QEffect *>(peer);
 
@@ -77,7 +78,7 @@ void RenderEffect::updateFromPeer(QNode *peer)
         m_parameterPack.appendParameter(p->id());
 }
 
-void RenderEffect::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderEffect::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     QVariant propertyValue = propertyChange->value();
@@ -102,24 +103,23 @@ void RenderEffect::sceneChangeEvent(const QSceneChangePtr &e)
     }
 }
 
-void RenderEffect::appendRenderTechnique(const QNodeId &technique)
+void RenderEffect::appendRenderTechnique(const Qt3D::QNodeId &technique)
 {
     if (!m_techniques.contains(technique))
         m_techniques.append(technique);
 }
 
-QList<QNodeId> RenderEffect::techniques() const
+QList<Qt3D::QNodeId> RenderEffect::techniques() const
 {
     return m_techniques;
 }
 
-QList<QNodeId> RenderEffect::parameters() const
+QList<Qt3D::QNodeId> RenderEffect::parameters() const
 {
     return m_parameterPack.parameters();
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/rendereffect_p.h b/src/render/backend/rendereffect_p.h
index 40291c275..fa42e46a0 100644
--- a/src/render/backend/rendereffect_p.h
+++ b/src/render/backend/rendereffect_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDEREFFECT_H
-#define QT3D_RENDER_RENDEREFFECT_H
+#ifndef QT3DRENDER_RENDER_RENDEREFFECT_H
+#define QT3DRENDER_RENDER_RENDEREFFECT_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/private/parameterpack_p.h>
@@ -45,36 +45,36 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QTechnique;
 
 namespace Render {
 
 class RenderEffect
-        : public QBackendNode
+        : public Qt3D::QBackendNode
 {
 public:
     RenderEffect();
     ~RenderEffect();
     void cleanup();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void appendRenderTechnique(const QNodeId &t);
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void appendRenderTechnique(const Qt3D::QNodeId &t);
 
-    QList<QNodeId> techniques() const;
-    QList<QNodeId> parameters() const;
+    QList<Qt3D::QNodeId> techniques() const;
+    QList<Qt3D::QNodeId> parameters() const;
 
 private:
-    QList<QNodeId> m_techniques;
+    QList<Qt3D::QNodeId> m_techniques;
     ParameterPack m_parameterPack;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDEREFFECT_H
+#endif // QT3DRENDER_RENDER_RENDEREFFECT_H
diff --git a/src/render/backend/renderentity.cpp b/src/render/backend/renderentity.cpp
index 11301e032..e51b2fec6 100644
--- a/src/render/backend/renderentity.cpp
+++ b/src/render/backend/renderentity.cpp
@@ -57,14 +57,16 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 namespace Render {
 
 RenderEntity::RenderEntity()
     : QBackendNode()
     , m_renderer(Q_NULLPTR)
-    , m_localBoundingVolume(new Qt3D::Sphere)
-    , m_worldBoundingVolume(new Qt3D::Sphere)
+    , m_localBoundingVolume(new Sphere)
+    , m_worldBoundingVolume(new Sphere)
 {
 }
 
@@ -91,10 +93,10 @@ void RenderEntity::cleanup()
         qCDebug(Render::RenderNodes) << Q_FUNC_INFO;
 
         // Clear components
-        m_transformComponent = QNodeId();
-        m_cameraComponent = QNodeId();
-        m_materialComponent = QNodeId();
-        m_geometryRendererComponent = QNodeId();
+        m_transformComponent = Qt3D::QNodeId();
+        m_cameraComponent = Qt3D::QNodeId();
+        m_materialComponent = Qt3D::QNodeId();
+        m_geometryRendererComponent = Qt3D::QNodeId();
         m_layerComponents.clear();
         m_shaderDataComponents.clear();
     }
@@ -129,7 +131,7 @@ void RenderEntity::setHandle(HEntity handle)
     m_handle = handle;
 }
 
-void RenderEntity::updateFromPeer(QNode *peer)
+void RenderEntity::updateFromPeer(Qt3D::QNode *peer)
 {
     QEntity *entity = static_cast<QEntity *>(peer);
     const QNodeId parentEntityId = entity->parentEntityId();
@@ -155,7 +157,7 @@ void RenderEntity::updateFromPeer(QNode *peer)
     }
 }
 
-void RenderEntity::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderEntity::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     switch (e->type()) {
@@ -235,12 +237,12 @@ const QMatrix4x4 *RenderEntity::worldTransform() const
     return m_renderer->worldMatrixManager()->data(m_worldTransform);
 }
 
-void RenderEntity::addComponent(QComponent *component)
+void RenderEntity::addComponent(Qt3D::QComponent *component)
 {
     // The backend element is always created when this method is called
     // If that's not the case something has gone wrong
 
-    if (qobject_cast<QTransform*>(component) != Q_NULLPTR)
+    if (qobject_cast<Qt3D::QTransform*>(component) != Q_NULLPTR)
         m_transformComponent = component->id();
     else if (qobject_cast<QCameraLens *>(component) != Q_NULLPTR)
         m_cameraComponent = component->id();
@@ -254,7 +256,7 @@ void RenderEntity::addComponent(QComponent *component)
         m_geometryRendererComponent = component->id();
 }
 
-void RenderEntity::removeComponent(const QNodeId &nodeId)
+void RenderEntity::removeComponent(const Qt3D::QNodeId &nodeId)
 {
     if (m_transformComponent == nodeId)
         m_transformComponent = QNodeId();
@@ -319,13 +321,13 @@ RenderGeometryRenderer *RenderEntity::renderComponent<RenderGeometryRenderer>()
 }
 
 template<>
-QNodeId RenderEntity::componentUuid<RenderTransform>() const { return m_transformComponent; }
+Qt3D::QNodeId RenderEntity::componentUuid<RenderTransform>() const { return m_transformComponent; }
 
 template<>
-QNodeId RenderEntity::componentUuid<RenderCameraLens>() const { return m_cameraComponent; }
+Qt3D::QNodeId RenderEntity::componentUuid<RenderCameraLens>() const { return m_cameraComponent; }
 
 template<>
-QNodeId RenderEntity::componentUuid<RenderMaterial>() const { return m_materialComponent; }
+Qt3D::QNodeId RenderEntity::componentUuid<RenderMaterial>() const { return m_materialComponent; }
 
 template<>
 QList<HLayer> RenderEntity::componentsHandle<RenderLayer>() const
@@ -346,7 +348,7 @@ QList<RenderLayer *> RenderEntity::renderComponents<RenderLayer>() const
 }
 
 template<>
-QList<QNodeId> RenderEntity::componentsUuid<RenderLayer>() const { return m_layerComponents; }
+QList<Qt3D::QNodeId> RenderEntity::componentsUuid<RenderLayer>() const { return m_layerComponents; }
 
 template<>
 QList<HShaderData> RenderEntity::componentsHandle<RenderShaderData>() const
@@ -367,10 +369,10 @@ QList<RenderShaderData *> RenderEntity::renderComponents<RenderShaderData>() con
 }
 
 template<>
-QList<QNodeId> RenderEntity::componentsUuid<RenderShaderData>() const { return m_shaderDataComponents; }
+QList<Qt3D::QNodeId> RenderEntity::componentsUuid<RenderShaderData>() const { return m_shaderDataComponents; }
 
 template<>
-QNodeId RenderEntity::componentUuid<RenderGeometryRenderer>() const { return m_geometryRendererComponent; }
+Qt3D::QNodeId RenderEntity::componentUuid<RenderGeometryRenderer>() const { return m_geometryRendererComponent; }
 
 
 RenderEntityFunctor::RenderEntityFunctor(Renderer *renderer)
@@ -378,7 +380,7 @@ RenderEntityFunctor::RenderEntityFunctor(Renderer *renderer)
 {
 }
 
-QBackendNode *RenderEntityFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const
+Qt3D::QBackendNode *RenderEntityFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
 {
     HEntity renderNodeHandle = m_renderer->renderNodesManager()->getOrAcquireHandle(frontend->id());
     RenderEntity *entity = m_renderer->renderNodesManager()->data(renderNodeHandle);
@@ -389,17 +391,17 @@ QBackendNode *RenderEntityFunctor::create(QNode *frontend, const QBackendNodeFac
     return entity;
 }
 
-QBackendNode *RenderEntityFunctor::get(const QNodeId &id) const
+Qt3D::QBackendNode *RenderEntityFunctor::get(const Qt3D::QNodeId &id) const
 {
     return m_renderer->renderNodesManager()->lookupResource(id);
 }
 
-void RenderEntityFunctor::destroy(const QNodeId &id) const
+void RenderEntityFunctor::destroy(const Qt3D::QNodeId &id) const
 {
     m_renderer->renderNodesManager()->releaseResource(id);
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderentity_p.h b/src/render/backend/renderentity_p.h
index f3afa822a..9940e315d 100644
--- a/src/render/backend/renderentity_p.h
+++ b/src/render/backend/renderentity_p.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERNODE_H
-#define QT3D_RENDER_RENDERNODE_H
+#ifndef QT3DRENDER_RENDER_RENDERNODE_H
+#define QT3DRENDER_RENDER_RENDERNODE_H
 
 #include <Qt3DRenderer/private/renderer_p.h>
 #include <Qt3DRenderer/private/handle_types_p.h>
@@ -50,18 +50,21 @@ QT_BEGIN_NAMESPACE
 class QMatrix4x4;
 
 namespace Qt3D {
-
-class QRenderAspect;
-class Sphere;
 class QNode;
 class QEntity;
 class QComponent;
+}
+
+namespace Qt3DRender {
+
+class QRenderAspect;
+class Sphere;
 
 namespace Render {
 
 class Renderer;
 
-class Q_AUTOTEST_EXPORT RenderEntity : public QBackendNode
+class Q_AUTOTEST_EXPORT RenderEntity : public Qt3D::QBackendNode
 {
 public:
     RenderEntity();
@@ -70,8 +73,8 @@ public:
 
     void setParentHandle(HEntity parentHandle);
     void setRenderer(Renderer *renderer);
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
     void dump() const;
 
@@ -90,19 +93,19 @@ public:
     Sphere *localBoundingVolume() { return m_localBoundingVolume; }
     Sphere *worldBoundingVolume() { return m_worldBoundingVolume; }
 
-    void addComponent(QComponent *component);
-    void removeComponent(const QNodeId &nodeId);
+    void addComponent(Qt3D::QComponent *component);
+    void removeComponent(const Qt3D::QNodeId &nodeId);
 
     template<class Backend, uint INDEXBITS>
-    QHandle<Backend, INDEXBITS> componentHandle() const
+    Qt3D::QHandle<Backend, INDEXBITS> componentHandle() const
     {
-        return QHandle<Backend, INDEXBITS>();
+        return Qt3D::QHandle<Backend, INDEXBITS>();
     }
 
     template<class Backend, uint INDEXBITS>
-    QList<QHandle<Backend, INDEXBITS> > componentsHandle() const
+    QList<Qt3D::QHandle<Backend, INDEXBITS> > componentsHandle() const
     {
-        return QList<QHandle<Backend, INDEXBITS> >();
+        return QList<Qt3D::QHandle<Backend, INDEXBITS> >();
     }
 
     template<class Backend>
@@ -118,15 +121,15 @@ public:
     }
 
     template<class Backend>
-    QNodeId componentUuid() const
+    Qt3D::QNodeId componentUuid() const
     {
-        return QNodeId();
+        return Qt3D::QNodeId();
     }
 
     template<class Backend>
-    QList<QNodeId> componentsUuid() const
+    QList<Qt3D::QNodeId> componentsUuid() const
     {
-        return QList<QNodeId>();
+        return QList<Qt3D::QNodeId>();
     }
 
 private:
@@ -152,12 +155,12 @@ private:
     Sphere *m_worldBoundingVolume;
 
     // Handles to Components
-    QNodeId m_transformComponent;
-    QNodeId m_materialComponent;
-    QNodeId m_cameraComponent;
-    QList<QNodeId> m_layerComponents;
-    QList<QNodeId> m_shaderDataComponents;
-    QNodeId m_geometryRendererComponent;
+    Qt3D::QNodeId m_transformComponent;
+    Qt3D::QNodeId m_materialComponent;
+    Qt3D::QNodeId m_cameraComponent;
+    QList<Qt3D::QNodeId> m_layerComponents;
+    QList<Qt3D::QNodeId> m_shaderDataComponents;
+    Qt3D::QNodeId m_geometryRendererComponent;
 
     QString m_objectName;
 };
@@ -187,13 +190,13 @@ template<>
 Q_AUTOTEST_EXPORT RenderGeometryRenderer *RenderEntity::renderComponent<RenderGeometryRenderer>() const;
 
 template<>
-Q_AUTOTEST_EXPORT QNodeId RenderEntity::componentUuid<RenderTransform>() const;
+Q_AUTOTEST_EXPORT Qt3D::QNodeId RenderEntity::componentUuid<RenderTransform>() const;
 
 template<>
-Q_AUTOTEST_EXPORT QNodeId RenderEntity::componentUuid<RenderCameraLens>() const;
+Q_AUTOTEST_EXPORT Qt3D::QNodeId RenderEntity::componentUuid<RenderCameraLens>() const;
 
 template<>
-Q_AUTOTEST_EXPORT QNodeId RenderEntity::componentUuid<RenderMaterial>() const;
+Q_AUTOTEST_EXPORT Qt3D::QNodeId RenderEntity::componentUuid<RenderMaterial>() const;
 
 template<>
 QList<HLayer> RenderEntity::componentsHandle<RenderLayer>() const;
@@ -202,7 +205,7 @@ template<>
 QList<RenderLayer *> RenderEntity::renderComponents<RenderLayer>() const;
 
 template<>
-Q_AUTOTEST_EXPORT QList<QNodeId> RenderEntity::componentsUuid<RenderLayer>() const;
+Q_AUTOTEST_EXPORT QList<Qt3D::QNodeId> RenderEntity::componentsUuid<RenderLayer>() const;
 
 template<>
 QList<HShaderData> RenderEntity::componentsHandle<RenderShaderData>() const;
@@ -211,26 +214,26 @@ template<>
 QList<RenderShaderData *> RenderEntity::renderComponents<RenderShaderData>() const;
 
 template<>
-Q_AUTOTEST_EXPORT QList<QNodeId> RenderEntity::componentsUuid<RenderShaderData>() const;
+Q_AUTOTEST_EXPORT QList<Qt3D::QNodeId> RenderEntity::componentsUuid<RenderShaderData>() const;
 
 template<>
-Q_AUTOTEST_EXPORT QNodeId RenderEntity::componentUuid<RenderGeometryRenderer>() const;
+Q_AUTOTEST_EXPORT Qt3D::QNodeId RenderEntity::componentUuid<RenderGeometryRenderer>() const;
 
-class RenderEntityFunctor : public QBackendNodeFunctor
+class RenderEntityFunctor : public Qt3D::QBackendNodeFunctor
 {
 public:
     explicit RenderEntityFunctor(Renderer *renderer);
-    QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
-    QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE;
-    void destroy(const QNodeId &id) const Q_DECL_OVERRIDE;
+    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE;
 
 private:
     Renderer *m_renderer;
 };
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERNODE_H
+#endif // QT3DRENDER_RENDER_RENDERNODE_H
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index e3a16fad8..b5a896057 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -97,8 +97,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 static void logOpenGLDebugMessage(const QOpenGLDebugMessage &debugMessage)
@@ -325,7 +326,7 @@ void Renderer::createThreadLocalAllocator(void *renderer)
 /*!
  * Returns the a FrameAllocator for the caller thread.
  */
-QFrameAllocator *Renderer::currentFrameAllocator()
+Qt3D::QFrameAllocator *Renderer::currentFrameAllocator()
 {
     // return the QFrameAllocator for the current thread
     // It is never cleared as each renderview when it is destroyed
@@ -355,7 +356,7 @@ void Renderer::initialize(QOpenGLContext *context)
     if (m_renderThread)
         m_waitForWindowToBeSetCondition.wait(mutex());
 
-    QByteArray debugLoggingMode = qgetenv("QT3D_DEBUG_LOGGING");
+    QByteArray debugLoggingMode = qgetenv("QT3DRENDER_DEBUG_LOGGING");
     bool enableDebugLogging = !debugLoggingMode.isEmpty();
 
     m_graphicsContext.reset(new QGraphicsContext);
@@ -428,7 +429,7 @@ void Renderer::shutdown()
     }
 }
 
-void Renderer::setFrameGraphRoot(const QNodeId &frameGraphRootUuid)
+void Renderer::setFrameGraphRoot(const Qt3D::QNodeId &frameGraphRootUuid)
 {
     m_frameGraphRootUuid = frameGraphRootUuid;
     qCDebug(Backend) << Q_FUNC_INFO << m_frameGraphRootUuid;
@@ -549,7 +550,7 @@ void Renderer::render()
     // Matrice update, bounding volumes computation ...
     // Should be jobs
 
-    // Qt3D has 2 distincts node trees
+    // namespace Qt3D has 2 distincts node trees
     // One scene description
     // One framegraph description
 
@@ -757,7 +758,7 @@ bool Renderer::submitRenderViews()
 
 // Waits to be told to create jobs for the next frame
 // Called by QRenderAspect jobsToExecute context of QAspectThread
-QVector<QAspectJobPtr> Renderer::createRenderBinJobs()
+QVector<Qt3D::QAspectJobPtr> Renderer::createRenderBinJobs()
 {
     // Traverse the current framegraph. For each leaf node create a
     // RenderView and set its configuration then create a job to
@@ -780,7 +781,7 @@ QVector<QAspectJobPtr> Renderer::createRenderBinJobs()
 
 // Returns a vector of jobs to be performed for dirty buffers
 // 1 dirty buffer == 1 job, all job can be performed in parallel
-QVector<QAspectJobPtr> Renderer::createRenderBufferJobs()
+QVector<Qt3D::QAspectJobPtr> Renderer::createRenderBufferJobs()
 {
     const QVector<QNodeId> dirtyBuffers = m_bufferManager->dirtyBuffers();
     QVector<QAspectJobPtr> dirtyBuffersJobs;
@@ -798,7 +799,7 @@ QVector<QAspectJobPtr> Renderer::createRenderBufferJobs()
     return dirtyBuffersJobs;
 }
 
-QVector<QAspectJobPtr> Renderer::createGeometryRendererJobs()
+QVector<Qt3D::QAspectJobPtr> Renderer::createGeometryRendererJobs()
 {
     const QVector<QNodeId> dirtyGeometryRenderers = m_geometryRendererManager->dirtyGeometryRenderers();
     QVector<QAspectJobPtr> dirtyGeometryRendererJobs;
@@ -816,7 +817,7 @@ QVector<QAspectJobPtr> Renderer::createGeometryRendererJobs()
 }
 
 // Called during while traversing the FrameGraph for each leaf node context of QAspectThread
-QAspectJobPtr Renderer::createRenderViewJob(FrameGraphNode *node, int submitOrderIndex)
+Qt3D::QAspectJobPtr Renderer::createRenderViewJob(FrameGraphNode *node, int submitOrderIndex)
 {
     RenderViewJobPtr job(new RenderViewJob);
     job->setRenderer(this);
@@ -1052,7 +1053,7 @@ RenderAttribute *Renderer::updateBuffersAndAttributes(RenderGeometry *geometry,
     return indexAttribute;
 }
 
-void Renderer::addAllocator(QFrameAllocator *allocator)
+void Renderer::addAllocator(Qt3D::QFrameAllocator *allocator)
 {
     QMutexLocker lock(&m_mutex);
     m_allocators.append(allocator);
@@ -1064,6 +1065,6 @@ QOpenGLFilter *Renderer::contextInfo() const
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h
index b6cdfea58..e1eefa7a1 100644
--- a/src/render/backend/renderer_p.h
+++ b/src/render/backend/renderer_p.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERER_H
-#define QT3D_RENDER_RENDERER_H
+#ifndef QT3DRENDER_RENDER_RENDERER_H
+#define QT3DRENDER_RENDER_RENDERER_H
 
 #include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DRenderer/qtechnique.h>
@@ -64,15 +64,18 @@ class QSurface;
 class QOpenGLDebugLogger;
 
 namespace Qt3D {
+class QEntity;
+class QFrameAllocator;
+}
+
+namespace Qt3DRender {
 
 class QCamera;
-class QEntity;
 class QMaterial;
 class QShaderProgram;
 class QMesh;
 class QRenderPass;
 class QAbstractShapeMesh;
-class QFrameAllocator;
 class QOpenGLFilter;
 class AbstractSceneParser;
 
@@ -134,11 +137,11 @@ public:
     void createAllocators();
     void destroyAllocators();
 
-    QFrameAllocator *currentFrameAllocator();
+    Qt3D::QFrameAllocator *currentFrameAllocator();
 
-    QThreadStorage<QFrameAllocator *> *tlsAllocators();
+    QThreadStorage<Qt3D::QFrameAllocator *> *tlsAllocators();
 
-    void setFrameGraphRoot(const QNodeId &fgRoot);
+    void setFrameGraphRoot(const Qt3D::QNodeId &fgRoot);
     Render::FrameGraphNode *frameGraphRoot() const;
 
     void setSceneGraphRoot(RenderEntity *sgRoot);
@@ -147,13 +150,13 @@ public:
     void render();
     void doRender();
 
-    QVector<QAspectJobPtr> createRenderBinJobs();
-    QVector<QAspectJobPtr> createRenderBufferJobs();
-    QVector<QAspectJobPtr> createGeometryRendererJobs();
-    QAspectJobPtr createRenderViewJob(FrameGraphNode *node, int submitOrderIndex);
+    QVector<Qt3D::QAspectJobPtr> createRenderBinJobs();
+    QVector<Qt3D::QAspectJobPtr> createRenderBufferJobs();
+    QVector<Qt3D::QAspectJobPtr> createGeometryRendererJobs();
+    Qt3D::QAspectJobPtr createRenderViewJob(FrameGraphNode *node, int submitOrderIndex);
     void executeCommands(const QVector<RenderCommand *> &commands);
     RenderAttribute *updateBuffersAndAttributes(RenderGeometry *geometry, RenderCommand *command, GLsizei &count, bool forceUpdate);
-    void addAllocator(QFrameAllocator *allocator);
+    void addAllocator(Qt3D::QFrameAllocator *allocator);
 
     inline CameraManager *cameraManager() const { return m_cameraManager; }
     inline EntityManager *renderNodesManager() const { return m_renderNodesManager; }
@@ -211,7 +214,7 @@ private:
     QRenderAspect *m_rendererAspect;
 
     // Frame graph root
-    QNodeId m_frameGraphRootUuid;
+    Qt3D::QNodeId m_frameGraphRootUuid;
 
     RenderEntity *m_renderSceneRoot;
 
@@ -279,21 +282,21 @@ private:
 
     static void createThreadLocalAllocator(void *renderer);
     static void destroyThreadLocalAllocator(void *renderer);
-    QThreadStorage<QFrameAllocator *> m_tlsAllocators;
+    QThreadStorage<Qt3D::QFrameAllocator *> m_tlsAllocators;
 
     QAtomicInt m_running;
 
     QScopedPointer<QOpenGLDebugLogger> m_debugLogger;
     QList<AbstractSceneParser *> m_sceneParsers;
-    QVector<QFrameAllocator *> m_allocators;
+    QVector<Qt3D::QFrameAllocator *> m_allocators;
 
     QVector<RenderAttribute *> m_dirtyAttributes;
     QVector<RenderGeometry *> m_dirtyGeometry;
 };
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERER_H
+#endif // QT3DRENDER_RENDER_RENDERER_H
diff --git a/src/render/backend/rendergeometry.cpp b/src/render/backend/rendergeometry.cpp
index 026a8146e..983dd5915 100644
--- a/src/render/backend/rendergeometry.cpp
+++ b/src/render/backend/rendergeometry.cpp
@@ -41,8 +41,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 RenderGeometry::RenderGeometry()
@@ -63,7 +64,7 @@ void RenderGeometry::cleanup()
     m_geometryDirty = false;
 }
 
-void RenderGeometry::updateFromPeer(QNode *peer)
+void RenderGeometry::updateFromPeer(Qt3D::QNode *peer)
 {
     QGeometry *geometry = static_cast<QGeometry *>(peer);
     if (geometry != Q_NULLPTR) {
@@ -75,7 +76,7 @@ void RenderGeometry::updateFromPeer(QNode *peer)
     }
 }
 
-void RenderGeometry::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderGeometry::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     QByteArray propertyName = propertyChange->propertyName();
@@ -116,8 +117,7 @@ void RenderGeometry::unsetDirty()
     m_geometryDirty = false;
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/rendergeometry_p.h b/src/render/backend/rendergeometry_p.h
index 01381dc01..48eb53724 100644
--- a/src/render/backend/rendergeometry_p.h
+++ b/src/render/backend/rendergeometry_p.h
@@ -34,19 +34,19 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERGEOMETRY_H
-#define QT3D_RENDER_RENDERGEOMETRY_H
+#ifndef QT3DRENDER_RENDER_RENDERGEOMETRY_H
+#define QT3DRENDER_RENDER_RENDERGEOMETRY_H
 
 #include <Qt3DCore/qbackendnode.h>
 
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
-class Q_AUTOTEST_EXPORT RenderGeometry : public QBackendNode
+class Q_AUTOTEST_EXPORT RenderGeometry : public Qt3D::QBackendNode
 {
 public:
     RenderGeometry();
@@ -54,24 +54,24 @@ public:
 
     void cleanup();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
-    inline QVector<QNodeId> attributes() const { return m_attributes; }
+    inline QVector<Qt3D::QNodeId> attributes() const { return m_attributes; }
     inline bool isDirty() const { return m_geometryDirty; }
     inline int verticesPerPatch() const { return m_verticesPerPatch; }
     void unsetDirty();
 
 private:
-    QVector<QNodeId> m_attributes;
+    QVector<Qt3D::QNodeId> m_attributes;
     int m_verticesPerPatch;
     bool m_geometryDirty;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERGEOMETRY_H
+#endif // QT3DRENDER_RENDER_RENDERGEOMETRY_H
diff --git a/src/render/backend/rendergeometryrenderer.cpp b/src/render/backend/rendergeometryrenderer.cpp
index 08ff49768..77d681989 100644
--- a/src/render/backend/rendergeometryrenderer.cpp
+++ b/src/render/backend/rendergeometryrenderer.cpp
@@ -41,8 +41,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 RenderGeometryRenderer::RenderGeometryRenderer()
@@ -72,7 +73,7 @@ void RenderGeometryRenderer::cleanup()
     m_restartIndex = -1;
     m_primitiveRestart = false;
     m_primitiveType = QGeometryRenderer::Triangles;
-    m_geometryId = QNodeId();
+    m_geometryId = Qt3D::QNodeId();
     m_dirty = false;
     m_functor.reset();
 }
@@ -82,7 +83,7 @@ void RenderGeometryRenderer::setManager(GeometryRendererManager *manager)
     m_manager = manager;
 }
 
-void RenderGeometryRenderer::updateFromPeer(QNode *peer)
+void RenderGeometryRenderer::updateFromPeer(Qt3D::QNode *peer)
 {
     QGeometryRenderer *geometryRenderer = static_cast<QGeometryRenderer *>(peer);
     if (geometryRenderer) {
@@ -102,7 +103,7 @@ void RenderGeometryRenderer::updateFromPeer(QNode *peer)
     }
 }
 
-void RenderGeometryRenderer::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderGeometryRenderer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     QByteArray propertyName = propertyChange->propertyName();
@@ -189,7 +190,7 @@ RenderGeometryRendererFunctor::RenderGeometryRendererFunctor(GeometryRendererMan
 {
 }
 
-QBackendNode *RenderGeometryRendererFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const
+Qt3D::QBackendNode *RenderGeometryRendererFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
 {
     RenderGeometryRenderer *geometryRenderer = m_manager->getOrCreateResource(frontend->id());
     geometryRenderer->setFactory(factory);
@@ -198,18 +199,17 @@ QBackendNode *RenderGeometryRendererFunctor::create(QNode *frontend, const QBack
     return geometryRenderer;
 }
 
-QBackendNode *RenderGeometryRendererFunctor::get(const QNodeId &id) const
+Qt3D::QBackendNode *RenderGeometryRendererFunctor::get(const Qt3D::QNodeId &id) const
 {
     return m_manager->lookupResource(id);
 }
 
-void RenderGeometryRendererFunctor::destroy(const QNodeId &id) const
+void RenderGeometryRendererFunctor::destroy(const Qt3D::QNodeId &id) const
 {
     return m_manager->releaseResource(id);
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/rendergeometryrenderer_p.h b/src/render/backend/rendergeometryrenderer_p.h
index baa81048c..5bdae6ee9 100644
--- a/src/render/backend/rendergeometryrenderer_p.h
+++ b/src/render/backend/rendergeometryrenderer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERGEOMETRYRENDERER_H
-#define QT3D_RENDER_RENDERGEOMETRYRENDERER_H
+#ifndef QT3DRENDER_RENDER_RENDERGEOMETRYRENDERER_H
+#define QT3DRENDER_RENDER_RENDERGEOMETRYRENDERER_H
 
 #include <Qt3DCore/qbackendnode.h>
 #include <Qt3DRenderer/qgeometryrenderer.h>
@@ -43,13 +43,13 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 class GeometryRendererManager;
 
-class Q_AUTOTEST_EXPORT RenderGeometryRenderer : public QBackendNode
+class Q_AUTOTEST_EXPORT RenderGeometryRenderer : public Qt3D::QBackendNode
 {
 public:
     RenderGeometryRenderer();
@@ -57,11 +57,11 @@ public:
 
     void cleanup();
     void setManager(GeometryRendererManager *manager);
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     void executeFunctor();
 
-    inline QNodeId geometryId() const { return m_geometryId; }
+    inline Qt3D::QNodeId geometryId() const { return m_geometryId; }
     inline int instanceCount() const { return m_instanceCount; }
     inline int primitiveCount() const { return m_primitiveCount; }
     inline int baseVertex() const { return m_baseVertex; }
@@ -74,7 +74,7 @@ public:
     void unsetDirty();
 
 private:
-    QNodeId m_geometryId;
+    Qt3D::QNodeId m_geometryId;
     int m_instanceCount;
     int m_primitiveCount;
     int m_baseVertex;
@@ -87,21 +87,21 @@ private:
     GeometryRendererManager *m_manager;
 };
 
-class RenderGeometryRendererFunctor : public QBackendNodeFunctor
+class RenderGeometryRendererFunctor : public Qt3D::QBackendNodeFunctor
 {
 public:
     explicit RenderGeometryRendererFunctor(GeometryRendererManager *manager);
-    QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
-    QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE;
-    void destroy(const QNodeId &id) const Q_DECL_OVERRIDE;
+    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE;
 private:
     GeometryRendererManager *m_manager;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERGEOMETRYRENDERER_H
+#endif // QT3DRENDER_RENDER_RENDERGEOMETRYRENDERER_H
diff --git a/src/render/backend/renderlayer.cpp b/src/render/backend/renderlayer.cpp
index b2a2b5803..5912210aa 100644
--- a/src/render/backend/renderlayer.cpp
+++ b/src/render/backend/renderlayer.cpp
@@ -41,8 +41,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 RenderLayer::RenderLayer()
@@ -59,7 +60,7 @@ void RenderLayer::cleanup()
 {
 }
 
-void RenderLayer::updateFromPeer(QNode *peer)
+void RenderLayer::updateFromPeer(Qt3D::QNode *peer)
 {
     QLayer *layer = static_cast<QLayer *>(peer);
     m_layers = layer->names();
@@ -71,7 +72,7 @@ QStringList RenderLayer::layers() const
     return m_layers;
 }
 
-void RenderLayer::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderLayer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (e->type() == NodeUpdated && propertyChange->propertyName() == QByteArrayLiteral("names"))
@@ -80,8 +81,7 @@ void RenderLayer::sceneChangeEvent(const QSceneChangePtr &e)
         m_enabled = propertyChange->value().toBool();
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderlayer_p.h b/src/render/backend/renderlayer_p.h
index bd7209536..6ccf3b7e7 100644
--- a/src/render/backend/renderlayer_p.h
+++ b/src/render/backend/renderlayer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERLAYER_H
-#define QT3D_RENDER_RENDERLAYER_H
+#ifndef QT3DRENDER_RENDER_RENDERLAYER_H
+#define QT3DRENDER_RENDER_RENDERLAYER_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qbackendnode.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QLayer;
 
@@ -51,17 +51,17 @@ namespace Render {
 
 class LayerManager;
 
-class RenderLayer : public QBackendNode
+class RenderLayer : public Qt3D::QBackendNode
 {
 public:
     RenderLayer();
     ~RenderLayer();
     void cleanup();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
     QStringList layers() const;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     inline bool isEnabled() const { return m_enabled; }
 
 private:
@@ -69,10 +69,10 @@ private:
     bool m_enabled;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERLAYER_H
+#endif // QT3DRENDER_RENDER_RENDERLAYER_H
diff --git a/src/render/backend/rendermaterial.cpp b/src/render/backend/rendermaterial.cpp
index 39f8cc322..1a2749f0d 100644
--- a/src/render/backend/rendermaterial.cpp
+++ b/src/render/backend/rendermaterial.cpp
@@ -46,9 +46,11 @@
 #include <Qt3DCore/qscenepropertychange.h>
 #include <QOpenGLShaderProgram>
 
+using namespace Qt3D;
+
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 RenderMaterial::RenderMaterial()
@@ -67,7 +69,7 @@ void RenderMaterial::cleanup()
     m_parameterPack.clear();
 }
 
-void RenderMaterial::updateFromPeer(QNode *node)
+void RenderMaterial::updateFromPeer(Qt3D::QNode *node)
 {
     QMaterial *mat = static_cast<QMaterial *>(node);
     m_parameterPack.clear();
@@ -78,7 +80,7 @@ void RenderMaterial::updateFromPeer(QNode *node)
         m_parameterPack.appendParameter(p->id());
 }
 
-void RenderMaterial::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderMaterial::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
 
@@ -109,17 +111,17 @@ void RenderMaterial::sceneChangeEvent(const QSceneChangePtr &e)
     }
 }
 
-QList<QNodeId> RenderMaterial::parameters() const
+QList<Qt3D::QNodeId> RenderMaterial::parameters() const
 {
     return m_parameterPack.parameters();
 }
 
-QNodeId RenderMaterial::effect() const
+Qt3D::QNodeId RenderMaterial::effect() const
 {
     return m_effectUuid;
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/rendermaterial_p.h b/src/render/backend/rendermaterial_p.h
index 934441f90..862ff0ad2 100644
--- a/src/render/backend/rendermaterial_p.h
+++ b/src/render/backend/rendermaterial_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERMATERIAL_H
-#define QT3D_RENDER_RENDERMATERIAL_H
+#ifndef QT3DRENDER_RENDER_RENDERMATERIAL_H
+#define QT3DRENDER_RENDER_RENDERMATERIAL_H
 
 #include <QVariant>
 
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QMaterial;
 class QParameter;
@@ -58,29 +58,29 @@ class RenderTechnique;
 class RenderEffect;
 class MaterialManager;
 
-class Q_AUTOTEST_EXPORT RenderMaterial : public QBackendNode
+class Q_AUTOTEST_EXPORT RenderMaterial : public Qt3D::QBackendNode
 {
 public:
     RenderMaterial();
     ~RenderMaterial();
     void cleanup();
 
-    void updateFromPeer(QNode* mat) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode* mat) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     inline bool isEnabled() const { return m_enabled; }
 
-    QList<QNodeId> parameters() const;
-    QNodeId effect() const;
+    QList<Qt3D::QNodeId> parameters() const;
+    Qt3D::QNodeId effect() const;
 
 private:
     ParameterPack m_parameterPack;
-    QNodeId m_effectUuid;
+    Qt3D::QNodeId m_effectUuid;
     bool m_enabled;
 };
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERMATERIAL_H
+#endif // QT3DRENDER_RENDER_RENDERMATERIAL_H
diff --git a/src/render/backend/rendernodefunctor_p.h b/src/render/backend/rendernodefunctor_p.h
index 1670336e0..736c62554 100644
--- a/src/render/backend/rendernodefunctor_p.h
+++ b/src/render/backend/rendernodefunctor_p.h
@@ -34,20 +34,20 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERNODEFUNCTOR_P_H
-#define QT3D_RENDER_RENDERNODEFUNCTOR_P_H
+#ifndef QT3DRENDER_RENDER_RENDERNODEFUNCTOR_P_H
+#define QT3DRENDER_RENDER_RENDERNODEFUNCTOR_P_H
 
 #include <Qt3DCore/qbackendnode.h>
 #include <Qt3DCore/qnode.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 template<class Backend, class Manager>
-class RenderNodeFunctor : public QBackendNodeFunctor
+class RenderNodeFunctor : public Qt3D::QBackendNodeFunctor
 {
 public:
     explicit RenderNodeFunctor(Manager *manager)
@@ -55,7 +55,7 @@ public:
     {
     }
 
-    QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_FINAL
+    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL
     {
         Backend *backend = m_manager->getOrCreateResource(frontend->id());
         backend->setFactory(factory);
@@ -63,12 +63,12 @@ public:
         return backend;
     }
 
-    QBackendNode *get(const QNodeId &id) const Q_DECL_FINAL
+    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL
     {
         return m_manager->lookupResource(id);
     }
 
-    void destroy(const QNodeId &id) const Q_DECL_FINAL
+    void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL
     {
         m_manager->releaseResource(id);
     }
@@ -77,10 +77,10 @@ private:
     Manager *m_manager;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERNODEFUNCTOR_P_H
+#endif // QT3DRENDER_RENDER_RENDERNODEFUNCTOR_P_H
diff --git a/src/render/backend/renderparameter.cpp b/src/render/backend/renderparameter.cpp
index e3f93cd3b..85d9e0980 100644
--- a/src/render/backend/renderparameter.cpp
+++ b/src/render/backend/renderparameter.cpp
@@ -44,8 +44,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 RenderParameter::RenderParameter()
@@ -55,14 +56,14 @@ RenderParameter::RenderParameter()
 {
 }
 
-void RenderParameter::updateFromPeer(QNode *mat)
+void RenderParameter::updateFromPeer(Qt3D::QNode *mat)
 {
     QParameter *param = static_cast<QParameter *>(mat);
     m_name = param->name();
     m_value = toBackendValue(param->value());
 }
 
-void RenderParameter::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderParameter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
 
@@ -110,8 +111,7 @@ QVariant RenderParameter::toBackendValue(const QVariant &value)
     }
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderparameter_p.h b/src/render/backend/renderparameter_p.h
index 091082035..b071b41a6 100644
--- a/src/render/backend/renderparameter_p.h
+++ b/src/render/backend/renderparameter_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERPARAMETER_P_H
-#define QT3D_RENDER_RENDERPARAMETER_P_H
+#ifndef QT3DRENDER_RENDER_RENDERPARAMETER_P_H
+#define QT3DRENDER_RENDER_RENDERPARAMETER_P_H
 
 #include <Qt3DCore/qbackendnode.h>
 #include <QVariant>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -50,13 +50,13 @@ class ParameterManager;
 class ShaderDataManager;
 class TextureManager;
 
-class RenderParameter : public QBackendNode
+class RenderParameter : public Qt3D::QBackendNode
 {
 public:
     RenderParameter();
 
-    void updateFromPeer(QNode* mat) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode* mat) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     QString name() const;
     QVariant value() const;
@@ -74,10 +74,10 @@ private:
     QVariant m_value;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERPARAMETER_P_H
+#endif // QT3DRENDER_RENDER_RENDERPARAMETER_P_H
diff --git a/src/render/backend/renderparametermapping.cpp b/src/render/backend/renderparametermapping.cpp
index f112023f3..62cb16dcf 100644
--- a/src/render/backend/renderparametermapping.cpp
+++ b/src/render/backend/renderparametermapping.cpp
@@ -38,8 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
 
 RenderParameterMapping::RenderParameterMapping()
@@ -48,7 +47,7 @@ RenderParameterMapping::RenderParameterMapping()
 }
 
 RenderParameterMapping::RenderParameterMapping(QParameterMapping *mapping)
-    : m_id(mapping ? mapping->id() : QNodeId())
+    : m_id(mapping ? mapping->id() : Qt3D::QNodeId())
     , m_parameterName(mapping ? mapping->parameterName() : QString())
     , m_shaderVariableName(mapping ? mapping->shaderVariableName() : QString())
     , m_bindingType(mapping ? mapping->bindingType() : QParameterMapping::Uniform)
@@ -60,7 +59,7 @@ bool RenderParameterMapping::isValid() const
     return !m_id.isNull();
 }
 
-QNodeId RenderParameterMapping::id() const
+Qt3D::QNodeId RenderParameterMapping::id() const
 {
     return m_id;
 }
@@ -80,8 +79,7 @@ QParameterMapping::Binding RenderParameterMapping::bindingType() const
     return m_bindingType;
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderparametermapping_p.h b/src/render/backend/renderparametermapping_p.h
index 578d0c826..fe5b85a91 100644
--- a/src/render/backend/renderparametermapping_p.h
+++ b/src/render/backend/renderparametermapping_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERPARAMETERMAPPING_P_H
-#define QT3D_RENDER_RENDERPARAMETERMAPPING_P_H
+#ifndef QT3DRENDER_RENDER_RENDERPARAMETERMAPPING_P_H
+#define QT3DRENDER_RENDER_RENDERPARAMETERMAPPING_P_H
 
 #include <Qt3DRenderer/qparametermapping.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -53,22 +53,22 @@ public:
 
     bool isValid() const;
 
-    QNodeId id() const;
+    Qt3D::QNodeId id() const;
     QString parameterName() const;
     QString shaderVariableName() const;
     QParameterMapping::Binding bindingType() const;
 
 private:
-    QNodeId m_id;
+    Qt3D::QNodeId m_id;
     QString m_parameterName;
     QString m_shaderVariableName;
     QParameterMapping::Binding m_bindingType;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERPARAMETERMAPPING_P_H
+#endif // QT3DRENDER_RENDER_RENDERPARAMETERMAPPING_P_H
diff --git a/src/render/backend/renderqueue.cpp b/src/render/backend/renderqueue.cpp
index 758315efc..1cdb8f96f 100644
--- a/src/render/backend/renderqueue.cpp
+++ b/src/render/backend/renderqueue.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -107,8 +107,8 @@ bool RenderQueue::isFrameQueueComplete() const
     return m_targetRenderViewCount && m_targetRenderViewCount == currentRenderViewCount();
 }
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderqueue_p.h b/src/render/backend/renderqueue_p.h
index 8368977f4..dceaf3966 100644
--- a/src/render/backend/renderqueue_p.h
+++ b/src/render/backend/renderqueue_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERQUEUE_H
-#define QT3D_RENDER_RENDERQUEUE_H
+#ifndef QT3DRENDER_RENDER_RENDERQUEUE_H
+#define QT3DRENDER_RENDER_RENDERQUEUE_H
 
 #include <QVector>
 #include <QtGlobal>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -68,10 +68,10 @@ private:
     QVector<RenderView *> m_currentWorkQueue;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERQUEUE_H
+#endif // QT3DRENDER_RENDER_RENDERQUEUE_H
diff --git a/src/render/backend/renderrenderpass.cpp b/src/render/backend/renderrenderpass.cpp
index 85828c14e..5bece0d4e 100644
--- a/src/render/backend/renderrenderpass.cpp
+++ b/src/render/backend/renderrenderpass.cpp
@@ -50,8 +50,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 RenderRenderPass::RenderRenderPass()
@@ -68,7 +69,7 @@ void RenderRenderPass::cleanup()
 {
 }
 
-void RenderRenderPass::updateFromPeer(QNode *peer)
+void RenderRenderPass::updateFromPeer(Qt3D::QNode *peer)
 {
     QRenderPass *pass = static_cast<QRenderPass *>(peer);
 
@@ -88,7 +89,7 @@ void RenderRenderPass::updateFromPeer(QNode *peer)
         m_parameterPack.appendParameter(p->id());
 }
 
-void RenderRenderPass::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderRenderPass::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     switch (e->type()) {
@@ -130,7 +131,7 @@ void RenderRenderPass::sceneChangeEvent(const QSceneChangePtr &e)
     }
 }
 
-QNodeId RenderRenderPass::shaderProgram() const
+Qt3D::QNodeId RenderRenderPass::shaderProgram() const
 {
     return m_shaderUuid;
 }
@@ -140,7 +141,7 @@ QList<RenderParameterMapping> RenderRenderPass::bindings() const
     return m_bindings.values();
 }
 
-QList<QNodeId> RenderRenderPass::annotations() const
+QList<Qt3D::QNodeId> RenderRenderPass::annotations() const
 {
     return m_annotationList;
 }
@@ -150,18 +151,18 @@ QList<RenderState *> RenderRenderPass::renderStates() const
     return m_renderStates.values();
 }
 
-QList<QNodeId> RenderRenderPass::parameters() const
+QList<Qt3D::QNodeId> RenderRenderPass::parameters() const
 {
     return m_parameterPack.parameters();
 }
 
-void RenderRenderPass::appendAnnotation(const QNodeId &annotationId)
+void RenderRenderPass::appendAnnotation(const Qt3D::QNodeId &annotationId)
 {
     if (!m_annotationList.contains(annotationId))
         m_annotationList.append(annotationId);
 }
 
-void RenderRenderPass::removeAnnotation(const QNodeId &annotationId)
+void RenderRenderPass::removeAnnotation(const Qt3D::QNodeId &annotationId)
 {
     m_annotationList.removeOne(annotationId);
 }
@@ -172,24 +173,23 @@ void RenderRenderPass::appendBinding(const RenderParameterMapping &binding)
         m_bindings[binding.id()] = binding;
 }
 
-void RenderRenderPass::removeBinding(const QNodeId &bindingId)
+void RenderRenderPass::removeBinding(const Qt3D::QNodeId &bindingId)
 {
     m_bindings.remove(bindingId);
 }
 
-void RenderRenderPass::appendRenderState(const QNodeId &id, RenderState *renderState)
+void RenderRenderPass::appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState)
 {
     if (!m_renderStates.contains(id))
         m_renderStates[id] = renderState;
 }
 
-void RenderRenderPass::removeRenderState(const QNodeId &renderStateId)
+void RenderRenderPass::removeRenderState(const Qt3D::QNodeId &renderStateId)
 {
     m_renderStates.remove(renderStateId);
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderrenderpass_p.h b/src/render/backend/renderrenderpass_p.h
index 1e9b8ecfd..b36c09f5a 100644
--- a/src/render/backend/renderrenderpass_p.h
+++ b/src/render/backend/renderrenderpass_p.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERRENDERPASS_H
-#define QT3D_RENDER_RENDERRENDERPASS_H
+#ifndef QT3DRENDER_RENDER_RENDERRENDERPASS_H
+#define QT3DRENDER_RENDER_RENDERRENDERPASS_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/private/renderparametermapping_p.h>
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QRenderPass;
 class QAbstractShader;
@@ -60,7 +60,7 @@ namespace Render {
 class RenderPassManager;
 class RenderState;
 
-class Q_AUTOTEST_EXPORT RenderRenderPass : public QBackendNode
+class Q_AUTOTEST_EXPORT RenderRenderPass : public Qt3D::QBackendNode
 {
 public:
     RenderRenderPass();
@@ -68,36 +68,36 @@ public:
 
     void cleanup();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
-    QNodeId shaderProgram() const;
+    Qt3D::QNodeId shaderProgram() const;
     QList<RenderParameterMapping> bindings() const;
-    QList<QNodeId> annotations() const;
+    QList<Qt3D::QNodeId> annotations() const;
     QList<RenderState *> renderStates() const;
-    QList<QNodeId> parameters() const;
+    QList<Qt3D::QNodeId> parameters() const;
 
 private:
-    void appendAnnotation(const QNodeId &criterionId);
-    void removeAnnotation(const QNodeId &criterionId);
+    void appendAnnotation(const Qt3D::QNodeId &criterionId);
+    void removeAnnotation(const Qt3D::QNodeId &criterionId);
 
     void appendBinding(const RenderParameterMapping &binding);
-    void removeBinding(const QNodeId &bindingId);
+    void removeBinding(const Qt3D::QNodeId &bindingId);
 
-    void appendRenderState(const QNodeId &id, RenderState *renderState);
-    void removeRenderState(const QNodeId &renderStateId);
+    void appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState);
+    void removeRenderState(const Qt3D::QNodeId &renderStateId);
 
-    QNodeId m_shaderUuid;
-    QHash<QNodeId, RenderParameterMapping> m_bindings;
-    QHash<QNodeId, RenderState *> m_renderStates;
-    QList<QNodeId> m_annotationList;
+    Qt3D::QNodeId m_shaderUuid;
+    QHash<Qt3D::QNodeId, RenderParameterMapping> m_bindings;
+    QHash<Qt3D::QNodeId, RenderState *> m_renderStates;
+    QList<Qt3D::QNodeId> m_annotationList;
     ParameterPack m_parameterPack;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERRENDERPASS_H
+#endif // QT3DRENDER_RENDER_RENDERRENDERPASS_H
diff --git a/src/render/backend/renderscene.cpp b/src/render/backend/renderscene.cpp
index 343b7a8d9..4cea15b19 100644
--- a/src/render/backend/renderscene.cpp
+++ b/src/render/backend/renderscene.cpp
@@ -44,8 +44,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 RenderScene::RenderScene()
@@ -54,7 +55,7 @@ RenderScene::RenderScene()
 {
 }
 
-void RenderScene::updateFromPeer(QNode *peer)
+void RenderScene::updateFromPeer(Qt3D::QNode *peer)
 {
     QAbstractSceneLoader *loader = static_cast<QAbstractSceneLoader *>(peer);
 
@@ -62,7 +63,7 @@ void RenderScene::updateFromPeer(QNode *peer)
     m_sceneManager->addSceneData(m_source, peerUuid());
 }
 
-void RenderScene::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderScene::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (propertyChange->propertyName() == QByteArrayLiteral("source")) {
@@ -76,7 +77,7 @@ QUrl RenderScene::source() const
     return m_source;
 }
 
-void RenderScene::setSceneSubtree(QEntity *subTree)
+void RenderScene::setSceneSubtree(Qt3D::QEntity *subTree)
 {
     QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerUuid()));
     e->setPropertyName("scene");
@@ -103,7 +104,7 @@ RenderSceneFunctor::RenderSceneFunctor(SceneManager *sceneManager)
 {
 }
 
-QBackendNode *RenderSceneFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const
+Qt3D::QBackendNode *RenderSceneFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
 {
     RenderScene *scene = m_sceneManager->getOrCreateResource(frontend->id());
     scene->setFactory(factory);
@@ -112,18 +113,17 @@ QBackendNode *RenderSceneFunctor::create(QNode *frontend, const QBackendNodeFact
     return scene;
 }
 
-QBackendNode *RenderSceneFunctor::get(const QNodeId &id) const
+Qt3D::QBackendNode *RenderSceneFunctor::get(const Qt3D::QNodeId &id) const
 {
     return m_sceneManager->lookupResource(id);
 }
 
-void RenderSceneFunctor::destroy(const QNodeId &id) const
+void RenderSceneFunctor::destroy(const Qt3D::QNodeId &id) const
 {
     m_sceneManager->releaseResource(id);
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderscene_p.h b/src/render/backend/renderscene_p.h
index 49cf8bbdb..c6a07a565 100644
--- a/src/render/backend/renderscene_p.h
+++ b/src/render/backend/renderscene_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERSCENE_P_H
-#define QT3D_RENDER_RENDERSCENE_P_H
+#ifndef QT3DRENDER_RENDER_RENDERSCENE_P_H
+#define QT3DRENDER_RENDER_RENDERSCENE_P_H
 
 #include <QtGlobal>
 #include <Qt3DCore/qbackendnode.h>
@@ -44,24 +44,25 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
-
 class QEntity;
+}
 
+namespace Qt3DRender {
 namespace Render {
 
 class SceneManager;
 
-class RenderScene : public QBackendNode
+class RenderScene : public Qt3D::QBackendNode
 {
 public:
     RenderScene();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
     // QObserverInterface interface
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     QUrl source() const;
-    void setSceneSubtree(QEntity *subTree);
+    void setSceneSubtree(Qt3D::QEntity *subTree);
     void setSceneManager(SceneManager *manager);
 
 private:
@@ -69,22 +70,21 @@ private:
     QUrl m_source;
 };
 
-class RenderSceneFunctor : public QBackendNodeFunctor
+class RenderSceneFunctor : public Qt3D::QBackendNodeFunctor
 {
 public:
     explicit RenderSceneFunctor(SceneManager *sceneManager);
-    QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
-    QBackendNode *get(const QNodeId &id) const Q_DECL_OVERRIDE;
-    void destroy(const QNodeId &id) const Q_DECL_OVERRIDE;
+    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE;
 
 private:
     SceneManager *m_sceneManager;
 };
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERSCENE_P_H
+#endif // QT3DRENDER_RENDER_RENDERSCENE_P_H
diff --git a/src/render/backend/rendershader.cpp b/src/render/backend/rendershader.cpp
index 9eea96cf2..38d894a09 100644
--- a/src/render/backend/rendershader.cpp
+++ b/src/render/backend/rendershader.cpp
@@ -48,7 +48,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 namespace Render {
 
 RenderShader::RenderShader()
@@ -83,7 +85,7 @@ void RenderShader::cleanup()
     m_uniformBlocks.clear();
 }
 
-void RenderShader::updateFromPeer(QNode *peer)
+void RenderShader::updateFromPeer(Qt3D::QNode *peer)
 {
     QShaderProgram *shader = static_cast<QShaderProgram *>(peer);
 
@@ -120,7 +122,7 @@ QVector<QByteArray> RenderShader::shaderCode() const
     return m_shaderCode;
 }
 
-void RenderShader::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderShader::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
@@ -396,6 +398,6 @@ void RenderShader::initialize(const RenderShader &other)
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/rendershader_p.h b/src/render/backend/rendershader_p.h
index becbb1317..13d5ae2a9 100644
--- a/src/render/backend/rendershader_p.h
+++ b/src/render/backend/rendershader_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERSHADER_H
-#define QT3D_RENDER_RENDERSHADER_H
+#ifndef QT3DRENDER_RENDER_RENDERSHADER_H
+#define QT3DRENDER_RENDER_RENDERSHADER_H
 
 #include <QVector>
 #include <Qt3DRenderer/private/quniformvalue_p.h>
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 class QOpenGLShaderProgram;
 class QMutex;
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QShaderProgram;
 
@@ -58,7 +58,7 @@ class AttachmentPack;
 
 typedef uint ProgramDNA;
 
-class Q_AUTOTEST_EXPORT RenderShader : public QBackendNode
+class Q_AUTOTEST_EXPORT RenderShader : public Qt3D::QBackendNode
 {
 public:
     RenderShader();
@@ -66,7 +66,7 @@ public:
 
     void cleanup();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
     void updateUniforms(QGraphicsContext *ctx, const QUniformPack &pack);
     void setFragOutputs(const QHash<QString, int> &fragOutputs);
 
@@ -75,7 +75,7 @@ public:
     QVector<QString> uniformBlockNames() const;
     QVector<QByteArray> shaderCode() const;
 
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     bool isLoaded() const;
     ProgramDNA dna() const;
 
@@ -124,9 +124,9 @@ private:
     friend class QGraphicsContext;
 };
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERSHADER_H
+#endif // QT3DRENDER_RENDER_RENDERSHADER_H
diff --git a/src/render/backend/rendershaderdata.cpp b/src/render/backend/rendershaderdata.cpp
index 5ed42ce2a..dd7ce3a3f 100644
--- a/src/render/backend/rendershaderdata.cpp
+++ b/src/render/backend/rendershaderdata.cpp
@@ -47,11 +47,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
-QList<QNodeId> RenderShaderData::m_updatedShaderData;
+QList<Qt3D::QNodeId> RenderShaderData::m_updatedShaderData;
 
 RenderShaderData::RenderShaderData()
     : QBackendNode()
@@ -65,7 +66,7 @@ RenderShaderData::~RenderShaderData()
     delete m_mutex;
 }
 
-void RenderShaderData::updateFromPeer(QNode *peer)
+void RenderShaderData::updateFromPeer(Qt3D::QNode *peer)
 {
     m_properties.clear();
     const QShaderData *shaderData = static_cast<const QShaderData *>(peer);
@@ -189,7 +190,7 @@ void RenderShaderData::addToClearUpdateList()
         RenderShaderData::m_updatedShaderData.append(peerUuid());
 }
 
-const int qNodeIdTypeId = qMetaTypeId<QNodeId>();
+const int qNodeIdTypeId = qMetaTypeId<Qt3D::QNodeId>();
 
 void RenderShaderData::readPeerProperties(QShaderData *shaderData)
 {
@@ -239,7 +240,7 @@ void RenderShaderData::setManager(ShaderDataManager *manager)
     m_manager = manager;
 }
 
-void RenderShaderData::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderShaderData::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     if (!m_propertyReader.isNull()) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
@@ -289,7 +290,7 @@ RenderShaderDataFunctor::RenderShaderDataFunctor(ShaderDataManager *manager)
 {
 }
 
-QBackendNode *RenderShaderDataFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const
+Qt3D::QBackendNode *RenderShaderDataFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
 {
     RenderShaderData *backend = m_manager->getOrCreateResource(frontend->id());
     backend->setFactory(factory);
@@ -298,18 +299,17 @@ QBackendNode *RenderShaderDataFunctor::create(QNode *frontend, const QBackendNod
     return backend;
 }
 
-QBackendNode *RenderShaderDataFunctor::get(const QNodeId &id) const
+Qt3D::QBackendNode *RenderShaderDataFunctor::get(const Qt3D::QNodeId &id) const
 {
     return m_manager->lookupResource(id);
 }
 
-void RenderShaderDataFunctor::destroy(const QNodeId &id) const
+void RenderShaderDataFunctor::destroy(const Qt3D::QNodeId &id) const
 {
     m_manager->releaseResource(id);
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/rendershaderdata_p.h b/src/render/backend/rendershaderdata_p.h
index 147d72ff5..2b09dca09 100644
--- a/src/render/backend/rendershaderdata_p.h
+++ b/src/render/backend/rendershaderdata_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERSHADERDATA_P_H
-#define QT3D_RENDER_RENDERSHADERDATA_P_H
+#ifndef QT3DRENDER_RENDER_RENDERSHADERDATA_P_H
+#define QT3DRENDER_RENDER_RENDERSHADERDATA_P_H
 
 #include <Qt3DCore/qbackendnode.h>
 #include <private/shadervariables_p.h>
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -53,18 +53,18 @@ class QGraphicsContext;
 class UniformBuffer;
 class ShaderDataManager;
 
-class Q_AUTOTEST_EXPORT RenderShaderData : public QBackendNode
+class Q_AUTOTEST_EXPORT RenderShaderData : public Qt3D::QBackendNode
 {
 public:
     RenderShaderData();
     ~RenderShaderData();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
     inline QHash<QString, QVariant> properties() const { return m_properties; }
     inline QHash<QString, QVariant> updatedProperties() const { return m_updatedProperties; }
 
     // Called by cleanup job
-    inline static QList<QNodeId> updatedShaderDataList() { return m_updatedShaderData; }
+    inline static QList<Qt3D::QNodeId> updatedShaderDataList() { return m_updatedShaderData; }
     inline static void clearShaderDataList() { return m_updatedShaderData.clear(); }
     void clearUpdate();
 
@@ -75,7 +75,7 @@ public:
     void updateTransformedProperties(const QMatrix4x4 &nodeWordlTransform);
 
 protected:
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
     // 1 to 1 match with frontend properties, modified only by sceneChangeEvent
@@ -91,7 +91,7 @@ private:
     QHash<QString, QShaderData::TransformType> m_transformedProperties;
     ShaderDataManager *m_manager;
     QMutex *m_mutex;
-    static QList<QNodeId> m_updatedShaderData;
+    static QList<Qt3D::QNodeId> m_updatedShaderData;
     QMatrix4x4 m_worldMatrix;
     QMatrix4x4 m_viewMatrix;
 
@@ -101,25 +101,25 @@ private:
     friend class RenderShaderDataFunctor;
 };
 
-class RenderShaderDataFunctor : public QBackendNodeFunctor
+class RenderShaderDataFunctor : public Qt3D::QBackendNodeFunctor
 {
 public:
     explicit RenderShaderDataFunctor(ShaderDataManager *manager);
 
-    QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_FINAL;
-    QBackendNode *get(const QNodeId &id) const Q_DECL_FINAL;
-    void destroy(const QNodeId &id) const Q_DECL_FINAL;
+    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL;
+    void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL;
 
 private:
     ShaderDataManager *m_manager;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::Render::RenderShaderData*)
+Q_DECLARE_METATYPE(Qt3DRender::Render::RenderShaderData*)
 
-#endif // QT3D_RENDER_RENDERSHADERDATA_P_H
+#endif // QT3DRENDER_RENDER_RENDERSHADERDATA_P_H
diff --git a/src/render/backend/renderstate.cpp b/src/render/backend/renderstate.cpp
index b89d807af..502cb0160 100644
--- a/src/render/backend/renderstate.cpp
+++ b/src/render/backend/renderstate.cpp
@@ -66,7 +66,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 RenderStateSet::RenderStateSet()
@@ -330,7 +330,7 @@ RenderState *RenderState::getOrCreateBackendState(QRenderState *renderState)
     }
 }
 
-} // Render
-} // namespace Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderstate_p.h b/src/render/backend/renderstate_p.h
index 7779a5a3b..59d5fcef3 100644
--- a/src/render/backend/renderstate_p.h
+++ b/src/render/backend/renderstate_p.h
@@ -35,14 +35,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERSTATE_H
-#define QT3D_RENDER_RENDERSTATE_H
+#ifndef QT3DRENDER_RENDER_RENDERSTATE_H
+#define QT3DRENDER_RENDER_RENDERSTATE_H
 
 #include <QVector>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QRenderState;
 
@@ -123,9 +123,9 @@ private:
 
 };
 
-} // Render
-} // namespace Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERSTATE_H
+#endif // QT3DRENDER_RENDER_RENDERSTATE_H
diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp
index ae47539ad..e55284377 100644
--- a/src/render/backend/rendertarget.cpp
+++ b/src/render/backend/rendertarget.cpp
@@ -42,8 +42,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 RenderTarget::RenderTarget()
@@ -51,7 +52,7 @@ RenderTarget::RenderTarget()
 {
 }
 
-void RenderTarget::updateFromPeer(QNode *peer)
+void RenderTarget::updateFromPeer(Qt3D::QNode *peer)
 {
     QRenderTarget *target = static_cast<QRenderTarget *>(peer);
     m_renderAttachments.clear();
@@ -74,12 +75,12 @@ void RenderTarget::removeRenderAttachment(const QNodeId &attachmentId)
     m_renderAttachments.removeOne(attachmentId);
 }
 
-QList<QNodeId> RenderTarget::renderAttachments() const
+QList<Qt3D::QNodeId> RenderTarget::renderAttachments() const
 {
     return m_renderAttachments;
 }
 
-void RenderTarget::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderTarget::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (e->type() == NodeAdded && propertyChange->propertyName() == QByteArrayLiteral("attachment"))
@@ -88,8 +89,7 @@ void RenderTarget::sceneChangeEvent(const QSceneChangePtr &e)
         removeRenderAttachment(propertyChange->value().value<QNodeId>());
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/rendertarget_p.h b/src/render/backend/rendertarget_p.h
index 35b1ad674..ceb3fe3ce 100644
--- a/src/render/backend/rendertarget_p.h
+++ b/src/render/backend/rendertarget_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERTARGET_H
-#define QT3D_RENDER_RENDERTARGET_H
+#ifndef QT3DRENDER_RENDER_RENDERTARGET_H
+#define QT3DRENDER_RENDER_RENDERTARGET_H
 
 #include <Qt3DCore/qbackendnode.h>
 #include <Qt3DCore/qnodeid.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QRenderTarget;
 class QRenderAttachment;
@@ -52,29 +52,29 @@ namespace Render {
 
 class RenderTargetManager;
 
-class RenderTarget : public QBackendNode
+class RenderTarget : public Qt3D::QBackendNode
 {
 public:
     RenderTarget();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
     void cleanup();
 
-    void appendRenderAttachment(const QNodeId &attachmentId);
-    void removeRenderAttachment(const QNodeId &attachmentId);
+    void appendRenderAttachment(const Qt3D::QNodeId &attachmentId);
+    void removeRenderAttachment(const Qt3D::QNodeId &attachmentId);
 
-    QList<QNodeId> renderAttachments() const;
+    QList<Qt3D::QNodeId> renderAttachments() const;
 
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
-    QList<QNodeId> m_renderAttachments;
+    QList<Qt3D::QNodeId> m_renderAttachments;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERTARGET_H
+#endif // QT3DRENDER_RENDER_RENDERTARGET_H
diff --git a/src/render/backend/rendertechnique.cpp b/src/render/backend/rendertechnique.cpp
index 4f4262aef..bc72b188c 100644
--- a/src/render/backend/rendertechnique.cpp
+++ b/src/render/backend/rendertechnique.cpp
@@ -51,7 +51,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 namespace Render {
 
 RenderTechnique::RenderTechnique()
@@ -70,7 +72,7 @@ void RenderTechnique::cleanup()
 {
 }
 
-void RenderTechnique::updateFromPeer(QNode *peer)
+void RenderTechnique::updateFromPeer(Qt3D::QNode *peer)
 {
     m_parameterPack.clear();
     m_renderPasses.clear();
@@ -92,7 +94,7 @@ void RenderTechnique::updateFromPeer(QNode *peer)
     }
 }
 
-void RenderTechnique::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderTechnique::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     switch (e->type()) {
@@ -139,28 +141,28 @@ void RenderTechnique::sceneChangeEvent(const QSceneChangePtr &e)
     }
 }
 
-QList<QNodeId> RenderTechnique::parameters() const
+QList<Qt3D::QNodeId> RenderTechnique::parameters() const
 {
     return m_parameterPack.parameters();
 }
 
-void RenderTechnique::appendRenderPass(const QNodeId &renderPassId)
+void RenderTechnique::appendRenderPass(const Qt3D::QNodeId &renderPassId)
 {
     if (!m_renderPasses.contains(renderPassId))
         m_renderPasses.append(renderPassId);
 }
 
-void RenderTechnique::removeRenderPass(const QNodeId &renderPassId)
+void RenderTechnique::removeRenderPass(const Qt3D::QNodeId &renderPassId)
 {
     m_renderPasses.removeOne(renderPassId);
 }
 
-QList<QNodeId> RenderTechnique::annotations() const
+QList<Qt3D::QNodeId> RenderTechnique::annotations() const
 {
     return m_annotationList;
 }
 
-QList<QNodeId> RenderTechnique::renderPasses() const
+QList<Qt3D::QNodeId> RenderTechnique::renderPasses() const
 {
     return m_renderPasses;
 }
@@ -170,18 +172,18 @@ QOpenGLFilter *RenderTechnique::openGLFilter() const
     return m_openglFilter;
 }
 
-void RenderTechnique::appendAnnotation(const QNodeId &criterionId)
+void RenderTechnique::appendAnnotation(const Qt3D::QNodeId &criterionId)
 {
     if (!m_annotationList.contains(criterionId))
         m_annotationList.append(criterionId);
 }
 
-void RenderTechnique::removeAnnotation(const QNodeId &criterionId)
+void RenderTechnique::removeAnnotation(const Qt3D::QNodeId &criterionId)
 {
     m_annotationList.removeOne(criterionId);
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/rendertechnique_p.h b/src/render/backend/rendertechnique_p.h
index 6427c6176..04fdb3180 100644
--- a/src/render/backend/rendertechnique_p.h
+++ b/src/render/backend/rendertechnique_p.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERTECHNIQUE_H
-#define QT3D_RENDER_RENDERTECHNIQUE_H
+#ifndef QT3DRENDER_RENDER_RENDERTECHNIQUE_H
+#define QT3DRENDER_RENDER_RENDERTECHNIQUE_H
 
 #include <QVector>
 #include <QStringList>
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QTechnique;
 class QParameter;
@@ -58,39 +58,39 @@ namespace Render {
 
 class TechniqueManager;
 
-class RenderTechnique : public QBackendNode
+class RenderTechnique : public Qt3D::QBackendNode
 {
 public:
     RenderTechnique();
     ~RenderTechnique();
     void cleanup();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    QList<QNodeId> parameters() const;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    QList<Qt3D::QNodeId> parameters() const;
 
-    void appendRenderPass(const QNodeId &renderPassId);
-    void removeRenderPass(const QNodeId &renderPassId);
+    void appendRenderPass(const Qt3D::QNodeId &renderPassId);
+    void removeRenderPass(const Qt3D::QNodeId &renderPassId);
 
-    void appendAnnotation(const QNodeId &criterionId);
-    void removeAnnotation(const QNodeId &criterionId);
+    void appendAnnotation(const Qt3D::QNodeId &criterionId);
+    void removeAnnotation(const Qt3D::QNodeId &criterionId);
 
-    QList<QNodeId> annotations() const;
-    QList<QNodeId> renderPasses() const;
+    QList<Qt3D::QNodeId> annotations() const;
+    QList<Qt3D::QNodeId> renderPasses() const;
     QOpenGLFilter *openGLFilter() const;
 
 private:
     QOpenGLFilter *m_openglFilter;
 
     ParameterPack m_parameterPack;
-    QList<QNodeId> m_annotationList;
-    QList<QNodeId> m_renderPasses;
+    QList<Qt3D::QNodeId> m_annotationList;
+    QList<Qt3D::QNodeId> m_renderPasses;
 };
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERTECHNIQUE_H
+#endif // QT3DRENDER_RENDER_RENDERTECHNIQUE_H
diff --git a/src/render/backend/rendertexture.cpp b/src/render/backend/rendertexture.cpp
index f49809fe9..2c411d19a 100644
--- a/src/render/backend/rendertexture.cpp
+++ b/src/render/backend/rendertexture.cpp
@@ -50,7 +50,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 namespace Render {
 
 RenderTexture::RenderTexture()
@@ -121,7 +123,7 @@ void RenderTexture::cleanup()
 }
 
 // AspectThread
-void RenderTexture::updateFromPeer(QNode *peer)
+void RenderTexture::updateFromPeer(Qt3D::QNode *peer)
 {
     QAbstractTextureProvider *texture = static_cast<QAbstractTextureProvider *>(peer);
 
@@ -410,7 +412,7 @@ void RenderTexture::setFormat(QAbstractTextureProvider::TextureFormat format)
 }
 
 // ChangeArbiter/Aspect Thread
-void RenderTexture::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderTexture::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     // The QOpenGLTexture has to be manipulated from the RenderThread only
     QMutexLocker lock(m_lock);
@@ -577,7 +579,7 @@ RenderTextureFunctor::RenderTextureFunctor(TextureManager *textureManager,
 {
 }
 
-QBackendNode *RenderTextureFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const
+Qt3D::QBackendNode *RenderTextureFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
 {
     RenderTexture *backend = m_textureManager->getOrCreateResource(frontend->id());
     backend->setFactory(factory);
@@ -588,17 +590,17 @@ QBackendNode *RenderTextureFunctor::create(QNode *frontend, const QBackendNodeFa
     return backend;
 }
 
-QBackendNode *RenderTextureFunctor::get(const QNodeId &id) const
+Qt3D::QBackendNode *RenderTextureFunctor::get(const Qt3D::QNodeId &id) const
 {
     return m_textureManager->lookupResource(id);
 }
 
-void RenderTextureFunctor::destroy(const QNodeId &id) const
+void RenderTextureFunctor::destroy(const Qt3D::QNodeId &id) const
 {
     m_textureManager->releaseResource(id);
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/rendertexture_p.h b/src/render/backend/rendertexture_p.h
index 052c00b36..1764ef35a 100644
--- a/src/render/backend/rendertexture_p.h
+++ b/src/render/backend/rendertexture_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERTEXTURE_H
-#define QT3D_RENDER_RENDERTEXTURE_H
+#ifndef QT3DRENDER_RENDER_RENDERTEXTURE_H
+#define QT3DRENDER_RENDER_RENDERTEXTURE_H
 
 #include <QOpenGLContext>
 #include <QMutex>
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 
 class QOpenGLTexture;
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAbstractTextureProvider;
 
@@ -60,14 +60,14 @@ class TextureDataManager;
 
 typedef uint TextureDNA;
 
-class RenderTexture : public QBackendNode
+class RenderTexture : public Qt3D::QBackendNode
 {
 public:
     RenderTexture();
     ~RenderTexture();
     void cleanup();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
     QOpenGLTexture* getOrCreateGLTexture() ;
 
@@ -75,7 +75,7 @@ public:
 
     bool isTextureReset() const;
 
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     TextureDNA dna() const;
 
     void setTextureManager(TextureManager *manager);
@@ -134,16 +134,16 @@ private:
     void updateDNA();
 };
 
-class RenderTextureFunctor : public QBackendNodeFunctor
+class RenderTextureFunctor : public Qt3D::QBackendNodeFunctor
 {
 public:
     explicit RenderTextureFunctor(TextureManager *textureManager,
                                   TextureImageManager *textureImageManager,
                                   TextureDataManager *textureDataManager);
 
-    QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_FINAL;
-    QBackendNode *get(const QNodeId &id) const Q_DECL_FINAL;
-    void destroy(const QNodeId &id) const Q_DECL_FINAL;
+    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL;
+    void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL;
 
 private:
     TextureManager *m_textureManager;
@@ -152,10 +152,10 @@ private:
 };
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::Render::RenderTexture*)
+Q_DECLARE_METATYPE(Qt3DRender::Render::RenderTexture*)
 
-#endif // QT3D_RENDER_RENDERTEXTURE_H
+#endif // QT3DRENDER_RENDER_RENDERTEXTURE_H
diff --git a/src/render/backend/rendertextureimage.cpp b/src/render/backend/rendertextureimage.cpp
index 0a24e4e71..c54bd2eec 100644
--- a/src/render/backend/rendertextureimage.cpp
+++ b/src/render/backend/rendertextureimage.cpp
@@ -41,8 +41,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 RenderTextureImage::RenderTextureImage()
@@ -72,7 +73,7 @@ void RenderTextureImage::cleanup()
     m_dna = 0;
 }
 
-void RenderTextureImage::updateFromPeer(QNode *peer)
+void RenderTextureImage::updateFromPeer(Qt3D::QNode *peer)
 {
     QAbstractTextureImage *textureImage = static_cast<QAbstractTextureImage *>(peer);
     m_layer = textureImage->layer();
@@ -93,7 +94,7 @@ void RenderTextureImage::updateFromPeer(QNode *peer)
     }
 }
 
-void RenderTextureImage::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderTextureImage::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
 
@@ -160,7 +161,7 @@ RenderTextureImageFunctor::RenderTextureImageFunctor(TextureManager *textureMana
 {
 }
 
-QBackendNode *RenderTextureImageFunctor::create(QNode *frontend, const QBackendNodeFactory *factory) const
+Qt3D::QBackendNode *RenderTextureImageFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
 {
     RenderTextureImage *backend = m_textureImageManager->getOrCreateResource(frontend->id());
     backend->setFactory(factory);
@@ -171,18 +172,17 @@ QBackendNode *RenderTextureImageFunctor::create(QNode *frontend, const QBackendN
     return backend;
 }
 
-QBackendNode *RenderTextureImageFunctor::get(const QNodeId &id) const
+Qt3D::QBackendNode *RenderTextureImageFunctor::get(const Qt3D::QNodeId &id) const
 {
     return m_textureImageManager->lookupResource(id);
 }
 
-void RenderTextureImageFunctor::destroy(const QNodeId &id) const
+void RenderTextureImageFunctor::destroy(const Qt3D::QNodeId &id) const
 {
     m_textureImageManager->releaseResource(id);
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/rendertextureimage_p.h b/src/render/backend/rendertextureimage_p.h
index d9aa9c09a..e15c7c30b 100644
--- a/src/render/backend/rendertextureimage_p.h
+++ b/src/render/backend/rendertextureimage_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERTEXTUREIMAGE_H
-#define QT3D_RENDER_RENDERTEXTUREIMAGE_H
+#ifndef QT3DRENDER_RENDER_RENDERTEXTUREIMAGE_H
+#define QT3DRENDER_RENDER_RENDERTEXTUREIMAGE_H
 
 #include <qglobal.h>
 #include <Qt3DCore/qbackendnode.h>
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -55,13 +55,13 @@ class TextureDataManager;
 
 typedef uint TextureImageDNA;
 
-class RenderTextureImage : public QBackendNode
+class RenderTextureImage : public Qt3D::QBackendNode
 {
 public:
     RenderTextureImage();
     void cleanup();
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     int m_layer;
     int m_mipmapLevel;
@@ -94,22 +94,22 @@ private:
     TextureManager *m_textureManager;
     TextureImageManager *m_textureImageManager;
     TextureDataManager *m_textureDataManager;
-    QList<QNodeId> m_referencedTextures;
+    QList<Qt3D::QNodeId> m_referencedTextures;
     HTexture m_textureProvider;
-    QNodeId m_textureProviderId;
+    Qt3D::QNodeId m_textureProviderId;
     TextureImageDNA m_dna;
 };
 
-class RenderTextureImageFunctor : public QBackendNodeFunctor
+class RenderTextureImageFunctor : public Qt3D::QBackendNodeFunctor
 {
 public:
     explicit RenderTextureImageFunctor(TextureManager *textureManager,
                                   TextureImageManager *textureImageManager,
                                   TextureDataManager *textureDataManager);
 
-    QBackendNode *create(QNode *frontend, const QBackendNodeFactory *factory) const Q_DECL_FINAL;
-    QBackendNode *get(const QNodeId &id) const Q_DECL_FINAL;
-    void destroy(const QNodeId &id) const Q_DECL_FINAL;
+    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL;
+    void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL;
 
 private:
     TextureManager *m_textureManager;
@@ -118,10 +118,10 @@ private:
 };
 
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERTEXTUREIMAGE_H
+#endif // QT3DRENDER_RENDER_RENDERTEXTUREIMAGE_H
diff --git a/src/render/backend/renderthread.cpp b/src/render/backend/renderthread.cpp
index a75e3bc68..e899d0057 100644
--- a/src/render/backend/renderthread.cpp
+++ b/src/render/backend/renderthread.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -95,8 +95,8 @@ void RenderThread::run()
     qCDebug(Render::Backend) << "Exiting RenderThread";
 }
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderthread_p.h b/src/render/backend/renderthread_p.h
index c704881b9..845aec2fe 100644
--- a/src/render/backend/renderthread_p.h
+++ b/src/render/backend/renderthread_p.h
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -67,9 +67,9 @@ private:
     QSemaphore m_semaphore;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/backend/rendertransform.cpp b/src/render/backend/rendertransform.cpp
index ea531a5f9..c01c3523f 100644
--- a/src/render/backend/rendertransform.cpp
+++ b/src/render/backend/rendertransform.cpp
@@ -43,8 +43,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 namespace Render {
 
 RenderTransform::RenderTransform()
@@ -52,9 +53,9 @@ RenderTransform::RenderTransform()
 {
 }
 
-void RenderTransform::updateFromPeer(QNode *peer)
+void RenderTransform::updateFromPeer(Qt3D::QNode *peer)
 {
-    QTransform *transform = static_cast<QTransform *>(peer);
+    Qt3D::QTransform *transform = static_cast<Qt3D::QTransform *>(peer);
 
     m_transformMatrix = transform->matrix();
     m_enabled = transform->isEnabled();
@@ -65,7 +66,7 @@ QMatrix4x4 RenderTransform::transformMatrix() const
     return m_transformMatrix;
 }
 
-void RenderTransform::sceneChangeEvent(const QSceneChangePtr &e)
+void RenderTransform::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         const QScenePropertyChangePtr &propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
@@ -76,8 +77,7 @@ void RenderTransform::sceneChangeEvent(const QSceneChangePtr &e)
     }
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/rendertransform_p.h b/src/render/backend/rendertransform_p.h
index 52df04b4a..8508e52dc 100644
--- a/src/render/backend/rendertransform_p.h
+++ b/src/render/backend/rendertransform_p.h
@@ -34,29 +34,29 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERTRANSFORM_H
-#define QT3D_RENDER_RENDERTRANSFORM_H
+#ifndef QT3DRENDER_RENDER_RENDERTRANSFORM_H
+#define QT3DRENDER_RENDER_RENDERTRANSFORM_H
 
 #include <Qt3DCore/qbackendnode.h>
 #include <QMatrix4x4>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 class Renderer;
 class TransformManager;
 
-class RenderTransform : public QBackendNode
+class RenderTransform : public Qt3D::QBackendNode
 {
 public:
     RenderTransform();
 
-    void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
     QMatrix4x4 transformMatrix() const;
-    void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     inline bool isEnabled() const { return m_enabled; }
 
 private:
@@ -64,10 +64,10 @@ private:
     bool m_enabled;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERTRANSFORM_H
+#endif // QT3DRENDER_RENDER_RENDERTRANSFORM_H
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index 64ed66569..b4e902388 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -71,7 +71,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 namespace  {
@@ -94,7 +94,7 @@ bool isEntityInLayers(const RenderEntity *entity, const QStringList &layers)
     return false;
 }
 
-void destroyUniformValue(const QUniformValue *value, QFrameAllocator *allocator)
+void destroyUniformValue(const QUniformValue *value, Qt3D::QFrameAllocator *allocator)
 {
     QUniformValue *v = const_cast<QUniformValue *>(value);
     if (v->isTexture())
@@ -704,6 +704,6 @@ void RenderView::setShaderAndUniforms(RenderCommand *command, RenderRenderPass *
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h
index 366030af9..127cea5e4 100644
--- a/src/render/backend/renderview_p.h
+++ b/src/render/backend/renderview_p.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERVIEW_H
-#define QT3D_RENDER_RENDERVIEW_H
+#ifndef QT3DRENDER_RENDER_RENDERVIEW_H
+#define QT3DRENDER_RENDER_RENDERVIEW_H
 
 #include <Qt3DRenderer/qparameter.h>
 #include <Qt3DRenderer/qclearbuffer.h>
@@ -57,10 +57,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QRenderPass;
-class QFrameAllocator;
 
 namespace Render {
 
@@ -94,7 +93,7 @@ public:
     inline void setSurfaceSize(const QSize &size) { m_surfaceSize = size; }
     inline Renderer *renderer() const { return m_renderer; }
 
-    inline void setAllocator(QFrameAllocator *allocator)
+    inline void setAllocator(Qt3D::QFrameAllocator *allocator)
     {
         m_allocator = allocator;
         m_data = m_allocator->allocate<InnerData>();
@@ -106,7 +105,7 @@ public:
         // help cache performance during iteration
         m_data->m_viewMatrix = m_allocator->allocate<QMatrix4x4>();
     }
-    inline QFrameAllocator *allocator() const { return m_allocator; }
+    inline Qt3D::QFrameAllocator *allocator() const { return m_allocator; }
 
     inline void setRenderCamera(RenderCameraLens *renderCamera) { m_data->m_renderCamera = renderCamera; }
     inline RenderCameraLens *renderCamera() const { return m_data->m_renderCamera; }
@@ -186,7 +185,7 @@ public:
     void setRenderTargetHandle(HTarget renderTargetHandle) { m_renderTarget = renderTargetHandle; }
     HTarget renderTargetHandle() const { return m_renderTarget; }
 
-    void addSortCriteria(const QList<QNodeId> &sortMethodUid) { m_data->m_sortingCriteria.append(sortMethodUid); }
+    void addSortCriteria(const QList<Qt3D::QNodeId> &sortMethodUid) { m_data->m_sortingCriteria.append(sortMethodUid); }
 
     // Helps making the size of RenderView smaller
     // Contains all the data needed for the actual building of the RenderView
@@ -204,7 +203,7 @@ public:
         const RenderPassFilter *m_passFilter;
         QMatrix4x4 *m_viewMatrix;
         QStringList m_layers;
-        QList<QNodeId> m_sortingCriteria;
+        QList<Qt3D::QNodeId> m_sortingCriteria;
         QVector3D m_eyePos;
         UniformBlockValueBuilder m_uniformBlockBuilder;
     };
@@ -214,7 +213,7 @@ private:
 
     Renderer *m_renderer;
     QSize m_surfaceSize;
-    QFrameAllocator *m_allocator;
+    Qt3D::QFrameAllocator *m_allocator;
 
     InnerData *m_data;
 
@@ -267,8 +266,8 @@ private:
 };
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERVIEW_H
+#endif // QT3DRENDER_RENDER_RENDERVIEW_H
diff --git a/src/render/backend/scenemanager.cpp b/src/render/backend/scenemanager.cpp
index fb49a2410..ed1253226 100644
--- a/src/render/backend/scenemanager.cpp
+++ b/src/render/backend/scenemanager.cpp
@@ -38,19 +38,18 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
 
 SceneManager::SceneManager() : QResourceManager<RenderScene,
-                                                 QNodeId,
-                                                 8,
-                                                 Qt3D::ArrayAllocatingPolicy,
-                                                 Qt3D::ObjectLevelLockingPolicy>()
+                                                Qt3D::QNodeId,
+                                                8,
+                                                Qt3D::ArrayAllocatingPolicy,
+                                                Qt3D::ObjectLevelLockingPolicy>()
 {
 }
 
-void SceneManager::addSceneData(const QUrl &source, const QNodeId &sceneUuid)
+void SceneManager::addSceneData(const QUrl &source, const Qt3D::QNodeId &sceneUuid)
 {
     LoadSceneJobPtr newJob(new LoadSceneJob(source, sceneUuid));
 
@@ -69,20 +68,19 @@ QVector<LoadSceneJobPtr> SceneManager::pendingSceneLoaderJobs()
     return copy;
 }
 
-void SceneManager::addLoadedSceneTree(const QUrl &source, QEntity *tree)
+void SceneManager::addLoadedSceneTree(const QUrl &source, Qt3D::QEntity *tree)
 {
     SceneManager::Locker lock(this);
     m_loadedSceneTrees.insert(source, tree);
 }
 
-QEntity *SceneManager::sceneTreeFromSource(const QUrl &source)
+Qt3D::QEntity *SceneManager::sceneTreeFromSource(const QUrl &source)
 {
     SceneManager::Locker lock(this);
     return m_loadedSceneTrees.value(source);
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/scenemanager_p.h b/src/render/backend/scenemanager_p.h
index 61b0c02a9..073737de2 100644
--- a/src/render/backend/scenemanager_p.h
+++ b/src/render/backend/scenemanager_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_SCENEMANAGER_P_H
-#define QT3D_RENDER_SCENEMANAGER_P_H
+#ifndef QT3DRENDER_RENDER_SCENEMANAGER_P_H
+#define QT3DRENDER_RENDER_SCENEMANAGER_P_H
 
 #include <Qt3DCore/private/qresourcemanager_p.h>
 #include <Qt3DRenderer/private/renderscene_p.h>
@@ -45,13 +45,14 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
-
 class QEntity;
+}
 
+namespace Qt3DRender {
 namespace Render {
 
-class SceneManager : public QResourceManager<RenderScene,
-                                             QNodeId,
+class SceneManager : public Qt3D::QResourceManager<RenderScene,
+                                             Qt3D::QNodeId,
                                              8,
                                              Qt3D::ArrayAllocatingPolicy,
                                              Qt3D::ObjectLevelLockingPolicy>
@@ -59,20 +60,19 @@ class SceneManager : public QResourceManager<RenderScene,
 public:
     SceneManager();
 
-    void addSceneData(const QUrl &source, const QNodeId &sceneUuid);
+    void addSceneData(const QUrl &source, const Qt3D::QNodeId &sceneUuid);
     QVector<LoadSceneJobPtr> pendingSceneLoaderJobs();
 
-    void addLoadedSceneTree(const QUrl &source, QEntity *tree);
-    QEntity *sceneTreeFromSource(const QUrl &source);
+    void addLoadedSceneTree(const QUrl &source, Qt3D::QEntity *tree);
+    Qt3D::QEntity *sceneTreeFromSource(const QUrl &source);
 
 private:
-    QHash<QUrl, QEntity *> m_loadedSceneTrees;
+    QHash<QUrl, Qt3D::QEntity *> m_loadedSceneTrees;
     QVector<LoadSceneJobPtr> m_pendingJobs;
 };
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/backend/shadervariables_p.h b/src/render/backend/shadervariables_p.h
index a1d4748c1..d6bd1245d 100644
--- a/src/render/backend/shadervariables_p.h
+++ b/src/render/backend/shadervariables_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_SHADERVARIABLES_P_H
-#define QT3D_RENDER_SHADERVARIABLES_P_H
+#ifndef QT3DRENDER_RENDER_SHADERVARIABLES_P_H
+#define QT3DRENDER_RENDER_SHADERVARIABLES_P_H
 
 #include <QtGlobal>
 #include <QOpenGLContext>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -91,10 +91,10 @@ struct ShaderUniformBlock
     int m_size;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_SHADERVARIABLES_P_H
+#endif // QT3DRENDER_RENDER_SHADERVARIABLES_P_H
diff --git a/src/render/backend/states/blendstate.cpp b/src/render/backend/states/blendstate.cpp
index 0e6894535..822f4820d 100644
--- a/src/render/backend/states/blendstate.cpp
+++ b/src/render/backend/states/blendstate.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 template <class State>
@@ -329,7 +329,7 @@ StencilMask::StencilMask(uint frontMask, uint backMask)
 {
 }
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/states/blendstate_p.h b/src/render/backend/states/blendstate_p.h
index 13dcb646b..2530b5209 100644
--- a/src/render/backend/states/blendstate_p.h
+++ b/src/render/backend/states/blendstate_p.h
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 namespace Render {
 
 class Q_AUTOTEST_EXPORT BlendState : public GenericState2<BlendState, GLenum, GLenum>
@@ -155,7 +155,7 @@ private:
     FrontFace(GLenum func);
 };
 
-class Q_AUTOTEST_EXPORT Dithering : public Qt3D::Render::RenderState
+class Q_AUTOTEST_EXPORT Dithering : public RenderState
 {
 public:
     virtual void apply(QGraphicsContext *gc) const Q_DECL_OVERRIDE;
@@ -194,7 +194,7 @@ private:
     StencilTest(GLenum frontFunc, int frontRef, uint frontMask, GLenum backFunc, int backRef, uint backMask);
 };
 
-class Q_AUTOTEST_EXPORT AlphaCoverage : public Qt3D::Render::RenderState
+class Q_AUTOTEST_EXPORT AlphaCoverage : public RenderState
 {
 public:
     void apply(QGraphicsContext *gc) const Q_DECL_OVERRIDE;
@@ -275,8 +275,8 @@ private:
     StencilMask(uint frontMask, uint backMask);
 };
 
-} // Render
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/backend/texturedatamanager.cpp b/src/render/backend/texturedatamanager.cpp
index 6568bff5d..3e77179f6 100644
--- a/src/render/backend/texturedatamanager.cpp
+++ b/src/render/backend/texturedatamanager.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -48,7 +48,7 @@ TextureDataManager::TextureDataManager()
 {}
 
 // Called from AspectThread sync
-void TextureDataManager::addToPendingTextures(const QNodeId &textureId)
+void TextureDataManager::addToPendingTextures(const Qt3D::QNodeId &textureId)
 {
     // This simple check ensures that we won't be having n jobs
     // for one mesh, in case n Materials are referencing the said
@@ -58,9 +58,9 @@ void TextureDataManager::addToPendingTextures(const QNodeId &textureId)
 }
 
 // Called from AspectThread prepare jobs
-QVector<QNodeId> TextureDataManager::texturesPending()
+QVector<Qt3D::QNodeId> TextureDataManager::texturesPending()
 {
-    QVector<QNodeId> textureIds = m_texturesPending;
+    QVector<Qt3D::QNodeId> textureIds = m_texturesPending;
     m_texturesPending.clear();
     return textureIds;
 }
@@ -163,8 +163,8 @@ void TextureDataManager::cleanup()
    m_textureHandlesToRelease.clear();
 }
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/texturedatamanager_p.h b/src/render/backend/texturedatamanager_p.h
index 8765ae6f1..734e9049c 100644
--- a/src/render/backend/texturedatamanager_p.h
+++ b/src/render/backend/texturedatamanager_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_TEXTUREDATAMANAGER_H
-#define QT3D_RENDER_TEXTUREDATAMANAGER_H
+#ifndef QT3DRENDER_RENDER_TEXTUREDATAMANAGER_H
+#define QT3DRENDER_RENDER_TEXTUREDATAMANAGER_H
 
 #include <Qt3DCore/private/qresourcemanager_p.h>
 #include <Qt3DRenderer/qtexture.h>
@@ -47,24 +47,24 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 typedef QPair<QTextureDataFunctorPtr, QVector<HTextureImage> > FunctorImageHandlesPair;
 typedef QPair<QTextureDataFunctorPtr, HTextureData> FunctorTextureDataPair;
 
-class TextureDataManager : public QResourceManager<TexImageData,
-                                                   QNodeId,
-                                                   16,
-                                                   Qt3D::ArrayAllocatingPolicy,
-                                                   Qt3D::ObjectLevelLockingPolicy>
+class TextureDataManager : public Qt3D::QResourceManager<TexImageData,
+                                                         Qt3D::QNodeId,
+                                                         16,
+                                                         Qt3D::ArrayAllocatingPolicy,
+                                                         Qt3D::ObjectLevelLockingPolicy>
 {
 public:
     TextureDataManager();
-    void addToPendingTextures(const QNodeId &textureId);
+    void addToPendingTextures(const Qt3D::QNodeId &textureId);
 
-    QVector<QNodeId> texturesPending();
+    QVector<Qt3D::QNodeId> texturesPending();
 
     HTextureData textureDataFromFunctor(const QTextureDataFunctorPtr &functor) const;
     void addTextureDataForFunctor(HTextureData textureDataHandle, const QTextureDataFunctorPtr &functor);
@@ -76,19 +76,17 @@ public:
     void cleanup();
 
 private:
-    QVector<QNodeId> m_texturesPending;
+    QVector<Qt3D::QNodeId> m_texturesPending;
     QVector<FunctorTextureDataPair > m_textureDataFunctors;
     QVector<FunctorImageHandlesPair > m_texturesImagesPerFunctor;
     mutable QMutex m_mutex;
     QVector<HTextureData> m_textureHandlesToRelease;
 };
 
-} // Render
-
-Q_DECLARE_RESOURCE_INFO(TexImageData, Q_REQUIRES_CLEANUP);
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::TexImageData, Q_REQUIRES_CLEANUP)
 
 QT_END_NAMESPACE
 
diff --git a/src/render/backend/vsyncframeadvanceservice.cpp b/src/render/backend/vsyncframeadvanceservice.cpp
index f8c7bf5c8..5c937e6ed 100644
--- a/src/render/backend/vsyncframeadvanceservice.cpp
+++ b/src/render/backend/vsyncframeadvanceservice.cpp
@@ -42,11 +42,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DRender {
 namespace Render {
 
-class VSyncFrameAdvanceServicePrivate Q_DECL_FINAL : public QAbstractFrameAdvanceServicePrivate
+class VSyncFrameAdvanceServicePrivate Q_DECL_FINAL : public Qt3D::QAbstractFrameAdvanceServicePrivate
 {
 public:
     VSyncFrameAdvanceServicePrivate()
@@ -109,8 +108,7 @@ void VSyncFrameAdvanceService::proceedToNextFrame()
     d->m_semaphore.release(1);
 }
 
-} // Render
-
-} // Qt3D
+} // namespace Render
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/backend/vsyncframeadvanceservice_p.h b/src/render/backend/vsyncframeadvanceservice_p.h
index 6499a9eaf..e38e9b4ca 100644
--- a/src/render/backend/vsyncframeadvanceservice_p.h
+++ b/src/render/backend/vsyncframeadvanceservice_p.h
@@ -34,20 +34,20 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_VSYNCFRAMEADVANCESERVICE_H
-#define QT3D_RENDER_VSYNCFRAMEADVANCESERVICE_H
+#ifndef QT3DRENDER_RENDER_VSYNCFRAMEADVANCESERVICE_H
+#define QT3DRENDER_RENDER_VSYNCFRAMEADVANCESERVICE_H
 
 #include <Qt3DCore/qabstractframeadvanceservice.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 class VSyncFrameAdvanceServicePrivate;
 
-class Q_AUTOTEST_EXPORT VSyncFrameAdvanceService Q_DECL_FINAL : public QAbstractFrameAdvanceService
+class Q_AUTOTEST_EXPORT VSyncFrameAdvanceService Q_DECL_FINAL : public Qt3D::QAbstractFrameAdvanceService
 {
 public:
     VSyncFrameAdvanceService();
@@ -63,10 +63,10 @@ private:
     Q_DECLARE_PRIVATE(VSyncFrameAdvanceService)
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_VSYNCFRAMEADVANCESERVICE_H
+#endif // QT3DRENDER_RENDER_VSYNCFRAMEADVANCESERVICE_H
diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp
index f759d143c..a21ebad09 100644
--- a/src/render/defaults/qdiffusemapmaterial.cpp
+++ b/src/render/defaults/qdiffusemapmaterial.cpp
@@ -50,10 +50,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QDiffuseMapMaterialPrivate
+    \class Qt3DRender::QDiffuseMapMaterialPrivate
     \internal
 */
 QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate()
@@ -129,7 +129,7 @@ void QDiffuseMapMaterialPrivate::init()
 }
 
 /*!
-    \class Qt3D::QDiffuseMapMaterial
+    \class Qt3DRender::QDiffuseMapMaterial
     \brief The QDiffuseMapMaterial provides a default implementation of the phong lighting effect where the diffuse light component
     is read from a texture map.
     \inmodule Qt3DRenderer
@@ -150,7 +150,7 @@ void QDiffuseMapMaterialPrivate::init()
 */
 
 /*!
-    Constructs a new Qt3D::QDiffuseMapMaterial instance with parent object \a parent.
+    Constructs a new Qt3DRender::QDiffuseMapMaterial instance with parent object \a parent.
  */
 QDiffuseMapMaterial::QDiffuseMapMaterial(QNode *parent)
     : QMaterial(*new QDiffuseMapMaterialPrivate, parent)
@@ -172,7 +172,7 @@ QDiffuseMapMaterial::~QDiffuseMapMaterial()
 }
 
 /*!
-    \property Qt3D::QDiffuseMapMaterial::ambient
+    \property Qt3DRender::QDiffuseMapMaterial::ambient
 
     Holds the current ambient color.
 */
@@ -184,7 +184,7 @@ QColor QDiffuseMapMaterial::ambient() const
 }
 
 /*!
-    \property Qt3D::QDiffuseMapMaterial::specular
+    \property Qt3DRender::QDiffuseMapMaterial::specular
 
     Holds the current specular color.
 */
@@ -195,7 +195,7 @@ QColor QDiffuseMapMaterial::specular() const
 }
 
 /*!
-    \property Qt3D::QDiffuseMapMaterial::shininess
+    \property Qt3DRender::QDiffuseMapMaterial::shininess
 
     Holds the current shininess as a float value.
 */
@@ -206,7 +206,7 @@ float QDiffuseMapMaterial::shininess() const
 }
 
 /*!
-    \property Qt3D::QDiffuseMapMaterial::diffuse
+    \property Qt3DRender::QDiffuseMapMaterial::diffuse
 
     Holds the current QTexture used as the diffuse map.
 
@@ -226,7 +226,7 @@ QAbstractTextureProvider *QDiffuseMapMaterial::diffuse() const
 }
 
 /*!
-    \property Qt3D::QDiffuseMapMaterial::textureScale
+    \property Qt3DRender::QDiffuseMapMaterial::textureScale
 
     Holds the current texture scale as a float value.
 
@@ -267,6 +267,6 @@ void QDiffuseMapMaterial::setTextureScale(float textureScale)
     d->m_textureScaleParameter->setValue(textureScale);
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h
index 13a1dd6da..dbbdb21f1 100644
--- a/src/render/defaults/qdiffusemapmaterial.h
+++ b/src/render/defaults/qdiffusemapmaterial.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QDIFFUSEMAPMATERIAL_H
-#define QT3D_RENDER_QDIFFUSEMAPMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H
+#define QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H
 
 #include <Qt3DRenderer/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QDiffuseMapMaterialPrivate;
 class QAbstractTextureProvider;
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
 public:
-    explicit QDiffuseMapMaterial(QNode *parent = 0);
+    explicit QDiffuseMapMaterial(Qt3D::QNode *parent = 0);
     ~QDiffuseMapMaterial();
 
     QColor ambient() const;
@@ -83,8 +83,8 @@ private:
     Q_DECLARE_PRIVATE(QDiffuseMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QDIFFUSEMAPMATERIAL_H
+#endif // QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H
diff --git a/src/render/defaults/qdiffusemapmaterial_p.h b/src/render/defaults/qdiffusemapmaterial_p.h
index 7bda02b57..c96b644f1 100644
--- a/src/render/defaults/qdiffusemapmaterial_p.h
+++ b/src/render/defaults/qdiffusemapmaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QDIFFUSEMAPMATERIAL_P_H
-#define QT3D_RENDER_QDIFFUSEMAPMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_P_H
+#define QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QAbstractTextureProvider;
@@ -80,9 +80,9 @@ class QDiffuseMapMaterialPrivate : public QMaterialPrivate
     Q_DECLARE_PUBLIC(QDiffuseMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QDIFFUSEAPMATERIAL_P_H
+#endif // QT3DRENDER_RENDER_QDIFFUSEAPMATERIAL_P_H
 
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp
index 25ed94490..542cb202d 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp
@@ -51,10 +51,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QDiffuseSpecularMapMaterialPrivate
+    \class Qt3DRender::QDiffuseSpecularMapMaterialPrivate
     \internal
 */
 QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate()
@@ -137,7 +137,7 @@ void QDiffuseSpecularMapMaterialPrivate::init()
 }
 
 /*!
-    \class Qt3D::QDiffuseSpecularMapMaterial
+    \class Qt3DRender::QDiffuseSpecularMapMaterial
     \brief The QDiffuseSpecularMapMaterial provides a default implementation of the phong lighting and bump effect where the diffuse and specular light components
     are read from texture maps.
     \inmodule Qt3DRenderer
@@ -158,7 +158,7 @@ void QDiffuseSpecularMapMaterialPrivate::init()
 */
 
 /*!
-    Constructs a new Qt3D::QDiffuseSpecularMapMaterial instance with parent object \a parent.
+    Constructs a new Qt3DRender::QDiffuseSpecularMapMaterial instance with parent object \a parent.
 */
 QDiffuseSpecularMapMaterial::QDiffuseSpecularMapMaterial(QNode *parent)
     : QMaterial(*new QDiffuseSpecularMapMaterialPrivate, parent)
@@ -180,7 +180,7 @@ QDiffuseSpecularMapMaterial::~QDiffuseSpecularMapMaterial()
 }
 
 /*!
-    \property Qt3D::QDiffuseSpecularMapMaterial::ambient
+    \property Qt3DRender::QDiffuseSpecularMapMaterial::ambient
 
     Holds the current ambient color.
 */
@@ -191,7 +191,7 @@ QColor QDiffuseSpecularMapMaterial::ambient() const
 }
 
 /*!
-    \property Qt3D::QDiffuseSpecularMapMaterial::diffuse
+    \property Qt3DRender::QDiffuseSpecularMapMaterial::diffuse
 
     Holds the current diffuse map texture.
 
@@ -211,7 +211,7 @@ QAbstractTextureProvider *QDiffuseSpecularMapMaterial::diffuse() const
 }
 
 /*!
-    \property Qt3D::QDiffuseSpecularMapMaterial::specular
+    \property Qt3DRender::QDiffuseSpecularMapMaterial::specular
 
     Holds the current specular map texture.
 
@@ -231,7 +231,7 @@ QAbstractTextureProvider *QDiffuseSpecularMapMaterial::specular() const
 }
 
 /*!
-    \property Qt3D::QDiffuseSpecularMapMaterial::shininess
+    \property Qt3DRender::QDiffuseSpecularMapMaterial::shininess
 
     Holds the current shininess as a float value.
 */
@@ -242,7 +242,7 @@ float QDiffuseSpecularMapMaterial::shininess() const
 }
 
 /*!
-    \property Qt3D::QDiffuseSpecularMapMaterial::textureScale
+    \property Qt3DRender::QDiffuseSpecularMapMaterial::textureScale
 
     Holds the current texture scale as a float value.
 */
@@ -282,6 +282,6 @@ void QDiffuseSpecularMapMaterial::setTextureScale(float textureScale)
     d->m_textureScaleParameter->setValue(textureScale);
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.h b/src/render/defaults/qdiffusespecularmapmaterial.h
index e6076ca76..d4568c4a0 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial.h
+++ b/src/render/defaults/qdiffusespecularmapmaterial.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QDIFFUSESPECULARMAPMATERIAL_H
-#define QT3D_RENDER_QDIFFUSESPECULARMAPMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_H
+#define QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_H
 
 #include <Qt3DRenderer/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAbstractTextureProvider;
 class QDiffuseSpecularMapMaterialPrivate;
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
 public:
-    explicit QDiffuseSpecularMapMaterial(QNode *parent = 0);
+    explicit QDiffuseSpecularMapMaterial(Qt3D::QNode *parent = 0);
     ~QDiffuseSpecularMapMaterial();
 
     QColor ambient() const;
@@ -83,8 +83,8 @@ private:
     Q_DECLARE_PRIVATE(QDiffuseSpecularMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QDIFFUSESPECULARMAPMATERIAL_H
+#endif // QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_H
diff --git a/src/render/defaults/qdiffusespecularmapmaterial_p.h b/src/render/defaults/qdiffusespecularmapmaterial_p.h
index 72ab20e83..bac2f5ace 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial_p.h
+++ b/src/render/defaults/qdiffusespecularmapmaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H
-#define QT3D_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H
+#define QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QAbstractTextureProvider;
@@ -82,9 +82,9 @@ public:
     Q_DECLARE_PUBLIC(QDiffuseSpecularMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H
+#endif // QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H
 
diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/render/defaults/qforwardrenderer.cpp
index a7167ca5d..cd6307ec4 100644
--- a/src/render/defaults/qforwardrenderer.cpp
+++ b/src/render/defaults/qforwardrenderer.cpp
@@ -44,10 +44,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QForwardRendererPrivate
+    \class Qt3DRender::QForwardRendererPrivate
     \internal
 */
 QForwardRendererPrivate::QForwardRendererPrivate()
@@ -68,7 +68,7 @@ void QForwardRendererPrivate::init()
 
     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(QClearBuffer::ColorDepthBuffer);
 
     QAnnotation *forwardRenderingStyle = new QAnnotation(q);
     forwardRenderingStyle->setName(QStringLiteral("renderingStyle"));
@@ -77,25 +77,25 @@ void QForwardRendererPrivate::init()
 }
 
 /*!
-    \class Qt3D::QForwardRenderer
-    \brief The Qt3D::QForwardRenderer provides a default \l {QFrameGraph}{FrameGraph} implementation of a forward renderer.
+    \class Qt3DRender::QForwardRenderer
+    \brief The Qt3DRender::QForwardRenderer provides a default \l {QFrameGraph}{FrameGraph} implementation of a forward renderer.
     \inmodule Qt3DRender
     \since 5.5
 
     Forward rendering is how OpenGL is traditionally. It renders directly to the backbuffer
     one object at a time shading each one as it goes.
 
-    Internally the Qt3D::QForwardRenderer is a subclass of Qt3D::QTechniqueFilter.
-    This a is a single leaf Framegraph tree which contains a Qt3D::QViewport, a Qt3D::QCameraSelector
-    and a Qt3D::QClearBuffer.
-    The Qt3D::QForwardRenderer has a default requirement annotation whose name is "renderingStyle" and value "forward".
+    Internally the Qt3DRender::QForwardRenderer is a subclass of Qt3DRender::QTechniqueFilter.
+    This a is a single leaf Framegraph tree which contains a Qt3DRender::QViewport, a Qt3DRender::QCameraSelector
+    and a Qt3DRender::QClearBuffer.
+    The Qt3DRender::QForwardRenderer has a default requirement annotation whose name is "renderingStyle" and value "forward".
     If you need to filter out your techniques, you should do so based on that annotation.
 
     By default the viewport occupies the whole screen and the clear color is white.
 */
 
 /*!
-    Constructs a new Qt3D::QForwardRenderer instance with parent object \a parent.
+    Constructs a new Qt3DRender::QForwardRenderer instance with parent object \a parent.
  */
 QForwardRenderer::QForwardRenderer(QNode *parent)
     : QTechniqueFilter(*new QForwardRendererPrivate, parent)
@@ -131,14 +131,14 @@ void QForwardRenderer::setClearColor(const QColor &clearColor)
 
     \note A camera is a QEntity having a QCameraLens as one of its components.
 */
-void QForwardRenderer::setCamera(QEntity *camera)
+void QForwardRenderer::setCamera(Qt3D::QEntity *camera)
 {
     Q_D(QForwardRenderer);
     d->m_cameraSelector->setCamera(camera);
 }
 
 /*!
-    \property Qt3D::QForwardRenderer::viewportRect
+    \property Qt3DRender::QForwardRenderer::viewportRect
 
     Holds the current viewport rect.
  */
@@ -149,7 +149,7 @@ QRectF QForwardRenderer::viewportRect() const
 }
 
 /*!
-    \property Qt3D::QForwardRenderer::clearColor
+    \property Qt3DRender::QForwardRenderer::clearColor
 
     Holds the current clearColor.
 */
@@ -160,18 +160,18 @@ QColor QForwardRenderer::clearColor() const
 }
 
 /*!
-    \property Qt3D::QForwardRenderer::camera
+    \property Qt3DRender::QForwardRenderer::camera
 
     Holds the current QEntity camera used to render the scene.
 
     \note A camera is a QEntity that has a QCameraLens as one of its components.
 */
-QEntity *QForwardRenderer::camera() const
+Qt3D::QEntity *QForwardRenderer::camera() const
 {
     Q_D(const QForwardRenderer);
     return d->m_cameraSelector->camera();
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qforwardrenderer.h b/src/render/defaults/qforwardrenderer.h
index 4272ea22d..ff485f55f 100644
--- a/src/render/defaults/qforwardrenderer.h
+++ b/src/render/defaults/qforwardrenderer.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QFORWARDRENDERER_H
-#define QT3D_RENDER_QFORWARDRENDERER_H
+#ifndef QT3DRENDER_RENDER_QFORWARDRENDERER_H
+#define QT3DRENDER_RENDER_QFORWARDRENDERER_H
 
 #include <Qt3DRenderer/qtechniquefilter.h>
 #include <QRectF>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QForwardRendererPrivate;
 
@@ -52,18 +52,18 @@ class QT3DRENDERERSHARED_EXPORT QForwardRenderer : public QTechniqueFilter
     Q_OBJECT
     Q_PROPERTY(QRectF viewportRect READ viewportRect WRITE setViewportRect NOTIFY viewportRectChanged)
     Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged)
-    Q_PROPERTY(QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged)
+    Q_PROPERTY(Qt3D::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged)
 public:
-    explicit QForwardRenderer(QNode *parent = 0);
+    explicit QForwardRenderer(Qt3D::QNode *parent = 0);
     ~QForwardRenderer();
 
     void setViewportRect(const QRectF &viewportRect);
     void setClearColor(const QColor &clearColor);
-    void setCamera(QEntity *camera);
+    void setCamera(Qt3D::QEntity *camera);
 
     QRectF viewportRect() const;
     QColor clearColor() const;
-    QEntity *camera() const;
+    Qt3D::QEntity *camera() const;
 
 Q_SIGNALS:
     void viewportRectChanged();
@@ -74,8 +74,8 @@ private:
     Q_DECLARE_PRIVATE(QForwardRenderer)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDERER_QFORWARDRENDERER_H
+#endif // QT3DRENDER_RENDERER_QFORWARDRENDERER_H
diff --git a/src/render/defaults/qforwardrenderer_p.h b/src/render/defaults/qforwardrenderer_p.h
index e0762e9c8..689dc23de 100644
--- a/src/render/defaults/qforwardrenderer_p.h
+++ b/src/render/defaults/qforwardrenderer_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QFORWARDRENDERER_P_H
-#define QT3D_RENDER_QFORWARDRENDERER_P_H
+#ifndef QT3DRENDER_RENDER_QFORWARDRENDERER_P_H
+#define QT3DRENDER_RENDER_QFORWARDRENDERER_P_H
 
 #include <Qt3DRenderer/private/qtechniquefilter_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QForwardRenderer;
 class QViewport;
@@ -62,9 +62,9 @@ public:
     Q_DECLARE_PUBLIC(QForwardRenderer)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QFORWARDRENDERER_P_H
+#endif // QT3DRENDER_RENDER_QFORWARDRENDERER_P_H
 
diff --git a/src/render/defaults/qgoochmaterial.cpp b/src/render/defaults/qgoochmaterial.cpp
index e8f89b899..e8363d6b1 100644
--- a/src/render/defaults/qgoochmaterial.cpp
+++ b/src/render/defaults/qgoochmaterial.cpp
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
    \class Qt3D::QGoochMaterialPrivate
diff --git a/src/render/defaults/qgoochmaterial.h b/src/render/defaults/qgoochmaterial.h
index 5c8be4a13..88f868a8a 100644
--- a/src/render/defaults/qgoochmaterial.h
+++ b/src/render/defaults/qgoochmaterial.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QGOOCHMATERIAL_H
-#define QT3D_RENDER_QGOOCHMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QGOOCHMATERIAL_H
+#define QT3DRENDER_RENDER_QGOOCHMATERIAL_H
 
 #include <Qt3DRenderer/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QGoochMaterialPrivate;
 
@@ -58,7 +58,7 @@ class QGoochMaterial : public QMaterial
     Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged)
 
 public:
-    explicit QGoochMaterial(QNode *parent = 0);
+    explicit QGoochMaterial(Qt3D::QNode *parent = 0);
     QColor diffuse() const;
     QColor specular() const;
     QColor cool() const;
@@ -86,14 +86,14 @@ Q_SIGNALS:
     void shininessChanged();
 
 protected:
-    QGoochMaterial(QGoochMaterialPrivate &dd, QNode *parent = 0);
+    QGoochMaterial(QGoochMaterialPrivate &dd, Qt3D::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QGoochMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QGOOCHMATERIAL_H
+#endif // QT3DRENDER_RENDER_QGOOCHMATERIAL_H
diff --git a/src/render/defaults/qgoochmaterial_p.h b/src/render/defaults/qgoochmaterial_p.h
index 7f07536e1..ed6b0d663 100644
--- a/src/render/defaults/qgoochmaterial_p.h
+++ b/src/render/defaults/qgoochmaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QGOOCHMATERIAL_P_H
-#define QT3D_RENDER_QGOOCHMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QGOOCHMATERIAL_P_H
+#define QT3DRENDER_RENDER_QGOOCHMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QRenderPass;
@@ -76,9 +76,9 @@ public:
     Q_DECLARE_PUBLIC(QGoochMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QGOOCHMATERIAL_P_H
+#endif // QT3DRENDER_RENDER_QGOOCHMATERIAL_P_H
 
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
index 0c236b56d..a75b8f7f5 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
@@ -53,11 +53,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 
 /*!
-    \class Qt3D::QNormalDiffuseMapAlphaMaterialPrivate
+    \class Qt3DRender::QNormalDiffuseMapAlphaMaterialPrivate
     \internal
 */
 QNormalDiffuseMapAlphaMaterialPrivate::QNormalDiffuseMapAlphaMaterialPrivate()
@@ -125,7 +125,7 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init()
 
 
 /*!
-    \class Qt3D::QNormalDiffuseMapAlphaMaterial
+    \class Qt3DRender::QNormalDiffuseMapAlphaMaterial
     \brief The QNormalDiffuseMapAlphaMaterial provides a default implementation of the phong lighting and bump effect where the diffuse light component
     is read from a texture map and the normals of the mesh being rendered from a normal texture map. In addition, it defines an alpha to coverage and
     a depth test to be performed in the rendering pass.
@@ -146,7 +146,7 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init()
     Techniques are provided for OpenGL 2, OpenGL 3 or above as well as OpenGL ES 2.
 */
 /*!
-    Constructs a new Qt3D::QNormalDiffuseMapAlphaMaterial instance with parent object \a parent.
+    Constructs a new Qt3DRender::QNormalDiffuseMapAlphaMaterial instance with parent object \a parent.
 */
 QNormalDiffuseMapAlphaMaterial::QNormalDiffuseMapAlphaMaterial(QNode *parent)
     : QNormalDiffuseMapMaterial(*new QNormalDiffuseMapAlphaMaterialPrivate, parent)
@@ -160,6 +160,6 @@ QNormalDiffuseMapAlphaMaterial::~QNormalDiffuseMapAlphaMaterial()
 {
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.h b/src/render/defaults/qnormaldiffusemapalphamaterial.h
index b21009c8f..ae7c28b71 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial.h
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H
-#define QT3D_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H
+#define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H
 
 #include <Qt3DRenderer/qnormaldiffusemapmaterial.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QNormalDiffuseMapAlphaMaterialPrivate;
 
@@ -49,15 +49,15 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapAlphaMaterial : public QNormalD
 {
     Q_OBJECT
 public:
-    explicit QNormalDiffuseMapAlphaMaterial(QNode *parent = 0);
+    explicit QNormalDiffuseMapAlphaMaterial(Qt3D::QNode *parent = 0);
     ~QNormalDiffuseMapAlphaMaterial();
 
 private:
     Q_DECLARE_PRIVATE(QNormalDiffuseMapAlphaMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H
+#endif // QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial_p.h b/src/render/defaults/qnormaldiffusemapalphamaterial_p.h
index bc3444fc6..a64faf19f 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial_p.h
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_P_H
-#define QT3D_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_P_H
+#define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qnormaldiffusemapmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QNormalDiffuseMapAlphaMaterial;
 
@@ -61,7 +61,7 @@ public:
     Q_DECLARE_PUBLIC(QNormalDiffuseMapAlphaMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp
index 6f64c31eb..64bc8f768 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp
@@ -51,10 +51,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QNormalDiffuseMapMaterialPrivate
+    \class Qt3DRender::QNormalDiffuseMapMaterialPrivate
     \internal
 */
 QNormalDiffuseMapMaterialPrivate::QNormalDiffuseMapMaterialPrivate()
@@ -138,7 +138,7 @@ void QNormalDiffuseMapMaterialPrivate::init()
 }
 
 /*!
-    \class Qt3D::QNormalDiffuseMapMaterial
+    \class Qt3DRender::QNormalDiffuseMapMaterial
     \brief The QNormalDiffuseMapMaterial provides a default implementation of the phong lighting and bump effect where the diffuse light component
     is read from a texture map and the normals of the mesh being rendered from a normal texture map.
     \inmodule Qt3DRenderer
@@ -159,7 +159,7 @@ void QNormalDiffuseMapMaterialPrivate::init()
 */
 
 /*!
-    Constructs a new Qt3D::QNormalDiffuseMapMaterial instance with parent object \a parent.
+    Constructs a new Qt3DRender::QNormalDiffuseMapMaterial instance with parent object \a parent.
 */
 QNormalDiffuseMapMaterial::QNormalDiffuseMapMaterial(QNode *parent)
     : QMaterial(*new QNormalDiffuseMapMaterialPrivate, parent)
@@ -196,7 +196,7 @@ QNormalDiffuseMapMaterial::~QNormalDiffuseMapMaterial()
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseMapMaterial::ambient
+    \property Qt3DRender::QNormalDiffuseMapMaterial::ambient
 
     Holds the current ambient color.
 */
@@ -207,7 +207,7 @@ QColor QNormalDiffuseMapMaterial::ambient() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseMapMaterial::specular
+    \property Qt3DRender::QNormalDiffuseMapMaterial::specular
 
     Holds the current specular color.
 */
@@ -218,7 +218,7 @@ QColor QNormalDiffuseMapMaterial::specular() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseMapMaterial::diffuse
+    \property Qt3DRender::QNormalDiffuseMapMaterial::diffuse
 
     Holds the current diffuse map texture.
 
@@ -238,7 +238,7 @@ QAbstractTextureProvider *QNormalDiffuseMapMaterial::diffuse() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseMapMaterial::normal
+    \property Qt3DRender::QNormalDiffuseMapMaterial::normal
 
     Holds the current normal map texture.
 
@@ -257,7 +257,7 @@ QAbstractTextureProvider *QNormalDiffuseMapMaterial::normal() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseMapMaterial::shininess
+    \property Qt3DRender::QNormalDiffuseMapMaterial::shininess
 
     Holds the current shininess as a float value.
 */
@@ -268,7 +268,7 @@ float QNormalDiffuseMapMaterial::shininess() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseMapMaterial::textureScale
+    \property Qt3DRender::QNormalDiffuseMapMaterial::textureScale
 
     Holds the current texture scale as a float value.
 */
@@ -314,6 +314,6 @@ void QNormalDiffuseMapMaterial::setTextureScale(float textureScale)
     d->m_textureScaleParameter->setValue(textureScale);
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.h b/src/render/defaults/qnormaldiffusemapmaterial.h
index 766e14353..4eb6d662c 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial.h
+++ b/src/render/defaults/qnormaldiffusemapmaterial.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QNORMALDIFFUSEMAPMATERIAL_H
-#define QT3D_RENDER_QNORMALDIFFUSEMAPMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_H
+#define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_H
 
 #include <Qt3DRenderer/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAbstractTextureProvider;
 class QNormalDiffuseMapMaterialPrivate;
@@ -58,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
 public:
-    explicit QNormalDiffuseMapMaterial(QNode *parent = 0);
+    explicit QNormalDiffuseMapMaterial(Qt3D::QNode *parent = 0);
     ~QNormalDiffuseMapMaterial();
 
     QColor ambient() const;
@@ -84,13 +84,13 @@ Q_SIGNALS:
     void textureScaleChanged();
 
 protected:
-    QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, QNode *parent = 0);
+    QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, Qt3D::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QNormalDiffuseMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/defaults/qnormaldiffusemapmaterial_p.h b/src/render/defaults/qnormaldiffusemapmaterial_p.h
index ccf986074..161d49d1d 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial_p.h
+++ b/src/render/defaults/qnormaldiffusemapmaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H
-#define QT3D_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H
+#define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QAbstractTextureProvider;
@@ -83,9 +83,9 @@ public:
     Q_DECLARE_PUBLIC(QNormalDiffuseMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H
+#endif // QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H
 
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
index ff312964a..d779768d3 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
@@ -50,10 +50,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QNormalDiffuseSpecularMapMaterialPrivate
+    \class Qt3DRender::QNormalDiffuseSpecularMapMaterialPrivate
     \internal
 */
 QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPrivate()
@@ -144,7 +144,7 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init()
 }
 
 /*!
-    \class Qt3D::QNormalDiffuseSpecularMapMaterial
+    \class Qt3DRender::QNormalDiffuseSpecularMapMaterial
     \brief The QNormalDiffuseSpecularMapMaterial provides a default implementation of the phong lighting and bump effect where the diffuse and specular light components
     are read from texture maps and the normals of the mesh being rendered from a normal texture map.
     \inmodule Qt3DRenderer
@@ -165,7 +165,7 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init()
 */
 
 /*!
-    Constructs a new Qt3D::QNormalDiffuseSpecularMapMaterial instance with parent object \a parent.
+    Constructs a new Qt3DRender::QNormalDiffuseSpecularMapMaterial instance with parent object \a parent.
 */
 QNormalDiffuseSpecularMapMaterial::QNormalDiffuseSpecularMapMaterial(QNode *parent)
     : QMaterial(*new QNormalDiffuseSpecularMapMaterialPrivate, parent)
@@ -195,14 +195,14 @@ QNormalDiffuseSpecularMapMaterial::QNormalDiffuseSpecularMapMaterial(QNormalDiff
 }
 
 /*!
-    Destroys the Qt3D::QNormalDiffuseSpecularMapMaterial instance.
+    Destroys the Qt3DRender::QNormalDiffuseSpecularMapMaterial instance.
 */
 QNormalDiffuseSpecularMapMaterial::~QNormalDiffuseSpecularMapMaterial()
 {
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseSpecularMapMaterial::ambient
+    \property Qt3DRender::QNormalDiffuseSpecularMapMaterial::ambient
 
     Holds the current ambient color.
 */
@@ -213,7 +213,7 @@ QColor QNormalDiffuseSpecularMapMaterial::ambient() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseSpecularMapMaterial::diffuse
+    \property Qt3DRender::QNormalDiffuseSpecularMapMaterial::diffuse
 
     Holds the current diffuse map texture.
 
@@ -233,7 +233,7 @@ QAbstractTextureProvider *QNormalDiffuseSpecularMapMaterial::diffuse() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseSpecularMapMaterial::normal
+    \property Qt3DRender::QNormalDiffuseSpecularMapMaterial::normal
 
     Holds the current normal map texture.
 
@@ -252,7 +252,7 @@ QAbstractTextureProvider *QNormalDiffuseSpecularMapMaterial::normal() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseSpecularMapMaterial::specular
+    \property Qt3DRender::QNormalDiffuseSpecularMapMaterial::specular
 
     Holds the current specular map texture.
 
@@ -272,7 +272,7 @@ QAbstractTextureProvider *QNormalDiffuseSpecularMapMaterial::specular() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseSpecularMapMaterial::shininess
+    \property Qt3DRender::QNormalDiffuseSpecularMapMaterial::shininess
 
     Holds the current shininess as a float value.
 */
@@ -283,7 +283,7 @@ float QNormalDiffuseSpecularMapMaterial::shininess() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseSpecularMapMaterial::textureScale
+    \property Qt3DRender::QNormalDiffuseSpecularMapMaterial::textureScale
 
     Holds the current texture scale as a float value.
 */
@@ -329,6 +329,6 @@ void QNormalDiffuseSpecularMapMaterial::setTextureScale(float textureScale)
     d->m_textureScaleParameter->setValue(textureScale);
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.h b/src/render/defaults/qnormaldiffusespecularmapmaterial.h
index c0cdf6912..5d92ebbc2 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial.h
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H
-#define QT3D_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H
+#define QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H
 
 #include <Qt3DRenderer/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QNormalDiffuseSpecularMapMaterialPrivate;
 
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMate
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
 public:
-    explicit QNormalDiffuseSpecularMapMaterial(QNode *parent = 0);
+    explicit QNormalDiffuseSpecularMapMaterial(Qt3D::QNode *parent = 0);
     ~QNormalDiffuseSpecularMapMaterial();
 
     QColor ambient() const;
@@ -83,14 +83,14 @@ Q_SIGNALS:
     void textureScaleChanged();
 
 protected:
-    QNormalDiffuseSpecularMapMaterial(QNormalDiffuseSpecularMapMaterialPrivate &dd, QNode *parent = 0);
+    QNormalDiffuseSpecularMapMaterial(QNormalDiffuseSpecularMapMaterialPrivate &dd, Qt3D::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QNormalDiffuseSpecularMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H
+#endif // QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
index 82187eabc..6e3f2ab3b 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H
-#define QT3D_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H
+#define QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QAbstractTextureProvider;
@@ -84,9 +84,9 @@ public:
     Q_DECLARE_PUBLIC(QNormalDiffuseSpecularMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H
+#endif // QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H
 
diff --git a/src/render/defaults/qpervertexcolormaterial.cpp b/src/render/defaults/qpervertexcolormaterial.cpp
index 578ff35f4..37fddd691 100644
--- a/src/render/defaults/qpervertexcolormaterial.cpp
+++ b/src/render/defaults/qpervertexcolormaterial.cpp
@@ -49,10 +49,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QPerVertexColorMaterialPrivate
+    \class Qt3DRender::QPerVertexColorMaterialPrivate
     \internal
 */
 QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate()
@@ -72,7 +72,7 @@ QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate()
 }
 
 /*!
-    \class Qt3D::QPerVertexColorMaterial
+    \class Qt3DRender::QPerVertexColorMaterial
     \brief The QPerVertexColorMaterial class provides a default implementation for rendering the color properties set for each vertex.
     \inmodule Qt3DRenderer
     \since 5.5
@@ -90,7 +90,7 @@ QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate()
 */
 
 /*!
-    \fn Qt3D::QPerVertexColorMaterial::QPerVertexColorMaterial(QNode *parent)
+    \fn Qt3DRender::QPerVertexColorMaterial::QPerVertexColorMaterial(QNode *parent)
 
     Constructs a new QPerVertexColorMaterial instance with parent object \a parent.
 */
@@ -102,7 +102,7 @@ QPerVertexColorMaterial::QPerVertexColorMaterial(QNode *parent)
 }
 
 /*!
-   \fn Qt3D::QPerVertexColorMaterial::~QPerVertexColorMaterial()
+   \fn Qt3DRender::QPerVertexColorMaterial::~QPerVertexColorMaterial()
 
    Destroys the QPerVertexColorMaterial
 */
@@ -151,6 +151,6 @@ void QPerVertexColorMaterialPrivate::init()
     q_func()->setEffect(m_vertexEffect);
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qpervertexcolormaterial.h b/src/render/defaults/qpervertexcolormaterial.h
index d0e17c722..a21649858 100644
--- a/src/render/defaults/qpervertexcolormaterial.h
+++ b/src/render/defaults/qpervertexcolormaterial.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QPERVERTEXCOLORMATERIAL_H
-#define QT3D_RENDER_QPERVERTEXCOLORMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_H
+#define QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_H
 
 #include <Qt3DRenderer/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QPerVertexColorMaterialPrivate;
 
@@ -51,15 +51,15 @@ class QT3DRENDERERSHARED_EXPORT QPerVertexColorMaterial : public QMaterial
     Q_OBJECT
 
 public:
-    explicit QPerVertexColorMaterial(QNode *parent = 0);
+    explicit QPerVertexColorMaterial(Qt3D::QNode *parent = 0);
     ~QPerVertexColorMaterial();
 
 private:
     Q_DECLARE_PRIVATE(QPerVertexColorMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QPERVERTEXCOLORMATERIAL_H
+#endif // QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_H
diff --git a/src/render/defaults/qpervertexcolormaterial_p.h b/src/render/defaults/qpervertexcolormaterial_p.h
index 8fdd4ce95..49099b151 100644
--- a/src/render/defaults/qpervertexcolormaterial_p.h
+++ b/src/render/defaults/qpervertexcolormaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QPERVERTEXCOLORMATERIAL_P_H
-#define QT3D_RENDER_QPERVERTEXCOLORMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_P_H
+#define QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QTechnique;
@@ -74,9 +74,9 @@ public:
     Q_DECLARE_PUBLIC(QPerVertexColorMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QPERVERTEXCOLORMATERIAL_P_H
+#endif // QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_P_H
 
diff --git a/src/render/defaults/qphongmaterial.cpp b/src/render/defaults/qphongmaterial.cpp
index a1d313c67..8e9186418 100644
--- a/src/render/defaults/qphongmaterial.cpp
+++ b/src/render/defaults/qphongmaterial.cpp
@@ -49,10 +49,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QPhongMaterialPrivate
+    \class Qt3DRender::QPhongMaterialPrivate
     \internal
 */
 QPhongMaterialPrivate::QPhongMaterialPrivate()
@@ -76,7 +76,7 @@ QPhongMaterialPrivate::QPhongMaterialPrivate()
 }
 
 /*!
-    \class Qt3D::QPhongMaterial
+    \class Qt3DRender::QPhongMaterial
     \brief The QPhongMaterial class provides a default implementation of the phong lighting effect.
     \inmodule Qt3DRenderer
     \since 5.5
@@ -96,7 +96,7 @@ QPhongMaterialPrivate::QPhongMaterialPrivate()
 */
 
 /*!
-    \fn Qt3D::QPhongMaterial::QPhongMaterial(QNode *parent)
+    \fn Qt3DRender::QPhongMaterial::QPhongMaterial(QNode *parent)
 
     Constructs a new QPhongMaterial instance with parent object \a parent.
 */
@@ -112,7 +112,7 @@ QPhongMaterial::QPhongMaterial(QNode *parent)
 }
 
 /*!
-   \fn Qt3D::QPhongMaterial::~QPhongMaterial()
+   \fn Qt3DRender::QPhongMaterial::~QPhongMaterial()
 
    Destroys the QPhongMaterial.
 */
@@ -121,7 +121,7 @@ QPhongMaterial::~QPhongMaterial()
 }
 
 /*!
-    \property Qt3D::QPhongMaterial::ambient
+    \property Qt3DRender::QPhongMaterial::ambient
 
     Holds the ambient color.
 */
@@ -132,7 +132,7 @@ QColor QPhongMaterial::ambient() const
 }
 
 /*!
-    \property Qt3D::QPhongMaterial::diffuse
+    \property Qt3DRender::QPhongMaterial::diffuse
 
     Holds the diffuse color.
 */
@@ -143,7 +143,7 @@ QColor QPhongMaterial::diffuse() const
 }
 
 /*!
-    \property QColor Qt3D::QPhongMaterial::specular
+    \property QColor Qt3DRender::QPhongMaterial::specular
 
     Holds the specular color.
 */
@@ -154,7 +154,7 @@ QColor QPhongMaterial::specular() const
 }
 
 /*!
-    \property Qt3D::QPhongMaterial::shininess
+    \property Qt3DRender::QPhongMaterial::shininess
 
     Holds the shininess exponent.
 */
@@ -233,6 +233,6 @@ void QPhongMaterialPrivate::init()
     q_func()->setEffect(m_phongEffect);
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qphongmaterial.h b/src/render/defaults/qphongmaterial.h
index 6dc900416..a37f0f75c 100644
--- a/src/render/defaults/qphongmaterial.h
+++ b/src/render/defaults/qphongmaterial.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QPHONGMATERIAL_H
-#define QT3D_RENDER_QPHONGMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QPHONGMATERIAL_H
+#define QT3DRENDER_RENDER_QPHONGMATERIAL_H
 
 #include <Qt3DRenderer/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QPhongMaterialPrivate;
 
@@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QPhongMaterial : public QMaterial
     Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged)
 
 public:
-    explicit QPhongMaterial(QNode *parent = 0);
+    explicit QPhongMaterial(Qt3D::QNode *parent = 0);
     ~QPhongMaterial();
 
     QColor ambient() const;
@@ -78,8 +78,8 @@ private:
     Q_DECLARE_PRIVATE(QPhongMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QPHONGMATERIAL_H
+#endif // QT3DRENDER_RENDER_QPHONGMATERIAL_H
diff --git a/src/render/defaults/qphongmaterial_p.h b/src/render/defaults/qphongmaterial_p.h
index be6af94cd..1d4372944 100644
--- a/src/render/defaults/qphongmaterial_p.h
+++ b/src/render/defaults/qphongmaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QPHONGMATERIAL_P_H
-#define QT3D_RENDER_QPHONGMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QPHONGMATERIAL_P_H
+#define QT3DRENDER_RENDER_QPHONGMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QTechnique;
@@ -78,9 +78,9 @@ public:
     Q_DECLARE_PUBLIC(QPhongMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QPHONGMATERIAL_P_H
+#endif // QT3DRENDER_RENDER_QPHONGMATERIAL_P_H
 
diff --git a/src/render/defaults/qskyboxentity.cpp b/src/render/defaults/qskyboxentity.cpp
index 45d367c18..c9a271d9e 100644
--- a/src/render/defaults/qskyboxentity.cpp
+++ b/src/render/defaults/qskyboxentity.cpp
@@ -53,8 +53,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 
 /*!
  * \class Qt3D::QSkyboxEntityPrivate
@@ -74,7 +75,7 @@ QSkyboxEntityPrivate::QSkyboxEntityPrivate()
     , m_es2RenderPass(new QRenderPass())
     , m_gl3RenderPass(new QRenderPass())
     , m_mesh(new QCuboidMesh())
-    , m_transform(new QTransform())
+    , m_transform(new Qt3D::QTransform())
     , m_translate(new QTranslateTransform())
     , m_textureParameter(new QParameter(QStringLiteral("skyboxTexture"), m_skyboxTexture))
     , m_posXImage(new QTextureImage())
@@ -281,6 +282,6 @@ QVector3D QSkyboxEntity::cameraPosition() const
     return d->m_position;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qskyboxentity.h b/src/render/defaults/qskyboxentity.h
index f2e7a76cb..103f8004a 100644
--- a/src/render/defaults/qskyboxentity.h
+++ b/src/render/defaults/qskyboxentity.h
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QSKYBOXENTITY_H
-#define QT3D_RENDER_QSKYBOXENTITY_H
+#ifndef QT3DRENDER_RENDER_QSKYBOXENTITY_H
+#define QT3DRENDER_RENDER_QSKYBOXENTITY_H
 
 #include <Qt3DCore/qentity.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QSkyboxEntityPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QSkyboxEntity : public QEntity
+class QT3DRENDERERSHARED_EXPORT QSkyboxEntity : public Qt3D::QEntity
 {
     Q_OBJECT
 public:
-    explicit QSkyboxEntity(QNode *parent = 0);
+    explicit QSkyboxEntity(Qt3D::QNode *parent = 0);
     ~QSkyboxEntity();
 
     void setBaseName(const QString &path);
@@ -71,8 +71,8 @@ private:
     Q_DECLARE_PRIVATE(QSkyboxEntity)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QSKYBOXENTITY_H
+#endif // QT3DRENDER_RENDER_QSKYBOXENTITY_H
diff --git a/src/render/defaults/qskyboxentity_p.h b/src/render/defaults/qskyboxentity_p.h
index a377dd520..f726fb3ec 100644
--- a/src/render/defaults/qskyboxentity_p.h
+++ b/src/render/defaults/qskyboxentity_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QSKYBOXENTITY_P_H
-#define QT3D_RENDER_QSKYBOXENTITY_P_H
+#ifndef QT3DRENDER_RENDER_QSKYBOXENTITY_P_H
+#define QT3DRENDER_RENDER_QSKYBOXENTITY_P_H
 
 #include <Qt3DCore/private/qentity_p.h>
 #include <QVector3D>
@@ -43,8 +43,12 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
-
+class QTransform;
 class QTranslateTransform;
+}
+
+namespace Qt3DRender {
+
 class QTextureCubeMap;
 class QShaderProgram;
 class QSkyboxEntity;
@@ -52,12 +56,11 @@ class QTextureImage;
 class QCuboidMesh;
 class QRenderPass;
 class QTechnique;
-class QTransform;
 class QParameter;
 class QMaterial;
 class QEffect;
 
-class QSkyboxEntityPrivate : public QEntityPrivate
+class QSkyboxEntityPrivate : public Qt3D::QEntityPrivate
 {
     QSkyboxEntityPrivate();
 
@@ -78,8 +81,8 @@ class QSkyboxEntityPrivate : public QEntityPrivate
     QRenderPass *m_es2RenderPass;
     QRenderPass *m_gl3RenderPass;
     QCuboidMesh *m_mesh;
-    QTransform *m_transform;
-    QTranslateTransform *m_translate;
+    Qt3D::QTransform *m_transform;
+    Qt3D::QTranslateTransform *m_translate;
     QParameter *m_textureParameter;
     QTextureImage *m_posXImage;
     QTextureImage *m_posYImage;
@@ -92,9 +95,9 @@ class QSkyboxEntityPrivate : public QEntityPrivate
     QVector3D m_position;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QSKYBOXENTITY_P_H
+#endif // QT3DRENDER_RENDER_QSKYBOXENTITY_P_H
 
diff --git a/src/render/frontend/framegraph-components/qcameraselector.cpp b/src/render/frontend/framegraph-components/qcameraselector.cpp
index 5085adf45..d77c493e9 100644
--- a/src/render/frontend/framegraph-components/qcameraselector.cpp
+++ b/src/render/frontend/framegraph-components/qcameraselector.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
     \class Qt3D::CameraSelector
@@ -55,7 +55,7 @@ QCameraSelector::QCameraSelector(QCameraSelectorPrivate &dd, QNode *parent)
 }
 
 /*!
-    \class Qt3D::QCameraSelectorPrivate
+    \class Qt3DRender::QCameraSelectorPrivate
     \internal
 */
 QCameraSelectorPrivate::QCameraSelectorPrivate()
@@ -69,7 +69,7 @@ void QCameraSelector::copy(const QNode *ref)
     const QCameraSelector *other = static_cast<const QCameraSelector*>(ref);
 
     if (other->d_func()->m_camera)
-        setCamera(qobject_cast<QEntity *>(QNode::clone(other->d_func()->m_camera)));
+        setCamera(qobject_cast<Qt3D::QEntity *>(QNode::clone(other->d_func()->m_camera)));
 }
 
 QCameraSelector::QCameraSelector(Qt3D::QNode *parent)
@@ -81,7 +81,7 @@ QCameraSelector::~QCameraSelector()
     QNode::cleanup();
 }
 
-void QCameraSelector::setCamera(QEntity *camera)
+void QCameraSelector::setCamera(Qt3D::QEntity *camera)
 {
     Q_D(QCameraSelector);
     if (d->m_camera != camera) {
@@ -97,12 +97,12 @@ void QCameraSelector::setCamera(QEntity *camera)
     }
 }
 
-QEntity *QCameraSelector::camera() const
+Qt3D::QEntity *QCameraSelector::camera() const
 {
     Q_D(const QCameraSelector);
     return d->m_camera;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/framegraph-components/qcameraselector.h b/src/render/frontend/framegraph-components/qcameraselector.h
index 4811d7a96..546d77a61 100644
--- a/src/render/frontend/framegraph-components/qcameraselector.h
+++ b/src/render/frontend/framegraph-components/qcameraselector.h
@@ -34,17 +34,16 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCAMERASELECTOR_H
-#define QT3D_QCAMERASELECTOR_H
+#ifndef QT3DRENDER_QCAMERASELECTOR_H
+#define QT3DRENDER_QCAMERASELECTOR_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/qframegraphnode.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QCamera;
 class QCameraSelectorPrivate;
 
 class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphNode
@@ -53,27 +52,27 @@ class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphNode
     Q_PROPERTY(Qt3D::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged)
 
 public:
-    explicit QCameraSelector(QNode *parent = 0);
+    explicit QCameraSelector(Qt3D::QNode *parent = 0);
     ~QCameraSelector();
 
-    void setCamera(QEntity *camera);
-    QEntity *camera() const;
+    void setCamera(Qt3D::QEntity *camera);
+    Qt3D::QEntity *camera() const;
 
 Q_SIGNALS:
     void cameraChanged();
 
 protected:
-    QCameraSelector(QCameraSelectorPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QCameraSelector(QCameraSelectorPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     QT3D_CLONEABLE(QCameraSelector)
     Q_DECLARE_PRIVATE(QCameraSelector)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
 
-#endif // QT3D_QCAMERASELECTOR_H
+#endif // QT3DRENDER_QCAMERASELECTOR_H
diff --git a/src/render/frontend/framegraph-components/qcameraselector_p.h b/src/render/frontend/framegraph-components/qcameraselector_p.h
index 1ef076557..bcf00d6b6 100644
--- a/src/render/frontend/framegraph-components/qcameraselector_p.h
+++ b/src/render/frontend/framegraph-components/qcameraselector_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCAMERASELECTOR_P_H
-#define QT3D_QCAMERASELECTOR_P_H
+#ifndef QT3DRENDER_QCAMERASELECTOR_P_H
+#define QT3DRENDER_QCAMERASELECTOR_P_H
 
 #include <private/qframegraphnode_p.h>
 #include <Qt3DRenderer/qcameraselector.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QCameraSelector;
 
@@ -52,12 +52,12 @@ public:
     QCameraSelectorPrivate();
 
     Q_DECLARE_PUBLIC(QCameraSelector)
-    QEntity *m_camera;
+    Qt3D::QEntity *m_camera;
 };
 
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCAMERASELECTOR_P_H
+#endif // QT3DRENDER_QCAMERASELECTOR_P_H
diff --git a/src/render/frontend/framegraph-components/qclearbuffer.cpp b/src/render/frontend/framegraph-components/qclearbuffer.cpp
index f40a80883..5706f6aa7 100644
--- a/src/render/frontend/framegraph-components/qclearbuffer.cpp
+++ b/src/render/frontend/framegraph-components/qclearbuffer.cpp
@@ -40,10 +40,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QClearBufferPrivate
+    \class Qt3DRender::QClearBufferPrivate
     \internal
 */
 QClearBufferPrivate::QClearBufferPrivate()
@@ -91,6 +91,6 @@ void QClearBuffer::setBuffers(QClearBuffer::BufferType buffers)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/framegraph-components/qclearbuffer.h b/src/render/frontend/framegraph-components/qclearbuffer.h
index 782ec6ef4..9b42cb46c 100644
--- a/src/render/frontend/framegraph-components/qclearbuffer.h
+++ b/src/render/frontend/framegraph-components/qclearbuffer.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCLEARBUFFER_H
-#define QT3D_QCLEARBUFFER_H
+#ifndef QT3DRENDER_QCLEARBUFFER_H
+#define QT3DRENDER_QCLEARBUFFER_H
 
 #include <Qt3DRenderer/qframegraphnode.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QClearBufferPrivate;
 
@@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QClearBuffer : public QFrameGraphNode
     Q_OBJECT
     Q_PROPERTY(BufferType buffers READ buffers WRITE setBuffers NOTIFY buffersChanged)
 public:
-    explicit QClearBuffer(QNode *parent = 0);
+    explicit QClearBuffer(Qt3D::QNode *parent = 0);
     ~QClearBuffer();
 
     enum BufferType {
@@ -72,16 +72,16 @@ Q_SIGNALS:
     void buffersChanged();
 
 protected:
-    QClearBuffer(QClearBufferPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QClearBuffer(QClearBufferPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QClearBuffer)
     QT3D_CLONEABLE(QClearBuffer)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCLEARBUFFER_H
+#endif // QT3DRENDER_QCLEARBUFFER_H
diff --git a/src/render/frontend/framegraph-components/qclearbuffer_p.h b/src/render/frontend/framegraph-components/qclearbuffer_p.h
index f78b89429..402f956a2 100644
--- a/src/render/frontend/framegraph-components/qclearbuffer_p.h
+++ b/src/render/frontend/framegraph-components/qclearbuffer_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCLEARBUFFER_P_H
-#define QT3D_QCLEARBUFFER_P_H
+#ifndef QT3DRENDER_QCLEARBUFFER_P_H
+#define QT3DRENDER_QCLEARBUFFER_P_H
 
 #include <private/qframegraphnode_p.h>
 #include <Qt3DRenderer/qclearbuffer.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QClearBufferPrivate : public QFrameGraphNodePrivate
 {
@@ -53,8 +53,8 @@ public:
     QClearBuffer::BufferType m_buffersType;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCLEARBUFFER_P_H
+#endif // QT3DRENDER_QCLEARBUFFER_P_H
diff --git a/src/render/frontend/framegraph-components/qframegraph.cpp b/src/render/frontend/framegraph-components/qframegraph.cpp
index fdf9724ee..b8357f396 100644
--- a/src/render/frontend/framegraph-components/qframegraph.cpp
+++ b/src/render/frontend/framegraph-components/qframegraph.cpp
@@ -42,10 +42,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QFrameGraphPrivate
+    \class Qt3DRender::QFrameGraphPrivate
     \internal
 */
 QFrameGraphPrivate::QFrameGraphPrivate()
@@ -72,14 +72,14 @@ QFrameGraphPrivate::QFrameGraphPrivate()
 
 /*!
     \qmltype FrameGraph
-    \instantiates Qt3D::QFrameGraph
+    \instantiates Qt3DRender::QFrameGraph
     \inherits Component3D
     \inqmlmodule Qt3D.Renderer
     \since 5.5
     \brief For OpenGL ...
 */
 
-/*! \fn void Qt3D::QFrameGraph::copy(const QNode *ref)
+/*! \fn void Qt3DRender::QFrameGraph::copy(const QNode *ref)
   Copies the \a ref instance into this one.
  */
 void QFrameGraph::copy(const QNode *ref)
@@ -90,7 +90,7 @@ void QFrameGraph::copy(const QNode *ref)
 }
 
 /*!
-  \fn Qt3D::QFrameGraph::QFrameGraph(QNode *parent)
+  \fn Qt3DRender::QFrameGraph::QFrameGraph(QNode *parent)
   Constructs a new QFrameGraph with the specified \a parent.
 */
 QFrameGraph::QFrameGraph(QNode *parent)
@@ -116,7 +116,7 @@ QFrameGraph::QFrameGraph(QFrameGraphPrivate &dd, QNode *parent)
 */
 
 /*!
-  \property Qt3D::QFrameGraph::activeFrameGraph
+  \property Qt3DRender::QFrameGraph::activeFrameGraph
 
   Holds the current activeFrameGraph root node.
  */
@@ -139,6 +139,6 @@ void QFrameGraph::setActiveFrameGraph(QFrameGraphNode *activeFrameGraph)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/framegraph-components/qframegraph.h b/src/render/frontend/framegraph-components/qframegraph.h
index 9dc3fbc76..2a32a95f6 100644
--- a/src/render/frontend/framegraph-components/qframegraph.h
+++ b/src/render/frontend/framegraph-components/qframegraph.h
@@ -34,29 +34,29 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QFRAMEGRAPH_H
-#define QT3D_QFRAMEGRAPH_H
+#ifndef QT3DRENDER_QFRAMEGRAPH_H
+#define QT3DRENDER_QFRAMEGRAPH_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qcomponent.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QFrameGraphPrivate;
 class QFrameGraphNode;
 
-class QT3DRENDERERSHARED_EXPORT QFrameGraph : public QComponent
+class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3D::QComponent
 {
     Q_OBJECT
     // Note : The full namespace has to be used to define the property
     // otherwise this results in an error "cannot assign object to property"
-    Q_PROPERTY(Qt3D::QFrameGraphNode *activeFrameGraph READ activeFrameGraph WRITE setActiveFrameGraph NOTIFY activeFrameGraphChanged)
+    Q_PROPERTY(Qt3DRender::QFrameGraphNode *activeFrameGraph READ activeFrameGraph WRITE setActiveFrameGraph NOTIFY activeFrameGraphChanged)
     Q_CLASSINFO("DefaultProperty", "activeFrameGraph")
 
 public:
-    explicit QFrameGraph(QNode *parent = 0);
+    explicit QFrameGraph(Qt3D::QNode *parent = 0);
     ~QFrameGraph();
 
     QFrameGraphNode *activeFrameGraph() const;
@@ -66,16 +66,16 @@ Q_SIGNALS:
     void activeFrameGraphChanged();
 
 protected:
-    QFrameGraph(QFrameGraphPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QFrameGraph(QFrameGraphPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QFrameGraph)
     QT3D_CLONEABLE(QFrameGraph)
 };
 
-} //Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QFRAMEGRAPH_H
+#endif // QT3DRENDER_QFRAMEGRAPH_H
diff --git a/src/render/frontend/framegraph-components/qframegraph_p.h b/src/render/frontend/framegraph-components/qframegraph_p.h
index c4963a4ea..0eb8ca7e5 100644
--- a/src/render/frontend/framegraph-components/qframegraph_p.h
+++ b/src/render/frontend/framegraph-components/qframegraph_p.h
@@ -34,20 +34,20 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QFRAMEGRAPH_P_H
-#define QT3D_QFRAMEGRAPH_P_H
+#ifndef QT3DRENDER_QFRAMEGRAPH_P_H
+#define QT3DRENDER_QFRAMEGRAPH_P_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <private/qcomponent_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QFrameGraph;
 class QFrameGraphNode;
 
-class QFrameGraphPrivate : public QComponentPrivate
+class QFrameGraphPrivate : public Qt3D::QComponentPrivate
 {
 public:
     QFrameGraphPrivate();
@@ -61,4 +61,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QFRAMEGRAPH_P_H
+#endif // QT3DRENDER_QFRAMEGRAPH_P_H
diff --git a/src/render/frontend/framegraph-components/qframegraphnode.cpp b/src/render/frontend/framegraph-components/qframegraphnode.cpp
index 78d50782a..1c28d72a0 100644
--- a/src/render/frontend/framegraph-components/qframegraphnode.cpp
+++ b/src/render/frontend/framegraph-components/qframegraphnode.cpp
@@ -39,10 +39,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QFrameGraphNodePrivate
+    \class Qt3DRender::QFrameGraphNodePrivate
     \internal
 */
 QFrameGraphNodePrivate::QFrameGraphNodePrivate()
@@ -82,7 +82,7 @@ QFrameGraphNode::QFrameGraphNode(QNode *parent)
 
 QFrameGraphNode::~QFrameGraphNode()
 {
-    Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QFrameGraphNode subclass didn't call QNode::cleanup in its destructor");
+    Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QFrameGraphNode subclass didn't call QNode::cleanup in its destructor");
 }
 
 /*!
@@ -114,7 +114,7 @@ QFrameGraphNode::QFrameGraphNode(QFrameGraphNodePrivate &dd, QNode *parent)
 */
 
 /*!
-    \property Qt3D::QFrameGraphNode::enabled
+    \property Qt3DRender::QFrameGraphNode::enabled
 
     Holds whether the frame graph node is enabled or disabled.
 */
@@ -135,6 +135,6 @@ void QFrameGraphNode::setEnabled(bool enabled)
 }
 
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/framegraph-components/qframegraphnode.h b/src/render/frontend/framegraph-components/qframegraphnode.h
index b13fd6eb6..ce14b9bed 100644
--- a/src/render/frontend/framegraph-components/qframegraphnode.h
+++ b/src/render/frontend/framegraph-components/qframegraphnode.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QFRAMEGRAPHNODE_H
-#define QT3D_QFRAMEGRAPHNODE_H
+#ifndef QT3DRENDER_QFRAMEGRAPHNODE_H
+#define QT3DRENDER_QFRAMEGRAPHNODE_H
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
@@ -43,16 +43,16 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QFrameGraphNodePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QFrameGraphNode : public QNode
+class QT3DRENDERERSHARED_EXPORT QFrameGraphNode : public Qt3D::QNode
 {
     Q_OBJECT
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
 public:
-    explicit QFrameGraphNode(QNode *parent = 0);
+    explicit QFrameGraphNode(Qt3D::QNode *parent = 0);
     ~QFrameGraphNode();
 
     QFrameGraphNode *parentFrameGraphNode() const;
@@ -61,7 +61,7 @@ public:
     void setEnabled(bool enabled);
 
 protected:
-    QFrameGraphNode(QFrameGraphNodePrivate &dd, QNode *parent = 0);
+    QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3D::QNode *parent = 0);
 
 Q_SIGNALS:
     void enabledChanged();
@@ -70,8 +70,8 @@ private:
     Q_DECLARE_PRIVATE(QFrameGraphNode)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QFRAMEGRAPHNODE_H
+#endif // QT3DRENDER_QFRAMEGRAPHNODE_H
diff --git a/src/render/frontend/framegraph-components/qframegraphnode_p.h b/src/render/frontend/framegraph-components/qframegraphnode_p.h
index 02cfc5be1..d1dc98196 100644
--- a/src/render/frontend/framegraph-components/qframegraphnode_p.h
+++ b/src/render/frontend/framegraph-components/qframegraphnode_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QFRAMEGRAPHNODE_P_H
-#define QT3D_QFRAMEGRAPHNODE_P_H
+#ifndef QT3DRENDER_QFRAMEGRAPHNODE_P_H
+#define QT3DRENDER_QFRAMEGRAPHNODE_P_H
 
 #include <QtCore/QtGlobal>
 #include <private/qnode_p.h>
@@ -43,11 +43,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QFrameGraphNode;
 
-class QFrameGraphNodePrivate : public QNodePrivate
+class QFrameGraphNodePrivate : public Qt3D::QNodePrivate
 {
 public:
     QFrameGraphNodePrivate();
@@ -57,8 +57,8 @@ public:
     QList<QFrameGraphNode *> m_fgChildren;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QFRAMEGRAPHNODE_P_H
+#endif // QT3DRENDER_QFRAMEGRAPHNODE_P_H
diff --git a/src/render/frontend/framegraph-components/qframegraphselector.cpp b/src/render/frontend/framegraph-components/qframegraphselector.cpp
index e60872ffe..6d2dc7e6e 100644
--- a/src/render/frontend/framegraph-components/qframegraphselector.cpp
+++ b/src/render/frontend/framegraph-components/qframegraphselector.cpp
@@ -39,10 +39,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QFrameGraphSelectorPrivate
+    \class Qt3DRender::QFrameGraphSelectorPrivate
     \internal
 */
 QFrameGraphSelectorPrivate::QFrameGraphSelectorPrivate()
@@ -51,19 +51,19 @@ QFrameGraphSelectorPrivate::QFrameGraphSelectorPrivate()
 }
 
 /*!
-    \class Qt3D::QFrameGraphSelector
+    \class Qt3DRender::QFrameGraphSelector
     \inmodule Qt3DRenderer
 
-    \brief Qt3D::QFrameGraphSelector provide a way to select a one or more subtree of
+    \brief Qt3DRender::QFrameGraphSelector provide a way to select a one or more subtree of
     the FrameGraph at runtime
 
-     The selection is made by executing Qt3D::QFrameGraphSelectorFunctor that will
+     The selection is made by executing Qt3DRender::QFrameGraphSelectorFunctor that will
      return a vector containing the indices of the \l {QFrameGraph}{FrameGraph} subtree to be used
      for the current frame.
  */
 
 /*!
-    Constructs a new Qt3D::QFrameGraphSelector instance using \a parent as parent.
+    Constructs a new Qt3DRender::QFrameGraphSelector instance using \a parent as parent.
  */
 QFrameGraphSelector::QFrameGraphSelector(QNode *parent)
     : QFrameGraphNode(*new QFrameGraphSelectorPrivate, parent)
@@ -99,6 +99,6 @@ void QFrameGraphSelector::copy(const QNode *ref)
     QFrameGraphNode::copy(ref);
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/framegraph-components/qframegraphselector.h b/src/render/frontend/framegraph-components/qframegraphselector.h
index f350539d4..8300be080 100644
--- a/src/render/frontend/framegraph-components/qframegraphselector.h
+++ b/src/render/frontend/framegraph-components/qframegraphselector.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QFRAMEGRAPHSELECTOR_H
-#define QT3D_QFRAMEGRAPHSELECTOR_H
+#ifndef QT3DRENDER_QFRAMEGRAPHSELECTOR_H
+#define QT3DRENDER_QFRAMEGRAPHSELECTOR_H
 
 #include <Qt3DRenderer/qframegraphnode.h>
 #include <Qt3DCore/qnode.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QFrameGraphSelectorPrivate;
 
@@ -59,24 +59,24 @@ class QT3DRENDERERSHARED_EXPORT QFrameGraphSelector : public QFrameGraphNode
 {
     Q_OBJECT
 public:
-    explicit QFrameGraphSelector(QNode *parent = 0);
+    explicit QFrameGraphSelector(Qt3D::QNode *parent = 0);
     ~QFrameGraphSelector();
 
     QFrameGraphSelectorFunctorPtr selectionFunctor() const;
     void setSelectionFunctor(QFrameGraphSelectorFunctorPtr functor);
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     QT3D_CLONEABLE(QFrameGraphSelector)
     Q_DECLARE_PRIVATE(QFrameGraphSelector)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QFrameGraphSelectorFunctorPtr)
+Q_DECLARE_METATYPE(Qt3DRender::QFrameGraphSelectorFunctorPtr)
 
-#endif // QT3D_QGFRAMEGRAPHSELECTOR_H
+#endif // QT3DRENDER_QGFRAMEGRAPHSELECTOR_H
diff --git a/src/render/frontend/framegraph-components/qframegraphselector_p.h b/src/render/frontend/framegraph-components/qframegraphselector_p.h
index 28228dcdb..b1d63a7fe 100644
--- a/src/render/frontend/framegraph-components/qframegraphselector_p.h
+++ b/src/render/frontend/framegraph-components/qframegraphselector_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QFRAMEGRAPHSELECTOR_P_H
-#define QT3D_QFRAMEGRAPHSELECTOR_P_H
+#ifndef QT3DRENDER_QFRAMEGRAPHSELECTOR_P_H
+#define QT3DRENDER_QFRAMEGRAPHSELECTOR_P_H
 
 #include <Qt3DRenderer/private/qframegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QFrameGraphSelector;
 class QFrameGraphSelectorFunctor;
@@ -57,9 +57,9 @@ public:
     Q_DECLARE_PUBLIC(QFrameGraphSelector)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QFRAMEGRAPHSELECTOR_P_H
+#endif // QT3DRENDER_QFRAMEGRAPHSELECTOR_P_H
 
diff --git a/src/render/frontend/framegraph-components/qlayerfilter.cpp b/src/render/frontend/framegraph-components/qlayerfilter.cpp
index b15147f28..1dad3c1db 100644
--- a/src/render/frontend/framegraph-components/qlayerfilter.cpp
+++ b/src/render/frontend/framegraph-components/qlayerfilter.cpp
@@ -40,10 +40,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QLayerFilterPrivate
+    \class Qt3DRender::QLayerFilterPrivate
     \internal
 */
 QLayerFilterPrivate::QLayerFilterPrivate()
@@ -60,14 +60,14 @@ QLayerFilterPrivate::QLayerFilterPrivate()
 
 /*!
     \qmltype LayerFilter
-    \instantiates Qt3D::QLayerFilter
+    \instantiates Qt3DRender::QLayerFilter
     \inherits FrameGraphNode
     \inqmlmodule Qt3D.Renderer
     \since 5.5
     \brief For ...
 */
 
-/*! \fn void Qt3D::QLayerFilter::copy(const QNode *ref)
+/*! \fn void Qt3DRender::QLayerFilter::copy(const QNode *ref)
   Copies the \a ref instance into this one.
  */
 void QLayerFilter::copy(const QNode *ref)
@@ -78,7 +78,7 @@ void QLayerFilter::copy(const QNode *ref)
 }
 
 
-/*! \fn Qt3D::QLayerFilter::QLayerFilter(QNode *parent)
+/*! \fn Qt3DRender::QLayerFilter::QLayerFilter(QNode *parent)
   Constructs a new QLayerFilter with the specified \a parent.
  */
 QLayerFilter::QLayerFilter(QNode *parent)
@@ -98,7 +98,7 @@ QLayerFilter::QLayerFilter(QLayerFilterPrivate &dd, QNode *parent)
 }
 
 /*!
-  \property Qt3D::QLayerFilter::layers
+  \property Qt3DRender::QLayerFilter::layers
 
  */
 
@@ -123,6 +123,6 @@ QStringList QLayerFilter::layers() const
 }
 
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/framegraph-components/qlayerfilter.h b/src/render/frontend/framegraph-components/qlayerfilter.h
index 83b97b1e0..7e177e322 100644
--- a/src/render/frontend/framegraph-components/qlayerfilter.h
+++ b/src/render/frontend/framegraph-components/qlayerfilter.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QLAYERFILTER_H
-#define QT3D_QLAYERFILTER_H
+#ifndef QT3DRENDER_QLAYERFILTER_H
+#define QT3DRENDER_QLAYERFILTER_H
 
 #include <Qt3DRenderer/qframegraphnode.h>
 #include <QStringList>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QLayerFilterPrivate;
 
@@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QLayerFilter : public QFrameGraphNode
     Q_OBJECT
     Q_PROPERTY(QStringList layers READ layers WRITE setLayers NOTIFY layersChanged)
 public:
-    explicit QLayerFilter(QNode *parent = 0);
+    explicit QLayerFilter(Qt3D::QNode *parent = 0);
     ~QLayerFilter();
 
     void setLayers(const QStringList &layers);
@@ -61,16 +61,16 @@ Q_SIGNALS:
     void layersChanged();
 
 protected:
-    QLayerFilter(QLayerFilterPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QLayerFilter(QLayerFilterPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QLayerFilter)
     QT3D_CLONEABLE(QLayerFilter)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QLAYERFILTER_H
+#endif // QT3DRENDER_QLAYERFILTER_H
diff --git a/src/render/frontend/framegraph-components/qlayerfilter_p.h b/src/render/frontend/framegraph-components/qlayerfilter_p.h
index d998652e4..e1abb7cf8 100644
--- a/src/render/frontend/framegraph-components/qlayerfilter_p.h
+++ b/src/render/frontend/framegraph-components/qlayerfilter_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QLAYERFILTER_P_H
-#define QT3D_QLAYERFILTER_P_H
+#ifndef QT3DRENDER_QLAYERFILTER_P_H
+#define QT3DRENDER_QLAYERFILTER_P_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <private/qframegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QLayerFilter;
 
@@ -55,8 +55,8 @@ public:
     QStringList m_layers;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QLAYERFILTER_P_H
+#endif // QT3DRENDER_QLAYERFILTER_P_H
diff --git a/src/render/frontend/framegraph-components/qnodraw.cpp b/src/render/frontend/framegraph-components/qnodraw.cpp
index ed695145d..294bdba5f 100644
--- a/src/render/frontend/framegraph-components/qnodraw.cpp
+++ b/src/render/frontend/framegraph-components/qnodraw.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
  * \class Qt3D::QNoDraw::QNoDraw
@@ -48,8 +48,8 @@ namespace Qt3D {
  *
  * Qt3D::QNoDraw should be used when the FrameGraph needs to set up some render
  * states or clear some buffers without requiring any mesh to be drawn. It has
- * the same effect as having a Qt3D::QRenderPassFilter that matches none of
- * available Qt3D::QRenderPass instances of the scene without the overhead cost
+ * the same effect as having a Qt3DRender::QRenderPassFilter that matches none of
+ * available Qt3DRender::QRenderPass instances of the scene without the overhead cost
  * of actually performing the filtering.
  *
  * \since 5.5
@@ -65,6 +65,6 @@ QNoDraw::~QNoDraw()
     QNode::cleanup();
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/framegraph-components/qnodraw.h b/src/render/frontend/framegraph-components/qnodraw.h
index 99174573b..361bbfdc4 100644
--- a/src/render/frontend/framegraph-components/qnodraw.h
+++ b/src/render/frontend/framegraph-components/qnodraw.h
@@ -34,28 +34,28 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QNODRAW_H
-#define QT3D_QNODRAW_H
+#ifndef QT3DRENDER_QNODRAW_H
+#define QT3DRENDER_QNODRAW_H
 
 #include <Qt3DRenderer/qframegraphnode.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QT3DRENDERERSHARED_EXPORT QNoDraw : public QFrameGraphNode
 {
     Q_OBJECT
 public:
-    explicit QNoDraw(QNode *parent = 0);
+    explicit QNoDraw(Qt3D::QNode *parent = 0);
     ~QNoDraw();
 
 private:
     QT3D_CLONEABLE(QNoDraw)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QNODRAW_H
+#endif // QT3DRENDER_QNODRAW_H
diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
index a0c845b00..bc72ed652 100644
--- a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
+++ b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
@@ -43,10 +43,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QRenderPassFilterPrivate
+    \class Qt3DRender::QRenderPassFilterPrivate
     \internal
 */
 
@@ -154,6 +156,6 @@ QList<QParameter *> QRenderPassFilter::parameters() const
     return d->m_parameters;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.h b/src/render/frontend/framegraph-components/qrenderpassfilter.h
index e0f71a78b..edab54406 100644
--- a/src/render/frontend/framegraph-components/qrenderpassfilter.h
+++ b/src/render/frontend/framegraph-components/qrenderpassfilter.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRENDERPASSFILTER_H
-#define QT3D_QRENDERPASSFILTER_H
+#ifndef QT3DRENDER_QRENDERPASSFILTER_H
+#define QT3DRENDER_QRENDERPASSFILTER_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/qframegraphnode.h>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QRenderPassFilterPrivate;
 class QAnnotation;
@@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode
     Q_OBJECT
 
 public:
-    explicit QRenderPassFilter(QNode *parent = 0);
+    explicit QRenderPassFilter(Qt3D::QNode *parent = 0);
     ~QRenderPassFilter();
 
     QList<QAnnotation *> includes() const;
@@ -67,16 +67,16 @@ public:
     QList<QParameter *> parameters() const;
 
 protected:
-    QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QRenderPassFilter)
     QT3D_CLONEABLE(QRenderPassFilter)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QRENDERPASSFILTER_H
+#endif // QT3DRENDER_QRENDERPASSFILTER_H
diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter_p.h b/src/render/frontend/framegraph-components/qrenderpassfilter_p.h
index a849bf0c2..a1f3a4afa 100644
--- a/src/render/frontend/framegraph-components/qrenderpassfilter_p.h
+++ b/src/render/frontend/framegraph-components/qrenderpassfilter_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRENDERPASSFILTER_P_H
-#define QT3D_QRENDERPASSFILTER_P_H
+#ifndef QT3DRENDER_QRENDERPASSFILTER_P_H
+#define QT3DRENDER_QRENDERPASSFILTER_P_H
 
 #include <private/qframegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QRenderPassFilter;
 
@@ -58,8 +58,8 @@ public:
     QList<QParameter *> m_parameters;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QRENDERPASSFILTER_P_H
+#endif // QT3DRENDER_QRENDERPASSFILTER_P_H
diff --git a/src/render/frontend/framegraph-components/qrendertargetselector.cpp b/src/render/frontend/framegraph-components/qrendertargetselector.cpp
index 069252766..fc87cadc9 100644
--- a/src/render/frontend/framegraph-components/qrendertargetselector.cpp
+++ b/src/render/frontend/framegraph-components/qrendertargetselector.cpp
@@ -42,10 +42,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QRenderTargetSelectorPrivate
+    \class Qt3DRender::QRenderTargetSelectorPrivate
     \internal
 */
 QRenderTargetSelectorPrivate::QRenderTargetSelectorPrivate()
@@ -96,9 +98,9 @@ QRenderTarget *QRenderTargetSelector::target() const
 /*!
  * \internal
  * Sets the draw buffers \a buffers to be used. The draw buffers should be
- * matching the Qt3D::QRenderAttachment::RenderAttachmentType
- * defined in the attachments of the Qt3D::QRenderTarget associated to the
- * Qt3D::QRenderTargetSelector instance.
+ * matching the Qt3DRender::QRenderAttachment::RenderAttachmentType
+ * defined in the attachments of the Qt3DRender::QRenderTarget associated to the
+ * Qt3DRender::QRenderTargetSelector instance.
  *
  * \note At render time, if no draw buffer has been specified, the renderer will
  * default to using all the attachments' draw buffers.
@@ -120,7 +122,7 @@ void QRenderTargetSelector::setDrawBuffers(const QList<QRenderAttachment::Render
 }
 
 /*!
- * Returns the list of draw buffers for the current Qt3D::QRenderTargetSelector instance.
+ * Returns the list of draw buffers for the current Qt3DRender::QRenderTargetSelector instance.
  */
 QList<QRenderAttachment::RenderAttachmentType> QRenderTargetSelector::drawBuffers() const
 {
@@ -133,6 +135,6 @@ QRenderTargetSelector::QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Q
 {
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/framegraph-components/qrendertargetselector.h b/src/render/frontend/framegraph-components/qrendertargetselector.h
index 33529d4d9..c05f4584f 100644
--- a/src/render/frontend/framegraph-components/qrendertargetselector.h
+++ b/src/render/frontend/framegraph-components/qrendertargetselector.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRENDERTARGETSELECTOR_H
-#define QT3D_QRENDERTARGETSELECTOR_H
+#ifndef QT3DRENDER_QRENDERTARGETSELECTOR_H
+#define QT3DRENDER_QRENDERTARGETSELECTOR_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qnode.h>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QRenderTargetSelectorPrivate;
 class QRenderTarget;
@@ -52,9 +52,9 @@ class QRenderTarget;
 class QT3DRENDERERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged)
+    Q_PROPERTY(Qt3DRender::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged)
 public:
-    explicit QRenderTargetSelector(QNode *parent = 0);
+    explicit QRenderTargetSelector(Qt3D::QNode *parent = 0);
     ~QRenderTargetSelector();
 
     void setTarget(QRenderTarget *target);
@@ -67,18 +67,18 @@ Q_SIGNALS:
     void targetChanged();
 
 protected:
-    QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QRenderTargetSelector)
     QT3D_CLONEABLE(QRenderTargetSelector)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QList<Qt3D::QRenderAttachment::RenderAttachmentType>)
+Q_DECLARE_METATYPE(QList<Qt3DRender::QRenderAttachment::RenderAttachmentType>)
 
-#endif // QT3D_QRENDERTARGETSELECTOR_H
+#endif // QT3DRENDER_QRENDERTARGETSELECTOR_H
diff --git a/src/render/frontend/framegraph-components/qrendertargetselector_p.h b/src/render/frontend/framegraph-components/qrendertargetselector_p.h
index 10a27ee3a..fa4d4aff2 100644
--- a/src/render/frontend/framegraph-components/qrendertargetselector_p.h
+++ b/src/render/frontend/framegraph-components/qrendertargetselector_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRENDERTARGETSELECTOR_P_H
-#define QT3D_QRENDERTARGETSELECTOR_P_H
+#ifndef QT3DRENDER_QRENDERTARGETSELECTOR_P_H
+#define QT3DRENDER_QRENDERTARGETSELECTOR_P_H
 
 #include <private/qframegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QRenderTargetSelector;
 class QRenderTarget;
@@ -56,8 +56,8 @@ public:
     QList<QRenderAttachment::RenderAttachmentType> m_drawBuffers;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QRENDERTARGETSELECTOR_P_H
+#endif // QT3DRENDER_QRENDERTARGETSELECTOR_P_H
diff --git a/src/render/frontend/framegraph-components/qsortcriterion.cpp b/src/render/frontend/framegraph-components/qsortcriterion.cpp
index a85608df9..2c09a552c 100644
--- a/src/render/frontend/framegraph-components/qsortcriterion.cpp
+++ b/src/render/frontend/framegraph-components/qsortcriterion.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
     \class Qt3D::QSortCriterionPrivate
@@ -91,6 +91,6 @@ QSortCriterion::QSortCriterion(QSortCriterionPrivate &dd, QNode *parent)
 {
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/framegraph-components/qsortcriterion.h b/src/render/frontend/framegraph-components/qsortcriterion.h
index 81371aa7e..d4e12a7a8 100644
--- a/src/render/frontend/framegraph-components/qsortcriterion.h
+++ b/src/render/frontend/framegraph-components/qsortcriterion.h
@@ -34,24 +34,24 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSORTCRITERION_H
-#define QT3D_QSORTCRITERION_H
+#ifndef QT3DRENDER_QSORTCRITERION_H
+#define QT3DRENDER_QSORTCRITERION_H
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QSortCriterionPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QSortCriterion : public QNode
+class QT3DRENDERERSHARED_EXPORT QSortCriterion : public Qt3D::QNode
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged)
+    Q_PROPERTY(Qt3DRender::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged)
 public:
-    explicit QSortCriterion(QNode *parent = 0);
+    explicit QSortCriterion(Qt3D::QNode *parent = 0);
     ~QSortCriterion();
 
     enum SortType {
@@ -68,15 +68,15 @@ Q_SIGNALS:
     void sortChanged();
 
 protected:
-    QSortCriterion(QSortCriterionPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QSortCriterion(QSortCriterionPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     QT3D_CLONEABLE(QSortCriterion)
     Q_DECLARE_PRIVATE(QSortCriterion)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/frontend/framegraph-components/qsortcriterion_p.h b/src/render/frontend/framegraph-components/qsortcriterion_p.h
index 7e75c9a59..d4701aa24 100644
--- a/src/render/frontend/framegraph-components/qsortcriterion_p.h
+++ b/src/render/frontend/framegraph-components/qsortcriterion_p.h
@@ -34,17 +34,17 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSORTCRITERION_P_H
-#define QT3D_QSORTCRITERION_P_H
+#ifndef QT3DRENDER_QSORTCRITERION_P_H
+#define QT3DRENDER_QSORTCRITERION_P_H
 
 #include <private/qnode_p.h>
 #include <Qt3DRenderer/qsortcriterion.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QSortCriterionPrivate : public QNodePrivate
+class QSortCriterionPrivate : public Qt3D::QNodePrivate
 {
 public:
     QSortCriterionPrivate();
@@ -53,8 +53,8 @@ public:
     QSortCriterion::SortType m_sort;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSORTCRITERION_P_H
+#endif // QT3DRENDER_QSORTCRITERION_P_H
diff --git a/src/render/frontend/framegraph-components/qsortmethod.cpp b/src/render/frontend/framegraph-components/qsortmethod.cpp
index 824c8d198..c103fbe47 100644
--- a/src/render/frontend/framegraph-components/qsortmethod.cpp
+++ b/src/render/frontend/framegraph-components/qsortmethod.cpp
@@ -42,7 +42,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
     \class Qt3D::QSortMethodPrivate
@@ -113,6 +115,6 @@ QList<QSortCriterion *> QSortMethod::criteria() const
     return d->m_criteria;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/framegraph-components/qsortmethod.h b/src/render/frontend/framegraph-components/qsortmethod.h
index c0f17fdd4..5eb5ee85e 100644
--- a/src/render/frontend/framegraph-components/qsortmethod.h
+++ b/src/render/frontend/framegraph-components/qsortmethod.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSORTMETHOD_H
-#define QT3D_QSORTMETHOD_H
+#ifndef QT3DRENDER_QSORTMETHOD_H
+#define QT3DRENDER_QSORTMETHOD_H
 
 #include <Qt3DRenderer/qframegraphnode.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QSortCriterion;
 class QSortMethodPrivate;
@@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QSortMethod : public QFrameGraphNode
     Q_OBJECT
 
 public:
-    explicit QSortMethod(QNode *parent = 0);
+    explicit QSortMethod(Qt3D::QNode *parent = 0);
     ~QSortMethod();
 
     void addCriterion(QSortCriterion *criterion);
@@ -59,16 +59,16 @@ public:
     QList<QSortCriterion *> criteria() const;
 
 protected:
-    QSortMethod(QSortMethodPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QSortMethod(QSortMethodPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QSortMethod)
     QT3D_CLONEABLE(QSortMethod)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSORTMETHOD_H
+#endif // QT3DRENDER_QSORTMETHOD_H
diff --git a/src/render/frontend/framegraph-components/qsortmethod_p.h b/src/render/frontend/framegraph-components/qsortmethod_p.h
index 4ee604463..5cc7944ea 100644
--- a/src/render/frontend/framegraph-components/qsortmethod_p.h
+++ b/src/render/frontend/framegraph-components/qsortmethod_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSORTMETHOD_P_H
-#define QT3D_QSORTMETHOD_P_H
+#ifndef QT3DRENDER_QSORTMETHOD_P_H
+#define QT3DRENDER_QSORTMETHOD_P_H
 
 #include <private/qframegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QSortMethod;
 class QSortCriterion;
@@ -54,8 +54,8 @@ public:
     QList<QSortCriterion *> m_criteria;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSORTMETHOD_P_H
+#endif // QT3DRENDER_QSORTMETHOD_P_H
diff --git a/src/render/frontend/framegraph-components/qstateset.cpp b/src/render/frontend/framegraph-components/qstateset.cpp
index aad72596c..cd7646d7b 100644
--- a/src/render/frontend/framegraph-components/qstateset.cpp
+++ b/src/render/frontend/framegraph-components/qstateset.cpp
@@ -42,7 +42,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 QStateSetPrivate::QStateSetPrivate()
     : QFrameGraphNodePrivate()
@@ -58,14 +60,14 @@ QStateSetPrivate::QStateSetPrivate()
  * branch.
  *
  * States set on a Qt3D::QStateSet are set globally, contrary to the per
- * Material states that can be set on a Qt3D::QRenderPass. By default an empty
+ * Material states that can be set on a Qt3DRender::QRenderPass. By default an empty
  * Qt3D::QStateSet will result in all render states being disabled when
  * executed. Adding a Qt3D::QRenderState state explicitly enables that render
  * state at runtime.
  *
  * \since 5.5
  *
- * \sa Qt3D::QRenderState, Qt3D::QRenderPass
+ * \sa Qt3D::QRenderState, Qt3DRender::QRenderPass
  */
 
 QStateSet::QStateSet(QNode *parent)
@@ -141,6 +143,6 @@ QList<QRenderState *> QStateSet::renderStates() const
     return d->m_renderStates;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/framegraph-components/qstateset.h b/src/render/frontend/framegraph-components/qstateset.h
index 24c8609ed..c9d6eb68d 100644
--- a/src/render/frontend/framegraph-components/qstateset.h
+++ b/src/render/frontend/framegraph-components/qstateset.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSTATESET_H
-#define QT3D_QSTATESET_H
+#ifndef QT3DRENDER_QSTATESET_H
+#define QT3DRENDER_QSTATESET_H
 
 #include <Qt3DRenderer/qframegraphnode.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QStateSetPrivate;
 class QRenderState;
@@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QStateSet : public QFrameGraphNode
     Q_OBJECT
 
 public:
-    explicit QStateSet(QNode *parent = 0);
+    explicit QStateSet(Qt3D::QNode *parent = 0);
     ~QStateSet();
 
     void addRenderState(QRenderState *state);
@@ -59,16 +59,16 @@ public:
     QList<QRenderState *> renderStates() const;
 
 protected:
-    QStateSet(QStateSetPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QStateSet(QStateSetPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QStateSet)
     QT3D_CLONEABLE(QStateSet)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSTATESET_H
+#endif // QT3DRENDER_QSTATESET_H
diff --git a/src/render/frontend/framegraph-components/qstateset_p.h b/src/render/frontend/framegraph-components/qstateset_p.h
index 290578bec..69e743fd0 100644
--- a/src/render/frontend/framegraph-components/qstateset_p.h
+++ b/src/render/frontend/framegraph-components/qstateset_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSTATESET_P_H
-#define QT3D_QSTATESET_P_H
+#ifndef QT3DRENDER_QSTATESET_P_H
+#define QT3DRENDER_QSTATESET_P_H
 
 #include <private/qframegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QStateSet;
 class QRenderState;
@@ -55,9 +55,9 @@ public:
     QList<QRenderState *> m_renderStates;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSTATESET_P_H
+#endif // QT3DRENDER_QSTATESET_P_H
 
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.cpp b/src/render/frontend/framegraph-components/qtechniquefilter.cpp
index 1a1efc553..6092fb870 100644
--- a/src/render/frontend/framegraph-components/qtechniquefilter.cpp
+++ b/src/render/frontend/framegraph-components/qtechniquefilter.cpp
@@ -43,10 +43,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QTechniqueFilterPrivate
+    \class Qt3DRender::QTechniqueFilterPrivate
     \internal
 */
 QTechniqueFilterPrivate::QTechniqueFilterPrivate()
@@ -158,6 +160,6 @@ QList<QParameter *> QTechniqueFilter::parameters() const
     return d->m_parameters;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.h b/src/render/frontend/framegraph-components/qtechniquefilter.h
index eae99d231..8b8a115f8 100644
--- a/src/render/frontend/framegraph-components/qtechniquefilter.h
+++ b/src/render/frontend/framegraph-components/qtechniquefilter.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTECHNIQUEFILTER_H
-#define QT3D_QTECHNIQUEFILTER_H
+#ifndef QT3DRENDER_QTECHNIQUEFILTER_H
+#define QT3DRENDER_QTECHNIQUEFILTER_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/qframegraphnode.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QTechniqueFilterPrivate;
 class QAnnotation;
@@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode
 {
     Q_OBJECT
 public:
-    explicit QTechniqueFilter(QNode *parent = 0);
+    explicit QTechniqueFilter(Qt3D::QNode *parent = 0);
     ~QTechniqueFilter();
 
     QList<QAnnotation *> criteria() const;
@@ -64,16 +64,16 @@ public:
     QList<QParameter *> parameters() const;
 
 protected:
-    QTechniqueFilter(QTechniqueFilterPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QTechniqueFilter)
     QT3D_CLONEABLE(QTechniqueFilter)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTECHNIQUEFILTER_H
+#endif // QT3DRENDER_QTECHNIQUEFILTER_H
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter_p.h b/src/render/frontend/framegraph-components/qtechniquefilter_p.h
index 1b87f4e12..219e50b9a 100644
--- a/src/render/frontend/framegraph-components/qtechniquefilter_p.h
+++ b/src/render/frontend/framegraph-components/qtechniquefilter_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTECHNIQUEFILTER_P_H
-#define QT3D_QTECHNIQUEFILTER_P_H
+#ifndef QT3DRENDER_QTECHNIQUEFILTER_P_H
+#define QT3DRENDER_QTECHNIQUEFILTER_P_H
 
 #include <private/qframegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QTechniqueFilter;
 
@@ -55,8 +55,8 @@ public :
     QList<QParameter *> m_parameters;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTECHNIQUEFILTER_P_H
+#endif // QT3DRENDER_QTECHNIQUEFILTER_P_H
diff --git a/src/render/frontend/framegraph-components/qviewport.cpp b/src/render/frontend/framegraph-components/qviewport.cpp
index 6197dcd52..4f821b58f 100644
--- a/src/render/frontend/framegraph-components/qviewport.cpp
+++ b/src/render/frontend/framegraph-components/qviewport.cpp
@@ -41,10 +41,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QViewportPrivate
+    \class Qt3DRender::QViewportPrivate
     \internal
 */
 QViewportPrivate::QViewportPrivate()
@@ -106,6 +106,6 @@ void QViewport::setClearColor(const QColor &color)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/framegraph-components/qviewport.h b/src/render/frontend/framegraph-components/qviewport.h
index 7390e85ae..3f427d044 100644
--- a/src/render/frontend/framegraph-components/qviewport.h
+++ b/src/render/frontend/framegraph-components/qviewport.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QVIEWPORT_H
-#define QT3D_QVIEWPORT_H
+#ifndef QT3DRENDER_QVIEWPORT_H
+#define QT3DRENDER_QVIEWPORT_H
 
 #include <Qt3DRenderer/qframegraphnode.h>
 #include <QRectF>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QViewportPrivate;
 
@@ -54,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QViewport : public QFrameGraphNode
     Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged)
 
 public:
-    explicit QViewport(QNode *parent = 0);
+    explicit QViewport(Qt3D::QNode *parent = 0);
     ~QViewport();
 
     QRectF rect() const;
@@ -68,16 +68,16 @@ Q_SIGNALS:
     void clearColorChanged();
 
 protected:
-    QViewport(QViewportPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QViewport(QViewportPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QViewport)
     QT3D_CLONEABLE(QViewport)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QVIEWPORT_H
+#endif // QT3DRENDER_QVIEWPORT_H
diff --git a/src/render/frontend/framegraph-components/qviewport_p.h b/src/render/frontend/framegraph-components/qviewport_p.h
index 4e42887d7..bb1cd1a26 100644
--- a/src/render/frontend/framegraph-components/qviewport_p.h
+++ b/src/render/frontend/framegraph-components/qviewport_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QVIEWPORT_P_H
-#define QT3D_QVIEWPORT_P_H
+#ifndef QT3DRENDER_QVIEWPORT_P_H
+#define QT3DRENDER_QVIEWPORT_P_H
 
 #include <private/qframegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QViewport;
 
@@ -55,8 +55,8 @@ public :
     QColor m_clearColor;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QVIEWPORT_P_H
+#endif // QT3DRENDER_QVIEWPORT_P_H
diff --git a/src/render/frontend/qabstractlight.cpp b/src/render/frontend/qabstractlight.cpp
index 053841ee8..82e1826be 100644
--- a/src/render/frontend/qabstractlight.cpp
+++ b/src/render/frontend/qabstractlight.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D
+namespace Qt3DRender
 {
 
 /*!
@@ -155,6 +155,6 @@ QShaderData::TransformType QAbstractLight::positionTransformed() const
     return QShaderData::ModelToEye;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qabstractlight.h b/src/render/frontend/qabstractlight.h
index c5db0e67c..6f30fe955 100644
--- a/src/render/frontend/qabstractlight.h
+++ b/src/render/frontend/qabstractlight.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTLIGHT_H
-#define QT3D_QABSTRACTLIGHT_H
+#ifndef QT3DRENDER_QABSTRACTLIGHT_H
+#define QT3DRENDER_QABSTRACTLIGHT_H
 
 #include <Qt3DRenderer/qshaderdata.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
@@ -45,8 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D
-{
+namespace Qt3DRender {
 
 class QAbstractLightPrivate;
 
@@ -59,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QAbstractLight : public QShaderData
     Q_PROPERTY(TransformType positionTransformed READ positionTransformed CONSTANT)
 
 public :
-    explicit QAbstractLight(QNode *parent = 0);
+    explicit QAbstractLight(Qt3D::QNode *parent = 0);
 
     QColor color() const;
     void setColor(const QColor &color);
@@ -73,8 +72,8 @@ public :
     TransformType positionTransformed() const;
 
 protected :
-    QAbstractLight(QAbstractLightPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QAbstractLight(QAbstractLightPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
     void colorChanged();
@@ -85,8 +84,8 @@ private:
     Q_DECLARE_PRIVATE(QAbstractLight)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_LIGHT_H
+#endif // QT3DRENDER_LIGHT_H
diff --git a/src/render/frontend/qabstractlight_p.h b/src/render/frontend/qabstractlight_p.h
index 1d90a398a..9d70d4bb9 100644
--- a/src/render/frontend/qabstractlight_p.h
+++ b/src/render/frontend/qabstractlight_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTLIGHT_P_H
-#define QT3D_QABSTRACTLIGHT_P_H
+#ifndef QT3DRENDER_QABSTRACTLIGHT_P_H
+#define QT3DRENDER_QABSTRACTLIGHT_P_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <private/qshaderdata_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAbstractLight;
 
@@ -61,4 +61,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTLIGHT_P_H
+#endif // QT3DRENDER_QABSTRACTLIGHT_P_H
diff --git a/src/render/frontend/qabstractsceneloader.cpp b/src/render/frontend/qabstractsceneloader.cpp
index 539fdcf5e..d0e9a8838 100644
--- a/src/render/frontend/qabstractsceneloader.cpp
+++ b/src/render/frontend/qabstractsceneloader.cpp
@@ -42,12 +42,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
-namespace Render {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::Render::QAbstractSceneLoaderPrivate
+    \class Qt3DRender::Render::QAbstractSceneLoaderPrivate
     \internal
 */
 QAbstractSceneLoaderPrivate::QAbstractSceneLoaderPrivate()
@@ -70,7 +68,7 @@ QAbstractSceneLoader::QAbstractSceneLoader(QNode *parent)
 
 QAbstractSceneLoader::~QAbstractSceneLoader()
 {
-    Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QAbstractSceneLoader subclass didn't call QNode::cleanup in its destructor");
+    Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QAbstractSceneLoader subclass didn't call QNode::cleanup in its destructor");
 }
 
 void QAbstractSceneLoader::copy(const QNode *ref)
@@ -109,8 +107,6 @@ void QAbstractSceneLoader::setStatus(QAbstractSceneLoader::Status status)
     }
 }
 
-} // Render
-
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qabstractsceneloader.h b/src/render/frontend/qabstractsceneloader.h
index 368eb4bc6..88af95577 100644
--- a/src/render/frontend/qabstractsceneloader.h
+++ b/src/render/frontend/qabstractsceneloader.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTSCENELOADER_H
-#define QT3D_QABSTRACTSCENELOADER_H
+#ifndef QT3DRENDER_QABSTRACTSCENELOADER_H
+#define QT3DRENDER_QABSTRACTSCENELOADER_H
 
 #include <Qt3DCore/qcomponent.h>
 #include <Qt3DCore/qscenechange.h>
@@ -44,19 +44,18 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-namespace Render {
+namespace Qt3DRender {
 
 class QAbstractSceneLoader;
 class QAbstractSceneLoaderPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoader : public QComponent
+class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoader : public Qt3D::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
 public:
-    explicit QAbstractSceneLoader(QNode *parent = 0);
+    explicit QAbstractSceneLoader(Qt3D::QNode *parent = 0);
     ~QAbstractSceneLoader();
 
     enum Status {
@@ -77,17 +76,15 @@ Q_SIGNALS:
     void statusChanged();
 
 protected:
-    QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QAbstractSceneLoader)
 };
 
-} // Render
-
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTSCENELOADER_H
+#endif // QT3DRENDER_QABSTRACTSCENELOADER_H
diff --git a/src/render/frontend/qabstractsceneloader_p.h b/src/render/frontend/qabstractsceneloader_p.h
index c76f5d854..3377c730c 100644
--- a/src/render/frontend/qabstractsceneloader_p.h
+++ b/src/render/frontend/qabstractsceneloader_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTSCENELOADER_P_H
-#define QT3D_QABSTRACTSCENELOADER_P_H
+#ifndef QT3DRENDER_QABSTRACTSCENELOADER_P_H
+#define QT3DRENDER_QABSTRACTSCENELOADER_P_H
 
 #include <private/qcomponent_p.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
@@ -43,14 +43,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class AbstractSceneParser;
 
-namespace Render {
-
-
-class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoaderPrivate : public QComponentPrivate
+class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoaderPrivate : public Qt3D::QComponentPrivate
 {
 public:
     QAbstractSceneLoaderPrivate();
@@ -61,10 +58,8 @@ public:
     QAbstractSceneLoader::Status m_status;
 };
 
-} // Render
-
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTSCENE_P_H
+#endif // QT3DRENDER_QABSTRACTSCENE_P_H
diff --git a/src/render/frontend/qabstracttextureimage.cpp b/src/render/frontend/qabstracttextureimage.cpp
index f02cf1002..5f44090d4 100644
--- a/src/render/frontend/qabstracttextureimage.cpp
+++ b/src/render/frontend/qabstracttextureimage.cpp
@@ -40,7 +40,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
     \class Qt3D::QAbstractTextureImagePrivate
@@ -89,7 +91,7 @@ QAbstractTextureImage::QAbstractTextureImage(QNode *parent)
  */
 QAbstractTextureImage::~QAbstractTextureImage()
 {
-    Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QAbstractTextureImage subclass didn't call QNode::cleanup in its destructor");
+    Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QAbstractTextureImage subclass didn't call QNode::cleanup in its destructor");
 }
 
 
@@ -217,6 +219,6 @@ QAbstractTextureImage::QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Q
 {
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qabstracttextureimage.h b/src/render/frontend/qabstracttextureimage.h
index e73e823d1..24efd2508 100644
--- a/src/render/frontend/qabstracttextureimage.h
+++ b/src/render/frontend/qabstracttextureimage.h
@@ -34,21 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTTEXTUREIMAGE_H
-#define QT3D_QABSTRACTTEXTUREIMAGE_H
+#ifndef QT3DRENDER_QABSTRACTTEXTUREIMAGE_H
+#define QT3DRENDER_QABSTRACTTEXTUREIMAGE_H
 
 #include <Qt3DCore/qabstractfunctor.h>
 #include <Qt3DRenderer/qabstracttextureprovider.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 // TO DO TexImageDataPtr -> QImageDataPtr + d_ptr
 // We might also get rid of the layer, face, mipmap level from
 // TexImageDataPtr and store that in the functor directly
 // or use the QTextureImage instead
-class QT3DRENDERERSHARED_EXPORT QTextureDataFunctor : public QAbstractFunctor
+class QT3DRENDERERSHARED_EXPORT QTextureDataFunctor : public Qt3D::QAbstractFunctor
 {
 public:
     virtual ~QTextureDataFunctor() {}
@@ -60,14 +60,14 @@ typedef QSharedPointer<QTextureDataFunctor> QTextureDataFunctorPtr;
 
 class QAbstractTextureImagePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractTextureImage : public QNode
+class QT3DRENDERERSHARED_EXPORT QAbstractTextureImage : public Qt3D::QNode
 {
     Q_OBJECT
     Q_PROPERTY(int mipmapLevel READ mipmapLevel WRITE setMipmapLevel NOTIFY mipmapLevelChanged)
     Q_PROPERTY(int layer READ layer WRITE setLayer NOTIFY layerChanged)
-    Q_PROPERTY(Qt3D::QAbstractTextureProvider::CubeMapFace cubeMapFace READ cubeMapFace WRITE setCubeMapFace NOTIFY cubeMapFaceChanged)
+    Q_PROPERTY(Qt3DRender::QAbstractTextureProvider::CubeMapFace cubeMapFace READ cubeMapFace WRITE setCubeMapFace NOTIFY cubeMapFaceChanged)
 public:
-    explicit QAbstractTextureImage(QNode *parent = 0);
+    explicit QAbstractTextureImage(Qt3D::QNode *parent = 0);
     virtual ~QAbstractTextureImage();
 
     int mipmapLevel() const;
@@ -87,17 +87,17 @@ Q_SIGNALS:
     void cubeMapFaceChanged();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
-    QAbstractTextureImage(QAbstractTextureImagePrivate &dd, QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Qt3D::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QAbstractTextureImage)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QTextureDataFunctorPtr)
+Q_DECLARE_METATYPE(Qt3DRender::QTextureDataFunctorPtr)
 
-#endif // QT3D_QABSTRACTTEXTUREIMAGE_H
+#endif // QT3DRENDER_QABSTRACTTEXTUREIMAGE_H
diff --git a/src/render/frontend/qabstracttextureimage_p.h b/src/render/frontend/qabstracttextureimage_p.h
index fd795f18a..a56cd7573 100644
--- a/src/render/frontend/qabstracttextureimage_p.h
+++ b/src/render/frontend/qabstracttextureimage_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTTEXTUREIMAGE_P_H
-#define QT3D_QABSTRACTTEXTUREIMAGE_P_H
+#ifndef QT3DRENDER_QABSTRACTTEXTUREIMAGE_P_H
+#define QT3DRENDER_QABSTRACTTEXTUREIMAGE_P_H
 
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DRenderer/private/qt3drenderer_global_p.h>
@@ -43,11 +43,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAbstractTextureImage;
 
-class QT3DRENDERERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public QNodePrivate
+class QT3DRENDERERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3D::QNodePrivate
 {
 public:
     QAbstractTextureImagePrivate()
@@ -65,9 +65,9 @@ public:
     QAbstractTextureProvider::CubeMapFace m_face;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTTEXTUREIMAGE_P_H
+#endif // QT3DRENDER_QABSTRACTTEXTUREIMAGE_P_H
 
diff --git a/src/render/frontend/qabstracttextureprovider.cpp b/src/render/frontend/qabstracttextureprovider.cpp
index 8d858da38..34259b511 100644
--- a/src/render/frontend/qabstracttextureprovider.cpp
+++ b/src/render/frontend/qabstracttextureprovider.cpp
@@ -41,10 +41,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QAbstractTextureProviderPrivate
+    \class Qt3DRender::QAbstractTextureProviderPrivate
     \internal
 */
 QAbstractTextureProviderPrivate::QAbstractTextureProviderPrivate()
@@ -88,12 +90,12 @@ void QAbstractTextureProvider::copy(const QNode *ref)
 }
 
 /*!
-    \class Qt3D::QAbstractTextureProvider
+    \class Qt3DRender::QAbstractTextureProvider
     \inmodule Qt3DRender
     \since 5.5
     \brief A base class to be used to provide textures.
 
-    Qt3D::QAbstractTextureProvider shouldn't be used directly but rather
+    Qt3DRender::QAbstractTextureProvider shouldn't be used directly but rather
     through one of its subclasses. Each subclass implements a given texture
     target (2D, 2DArray, 3D, CubeMap ...) Each subclass provides a set of
     functors for each layer, cube map face and mipmap level. In turn the
@@ -137,7 +139,7 @@ void QAbstractTextureProvider::setSize(int w, int h, int d)
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::width
+    \property Qt3DRender::QAbstractTextureProvider::width
 
     Holds the width of the texture provider.
  */
@@ -151,7 +153,7 @@ void QAbstractTextureProvider::setWidth(int width)
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::height
+    \property Qt3DRender::QAbstractTextureProvider::height
 
     Holds the height of the texture provider.
  */
@@ -165,7 +167,7 @@ void QAbstractTextureProvider::setHeight(int height)
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::depth
+    \property Qt3DRender::QAbstractTextureProvider::depth
 
     Holds the depth of the texture provider.
  */
@@ -197,7 +199,7 @@ int QAbstractTextureProvider::depth() const
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::maximumLayers
+    \property Qt3DRender::QAbstractTextureProvider::maximumLayers
 
     Holds the maximum layer count of the texture provider. By default, the
     maximum layer count is 1.
@@ -227,7 +229,7 @@ int QAbstractTextureProvider::maximumLayers() const
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::unique
+    \property Qt3DRender::QAbstractTextureProvider::unique
 
     Sets whether this texture provider should be unique by reading \a unique.
     By default this is false.
@@ -260,7 +262,7 @@ bool QAbstractTextureProvider::isUnique() const
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::format
+    \property Qt3DRender::QAbstractTextureProvider::format
 
     Holds the format of the texture provider.
  */
@@ -283,7 +285,7 @@ QAbstractTextureProvider::TextureFormat QAbstractTextureProvider::format() const
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::status readonly
+    \property Qt3DRender::QAbstractTextureProvider::status readonly
 
     Holds the current status of the texture provider.
  */
@@ -303,7 +305,7 @@ QAbstractTextureProvider::Status QAbstractTextureProvider::status() const
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::target readonly
+    \property Qt3DRender::QAbstractTextureProvider::target readonly
 
     Holds the target format of the texture provider.
 
@@ -319,7 +321,7 @@ QAbstractTextureProvider::Target QAbstractTextureProvider::target() const
     Adds a new Qt3D::QAbstractTextureImage \a textureImage to the texture provider.
 
     \note Qt3D::QAbstractTextureImage should never be shared between multiple
-    Qt3D::QAbstractTextureProvider instances.
+    Qt3DRender::QAbstractTextureProvider instances.
  */
 void QAbstractTextureProvider::addTextureImage(QAbstractTextureImage *textureImage)
 {
@@ -372,7 +374,7 @@ QList<QAbstractTextureImage *> QAbstractTextureProvider::textureImages() const
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::generateMipMaps
+    \property Qt3DRender::QAbstractTextureProvider::generateMipMaps
 
     Holds whether the texture provider should auto generate mipmaps.
  */
@@ -392,7 +394,7 @@ bool QAbstractTextureProvider::generateMipMaps() const
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::minificationFilter
+    \property Qt3DRender::QAbstractTextureProvider::minificationFilter
 
     Holds the minification filter of the texture provider.
  */
@@ -406,7 +408,7 @@ void QAbstractTextureProvider::setMinificationFilter(Filter f)
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::magnificationFilter
+    \property Qt3DRender::QAbstractTextureProvider::magnificationFilter
 
     Holds the magnification filter of the texture provider.
  */
@@ -432,7 +434,7 @@ QAbstractTextureProvider::Filter QAbstractTextureProvider::magnificationFilter()
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::wrapMode
+    \property Qt3DRender::QAbstractTextureProvider::wrapMode
 
     Holds the wrap mode of the texture provider.
  */
@@ -469,7 +471,7 @@ QTextureWrapMode *QAbstractTextureProvider::wrapMode()
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::maximumAnisotropy
+    \property Qt3DRender::QAbstractTextureProvider::maximumAnisotropy
 
     Holds the maximum anisotropy of the texture provider.
  */
@@ -489,7 +491,7 @@ float QAbstractTextureProvider::maximumAnisotropy() const
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::comparisonFunction
+    \property Qt3DRender::QAbstractTextureProvider::comparisonFunction
 
     Holds the comparison function of the texture provider.
  */
@@ -509,7 +511,7 @@ QAbstractTextureProvider::ComparisonFunction QAbstractTextureProvider::compariso
 }
 
 /*!
-    \property Qt3D::QAbstractTextureProvider::comparisonMode
+    \property Qt3DRender::QAbstractTextureProvider::comparisonMode
 
     Holds the comparison mode of the texture provider.
  */
@@ -528,6 +530,6 @@ QAbstractTextureProvider::ComparisonMode QAbstractTextureProvider::comparisonMod
     return d->m_comparisonMode;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qabstracttextureprovider.h b/src/render/frontend/qabstracttextureprovider.h
index 436e3f84c..4a8e3adde 100644
--- a/src/render/frontend/qabstracttextureprovider.h
+++ b/src/render/frontend/qabstracttextureprovider.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTTEXTUREPROVIDER_H
-#define QT3D_QABSTRACTTEXTUREPROVIDER_H
+#ifndef QT3DRENDER_QABSTRACTTEXTUREPROVIDER_H
+#define QT3DRENDER_QABSTRACTTEXTUREPROVIDER_H
 
 #include <Qt3DRenderer/texturedata.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
@@ -43,19 +43,19 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAbstractTextureProviderPrivate;
 class QTextureWrapMode;
 class QAbstractTextureImage;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractTextureProvider : public QNode
+class QT3DRENDERERSHARED_EXPORT QAbstractTextureProvider : public Qt3D::QNode
 {
     Q_OBJECT
     Q_PROPERTY(Target target READ target CONSTANT)
     Q_PROPERTY(TextureFormat format READ format WRITE setFormat NOTIFY formatChanged)
     Q_PROPERTY(bool generateMipMaps READ generateMipMaps WRITE setGenerateMipMaps NOTIFY generateMipMapsChanged)
-    Q_PROPERTY(Qt3D::QTextureWrapMode *wrapMode READ wrapMode CONSTANT)
+    Q_PROPERTY(Qt3DRender::QTextureWrapMode *wrapMode READ wrapMode CONSTANT)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(int width READ width WRITE setWidth NOTIFY widthChanged)
     Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged)
@@ -326,10 +326,10 @@ Q_SIGNALS:
     void uniqueChanged();
 
 protected:
-    explicit QAbstractTextureProvider(QNode *parent = 0);
-    explicit QAbstractTextureProvider(Target target, QNode *parent = 0);
-    QAbstractTextureProvider(QAbstractTextureProviderPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    explicit QAbstractTextureProvider(Qt3D::QNode *parent = 0);
+    explicit QAbstractTextureProvider(Target target, Qt3D::QNode *parent = 0);
+    QAbstractTextureProvider(QAbstractTextureProviderPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
     void setStatus(Status status);
 
 private:
@@ -337,8 +337,8 @@ private:
     QT3D_CLONEABLE(QAbstractTextureProvider)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTTEXTUREPROVIDER_H
+#endif // QT3DRENDER_QABSTRACTTEXTUREPROVIDER_H
diff --git a/src/render/frontend/qabstracttextureprovider_p.h b/src/render/frontend/qabstracttextureprovider_p.h
index b9f216e5c..c6516904c 100644
--- a/src/render/frontend/qabstracttextureprovider_p.h
+++ b/src/render/frontend/qabstracttextureprovider_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTTEXTUREPROVIDER_P_H
-#define QT3D_QABSTRACTTEXTUREPROVIDER_P_H
+#ifndef QT3DRENDER_QABSTRACTTEXTUREPROVIDER_P_H
+#define QT3DRENDER_QABSTRACTTEXTUREPROVIDER_P_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/private/qnode_p.h>
@@ -44,9 +44,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QAbstractTextureProviderPrivate : public QNodePrivate
+class QAbstractTextureProviderPrivate : public Qt3D::QNodePrivate
 {
 public :
     QAbstractTextureProviderPrivate();
@@ -76,5 +76,5 @@ public :
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTTEXTUREPROVIDER_P_H
+#endif // QT3DRENDER_QABSTRACTTEXTUREPROVIDER_P_H
 
diff --git a/src/render/frontend/qalphacoverage.cpp b/src/render/frontend/qalphacoverage.cpp
index 2075b2704..7a8fea6bb 100644
--- a/src/render/frontend/qalphacoverage.cpp
+++ b/src/render/frontend/qalphacoverage.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAlphaCoveragePrivate : public QRenderStatePrivate
 {
@@ -62,6 +62,6 @@ QAlphaCoverage::~QAlphaCoverage()
     QNode::cleanup();
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qalphacoverage.h b/src/render/frontend/qalphacoverage.h
index 7ac1c7765..753b28919 100644
--- a/src/render/frontend/qalphacoverage.h
+++ b/src/render/frontend/qalphacoverage.h
@@ -35,14 +35,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QALPHACOVERAGE_H
-#define QT3D_QALPHACOVERAGE_H
+#ifndef QT3DRENDER_QALPHACOVERAGE_H
+#define QT3DRENDER_QALPHACOVERAGE_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAlphaCoveragePrivate;
 
@@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QAlphaCoverage : public QRenderState
 {
     Q_OBJECT
 public:
-    explicit QAlphaCoverage(QNode *parent = 0);
+    explicit QAlphaCoverage(Qt3D::QNode *parent = 0);
     ~QAlphaCoverage();
 
 private:
@@ -58,8 +58,8 @@ private:
     QT3D_CLONEABLE(QAlphaCoverage)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QALPHACOVERAGE_H
+#endif // QT3DRENDER_QALPHACOVERAGE_H
diff --git a/src/render/frontend/qalphatest.cpp b/src/render/frontend/qalphatest.cpp
index 1fb92db3a..34071c52d 100644
--- a/src/render/frontend/qalphatest.cpp
+++ b/src/render/frontend/qalphatest.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAlphaTestPrivate : public QRenderStatePrivate
 {
@@ -107,6 +107,6 @@ void QAlphaTest::setClamp(float clamp)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qalphatest.h b/src/render/frontend/qalphatest.h
index 4e8e86ca6..d59340ec7 100644
--- a/src/render/frontend/qalphatest.h
+++ b/src/render/frontend/qalphatest.h
@@ -35,14 +35,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QALPHATEST_H
-#define QT3D_QALPHATEST_H
+#ifndef QT3DRENDER_QALPHATEST_H
+#define QT3DRENDER_QALPHATEST_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAlphaTestPrivate;
 
@@ -65,7 +65,7 @@ public:
     };
     Q_ENUM(AlphaFunc)
 
-    explicit QAlphaTest(QNode *parent = 0);
+    explicit QAlphaTest(Qt3D::QNode *parent = 0);
     ~QAlphaTest();
 
     AlphaFunc func() const;
@@ -79,15 +79,15 @@ Q_SIGNALS:
     void clampChanged();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QAlphaTest)
     QT3D_CLONEABLE(QAlphaTest)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QALPHATEST_H
+#endif // QT3DRENDER_QALPHATEST_H
diff --git a/src/render/frontend/qannotation.cpp b/src/render/frontend/qannotation.cpp
index 1c0a2c583..85a46fcbe 100644
--- a/src/render/frontend/qannotation.cpp
+++ b/src/render/frontend/qannotation.cpp
@@ -41,11 +41,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 
 /*!
-    \class Qt3D::QAnnotationPrivate
+    \class Qt3DRender::QAnnotationPrivate
     \internal
 */
 QAnnotationPrivate::QAnnotationPrivate()
@@ -54,7 +54,7 @@ QAnnotationPrivate::QAnnotationPrivate()
 }
 
 /*!
-    \class QAnnotation
+    \class Qt3DRender::QAnnotation
     \inmodule Qt3DRenderer
     \since 5.5
     \brief The QAnnotation class provides ...
@@ -62,7 +62,7 @@ QAnnotationPrivate::QAnnotationPrivate()
 
 /*!
     \qmltype Annotation
-    \instantiates Qt3D::QAnnotation
+    \instantiates Qt3DRender::QAnnotation
     \inherits Node
     \inqmlmodule Qt3D.Renderer
     \since 5.5
@@ -141,6 +141,6 @@ QString QAnnotation::name() const
     return d->m_name;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qannotation.h b/src/render/frontend/qannotation.h
index f38402fb3..158ebdc77 100644
--- a/src/render/frontend/qannotation.h
+++ b/src/render/frontend/qannotation.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QANNOTATION_H
-#define QT3D_QANNOTATION_H
+#ifndef QT3DRENDER_QANNOTATION_H
+#define QT3DRENDER_QANNOTATION_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qnode.h>
@@ -43,17 +43,17 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAnnotationPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QAnnotation : public QNode
+class QT3DRENDERERSHARED_EXPORT QAnnotation : public Qt3D::QNode
 {
     Q_OBJECT
     Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
 public:
-    explicit QAnnotation(QNode *parent = 0);
+    explicit QAnnotation(Qt3D::QNode *parent = 0);
     ~QAnnotation();
 
     void setValue(const QVariant &value);
@@ -67,15 +67,15 @@ Q_SIGNALS:
     void valueChanged();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QAnnotation)
     QT3D_CLONEABLE(QAnnotation)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QANNOTATION_H
+#endif // QT3DRENDER_QANNOTATION_H
diff --git a/src/render/frontend/qannotation_p.h b/src/render/frontend/qannotation_p.h
index d0bd44dc5..e61ee0c35 100644
--- a/src/render/frontend/qannotation_p.h
+++ b/src/render/frontend/qannotation_p.h
@@ -34,17 +34,17 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QANNOTATION_P_H
-#define QT3D_QANNOTATION_P_H
+#ifndef QT3DRENDER_QANNOTATION_P_H
+#define QT3DRENDER_QANNOTATION_P_H
 
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DRenderer/qannotation.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QAnnotationPrivate : public QNodePrivate
+class QAnnotationPrivate : public Qt3D::QNodePrivate
 {
 public:
     QAnnotationPrivate();
@@ -54,8 +54,8 @@ public:
     QVariant m_value;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QANNOTATION_P_H
+#endif // QT3DRENDER_QANNOTATION_P_H
diff --git a/src/render/frontend/qblendequation.cpp b/src/render/frontend/qblendequation.cpp
index 1631a74dd..bee40fc67 100644
--- a/src/render/frontend/qblendequation.cpp
+++ b/src/render/frontend/qblendequation.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QBlendEquationPrivate : public QRenderStatePrivate
 {
@@ -88,6 +88,6 @@ void QBlendEquation::setMode(QBlendEquation::BlendMode mode)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qblendequation.h b/src/render/frontend/qblendequation.h
index 78df85183..94735fdb6 100644
--- a/src/render/frontend/qblendequation.h
+++ b/src/render/frontend/qblendequation.h
@@ -35,14 +35,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBLENDEQUATION_H
-#define QT3D_QBLENDEQUATION_H
+#ifndef QT3DRENDER_QBLENDEQUATION_H
+#define QT3DRENDER_QBLENDEQUATION_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QBlendEquationPrivate;
 
@@ -62,7 +62,7 @@ public:
     };
     Q_ENUM(BlendMode)
 
-    explicit QBlendEquation(QNode *parent = 0);
+    explicit QBlendEquation(Qt3D::QNode *parent = 0);
     ~QBlendEquation();
 
     BlendMode mode() const;
@@ -72,15 +72,15 @@ Q_SIGNALS:
     void modeChanged();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QBlendEquation)
     QT3D_CLONEABLE(QBlendEquation)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBLENDEQUATION_H
+#endif // QT3DRENDER_QBLENDEQUATION_H
diff --git a/src/render/frontend/qblendstate.cpp b/src/render/frontend/qblendstate.cpp
index e3344c0cc..7f7a8d680 100644
--- a/src/render/frontend/qblendstate.cpp
+++ b/src/render/frontend/qblendstate.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QBlendStatePrivate : public QRenderStatePrivate
 {
@@ -260,6 +260,6 @@ QBlendStateSeparate::QBlendStateSeparate(QNode *parent)
 {
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qblendstate.h b/src/render/frontend/qblendstate.h
index 7f3901f22..25072f449 100644
--- a/src/render/frontend/qblendstate.h
+++ b/src/render/frontend/qblendstate.h
@@ -35,14 +35,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBLENDSTATE_H
-#define QT3D_QBLENDSTATE_H
+#ifndef QT3DRENDER_QBLENDSTATE_H
+#define QT3DRENDER_QBLENDSTATE_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QBlendStatePrivate;
 
@@ -80,7 +80,7 @@ public:
     };
     Q_ENUM(Blending)
 
-    explicit QBlendState(QNode *parent = 0);
+    explicit QBlendState(Qt3D::QNode *parent = 0);
     ~QBlendState();
 
     Blending srcRGB() const;
@@ -102,8 +102,8 @@ Q_SIGNALS:
     void dstAlphaChanged();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
-    QBlendState(QRenderState::Type type, QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QBlendState(QRenderState::Type type, Qt3D::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QBlendState)
@@ -114,11 +114,11 @@ class QT3DRENDERERSHARED_EXPORT QBlendStateSeparate : public QBlendState
 {
     Q_OBJECT
 public:
-    explicit QBlendStateSeparate(QNode *parent = 0);
+    explicit QBlendStateSeparate(Qt3D::QNode *parent = 0);
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBLENDSTATE_H
+#endif // QT3DRENDER_QBLENDSTATE_H
diff --git a/src/render/frontend/qclipplane.cpp b/src/render/frontend/qclipplane.cpp
index 61f406187..d3f2fadb3 100644
--- a/src/render/frontend/qclipplane.cpp
+++ b/src/render/frontend/qclipplane.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QClipPlanePrivate : public QRenderStatePrivate
 {
@@ -120,6 +120,6 @@ void QClipPlane::copy(const QNode *ref)
     d_func()->m_plane = refClip->plane();
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qclipplane.h b/src/render/frontend/qclipplane.h
index a1d6c0db3..7afa6c5e7 100644
--- a/src/render/frontend/qclipplane.h
+++ b/src/render/frontend/qclipplane.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCLIPPLANE_H
-#define QT3D_QCLIPPLANE_H
+#ifndef QT3DRENDER_QCLIPPLANE_H
+#define QT3DRENDER_QCLIPPLANE_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QClipPlanePrivate;
 
@@ -50,14 +50,14 @@ class QT3DRENDERERSHARED_EXPORT QClipPlane : public QRenderState
     Q_OBJECT
     Q_PROPERTY(int plane READ plane WRITE setPlane NOTIFY planeChanged)
 public:
-    explicit QClipPlane(QNode *parent = 0);
+    explicit QClipPlane(Qt3D::QNode *parent = 0);
     ~QClipPlane();
 
     int plane() const;
     void setPlane(int);
 
 protected:
-    void copy(const QNode *ref) Q_DECL_FINAL;
+    void copy(const Qt3D::QNode *ref) Q_DECL_FINAL;
 
 Q_SIGNALS:
     void planeChanged();
@@ -67,8 +67,8 @@ private:
     QT3D_CLONEABLE(QClipPlane)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCLIPPLANE_H
+#endif // QT3DRENDER_QCLIPPLANE_H
diff --git a/src/render/frontend/qcolormask.cpp b/src/render/frontend/qcolormask.cpp
index 3c2057c08..9f61825ea 100644
--- a/src/render/frontend/qcolormask.cpp
+++ b/src/render/frontend/qcolormask.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QColorMaskPrivate : public QRenderStatePrivate
 {
@@ -173,7 +173,7 @@ void QColorMask::copy(const QNode *ref)
     d_func()->m_alpha = refState->d_func()->m_alpha;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/frontend/qcolormask.h b/src/render/frontend/qcolormask.h
index b58f4f569..886feebbb 100644
--- a/src/render/frontend/qcolormask.h
+++ b/src/render/frontend/qcolormask.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCOLORMASK_H
-#define QT3D_QCOLORMASK_H
+#ifndef QT3DRENDER_QCOLORMASK_H
+#define QT3DRENDER_QCOLORMASK_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QColorMaskPrivate;
 
@@ -54,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QColorMask : public QRenderState
     Q_PROPERTY(bool alpha READ isAlpha WRITE setAlpha NOTIFY alphaChanged)
 
 public:
-    explicit QColorMask(QNode *parent = Q_NULLPTR);
+    explicit QColorMask(Qt3D::QNode *parent = Q_NULLPTR);
     ~QColorMask();
 
     bool isRed() const;
@@ -74,15 +74,15 @@ Q_SIGNALS:
     void alphaChanged();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_FINAL;
+    void copy(const Qt3D::QNode *ref) Q_DECL_FINAL;
 
 private:
     Q_DECLARE_PRIVATE(QColorMask)
     QT3D_CLONEABLE(QColorMask)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCOLORMASK_H
+#endif // QT3DRENDER_QCOLORMASK_H
diff --git a/src/render/frontend/qcuboidmesh.cpp b/src/render/frontend/qcuboidmesh.cpp
index 9e26d8400..85435c893 100644
--- a/src/render/frontend/qcuboidmesh.cpp
+++ b/src/render/frontend/qcuboidmesh.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace {
 
@@ -398,7 +398,7 @@ private:
 };
 
 /*!
-    \class Qt3D::QCuboidMeshPrivate
+    \class Qt3DRender::QCuboidMeshPrivate
     \internal
 */
 class CuboidGeometry : public QGeometry
@@ -690,7 +690,7 @@ QSize QCuboidMesh::xyMeshResolution() const
     return static_cast<CuboidGeometry *>(geometry())->xyMeshResolution();
 }
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/frontend/qcuboidmesh.h b/src/render/frontend/qcuboidmesh.h
index 8e4578795..293c948d0 100644
--- a/src/render/frontend/qcuboidmesh.h
+++ b/src/render/frontend/qcuboidmesh.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_CUBOIDMESH_H
-#define QT3D_CUBOIDMESH_H
+#ifndef QT3DRENDER_CUBOIDMESH_H
+#define QT3DRENDER_CUBOIDMESH_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/qgeometryrenderer.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QT3DRENDERERSHARED_EXPORT QCuboidMesh : public QGeometryRenderer
 {
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QCuboidMesh : public QGeometryRenderer
     Q_PROPERTY(QSize xyMeshResolution READ xyMeshResolution WRITE setXYMeshResolution NOTIFY xyMeshResolutionChanged)
 
 public:
-    explicit QCuboidMesh(QNode *parent = 0);
+    explicit QCuboidMesh(Qt3D::QNode *parent = 0);
     ~QCuboidMesh();
 
     void setXExtent(float xExtent);
@@ -103,8 +103,8 @@ private:
     void setPrimitiveType(PrimitiveType primitiveType);
 };
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_CUBOIDMESH_H
+#endif // QT3DRENDER_CUBOIDMESH_H
diff --git a/src/render/frontend/qcullface.cpp b/src/render/frontend/qcullface.cpp
index 4bd885c34..ce71aaa59 100644
--- a/src/render/frontend/qcullface.cpp
+++ b/src/render/frontend/qcullface.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QCullFacePrivate : public QRenderStatePrivate
 {
@@ -89,6 +89,6 @@ void QCullFace::setMode(QCullFace::CullingMode mode)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qcullface.h b/src/render/frontend/qcullface.h
index 646df0811..d8832bcd6 100644
--- a/src/render/frontend/qcullface.h
+++ b/src/render/frontend/qcullface.h
@@ -36,14 +36,14 @@
 ****************************************************************************/
 
 
-#ifndef QT3D_QCULLFACE_H
-#define QT3D_QCULLFACE_H
+#ifndef QT3DRENDER_QCULLFACE_H
+#define QT3DRENDER_QCULLFACE_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QCullFacePrivate;
 
@@ -62,7 +62,7 @@ public:
     };
     Q_ENUM(CullingMode)
 
-    explicit QCullFace(QNode *parent = 0);
+    explicit QCullFace(Qt3D::QNode *parent = 0);
     ~QCullFace();
 
     CullingMode mode() const;
@@ -72,15 +72,15 @@ Q_SIGNALS:
     void modeChanged();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QCullFace)
     QT3D_CLONEABLE(QCullFace)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCULLFACE_H
+#endif // QT3DRENDER_QCULLFACE_H
diff --git a/src/render/frontend/qcylindergeometry.cpp b/src/render/frontend/qcylindergeometry.cpp
index 328c34deb..a1fff8a5f 100644
--- a/src/render/frontend/qcylindergeometry.cpp
+++ b/src/render/frontend/qcylindergeometry.cpp
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace {
 
@@ -447,6 +447,6 @@ float QCylinderGeometry::length() const
     return d->m_length;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qcylindergeometry.h b/src/render/frontend/qcylindergeometry.h
index 28b542ebe..3f381c609 100644
--- a/src/render/frontend/qcylindergeometry.h
+++ b/src/render/frontend/qcylindergeometry.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCYLINDERGEOMETRY_H
-#define QT3D_QCYLINDERGEOMETRY_H
+#ifndef QT3DRENDER_QCYLINDERGEOMETRY_H
+#define QT3DRENDER_QCYLINDERGEOMETRY_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/qgeometry.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QCylinderGeometryPrivate;
 
@@ -84,8 +84,8 @@ private:
     QT3D_CLONEABLE(QCylinderGeometry)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCYLINDERGEOMETRY_H
+#endif // QT3DRENDER_QCYLINDERGEOMETRY_H
diff --git a/src/render/frontend/qcylindergeometry_p.h b/src/render/frontend/qcylindergeometry_p.h
index b6fa67b2b..4fea1b5ba 100644
--- a/src/render/frontend/qcylindergeometry_p.h
+++ b/src/render/frontend/qcylindergeometry_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCYLINDERGEOMETRY_P_H
-#define QT3D_QCYLINDERGEOMETRY_P_H
+#ifndef QT3DRENDER_QCYLINDERGEOMETRY_P_H
+#define QT3DRENDER_QCYLINDERGEOMETRY_P_H
 
 #include <Qt3DRenderer/private/qgeometry_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAttribute;
 class QBuffer;
@@ -67,9 +67,9 @@ public:
     QBuffer *m_indexBuffer;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCYLINDERGEOMETRY_P_H
+#endif // QT3DRENDER_QCYLINDERGEOMETRY_P_H
 
diff --git a/src/render/frontend/qcylindermesh.cpp b/src/render/frontend/qcylindermesh.cpp
index c944f0977..8d9783493 100644
--- a/src/render/frontend/qcylindermesh.cpp
+++ b/src/render/frontend/qcylindermesh.cpp
@@ -49,7 +49,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 QCylinderMesh::QCylinderMesh(QNode *parent)
     : QGeometryRenderer(parent)
@@ -108,6 +108,6 @@ float QCylinderMesh::length() const
     return static_cast<QCylinderGeometry *>(geometry())->length();
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qcylindermesh.h b/src/render/frontend/qcylindermesh.h
index 1334dc306..648ebf2de 100644
--- a/src/render/frontend/qcylindermesh.h
+++ b/src/render/frontend/qcylindermesh.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCYLINDERMESH_H
-#define QT3D_QCYLINDERMESH_H
+#ifndef QT3DRENDER_QCYLINDERMESH_H
+#define QT3DRENDER_QCYLINDERMESH_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/qgeometryrenderer.h>
@@ -43,7 +43,7 @@
 QT_BEGIN_NAMESPACE
 
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QT3DRENDERERSHARED_EXPORT QCylinderMesh : public QGeometryRenderer
 {
@@ -53,7 +53,7 @@ class QT3DRENDERERSHARED_EXPORT QCylinderMesh : public QGeometryRenderer
     Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged)
     Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged)
 public:
-    explicit QCylinderMesh(QNode *parent = 0);
+    explicit QCylinderMesh(Qt3D::QNode *parent = 0);
     ~QCylinderMesh();
 
     void setRings(int rings);
@@ -86,8 +86,8 @@ private:
     void setPrimitiveType(PrimitiveType primitiveType);
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCYLINDERMESH_H
+#endif // QT3DRENDER_QCYLINDERMESH_H
diff --git a/src/render/frontend/qdepthmask.cpp b/src/render/frontend/qdepthmask.cpp
index df95b08d7..76e5339d0 100644
--- a/src/render/frontend/qdepthmask.cpp
+++ b/src/render/frontend/qdepthmask.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QDepthMaskPrivate : public QRenderStatePrivate
 {
@@ -89,6 +89,6 @@ void QDepthMask::setMask(bool mask)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qdepthmask.h b/src/render/frontend/qdepthmask.h
index d8f33d651..fdd02b4d3 100644
--- a/src/render/frontend/qdepthmask.h
+++ b/src/render/frontend/qdepthmask.h
@@ -35,14 +35,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QDEPTHMASK_H
-#define QT3D_QDEPTHMASK_H
+#ifndef QT3DRENDER_QDEPTHMASK_H
+#define QT3DRENDER_QDEPTHMASK_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QDepthMaskPrivate;
 
@@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT  QDepthMask : public QRenderState
     Q_OBJECT
     Q_PROPERTY (bool mask READ mask WRITE setMask NOTIFY maskChanged)
 public:
-    explicit QDepthMask(QNode *parent = 0);
+    explicit QDepthMask(Qt3D::QNode *parent = 0);
     ~QDepthMask();
 
     bool mask() const;
@@ -61,15 +61,15 @@ Q_SIGNALS:
     void maskChanged();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QDepthMask)
     QT3D_CLONEABLE(QDepthMask)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QDEPTHMASK_H
+#endif // QT3DRENDER_QDEPTHMASK_H
diff --git a/src/render/frontend/qdepthtest.cpp b/src/render/frontend/qdepthtest.cpp
index 716544dac..017b7ce00 100644
--- a/src/render/frontend/qdepthtest.cpp
+++ b/src/render/frontend/qdepthtest.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QDepthTest;
 
@@ -91,6 +91,6 @@ void QDepthTest::setFunc(QDepthTest::DepthFunc func)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qdepthtest.h b/src/render/frontend/qdepthtest.h
index e58dc25e7..e9b4275b6 100644
--- a/src/render/frontend/qdepthtest.h
+++ b/src/render/frontend/qdepthtest.h
@@ -35,14 +35,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QDEPTHTEST_H
-#define QT3D_QDEPTHTEST_H
+#ifndef QT3DRENDER_QDEPTHTEST_H
+#define QT3DRENDER_QDEPTHTEST_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QDepthTestPrivate;
 
@@ -64,7 +64,7 @@ public:
     };
     Q_ENUM(DepthFunc)
 
-    explicit QDepthTest(QNode *parent = 0);
+    explicit QDepthTest(Qt3D::QNode *parent = 0);
     ~QDepthTest();
 
     DepthFunc func() const;
@@ -74,15 +74,15 @@ Q_SIGNALS:
     void funcChanged();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QDepthTest)
     QT3D_CLONEABLE(QDepthTest)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QDEPTHTEST_H
+#endif // QT3DRENDER_QDEPTHTEST_H
diff --git a/src/render/frontend/qdirectionallight.cpp b/src/render/frontend/qdirectionallight.cpp
index 515ddfae0..ebdc1e170 100644
--- a/src/render/frontend/qdirectionallight.cpp
+++ b/src/render/frontend/qdirectionallight.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
  *
@@ -105,6 +105,6 @@ QVector3D QDirectionalLight::direction() const
     return d->m_direction;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qdirectionallight.h b/src/render/frontend/qdirectionallight.h
index a6e3f8bcc..f626d4f6a 100644
--- a/src/render/frontend/qdirectionallight.h
+++ b/src/render/frontend/qdirectionallight.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QDIRECTIONALLIGHT_H
-#define QT3D_QDIRECTIONALLIGHT_H
+#ifndef QT3DRENDER_QDIRECTIONALLIGHT_H
+#define QT3DRENDER_QDIRECTIONALLIGHT_H
 
 #include <Qt3DRenderer/qabstractlight.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QDirectionalLightPrivate;
 
@@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QDirectionalLight : public QAbstractLight
     Q_PROPERTY(QVector3D direction READ direction WRITE setDirection NOTIFY directionChanged)
 
 public:
-    explicit QDirectionalLight(QNode *parent = 0);
+    explicit QDirectionalLight(Qt3D::QNode *parent = 0);
 
     void setDirection(const QVector3D &direction);
     QVector3D direction() const;
@@ -60,16 +60,16 @@ Q_SIGNALS:
     void directionChanged();
 
 protected:
-    QDirectionalLight(QDirectionalLightPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QDirectionalLight(QDirectionalLightPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QDirectionalLight)
     QT3D_CLONEABLE(QDirectionalLight)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QDIRECTIONALLIGHT_H
+#endif // QT3DRENDER_QDIRECTIONALLIGHT_H
diff --git a/src/render/frontend/qdirectionallight_p.h b/src/render/frontend/qdirectionallight_p.h
index bfe24211c..4cff5e192 100644
--- a/src/render/frontend/qdirectionallight_p.h
+++ b/src/render/frontend/qdirectionallight_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QDIRECTIONALLIGHT_P_H
-#define QT3D_QDIRECTIONALLIGHT_P_H
+#ifndef QT3DRENDER_QDIRECTIONALLIGHT_P_H
+#define QT3DRENDER_QDIRECTIONALLIGHT_P_H
 
 #include <private/qabstractlight_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QDirectionalLight;
 
@@ -54,8 +54,8 @@ public:
     QVector3D m_direction;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QDIRECTIONALLIGHT_P_H
+#endif // QT3DRENDER_QDIRECTIONALLIGHT_P_H
diff --git a/src/render/frontend/qdithering.cpp b/src/render/frontend/qdithering.cpp
index c82272644..fd8ce1c2f 100644
--- a/src/render/frontend/qdithering.cpp
+++ b/src/render/frontend/qdithering.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QDitheringPrivate : public QRenderStatePrivate
 {
@@ -64,6 +64,6 @@ QDithering::~QDithering()
     QNode::cleanup();
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qdithering.h b/src/render/frontend/qdithering.h
index 5f41dc3d6..37794e372 100644
--- a/src/render/frontend/qdithering.h
+++ b/src/render/frontend/qdithering.h
@@ -35,14 +35,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QDITHERING_H
-#define QT3D_QDITHERING_H
+#ifndef QT3DRENDER_QDITHERING_H
+#define QT3DRENDER_QDITHERING_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QDitheringPrivate;
 
@@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QDithering : public QRenderState
 {
     Q_OBJECT
 public:
-    explicit QDithering(QNode *parent = 0);
+    explicit QDithering(Qt3D::QNode *parent = 0);
     ~QDithering();
 
 private:
@@ -58,8 +58,8 @@ private:
     QT3D_CLONEABLE(QDithering)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QDITHERING_H
+#endif // QT3DRENDER_QDITHERING_H
diff --git a/src/render/frontend/qeffect.cpp b/src/render/frontend/qeffect.cpp
index 2dc5a5def..443571872 100644
--- a/src/render/frontend/qeffect.cpp
+++ b/src/render/frontend/qeffect.cpp
@@ -43,10 +43,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QEffectPrivate
+    \class Qt3DRender::QEffectPrivate
     \internal
 */
 QEffectPrivate::QEffectPrivate()
@@ -177,6 +179,6 @@ QList<QTechnique *> QEffect::techniques() const
 }
 
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qeffect.h b/src/render/frontend/qeffect.h
index 59a34f238..164a6392a 100644
--- a/src/render/frontend/qeffect.h
+++ b/src/render/frontend/qeffect.h
@@ -34,26 +34,26 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QEFFECT_H
-#define QT3D_QEFFECT_H
+#ifndef QT3DRENDER_QEFFECT_H
+#define QT3DRENDER_QEFFECT_H
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QParameter;
 class QTechnique;
 class QEffectPrivate;
 
 class QT3DRENDERERSHARED_EXPORT QEffect
-        : public QNode
+        : public Qt3D::QNode
 {
     Q_OBJECT
 public:
-    explicit QEffect(QNode *parent = 0);
+    explicit QEffect(Qt3D::QNode *parent = 0);
     ~QEffect();
 
     void addParameter(QParameter *parameter);
@@ -65,16 +65,16 @@ public:
     QList<QTechnique *> techniques() const;
 
 protected:
-    QEffect(QEffectPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QEffect(QEffectPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QEffect)
     QT3D_CLONEABLE(QEffect)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QEFFECT_H
+#endif // QT3DRENDER_QEFFECT_H
diff --git a/src/render/frontend/qeffect_p.h b/src/render/frontend/qeffect_p.h
index 53485c6cd..7b9ca5b99 100644
--- a/src/render/frontend/qeffect_p.h
+++ b/src/render/frontend/qeffect_p.h
@@ -34,21 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QEFFECT_P_H
-#define QT3D_QEFFECT_P_H
+#ifndef QT3DRENDER_QEFFECT_P_H
+#define QT3DRENDER_QEFFECT_P_H
 
 #include <private/qnode_p.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QParameter;
 class QTechnique;
 
-class QT3DRENDERERSHARED_EXPORT QEffectPrivate : public QNodePrivate
+class QT3DRENDERERSHARED_EXPORT QEffectPrivate : public Qt3D::QNodePrivate
 {
 public :
     QEffectPrivate();
@@ -58,8 +58,8 @@ public :
     QList<QTechnique *> m_techniques;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QEFFECT_P_H
+#endif // QT3DRENDER_QEFFECT_P_H
diff --git a/src/render/frontend/qfrontface.cpp b/src/render/frontend/qfrontface.cpp
index b56cce619..4ec5043a4 100644
--- a/src/render/frontend/qfrontface.cpp
+++ b/src/render/frontend/qfrontface.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QFrontFacePrivate : public QRenderStatePrivate
 {
@@ -89,6 +89,6 @@ void QFrontFace::setDirection(QFrontFace::FaceDir direction)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qfrontface.h b/src/render/frontend/qfrontface.h
index ad52685c4..0a2c8cac9 100644
--- a/src/render/frontend/qfrontface.h
+++ b/src/render/frontend/qfrontface.h
@@ -35,14 +35,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QFRONTFACE_H
-#define QT3D_QFRONTFACE_H
+#ifndef QT3DRENDER_QFRONTFACE_H
+#define QT3DRENDER_QFRONTFACE_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QFrontFacePrivate;
 
@@ -59,7 +59,7 @@ public:
     };
     Q_ENUM(FaceDir)
 
-    explicit QFrontFace(QNode *parent = 0);
+    explicit QFrontFace(Qt3D::QNode *parent = 0);
     ~QFrontFace();
 
     FaceDir direction() const;
@@ -69,15 +69,15 @@ Q_SIGNALS:
     void directionChanged();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QFrontFace)
     QT3D_CLONEABLE(QFrontFace)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QFRONTFACE_H
+#endif // QT3DRENDER_QFRONTFACE_H
diff --git a/src/render/frontend/qgeometry.cpp b/src/render/frontend/qgeometry.cpp
index ac030bbf2..e59e195a1 100644
--- a/src/render/frontend/qgeometry.cpp
+++ b/src/render/frontend/qgeometry.cpp
@@ -42,7 +42,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 QGeometry::QGeometry(QNode *parent)
     : QNode(*new QGeometryPrivate(), parent)
@@ -59,7 +61,7 @@ QGeometry::~QGeometry()
     QNode::cleanup();
 }
 
-void QGeometry::addAttribute(QAbstractAttribute *attribute)
+void QGeometry::addAttribute(Qt3D::QAbstractAttribute *attribute)
 {
     Q_D(QGeometry);
     if (!d->m_attributes.contains(attribute)) {
@@ -81,7 +83,7 @@ void QGeometry::addAttribute(QAbstractAttribute *attribute)
     }
 }
 
-void QGeometry::removeAttribute(QAbstractAttribute *attribute)
+void QGeometry::removeAttribute(Qt3D::QAbstractAttribute *attribute)
 {
     Q_D(QGeometry);
     if (d->m_changeArbiter != Q_NULLPTR) {
@@ -123,6 +125,6 @@ void QGeometry::copy(const QNode *ref)
         d_func()->m_attributes.append(qobject_cast<QAbstractAttribute *>(QNode::clone(attribute)));
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qgeometry.h b/src/render/frontend/qgeometry.h
index 5578f41f7..f8774aba6 100644
--- a/src/render/frontend/qgeometry.h
+++ b/src/render/frontend/qgeometry.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QGEOMETRY_H
-#define QT3D_QGEOMETRY_H
+#ifndef QT3DRENDER_QGEOMETRY_H
+#define QT3DRENDER_QGEOMETRY_H
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
@@ -43,24 +43,27 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
+class QAbstractAttribute;
+}
+
+namespace Qt3DRender {
 
 class QGeometryPrivate;
-class QAbstractAttribute;
 
-typedef QVector<QAbstractAttribute *> QAttributeList;
+typedef QVector<Qt3D::QAbstractAttribute *> QAttributeList;
 
-class QT3DRENDERERSHARED_EXPORT QGeometry : public QNode
+class QT3DRENDERERSHARED_EXPORT QGeometry : public Qt3D::QNode
 {
     Q_OBJECT
     Q_PROPERTY(int verticesPerPatch READ verticesPerPatch WRITE setVerticesPerPatch NOTIFY verticesPerPatchChanged)
 
 public:
-    explicit QGeometry(QNode *parent = 0);
+    explicit QGeometry(Qt3D::QNode *parent = 0);
     ~QGeometry();
 
     QAttributeList attributes() const;
-    void addAttribute(QAbstractAttribute *attribute);
-    void removeAttribute(QAbstractAttribute *attribute);
+    void addAttribute(Qt3D::QAbstractAttribute *attribute);
+    void removeAttribute(Qt3D::QAbstractAttribute *attribute);
 
     void setVerticesPerPatch(int verticesPerPatch);
     int verticesPerPatch() const;
@@ -69,16 +72,16 @@ Q_SIGNALS:
     void verticesPerPatchChanged();
 
 protected:
-    QGeometry(QGeometryPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QGeometry(QGeometryPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QGeometry)
     QT3D_CLONEABLE(QGeometry)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QGEOMETRY_H
+#endif // QT3DRENDER_QGEOMETRY_H
diff --git a/src/render/frontend/qgeometry_p.h b/src/render/frontend/qgeometry_p.h
index 24dad3c86..9f298585b 100644
--- a/src/render/frontend/qgeometry_p.h
+++ b/src/render/frontend/qgeometry_p.h
@@ -41,9 +41,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QGeometryPrivate : public QNodePrivate
+class QGeometryPrivate : public Qt3D::QNodePrivate
 {
 public:
     Q_DECLARE_PUBLIC(QGeometry)
@@ -56,7 +56,7 @@ public:
     int m_verticesPerPatch;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/frontend/qgeometryrenderer.cpp b/src/render/frontend/qgeometryrenderer.cpp
index a74fcc579..8ba50b1b1 100644
--- a/src/render/frontend/qgeometryrenderer.cpp
+++ b/src/render/frontend/qgeometryrenderer.cpp
@@ -42,7 +42,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 QGeometryRendererPrivate::QGeometryRendererPrivate()
     : QComponentPrivate()
@@ -254,7 +256,7 @@ void QGeometryRenderer::copy(const QNode *ref)
     d_func()->m_functor = other->d_func()->m_functor;
 }
 
-void QGeometryRenderer::sceneChangeEvent(const QSceneChangePtr &e)
+void QGeometryRenderer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     Q_D(QGeometryRenderer);
     QScenePropertyChangePtr change = qSharedPointerCast<QScenePropertyChange>(e);
@@ -269,6 +271,6 @@ void QGeometryRenderer::sceneChangeEvent(const QSceneChangePtr &e)
 
 
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qgeometryrenderer.h b/src/render/frontend/qgeometryrenderer.h
index 78a74d798..5bf581111 100644
--- a/src/render/frontend/qgeometryrenderer.h
+++ b/src/render/frontend/qgeometryrenderer.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QGEOMETRYRENDERER_H
-#define QT3D_QGEOMETRYRENDERER_H
+#ifndef QT3DRENDER_QGEOMETRYRENDERER_H
+#define QT3DRENDER_QGEOMETRYRENDERER_H
 
 #include <Qt3DCore/qcomponent.h>
 #include <Qt3DRenderer/qgeometry.h>
@@ -43,14 +43,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QGeometryRendererPrivate;
 class QGeometryFunctor;
 
 typedef QSharedPointer<QGeometryFunctor> QGeometryFunctorPtr;
 
-class QT3DRENDERERSHARED_EXPORT QGeometryRenderer : public QComponent
+class QT3DRENDERERSHARED_EXPORT QGeometryRenderer : public Qt3D::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(int instanceCount READ instanceCount WRITE setInstanceCount NOTIFY instanceCountChanged)
@@ -59,11 +59,11 @@ class QT3DRENDERERSHARED_EXPORT QGeometryRenderer : public QComponent
     Q_PROPERTY(int baseInstance READ baseInstance WRITE setBaseInstance NOTIFY baseInstanceChanged)
     Q_PROPERTY(int restartIndex READ restartIndex WRITE setRestartIndex NOTIFY restartIndexChanged)
     Q_PROPERTY(bool primitiveRestart READ primitiveRestart WRITE setPrimitiveRestart NOTIFY primitiveRestartChanged)
-    Q_PROPERTY(Qt3D::QGeometry* geometry READ geometry WRITE setGeometry NOTIFY geometryChanged)
+    Q_PROPERTY(Qt3DRender::QGeometry* geometry READ geometry WRITE setGeometry NOTIFY geometryChanged)
     Q_PROPERTY(PrimitiveType primitiveType READ primitiveType WRITE setPrimitiveType NOTIFY primitiveTypeChanged)
 
 public:
-    explicit QGeometryRenderer(QNode *parent = 0);
+    explicit QGeometryRenderer(Qt3D::QNode *parent = 0);
     ~QGeometryRenderer();
 
     enum PrimitiveType {
@@ -116,17 +116,17 @@ Q_SIGNALS:
     void primitiveTypeChanged();
 
 protected:
-    QGeometryRenderer(QGeometryRendererPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QGeometryRenderer)
     QT3D_CLONEABLE(QGeometryRenderer)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QGEOMETRYRENDERER_H
+#endif // QT3DRENDER_QGEOMETRYRENDERER_H
diff --git a/src/render/frontend/qgeometryrenderer_p.h b/src/render/frontend/qgeometryrenderer_p.h
index ef6dc5c64..5989382c5 100644
--- a/src/render/frontend/qgeometryrenderer_p.h
+++ b/src/render/frontend/qgeometryrenderer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QGEOMETRYRENDERER_P_H
-#define QT3D_QGEOMETRYRENDERER_P_H
+#ifndef QT3DRENDER_QGEOMETRYRENDERER_P_H
+#define QT3DRENDER_QGEOMETRYRENDERER_P_H
 
 #include <Qt3DCore/private/qcomponent_p.h>
 #include <Qt3DRenderer/qgeometryrenderer.h>
@@ -43,9 +43,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QGeometryRendererPrivate : public QComponentPrivate
+class QGeometryRendererPrivate : public Qt3D::QComponentPrivate
 {
 public:
     QGeometryRendererPrivate();
@@ -62,10 +62,10 @@ public:
     QGeometryFunctorPtr m_functor;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
 
-#endif // QT3D_QGEOMETRYRENDERER_P_H
+#endif // QT3DRENDER_QGEOMETRYRENDERER_P_H
 
diff --git a/src/render/frontend/qitemmodelbuffer.cpp b/src/render/frontend/qitemmodelbuffer.cpp
index 540d341e0..f8437d1c9 100644
--- a/src/render/frontend/qitemmodelbuffer.cpp
+++ b/src/render/frontend/qitemmodelbuffer.cpp
@@ -41,7 +41,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 void variantToBytes(void* dest, const QVariant& v, GLint type)
 {
@@ -109,7 +111,7 @@ void variantToBytes(void* dest, const QVariant& v, GLint type)
 
 namespace {
 
-QAbstractAttribute::DataType typeFromGLType(GLint dataType, uint &dataCount)
+Qt3D::QAbstractAttribute::DataType typeFromGLType(GLint dataType, uint &dataCount)
 {
     switch (dataType) {
 
@@ -347,6 +349,6 @@ QItemModelBuffer::RoleMapping::RoleMapping(QByteArray rnm, QString nm, int ty) :
     byteSize = Render::QGraphicsContext::byteSizeFromType(ty);
 }
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qitemmodelbuffer.h b/src/render/frontend/qitemmodelbuffer.h
index d33ee76c9..1a4193868 100644
--- a/src/render/frontend/qitemmodelbuffer.h
+++ b/src/render/frontend/qitemmodelbuffer.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QITEMMODELBUFFER_H
-#define QT3D_QITEMMODELBUFFER_H
+#ifndef QT3DRENDER_QITEMMODELBUFFER_H
+#define QT3DRENDER_QITEMMODELBUFFER_H
 
 #include <QObject>
 #include <Qt3DRenderer/qt3drenderer_global.h>
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QT3DRENDERERSHARED_EXPORT QItemModelBuffer : public QObject
 {
@@ -98,8 +98,8 @@ private:
     bool validateRoles();
 };
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QITEMMODELBUFFER_H
+#endif // QT3DRENDER_QITEMMODELBUFFER_H
diff --git a/src/render/frontend/qlayer.cpp b/src/render/frontend/qlayer.cpp
index 76a83f992..ce3486555 100644
--- a/src/render/frontend/qlayer.cpp
+++ b/src/render/frontend/qlayer.cpp
@@ -39,10 +39,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QLayerPrivate
+    \class Qt3DRender::QLayerPrivate
     \internal
 */
 QLayerPrivate::QLayerPrivate()
@@ -59,7 +59,7 @@ QLayerPrivate::QLayerPrivate()
 
 /*!
     \qmltype Layer
-    \instantiates Qt3D::QLayer
+    \instantiates Qt3DRender::QLayer
     \inherits Component3D
     \inqmlmodule Qt3D.Renderer
     \since 5.5
@@ -67,7 +67,7 @@ QLayerPrivate::QLayerPrivate()
 */
 
 
-/*! \fn void Qt3D::QLayer::copy(const QNode *ref)
+/*! \fn void Qt3DRender::QLayer::copy(const QNode *ref)
   Copies the \a ref instance into this one.
  */
 void QLayer::copy(const QNode *ref)
@@ -77,7 +77,7 @@ void QLayer::copy(const QNode *ref)
     d_func()->m_names = layer->d_func()->m_names;
 }
 
-/*! \fn Qt3D::QLayer::QLayer(QObject *parent)
+/*! \fn Qt3DRender::QLayer::QLayer(QObject *parent)
   Constructs a new QLayer with the specified \a parent.
  */
 
@@ -98,7 +98,7 @@ QLayer::QLayer(QLayerPrivate &dd, QNode *parent)
 }
 
 /*!
-  \property Qt3D::QLayer::names
+  \property Qt3DRender::QLayer::names
 
  */
 
@@ -122,6 +122,6 @@ void QLayer::setNames(const QStringList &names)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h
index 7075eb592..10499d7ba 100644
--- a/src/render/frontend/qlayer.h
+++ b/src/render/frontend/qlayer.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QLAYER_H
-#define QT3D_QLAYER_H
+#ifndef QT3DRENDER_QLAYER_H
+#define QT3DRENDER_QLAYER_H
 
 #include <Qt3DCore/qcomponent.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
@@ -43,16 +43,16 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QLayerPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QLayer : public QComponent
+class QT3DRENDERERSHARED_EXPORT QLayer : public Qt3D::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(QStringList names READ names WRITE setNames NOTIFY namesChanged)
 public:
-    explicit QLayer(QNode *parent = 0);
+    explicit QLayer(Qt3D::QNode *parent = 0);
     ~QLayer();
 
     QStringList names() const;
@@ -62,16 +62,16 @@ Q_SIGNALS:
     void namesChanged();
 
 protected:
-    QLayer(QLayerPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QLayer(QLayerPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QLayer)
     QT3D_CLONEABLE(QLayer)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QLAYER_H
+#endif // QT3DRENDER_QLAYER_H
diff --git a/src/render/frontend/qlayer_p.h b/src/render/frontend/qlayer_p.h
index affd71bb4..feb403803 100644
--- a/src/render/frontend/qlayer_p.h
+++ b/src/render/frontend/qlayer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QLAYER_P_H
-#define QT3D_QLAYER_P_H
+#ifndef QT3DRENDER_QLAYER_P_H
+#define QT3DRENDER_QLAYER_P_H
 
 #include <private/qcomponent_p.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
@@ -43,9 +43,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QLayerPrivate : QComponentPrivate
+class QT3DRENDERERSHARED_EXPORT QLayerPrivate : public Qt3D::QComponentPrivate
 {
 public:
     QLayerPrivate();
@@ -54,8 +54,8 @@ public:
     QStringList m_names;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QLAYER_P_H
+#endif // QT3DRENDER_QLAYER_P_H
diff --git a/src/render/frontend/qmaterial.cpp b/src/render/frontend/qmaterial.cpp
index 1000e3179..b3c833556 100644
--- a/src/render/frontend/qmaterial.cpp
+++ b/src/render/frontend/qmaterial.cpp
@@ -43,8 +43,9 @@
 #include <Qt3DCore/qscenepropertychange.h>
 
 /*!
- * \class Qt3D::QMaterial
+ * \class Qt3DRender::QMaterial
  * \inmodule Qt3DRenderer
+ *
  * \inherits Component
  *
  * \brief Provides an abstract class that should be the base of all
@@ -61,10 +62,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QMaterialPrivate
+    \class Qt3DRender::QMaterialPrivate
     \internal
 */
 QMaterialPrivate::QMaterialPrivate()
@@ -199,6 +202,6 @@ void QMaterial::setTextureParameter(QString name, QAbstractTextureProvider *tex)
     d->m_textures[name] = tex;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qmaterial.h b/src/render/frontend/qmaterial.h
index c8cc89ab5..ca44901c1 100644
--- a/src/render/frontend/qmaterial.h
+++ b/src/render/frontend/qmaterial.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QMATERIAL_H
-#define QT3D_QMATERIAL_H
+#ifndef QT3DRENDER_QMATERIAL_H
+#define QT3DRENDER_QMATERIAL_H
 
 #include <QVariant>
 
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAbstractTextureProvider;
 class QParameter;
@@ -52,13 +52,13 @@ class QMaterialPrivate;
 class QEffect;
 typedef QMap<QString, QAbstractTextureProvider*> TextureDict;
 
-class QT3DRENDERERSHARED_EXPORT QMaterial : public QComponent
+class QT3DRENDERERSHARED_EXPORT QMaterial : public Qt3D::QComponent
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged)
+    Q_PROPERTY(Qt3DRender::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged)
 
 public:
-    explicit QMaterial(QNode *parent = 0);
+    explicit QMaterial(Qt3D::QNode *parent = 0);
     ~QMaterial();
 
     void setEffect(QEffect *effect);
@@ -76,8 +76,8 @@ Q_SIGNALS:
     void effectChanged();
 
 protected:
-    QMaterial(QMaterialPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QMaterial(QMaterialPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QMaterial)
@@ -88,4 +88,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QMATERIAL_H
+#endif // QT3DRENDER_QMATERIAL_H
diff --git a/src/render/frontend/qmaterial_p.h b/src/render/frontend/qmaterial_p.h
index e11e7258d..1ef84e05d 100644
--- a/src/render/frontend/qmaterial_p.h
+++ b/src/render/frontend/qmaterial_p.h
@@ -34,20 +34,20 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QMATERIAL_P_H
-#define QT3D_QMATERIAL_P_H
+#ifndef QT3DRENDER_QMATERIAL_P_H
+#define QT3DRENDER_QMATERIAL_P_H
 
 #include <private/qcomponent_p.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QParameter;
 class QEffect;
 
-class QT3DRENDERERSHARED_EXPORT QMaterialPrivate : public QComponentPrivate
+class QT3DRENDERERSHARED_EXPORT QMaterialPrivate : public Qt3D::QComponentPrivate
 {
 public:
     QMaterialPrivate();
@@ -58,8 +58,8 @@ public:
     QEffect *m_effect;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QMATERIAL_P_H
+#endif // QT3DRENDER_QMATERIAL_P_H
diff --git a/src/render/frontend/qmesh.cpp b/src/render/frontend/qmesh.cpp
index 4f8042d07..e35ee1dd0 100644
--- a/src/render/frontend/qmesh.cpp
+++ b/src/render/frontend/qmesh.cpp
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class MeshFunctor : public QGeometryFunctor
 {
@@ -63,7 +63,7 @@ private:
 
 
 /*!
-    \class Qt3D::QMeshPrivate
+    \class Qt3DRender::QMeshPrivate
     \internal
 */
 QMeshPrivate::QMeshPrivate()
@@ -125,7 +125,7 @@ QGeometry *MeshFunctor::operator()()
 
 
     // TO DO: Handle file download if remote url
-    QString filePath = QUrlHelper::urlToLocalFileOrQrc(m_sourcePath);
+    QString filePath = Qt3D::QUrlHelper::urlToLocalFileOrQrc(m_sourcePath);
     if (loader.load(filePath))
         return loader.geometry();
 
@@ -141,6 +141,6 @@ bool MeshFunctor::operator ==(const QGeometryFunctor &other) const
     return false;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qmesh.h b/src/render/frontend/qmesh.h
index ff50a80a6..fd5b686f6 100644
--- a/src/render/frontend/qmesh.h
+++ b/src/render/frontend/qmesh.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QMESH_H
-#define QT3D_QMESH_H
+#ifndef QT3DRENDER_QMESH_H
+#define QT3DRENDER_QMESH_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/qgeometryrenderer.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QMeshPrivate;
 
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QMesh : public QGeometryRenderer
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
 
 public:
-    explicit QMesh(QNode *parent = 0);
+    explicit QMesh(Qt3D::QNode *parent = 0);
     ~QMesh();
 
     void setSource(const QUrl &source);
@@ -67,7 +67,7 @@ Q_SIGNALS:
     void sourceChanged();
 
 protected:
-    QMesh(QMeshPrivate &dd, QNode *parent = 0);
+    QMesh(QMeshPrivate &dd, Qt3D::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QMesh)
@@ -77,4 +77,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // of QT3D_QMESH_H
+#endif // of QT3DRENDER_QMESH_H
diff --git a/src/render/frontend/qmesh_p.h b/src/render/frontend/qmesh_p.h
index 5246cfb54..0adadaa3f 100644
--- a/src/render/frontend/qmesh_p.h
+++ b/src/render/frontend/qmesh_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QMESH_P_H
-#define QT3D_QMESH_P_H
+#ifndef QT3DRENDER_QMESH_P_H
+#define QT3DRENDER_QMESH_P_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/private/qgeometryrenderer_p.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QMesh;
 
@@ -57,8 +57,8 @@ public:
     QUrl m_source;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QMESH_P_H
+#endif // QT3DRENDER_QMESH_P_H
diff --git a/src/render/frontend/qopenglfilter.cpp b/src/render/frontend/qopenglfilter.cpp
index 6efd47955..3bc20a84d 100644
--- a/src/render/frontend/qopenglfilter.cpp
+++ b/src/render/frontend/qopenglfilter.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QOpenGLFilterPrivate : public QObjectPrivate
 {
@@ -64,7 +64,7 @@ public:
 };
 
 /*!
-    \class QOpenGLFilter
+    \class Qt3DRender::QOpenGLFilter
     \inmodule Qt3DRenderer
     \since 5.5
     \brief The QOpenGLFilter class provides ...
@@ -72,14 +72,14 @@ public:
 
 /*!
     \qmltype OpenGLFilter
-    \instantiates Qt3D::QOpenGLFilter
+    \instantiates Qt3DRender::QOpenGLFilter
     \inherits QtObject
     \inqmlmodule Qt3D.Renderer
     \since 5.5
     \brief For OpenGL ...
 */
 
-/*! \fn Qt3D::QOpenGLFilter::QOpenGLFilter(QObject *parent)
+/*! \fn Qt3DRender::QOpenGLFilter::QOpenGLFilter(QObject *parent)
   Constructs a new QOpenGLFilter with the specified \a parent.
  */
 QOpenGLFilter::QOpenGLFilter(QObject *parent)
@@ -87,7 +87,7 @@ QOpenGLFilter::QOpenGLFilter(QObject *parent)
 {
 }
 
-/*! \fn void Qt3D::QOpenGLFilter::copy(const QOpenGLFilter &ref)
+/*! \fn void Qt3DRender::QOpenGLFilter::copy(const QOpenGLFilter &ref)
   Copies the \a ref instance into this one.
  */
 void QOpenGLFilter::copy(const QOpenGLFilter &ref)
@@ -102,7 +102,7 @@ void QOpenGLFilter::copy(const QOpenGLFilter &ref)
 }
 
 /*!
-  \enum Qt3D::QOpenGLFilter::Api
+  \enum Qt3DRender::QOpenGLFilter::Api
 
   \value ES QSurfaceFormat::OpenGLES
   \value Desktop QSurfaceFormat::OpenGL
@@ -110,7 +110,7 @@ void QOpenGLFilter::copy(const QOpenGLFilter &ref)
 */
 
 /*!
-  \enum Qt3D::QOpenGLFilter::Profile
+  \enum Qt3DRender::QOpenGLFilter::Profile
 
   \value None QSurfaceFormat::NoProfile
   \value Core QSurfaceFormat::CoreProfile
@@ -119,7 +119,7 @@ void QOpenGLFilter::copy(const QOpenGLFilter &ref)
 */
 
 /*!
-  \property Qt3D::QOpenGLFilter::api
+  \property Qt3DRender::QOpenGLFilter::api
 
 */
 
@@ -138,7 +138,7 @@ QOpenGLFilter::Api QOpenGLFilter::api() const
 }
 
 /*!
-  \property Qt3D::QOpenGLFilter::profile
+  \property Qt3DRender::QOpenGLFilter::profile
 
 */
 
@@ -157,7 +157,7 @@ QOpenGLFilter::Profile QOpenGLFilter::profile() const
 }
 
 /*!
-  \property Qt3D::QOpenGLFilter::minorVersion
+  \property Qt3DRender::QOpenGLFilter::minorVersion
 
  */
 
@@ -173,7 +173,7 @@ int QOpenGLFilter::minorVersion() const
 }
 
 /*!
-  \property Qt3D::QOpenGLFilter::majorVersion
+  \property Qt3DRender::QOpenGLFilter::majorVersion
 
  */
 
@@ -189,7 +189,7 @@ int QOpenGLFilter::majorVersion() const
 }
 
 /*!
-  \property Qt3D::QOpenGLFilter::extensions
+  \property Qt3DRender::QOpenGLFilter::extensions
 
  */
 
@@ -205,7 +205,7 @@ QStringList QOpenGLFilter::extensions() const
 }
 
 /*!
-  \property Qt3D::QOpenGLFilter::vendor
+  \property Qt3DRender::QOpenGLFilter::vendor
 
  */
 
@@ -281,7 +281,7 @@ void QOpenGLFilter::setVendor(const QString &vendor)
 }
 
 /*! \fn bool Qt3D::operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
-  \relates Qt3D::QOpenGLFilter
+  \relates Qt3DRender::QOpenGLFilter
   Returns true if \a reference and \a sample are equivalent.
  */
 bool operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
@@ -303,7 +303,7 @@ bool operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
 }
 
 /*! \fn bool Qt3D::operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
-  \relates Qt3D::QOpenGLFilter
+  \relates Qt3DRender::QOpenGLFilter
   Returns true if \a reference and \a sample are different.
  */
 bool operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
@@ -311,9 +311,9 @@ bool operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
     return !(reference == sample);
 }
 
-/*! \fn void Qt3D::QOpenGLFilter::openGLFilterChanged()
+/*! \fn void Qt3DRender::QOpenGLFilter::openGLFilterChanged()
   This signal is emitted when the value of any property is changed.
 */
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qopenglfilter.h b/src/render/frontend/qopenglfilter.h
index 6ff43c417..9c4b729bd 100644
--- a/src/render/frontend/qopenglfilter.h
+++ b/src/render/frontend/qopenglfilter.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QOPENGLFILTER_H
-#define QT3D_QOPENGLFILTER_H
+#ifndef QT3DRENDER_QOPENGLFILTER_H
+#define QT3DRENDER_QOPENGLFILTER_H
 
 #include <QObject>
 #include <QStringList>
@@ -44,15 +44,15 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QOpenGLFilterPrivate;
 
 class QT3DRENDERERSHARED_EXPORT QOpenGLFilter : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QOpenGLFilter::Api api READ api WRITE setApi NOTIFY apiChanged)
-    Q_PROPERTY(Qt3D::QOpenGLFilter::Profile profile READ profile WRITE setProfile NOTIFY profileChanged)
+    Q_PROPERTY(Qt3DRender::QOpenGLFilter::Api api READ api WRITE setApi NOTIFY apiChanged)
+    Q_PROPERTY(Qt3DRender::QOpenGLFilter::Profile profile READ profile WRITE setProfile NOTIFY profileChanged)
     Q_PROPERTY(int minorVersion READ minorVersion WRITE setMinorVersion NOTIFY minorVersionChanged)
     Q_PROPERTY(int majorVersion READ majorVersion WRITE setMajorVersion NOTIFY majorVersionChanged)
     Q_PROPERTY(QStringList extensions READ extensions WRITE setExtensions NOTIFY extensionsChanged)
@@ -109,8 +109,8 @@ private:
 bool operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample);
 bool operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample);
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QOPENGLFILTER_H
+#endif // QT3DRENDER_QOPENGLFILTER_H
diff --git a/src/render/frontend/qparameter.cpp b/src/render/frontend/qparameter.cpp
index 95d35d5c2..96d1205df 100644
--- a/src/render/frontend/qparameter.cpp
+++ b/src/render/frontend/qparameter.cpp
@@ -42,11 +42,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QParameterPrivate
+    \class Qt3DRender::QParameterPrivate
     \internal
 */
 QParameterPrivate::QParameterPrivate()
@@ -144,6 +145,6 @@ QVariant QParameter::value() const
     return d->m_value;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qparameter.h b/src/render/frontend/qparameter.h
index 4ef6f22c4..03883f5f1 100644
--- a/src/render/frontend/qparameter.h
+++ b/src/render/frontend/qparameter.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QPARAMETER_H
-#define QT3D_QPARAMETER_H
+#ifndef QT3DRENDER_QPARAMETER_H
+#define QT3DRENDER_QPARAMETER_H
 
 #include <QVariant>
 #include <Qt3DCore/qnode.h>
@@ -43,22 +43,22 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QParameterPrivate;
 class QAbstractTextureProvider;
 
-class QT3DRENDERERSHARED_EXPORT QParameter : public QNode
+class QT3DRENDERERSHARED_EXPORT QParameter : public Qt3D::QNode
 {
     Q_OBJECT
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
 
 public:
-    explicit QParameter(QNode *parent = 0);
+    explicit QParameter(Qt3D::QNode *parent = 0);
     ~QParameter();
-    QParameter(const QString& name, const QVariant& value, QNode* parent = 0);
-    QParameter(const QString &name, QAbstractTextureProvider *texture, QNode *parent = 0);
+    QParameter(const QString& name, const QVariant& value, Qt3D::QNode* parent = 0);
+    QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3D::QNode *parent = 0);
 
     void setName(const QString &name);
     QString name() const;
@@ -75,16 +75,16 @@ Q_SIGNALS:
     void nameChanged();
 
 protected:
-    QParameter(QParameterPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QParameter(QParameterPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QParameter)
     QT3D_CLONEABLE(QParameter)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_PARAMETER_H
+#endif // QT3DRENDER_PARAMETER_H
diff --git a/src/render/frontend/qparameter_p.h b/src/render/frontend/qparameter_p.h
index bc7fe7f30..0d3603d66 100644
--- a/src/render/frontend/qparameter_p.h
+++ b/src/render/frontend/qparameter_p.h
@@ -34,19 +34,19 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QPARAMETER_P_H
-#define QT3D_QPARAMETER_P_H
+#ifndef QT3DRENDER_QPARAMETER_P_H
+#define QT3DRENDER_QPARAMETER_P_H
 
 #include <private/qnode_p.h>
 #include <private/qt3drenderer_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QParameter;
 
-class QT3DRENDERERSHARED_PRIVATE_EXPORT QParameterPrivate : public QNodePrivate
+class QT3DRENDERERSHARED_PRIVATE_EXPORT QParameterPrivate : public Qt3D::QNodePrivate
 {
 public:
     QParameterPrivate();
@@ -60,8 +60,8 @@ public:
     QString m_meshName;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QPARAMETER_P_H
+#endif // QT3DRENDER_QPARAMETER_P_H
diff --git a/src/render/frontend/qparametermapping.cpp b/src/render/frontend/qparametermapping.cpp
index 057ea0bdd..3890bf8b2 100644
--- a/src/render/frontend/qparametermapping.cpp
+++ b/src/render/frontend/qparametermapping.cpp
@@ -39,10 +39,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QParameterMappingPrivate
+    \class Qt3DRender::QParameterMappingPrivate
     \internal
 */
 QParameterMappingPrivate::QParameterMappingPrivate()
@@ -51,7 +51,7 @@ QParameterMappingPrivate::QParameterMappingPrivate()
 {
 }
 /*!
-    \class QParameterMapping
+    \class Qt3DRender::QParameterMapping
     \inmodule Qt3DRenderer
     \since 5.5
     \brief The QParameterMapping class provides ...
@@ -59,14 +59,14 @@ QParameterMappingPrivate::QParameterMappingPrivate()
 
 /*!
     \qmltype ParameterMapping
-    \instantiates Qt3D::QParameterMapping
+    \instantiates Qt3DRender::QParameterMapping
     \inherits Node
     \inqmlmodule Qt3D.Renderer
     \since 5.5
     \brief For ...
 */
 
-/*! \fn void Qt3D::QParameterMapping::copy(const QNode *ref)
+/*! \fn void Qt3DRender::QParameterMapping::copy(const QNode *ref)
   Copies the \a ref instance into this one.
  */
 void QParameterMapping::copy(const QNode *ref)
@@ -78,7 +78,7 @@ void QParameterMapping::copy(const QNode *ref)
     d_func()->m_bindingType = mapper->d_func()->m_bindingType;
 }
 
-/*! \fn Qt3D::QParameterMapping::QParameterMapping(QNode *parent)
+/*! \fn Qt3DRender::QParameterMapping::QParameterMapping(QNode *parent)
   Constructs a new QParameterMapping with the specified \a parent.
  */
 QParameterMapping::QParameterMapping(QNode *parent)
@@ -87,7 +87,7 @@ QParameterMapping::QParameterMapping(QNode *parent)
 }
 
 /*!
-  \enum Qt3D::QParameterMapping::Binding
+  \enum Qt3DRender::QParameterMapping::Binding
 
   \value Uniform
   \value Attribute
@@ -121,7 +121,7 @@ QParameterMapping::~QParameterMapping()
 }
 
 /*!
-  \property Qt3D::QParameterMapping::parameterName
+  \property Qt3DRender::QParameterMapping::parameterName
 
 */
 
@@ -140,7 +140,7 @@ void QParameterMapping::setParameterName(const QString &name)
 }
 
 /*!
-  \property Qt3D::QParameterMapping::shaderVariableName
+  \property Qt3DRender::QParameterMapping::shaderVariableName
 
 */
 
@@ -159,7 +159,7 @@ void QParameterMapping::setShaderVariableName(const QString &name)
 }
 
 /*!
-  \property Qt3D::QParameterMapping::bindingType
+  \property Qt3DRender::QParameterMapping::bindingType
 
 */
 
@@ -198,6 +198,6 @@ QParameterMapping::Binding QParameterMapping::bindingType() const
     return d->m_bindingType;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qparametermapping.h b/src/render/frontend/qparametermapping.h
index 25fcfc809..f4e209abd 100644
--- a/src/render/frontend/qparametermapping.h
+++ b/src/render/frontend/qparametermapping.h
@@ -34,19 +34,19 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QPARAMETERMAPPING_H
-#define QT3D_QPARAMETERMAPPING_H
+#ifndef QT3DRENDER_QPARAMETERMAPPING_H
+#define QT3DRENDER_QPARAMETERMAPPING_H
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QParameterMappingPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QParameterMapping : public QNode
+class QT3DRENDERERSHARED_EXPORT QParameterMapping : public Qt3D::QNode
 {
     Q_OBJECT
     Q_PROPERTY(QString parameterName READ parameterName WRITE setParameterName NOTIFY parameterNameChanged)
@@ -62,8 +62,8 @@ public:
     };
     Q_ENUM(Binding)
 
-    explicit QParameterMapping(QNode *parent = 0);
-    QParameterMapping(const QString &parameterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, QNode *parent = 0);
+    explicit QParameterMapping(Qt3D::QNode *parent = 0);
+    QParameterMapping(const QString &parameterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, Qt3D::QNode *parent = 0);
     ~QParameterMapping();
 
     void setParameterName(const QString &name);
@@ -80,16 +80,16 @@ Q_SIGNALS:
     void bindingTypeChanged();
 
 protected:
-    QParameterMapping(QParameterMappingPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QParameterMapping(QParameterMappingPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QParameterMapping)
     QT3D_CLONEABLE(QParameterMapping)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QPARAMETERBINDER_H
+#endif // QT3DRENDER_QPARAMETERBINDER_H
diff --git a/src/render/frontend/qparametermapping_p.h b/src/render/frontend/qparametermapping_p.h
index 6f0234c69..0fe32cb0f 100644
--- a/src/render/frontend/qparametermapping_p.h
+++ b/src/render/frontend/qparametermapping_p.h
@@ -34,17 +34,17 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QPARAMETERMAPPING_P_H
-#define QT3D_QPARAMETERMAPPING_P_H
+#ifndef QT3DRENDER_QPARAMETERMAPPING_P_H
+#define QT3DRENDER_QPARAMETERMAPPING_P_H
 
 #include <private/qnode_p.h>
 #include <Qt3DRenderer/QParameterMapping>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QParameterMappingPrivate : public QNodePrivate
+class QParameterMappingPrivate : public Qt3D::QNodePrivate
 {
 public:
     QParameterMappingPrivate();
@@ -56,8 +56,8 @@ public:
     QParameterMapping::Binding m_bindingType;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QPARAMETERMAPPING_P_H
+#endif // QT3DRENDER_QPARAMETERMAPPING_P_H
diff --git a/src/render/frontend/qplanemesh.cpp b/src/render/frontend/qplanemesh.cpp
index 569a8ffed..40a057a50 100644
--- a/src/render/frontend/qplanemesh.cpp
+++ b/src/render/frontend/qplanemesh.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace {
 
@@ -396,7 +396,7 @@ QSize QPlaneMesh::meshResolution() const
     return static_cast<PlaneGeometry *>(geometry())->resolution();
 }
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/frontend/qplanemesh.h b/src/render/frontend/qplanemesh.h
index 2c9e66db2..70d9c8518 100644
--- a/src/render/frontend/qplanemesh.h
+++ b/src/render/frontend/qplanemesh.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QPLANEMESH_H
-#define QT3D_QPLANEMESH_H
+#ifndef QT3DRENDER_QPLANEMESH_H
+#define QT3DRENDER_QPLANEMESH_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/qgeometryrenderer.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QT3DRENDERERSHARED_EXPORT QPlaneMesh : public QGeometryRenderer
 {
@@ -53,7 +53,7 @@ class QT3DRENDERERSHARED_EXPORT QPlaneMesh : public QGeometryRenderer
     Q_PROPERTY(QSize meshResolution READ meshResolution WRITE setMeshResolution NOTIFY meshResolutionChanged)
 
 public:
-    explicit QPlaneMesh(QNode *parent = 0);
+    explicit QPlaneMesh(Qt3D::QNode *parent = 0);
     ~QPlaneMesh();
 
     void setWidth(float width);
@@ -84,8 +84,8 @@ private:
     void setPrimitiveType(PrimitiveType primitiveType);
 };
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QPLANEMESH_H
+#endif // QT3DRENDER_QPLANEMESH_H
diff --git a/src/render/frontend/qpointlight.cpp b/src/render/frontend/qpointlight.cpp
index c474c1285..94653ee41 100644
--- a/src/render/frontend/qpointlight.cpp
+++ b/src/render/frontend/qpointlight.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*
   Expected Shader struct
@@ -59,7 +59,7 @@ namespace Qt3D {
  */
 
 /*!
-    \class Qt3D::QPointLightPrivate
+    \class Qt3DRender::QPointLightPrivate
     \internal
 */
 QPointLightPrivate::QPointLightPrivate()
@@ -76,7 +76,7 @@ QPointLightPrivate::QPointLightPrivate()
 
 /*!
     \qmltype PointLight
-    \instantiates Qt3D::QPointLight
+    \instantiates Qt3DRender::QPointLight
     \inherits AbstractLight
     \inqmlmodule Qt3D.Renderer
     \since 5.5
@@ -84,7 +84,7 @@ QPointLightPrivate::QPointLightPrivate()
 */
 
 /*!
-  \fn Qt3D::QPointLight::QPointLight(QNode *parent)
+  \fn Qt3DRender::QPointLight::QPointLight(QNode *parent)
   Constructs a new QPointLight with the specified \a parent.
  */
 QPointLight::QPointLight(QNode *parent)
@@ -98,6 +98,6 @@ QPointLight::QPointLight(QPointLightPrivate &dd, QNode *parent)
 {
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qpointlight.h b/src/render/frontend/qpointlight.h
index 9cb652a29..076f8b3cd 100644
--- a/src/render/frontend/qpointlight.h
+++ b/src/render/frontend/qpointlight.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QPOINTLIGHT_H
-#define QT3D_QPOINTLIGHT_H
+#ifndef QT3DRENDER_QPOINTLIGHT_H
+#define QT3DRENDER_QPOINTLIGHT_H
 
 #include <Qt3DRenderer/qabstractlight.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QPointLightPrivate;
 
@@ -50,16 +50,16 @@ class QT3DRENDERERSHARED_EXPORT QPointLight : public QAbstractLight
     Q_OBJECT
 
 public:
-    explicit QPointLight(QNode *parent = 0);
+    explicit QPointLight(Qt3D::QNode *parent = 0);
 
 protected:
     Q_DECLARE_PRIVATE(QPointLight)
-    QPointLight(QPointLightPrivate &dd, QNode *parent);
+    QPointLight(QPointLightPrivate &dd, Qt3D::QNode *parent);
     QT3D_CLONEABLE(QPointLight)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QPOINTLIGHT_H
+#endif // QT3DRENDER_QPOINTLIGHT_H
diff --git a/src/render/frontend/qpointlight_p.h b/src/render/frontend/qpointlight_p.h
index 0e98319ed..f39daabee 100644
--- a/src/render/frontend/qpointlight_p.h
+++ b/src/render/frontend/qpointlight_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QPOINTLIGHT_P_H
-#define QT3D_QPOINTLIGHT_P_H
+#ifndef QT3DRENDER_QPOINTLIGHT_P_H
+#define QT3DRENDER_QPOINTLIGHT_P_H
 
 #include <private/qabstractlight_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QPointLight;
 
@@ -53,7 +53,7 @@ public:
     Q_DECLARE_PUBLIC(QPointLight)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/frontend/qpolygonoffset.cpp b/src/render/frontend/qpolygonoffset.cpp
index d252d4893..27c9cde4f 100644
--- a/src/render/frontend/qpolygonoffset.cpp
+++ b/src/render/frontend/qpolygonoffset.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QPolygonOffsetPrivate : public QRenderStatePrivate
 {
@@ -105,6 +105,6 @@ void QPolygonOffset::copy(const QNode *ref)
     d_func()->m_units = refState->d_func()->m_units;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qpolygonoffset.h b/src/render/frontend/qpolygonoffset.h
index 339437ae1..9aff94a1f 100644
--- a/src/render/frontend/qpolygonoffset.h
+++ b/src/render/frontend/qpolygonoffset.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QPOLYGONOFFSET_H
-#define QT3D_QPOLYGONOFFSET_H
+#ifndef QT3DRENDER_QPOLYGONOFFSET_H
+#define QT3DRENDER_QPOLYGONOFFSET_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QPolygonOffsetPrivate;
 
@@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QPolygonOffset : public QRenderState
     Q_PROPERTY(float factor READ factor WRITE setFactor NOTIFY factorChanged)
     Q_PROPERTY(float units READ units WRITE setUnits NOTIFY unitsChanged)
 public:
-    explicit QPolygonOffset(QNode *parent = Q_NULLPTR);
+    explicit QPolygonOffset(Qt3D::QNode *parent = Q_NULLPTR);
     ~QPolygonOffset();
 
     float factor() const;
@@ -66,15 +66,15 @@ Q_SIGNALS:
     void unitsChanged(float newUnits);
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QPolygonOffset)
     QT3D_CLONEABLE(QPolygonOffset)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QPOLYGONOFFSET_H
+#endif // QT3DRENDER_QPOLYGONOFFSET_H
diff --git a/src/render/frontend/qrenderattachment.cpp b/src/render/frontend/qrenderattachment.cpp
index 35db47cc7..e0d6c42fa 100644
--- a/src/render/frontend/qrenderattachment.cpp
+++ b/src/render/frontend/qrenderattachment.cpp
@@ -40,10 +40,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QRenderAttachmentPrivate
+    \class Qt3DRender::QRenderAttachmentPrivate
     \internal
 */
 QRenderAttachmentPrivate::QRenderAttachmentPrivate()
@@ -174,6 +174,6 @@ QString QRenderAttachment::name() const
     return d->m_name;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qrenderattachment.h b/src/render/frontend/qrenderattachment.h
index 15706fb1d..49c14b146 100644
--- a/src/render/frontend/qrenderattachment.h
+++ b/src/render/frontend/qrenderattachment.h
@@ -34,24 +34,24 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRENDERATTACHMENT_H
-#define QT3D_QRENDERATTACHMENT_H
+#ifndef QT3DRENDER_QRENDERATTACHMENT_H
+#define QT3DRENDER_QRENDERATTACHMENT_H
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAbstractTextureProvider;
 class QRenderAttachmentPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QRenderAttachment : public QNode
+class QT3DRENDERERSHARED_EXPORT QRenderAttachment : public Qt3D::QNode
 {
     Q_OBJECT
     Q_PROPERTY(RenderAttachmentType type READ type WRITE setType NOTIFY typeChanged)
-    Q_PROPERTY(Qt3D::QAbstractTextureProvider *texture READ texture WRITE setTexture NOTIFY textureChanged)
+    Q_PROPERTY(Qt3DRender::QAbstractTextureProvider *texture READ texture WRITE setTexture NOTIFY textureChanged)
     Q_PROPERTY(int mipLevel READ mipLevel WRITE setMipLevel NOTIFY mipLevelChanged)
     Q_PROPERTY(int layer READ layer WRITE setLayer NOTIFY layerChanged)
     Q_PROPERTY(CubeMapFace face READ face WRITE setFace NOTIFY faceChanged)
@@ -91,7 +91,7 @@ public:
     };
     Q_ENUM(CubeMapFace)
 
-    explicit QRenderAttachment(QNode *parent = 0);
+    explicit QRenderAttachment(Qt3D::QNode *parent = 0);
     ~QRenderAttachment();
 
     void setType(RenderAttachmentType type);
@@ -121,18 +121,18 @@ Q_SIGNALS:
     void nameChanged();
 
 protected:
-    QRenderAttachment(QRenderAttachmentPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QRenderAttachment(QRenderAttachmentPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QRenderAttachment)
     QT3D_CLONEABLE(QRenderAttachment)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QRenderAttachment::RenderAttachmentType)
+Q_DECLARE_METATYPE(Qt3DRender::QRenderAttachment::RenderAttachmentType)
 
-#endif // QT3D_QRENDERATTACHMENT_H
+#endif // QT3DRENDER_QRENDERATTACHMENT_H
diff --git a/src/render/frontend/qrenderattachment_p.h b/src/render/frontend/qrenderattachment_p.h
index 8425c36e9..8c7202cfb 100644
--- a/src/render/frontend/qrenderattachment_p.h
+++ b/src/render/frontend/qrenderattachment_p.h
@@ -34,19 +34,19 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRENDERATTACHMENT_P_H
-#define QT3D_QRENDERATTACHMENT_P_H
+#ifndef QT3DRENDER_QRENDERATTACHMENT_P_H
+#define QT3DRENDER_QRENDERATTACHMENT_P_H
 
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DRenderer/qrenderattachment.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAbstractTextureProvider;
 
-class QRenderAttachmentPrivate : public QNodePrivate
+class QRenderAttachmentPrivate : public Qt3D::QNodePrivate
 {
 public:
     QRenderAttachmentPrivate();
@@ -61,8 +61,8 @@ public:
     QString m_name;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QRENDERATTACHMENT_P_H
+#endif // QT3DRENDER_QRENDERATTACHMENT_P_H
diff --git a/src/render/frontend/qrenderpass.cpp b/src/render/frontend/qrenderpass.cpp
index f6feba36a..efb315177 100644
--- a/src/render/frontend/qrenderpass.cpp
+++ b/src/render/frontend/qrenderpass.cpp
@@ -46,10 +46,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QRenderPassPrivate
+    \class Qt3DRender::QRenderPassPrivate
     \internal
 */
 QRenderPassPrivate::QRenderPassPrivate()
@@ -221,7 +223,7 @@ QList<QParameterMapping *> QRenderPass::bindings() const
 /*!
  * Adds a Qt3D::QRenderState \a state to the rendering pass. That implies that
  * when the pass is executed at render time, the globally set render state will
- * be modifed by the states defined locally by the Qt3D::QRenderPass.
+ * be modifed by the states defined locally by the Qt3DRender::QRenderPass.
  *
  * \note not defining any Qt3D::QRenderState in a pass will result in the pass using
  * the globally set render state for a given FrameGraph branch execution path.
@@ -246,7 +248,7 @@ void QRenderPass::addRenderState(QRenderState *state)
 }
 
 /*!
- * Removes \a state from the Qt3D::QRenderPass local render state.
+ * Removes \a state from the Qt3DRender::QRenderPass local render state.
  */
 void QRenderPass::removeRenderState(QRenderState *state)
 {
@@ -262,7 +264,7 @@ void QRenderPass::removeRenderState(QRenderState *state)
 
 /*!
  * Returns the list of Qt3D::QRenderState state objects making up the render
- * state of the Qt3D::QRenderPass.
+ * state of the Qt3DRender::QRenderPass.
  */
 QList<QRenderState *> QRenderPass::renderStates() const
 {
@@ -312,6 +314,6 @@ QList<QParameter *> QRenderPass::parameters() const
     return d->m_parameters;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qrenderpass.h b/src/render/frontend/qrenderpass.h
index 0a30a90e6..ed733ba12 100644
--- a/src/render/frontend/qrenderpass.h
+++ b/src/render/frontend/qrenderpass.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRENDERPASS_H
-#define QT3D_QRENDERPASS_H
+#ifndef QT3DRENDER_QRENDERPASS_H
+#define QT3DRENDER_QRENDERPASS_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
@@ -49,7 +49,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QParameter;
 class QRenderState;
@@ -58,13 +58,13 @@ typedef QList<QParameter*> ParameterList;
 
 class QRenderPassPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QRenderPass : public QNode
+class QT3DRENDERERSHARED_EXPORT QRenderPass : public Qt3D::QNode
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QShaderProgram *shaderProgram READ shaderProgram WRITE setShaderProgram NOTIFY shaderProgramChanged)
+    Q_PROPERTY(Qt3DRender::QShaderProgram *shaderProgram READ shaderProgram WRITE setShaderProgram NOTIFY shaderProgramChanged)
 
 public:
-    explicit QRenderPass(QNode *parent = 0);
+    explicit QRenderPass(Qt3D::QNode *parent = 0);
     ~QRenderPass();
 
     QString glslNameForParameter(QString paramName) const;
@@ -95,8 +95,8 @@ Q_SIGNALS:
     void shaderProgramChanged();
 
 protected:
-    QRenderPass(QRenderPassPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QRenderPass(QRenderPassPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QRenderPass)
@@ -107,4 +107,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QRENDERPASS_H
+#endif // QT3DRENDER_QRENDERPASS_H
diff --git a/src/render/frontend/qrenderpass_p.h b/src/render/frontend/qrenderpass_p.h
index cf21a23f7..ace1a54b1 100644
--- a/src/render/frontend/qrenderpass_p.h
+++ b/src/render/frontend/qrenderpass_p.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRENDERPASS_P_H
-#define QT3D_QRENDERPASS_P_H
+#ifndef QT3DRENDER_QRENDERPASS_P_H
+#define QT3DRENDER_QRENDERPASS_P_H
 
 #include <private/qnode_p.h>
 #include <Qt3DRenderer/qrenderpass.h>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QParameter;
 class QParameterMapping;
@@ -57,7 +57,7 @@ namespace Render
 class RenderStateSet;
 }
 
-class QT3DRENDERERSHARED_EXPORT QRenderPassPrivate : public QNodePrivate
+class QT3DRENDERERSHARED_EXPORT QRenderPassPrivate : public Qt3D::QNodePrivate
 {
 public:
     QRenderPassPrivate();
@@ -75,7 +75,7 @@ public:
     QShaderProgram *m_shader;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/frontend/qrenderstate.cpp b/src/render/frontend/qrenderstate.cpp
index a572b5e06..831962ca4 100644
--- a/src/render/frontend/qrenderstate.cpp
+++ b/src/render/frontend/qrenderstate.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
     \class Qt3D::QRenderStatePrivate
@@ -54,7 +54,7 @@ QRenderStatePrivate::QRenderStatePrivate(QRenderState::Type type)
 
 QRenderState::~QRenderState()
 {
-    Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QRenderState subclass didn't call QNode::cleanup in its destructor");
+    Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QRenderState subclass didn't call QNode::cleanup in its destructor");
 }
 
 QRenderState::Type QRenderState::type() const
@@ -69,6 +69,6 @@ QRenderState::QRenderState(QRenderStatePrivate &dd, QNode *parent)
 {
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qrenderstate.h b/src/render/frontend/qrenderstate.h
index 1dcaa05f7..6f730a432 100644
--- a/src/render/frontend/qrenderstate.h
+++ b/src/render/frontend/qrenderstate.h
@@ -35,19 +35,19 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRENDERSTATE_H
-#define QT3D_QRENDERSTATE_H
+#ifndef QT3DRENDER_QRENDERSTATE_H
+#define QT3DRENDER_QRENDERSTATE_H
 
-#include <Qt3DCore/QNode>
+#include <Qt3DCore/qnode.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QRenderStatePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QRenderState : public QNode
+class QT3DRENDERERSHARED_EXPORT QRenderState : public Qt3D::QNode
 {
     Q_OBJECT
 
@@ -78,14 +78,14 @@ public:
     Type type() const;
 
 protected:
-    QRenderState(QRenderStatePrivate &dd, QNode *parent = Q_NULLPTR);
+    QRenderState(QRenderStatePrivate &dd, Qt3D::QNode *parent = Q_NULLPTR);
 
 private:
     Q_DECLARE_PRIVATE(QRenderState)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QRENDERSTATE_H
+#endif // QT3DRENDER_QRENDERSTATE_H
diff --git a/src/render/frontend/qrenderstate_p.h b/src/render/frontend/qrenderstate_p.h
index 8ae1dd5c3..21bdd276a 100644
--- a/src/render/frontend/qrenderstate_p.h
+++ b/src/render/frontend/qrenderstate_p.h
@@ -35,17 +35,17 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRENDERSTATE_P_H
-#define QT3D_QRENDERSTATE_P_H
+#ifndef QT3DRENDER_QRENDERSTATE_P_H
+#define QT3DRENDER_QRENDERSTATE_P_H
 
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QRenderStatePrivate : public QNodePrivate
+class QRenderStatePrivate : public Qt3D::QNodePrivate
 {
 public:
     QRenderStatePrivate(QRenderState::Type type);
@@ -58,4 +58,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QRENDERSTATE_P_H
+#endif // QT3DRENDER_QRENDERSTATE_P_H
diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp
index d6297d7de..ed7354871 100644
--- a/src/render/frontend/qrendertarget.cpp
+++ b/src/render/frontend/qrendertarget.cpp
@@ -41,10 +41,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QRenderTargetPrivate
+    \class Qt3DRender::QRenderTargetPrivate
     \internal
 */
 QRenderTargetPrivate::QRenderTargetPrivate()
@@ -113,6 +115,6 @@ QList<QRenderAttachment *> QRenderTarget::attachments() const
     return d->m_attachments;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h
index 8b2860bca..a7b192b85 100644
--- a/src/render/frontend/qrendertarget.h
+++ b/src/render/frontend/qrendertarget.h
@@ -34,24 +34,24 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRENDERTARGET_H
-#define QT3D_QRENDERTARGET_H
+#ifndef QT3DRENDER_QRENDERTARGET_H
+#define QT3DRENDER_QRENDERTARGET_H
 
 #include <Qt3DCore/qcomponent.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QRenderTargetPrivate;
 class QRenderAttachment;
 
-class QT3DRENDERERSHARED_EXPORT QRenderTarget : public QComponent
+class QT3DRENDERERSHARED_EXPORT QRenderTarget : public Qt3D::QComponent
 {
     Q_OBJECT
 public:
-    explicit QRenderTarget(QNode *parent = 0);
+    explicit QRenderTarget(Qt3D::QNode *parent = 0);
     ~QRenderTarget();
 
     void addAttachment(QRenderAttachment *attachment);
@@ -59,16 +59,16 @@ public:
     QList<QRenderAttachment *> attachments() const;
 
 protected:
-    QRenderTarget(QRenderTargetPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QRenderTarget(QRenderTargetPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QRenderTarget)
     QT3D_CLONEABLE(QRenderTarget)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QRENDERTARGET_H
+#endif // QT3DRENDER_QRENDERTARGET_H
diff --git a/src/render/frontend/qrendertarget_p.h b/src/render/frontend/qrendertarget_p.h
index 50faf7308..57cdd175e 100644
--- a/src/render/frontend/qrendertarget_p.h
+++ b/src/render/frontend/qrendertarget_p.h
@@ -34,19 +34,19 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRENDERTARGET_P_H
-#define QT3D_QRENDERTARGET_P_H
+#ifndef QT3DRENDER_QRENDERTARGET_P_H
+#define QT3DRENDER_QRENDERTARGET_P_H
 
 #include <Qt3DCore/private/qcomponent_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QRenderAttachment;
 class QRenderTarget;
 
-class QRenderTargetPrivate : public QComponentPrivate
+class QRenderTargetPrivate : public Qt3D::QComponentPrivate
 {
 public:
     QRenderTargetPrivate();
@@ -59,4 +59,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QRENDERTARGET_P_H
+#endif // QT3DRENDER_QRENDERTARGET_P_H
diff --git a/src/render/frontend/qsceneloader.cpp b/src/render/frontend/qsceneloader.cpp
index eee55f813..b5b4975e7 100644
--- a/src/render/frontend/qsceneloader.cpp
+++ b/src/render/frontend/qsceneloader.cpp
@@ -44,10 +44,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 QSceneLoader::QSceneLoader(QNode *parent)
-    : Render::QAbstractSceneLoader(parent)
+    : QAbstractSceneLoader(parent)
 {
 }
 
@@ -57,9 +59,9 @@ QSceneLoader::~QSceneLoader()
 }
 
 // Called in main thread
-void QSceneLoader::sceneChangeEvent(const QSceneChangePtr &change)
+void QSceneLoader::sceneChangeEvent(const Qt3D::QSceneChangePtr &change)
 {
-    Render::QAbstractSceneLoaderPrivate *d = static_cast<Render::QAbstractSceneLoaderPrivate*>(QNodePrivate::get(this));
+    QAbstractSceneLoaderPrivate *d = static_cast<QAbstractSceneLoaderPrivate*>(QNodePrivate::get(this));
     QScenePropertyChangePtr e = qSharedPointerCast<QScenePropertyChange>(change);
     if (e->type() == NodeUpdated) {
         if (e->propertyName() == QByteArrayLiteral("scene")) {
@@ -84,6 +86,6 @@ void QSceneLoader::sceneChangeEvent(const QSceneChangePtr &change)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qsceneloader.h b/src/render/frontend/qsceneloader.h
index 8c0092beb..adbed1dda 100644
--- a/src/render/frontend/qsceneloader.h
+++ b/src/render/frontend/qsceneloader.h
@@ -34,29 +34,29 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSCENELOADER_H
-#define QT3D_QSCENELOADER_H
+#ifndef QT3DRENDER_QSCENELOADER_H
+#define QT3DRENDER_QSCENELOADER_H
 
 #include <Qt3DRenderer/qabstractsceneloader.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QSceneLoader : public Render::QAbstractSceneLoader
+class QT3DRENDERERSHARED_EXPORT QSceneLoader : public QAbstractSceneLoader
 {
     Q_OBJECT
 public:
-    explicit QSceneLoader(QNode *parent = 0);
+    explicit QSceneLoader(Qt3D::QNode *parent = 0);
     ~QSceneLoader();
-    void sceneChangeEvent(const QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE;
 
 protected:
     QT3D_CLONEABLE(QSceneLoader)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSCENELOADER_H
+#endif // QT3DRENDER_QSCENELOADER_H
diff --git a/src/render/frontend/qscissortest.cpp b/src/render/frontend/qscissortest.cpp
index 79ddd61bd..cc2624f41 100644
--- a/src/render/frontend/qscissortest.cpp
+++ b/src/render/frontend/qscissortest.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QScissorTestPrivate : public QRenderStatePrivate
 {
@@ -144,6 +144,6 @@ void QScissorTest::setHeight(int height)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qscissortest.h b/src/render/frontend/qscissortest.h
index aae531cd3..a607bcd72 100644
--- a/src/render/frontend/qscissortest.h
+++ b/src/render/frontend/qscissortest.h
@@ -35,14 +35,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSCISSORTEST_H
-#define QT3D_QSCISSORTEST_H
+#ifndef QT3DRENDER_QSCISSORTEST_H
+#define QT3DRENDER_QSCISSORTEST_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QScissorTestPrivate;
 
@@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QScissorTest  : public QRenderState
     Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged)
 
 public:
-    explicit QScissorTest(QNode *parent = 0);
+    explicit QScissorTest(Qt3D::QNode *parent = 0);
     ~QScissorTest();
 
     int left() const;
@@ -77,15 +77,15 @@ Q_SIGNALS:
     void heightChanged();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QScissorTest)
     QT3D_CLONEABLE(QScissorTest)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSCISSORTEST_H
+#endif // QT3DRENDER_QSCISSORTEST_H
diff --git a/src/render/frontend/qshaderdata.cpp b/src/render/frontend/qshaderdata.cpp
index 0592760ac..848b54bf8 100644
--- a/src/render/frontend/qshaderdata.cpp
+++ b/src/render/frontend/qshaderdata.cpp
@@ -39,10 +39,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QShaderDataPrivate
+    \class Qt3DRender::QShaderDataPrivate
     \internal
 */
 QShaderDataPrivate::QShaderDataPrivate()
@@ -52,7 +52,7 @@ QShaderDataPrivate::QShaderDataPrivate()
 }
 
 /*!
-    \class Qt3D::QShaderDataPrivate
+    \class Qt3DRender::QShaderDataPrivate
     \internal
 */
 QShaderDataPrivate::QShaderDataPrivate(PropertyReaderInterfacePtr reader)
@@ -62,14 +62,15 @@ QShaderDataPrivate::QShaderDataPrivate(PropertyReaderInterfacePtr reader)
 }
 
 /*!
- * \class Qt3D::QShaderData
+ * \class Qt3DRender::QShaderData
  * \inmodule Qt3DRenderer
+ *
  * \brief Provides a way of specifying values of a Uniform Block or a shader
  * structure.
  *
- * \note When subclassing and adding properties to Qt3D::QShaderData, please note
- * that if you need to nest an inner Qt3D::QShaderData, the data type of the
- * property should be Qt3D::QShaderData* instead of the name of your subclass.
+ * \note When subclassing and adding properties to Qt3DRender::QShaderData, please note
+ * that if you need to nest an inner Qt3DRender::QShaderData, the data type of the
+ * property should be Qt3DRender::QShaderData* instead of the name of your subclass.
  *
  * \since 5.5
  */
@@ -115,6 +116,6 @@ void QShaderData::copy(const QNode *ref)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qshaderdata.h b/src/render/frontend/qshaderdata.h
index 681c41439..4353581af 100644
--- a/src/render/frontend/qshaderdata.h
+++ b/src/render/frontend/qshaderdata.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSHADERDATA_H
-#define QT3D_QSHADERDATA_H
+#ifndef QT3DRENDER_QSHADERDATA_H
+#define QT3DRENDER_QSHADERDATA_H
 
 #include <Qt3DCore/qcomponent.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QShaderDataPrivate;
 
@@ -55,11 +55,11 @@ public:
 
 typedef QSharedPointer<PropertyReaderInterface> PropertyReaderInterfacePtr;
 
-class QT3DRENDERERSHARED_EXPORT QShaderData : public QComponent
+class QT3DRENDERERSHARED_EXPORT QShaderData : public Qt3D::QComponent
 {
     Q_OBJECT
 public:
-    explicit QShaderData(QNode *parent = 0);
+    explicit QShaderData(Qt3D::QNode *parent = 0);
     ~QShaderData();
 
     enum TransformType {
@@ -71,8 +71,8 @@ public:
     PropertyReaderInterfacePtr propertyReader() const;
 
 protected:
-    QShaderData(QShaderDataPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QShaderData(QShaderDataPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 
 private:
@@ -80,11 +80,11 @@ private:
     QT3D_CLONEABLE(QShaderData)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QShaderData*)
-Q_DECLARE_METATYPE(QList<Qt3D::QShaderData*>)
+Q_DECLARE_METATYPE(Qt3DRender::QShaderData*)
+Q_DECLARE_METATYPE(QList<Qt3DRender::QShaderData*>)
 
-#endif // QT3D_QSHADERDATA_H
+#endif // QT3DRENDER_QSHADERDATA_H
diff --git a/src/render/frontend/qshaderdata_p.h b/src/render/frontend/qshaderdata_p.h
index cdd30aec4..eaf6847f7 100644
--- a/src/render/frontend/qshaderdata_p.h
+++ b/src/render/frontend/qshaderdata_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSHADERDATA_P_H
-#define QT3D_QSHADERDATA_P_H
+#ifndef QT3DRENDER_QSHADERDATA_P_H
+#define QT3DRENDER_QSHADERDATA_P_H
 
 #include <private/qcomponent_p.h>
 #include <Qt3DRenderer/qshaderdata.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace {
 
@@ -72,7 +72,7 @@ class QShaderDataPropertyReader: public PropertyReaderInterface
     }
 };
 
-class QT3DRENDERERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public QComponentPrivate
+class QT3DRENDERERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public Qt3D::QComponentPrivate
 {
 public:
     QShaderDataPrivate();
@@ -82,8 +82,8 @@ public:
     Q_DECLARE_PUBLIC(QShaderData)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSHADERDATA_P_H
+#endif // QT3DRENDER_QSHADERDATA_P_H
diff --git a/src/render/frontend/qshaderprogram.cpp b/src/render/frontend/qshaderprogram.cpp
index 09e3d7f4e..6c44ee0ce 100644
--- a/src/render/frontend/qshaderprogram.cpp
+++ b/src/render/frontend/qshaderprogram.cpp
@@ -44,10 +44,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QShaderProgramPrivate
+    \class Qt3DRender::QShaderProgramPrivate
     \internal
 */
 QShaderProgramPrivate::QShaderProgramPrivate()
@@ -230,7 +230,7 @@ QByteArray QShaderProgram::shaderCode(ShaderType type) const
 QByteArray QShaderProgram::loadSource(const QUrl &sourceUrl)
 {
     // TO DO: Handle remote path
-    QString filePath = QUrlHelper::urlToLocalFileOrQrc(sourceUrl);
+    QString filePath = Qt3D::QUrlHelper::urlToLocalFileOrQrc(sourceUrl);
 
     QFile f(filePath);
     if (!f.exists())
@@ -240,6 +240,6 @@ QByteArray QShaderProgram::loadSource(const QUrl &sourceUrl)
     return f.readAll();
 }
 
-} // of namespace Qt3D
+} // of namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qshaderprogram.h b/src/render/frontend/qshaderprogram.h
index 1fada18b4..6695316ee 100644
--- a/src/render/frontend/qshaderprogram.h
+++ b/src/render/frontend/qshaderprogram.h
@@ -34,19 +34,19 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSHADERPROGRAM_H
-#define QT3D_QSHADERPROGRAM_H
+#ifndef QT3DRENDER_QSHADERPROGRAM_H
+#define QT3DRENDER_QSHADERPROGRAM_H
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QShaderProgramPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QShaderProgram : public QNode
+class QT3DRENDERERSHARED_EXPORT QShaderProgram : public Qt3D::QNode
 {
     Q_OBJECT
     Q_PROPERTY(QByteArray vertexShaderCode READ vertexShaderCode WRITE setVertexShaderCode NOTIFY vertexShaderCodeChanged)
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QShaderProgram : public QNode
     Q_PROPERTY(QByteArray computeShaderCode READ computeShaderCode WRITE setComputeShaderCode NOTIFY computeShaderCodeChanged)
 
 public:
-    explicit QShaderProgram(QNode *parent = 0);
+    explicit QShaderProgram(Qt3D::QNode *parent = 0);
     ~QShaderProgram();
 
     enum ShaderType {
@@ -103,8 +103,8 @@ Q_SIGNALS:
     void computeShaderCodeChanged();
 
 protected:
-    QShaderProgram(QShaderProgramPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QShaderProgram(QShaderProgramPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QShaderProgram)
@@ -115,4 +115,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSHADERPROGRAM_H
+#endif // QT3DRENDER_QSHADERPROGRAM_H
diff --git a/src/render/frontend/qshaderprogram_p.h b/src/render/frontend/qshaderprogram_p.h
index 455436a8a..2fd50f3b0 100644
--- a/src/render/frontend/qshaderprogram_p.h
+++ b/src/render/frontend/qshaderprogram_p.h
@@ -34,18 +34,18 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSHADERPROGRAM_P_H
-#define QT3D_QSHADERPROGRAM_P_H
+#ifndef QT3DRENDER_QSHADERPROGRAM_P_H
+#define QT3DRENDER_QSHADERPROGRAM_P_H
 
 #include <private/qnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QShaderProgram;
 
-class QShaderProgramPrivate : public QNodePrivate
+class QShaderProgramPrivate : public Qt3D::QNodePrivate
 {
 public:
     QShaderProgramPrivate();
@@ -65,8 +65,8 @@ public:
     QByteArray m_computeShaderCode;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSHADERPROGRAM_P_H
+#endif // QT3DRENDER_QSHADERPROGRAM_P_H
diff --git a/src/render/frontend/qspheremesh.cpp b/src/render/frontend/qspheremesh.cpp
index 66fe6f738..6e5b6ce4f 100644
--- a/src/render/frontend/qspheremesh.cpp
+++ b/src/render/frontend/qspheremesh.cpp
@@ -49,7 +49,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace {
 
diff --git a/src/render/frontend/qspheremesh.h b/src/render/frontend/qspheremesh.h
index 8363a01bc..e96ad94e8 100644
--- a/src/render/frontend/qspheremesh.h
+++ b/src/render/frontend/qspheremesh.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSPHEREMESH_H
-#define QT3D_QSPHEREMESH_H
+#ifndef QT3DRENDER_QSPHEREMESH_H
+#define QT3DRENDER_QSPHEREMESH_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/qgeometryrenderer.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QSphereMeshPrivate;
 
@@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QSphereMesh : public QGeometryRenderer
     Q_PROPERTY(bool generateTangents READ generateTangents WRITE setGenerateTangents NOTIFY generateTangentsChanged)
 
 public:
-    explicit QSphereMesh(QNode *parent = 0);
+    explicit QSphereMesh(Qt3D::QNode *parent = 0);
     ~QSphereMesh();
 
     void setRings(int rings);
@@ -87,8 +87,8 @@ private:
     void setPrimitiveType(PrimitiveType primitiveType);
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSPHEREMESH_H
+#endif // QT3DRENDER_QSPHEREMESH_H
diff --git a/src/render/frontend/qspotlight.cpp b/src/render/frontend/qspotlight.cpp
index 58901b4fd..191be0e62 100644
--- a/src/render/frontend/qspotlight.cpp
+++ b/src/render/frontend/qspotlight.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 
 /*
@@ -168,6 +168,6 @@ void QSpotLight::setCutOffAngle(float cutOffAngle)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qspotlight.h b/src/render/frontend/qspotlight.h
index 9a1123f14..c22ef62e5 100644
--- a/src/render/frontend/qspotlight.h
+++ b/src/render/frontend/qspotlight.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSPOTLIGHT_H
-#define QT3D_QSPOTLIGHT_H
+#ifndef QT3DRENDER_QSPOTLIGHT_H
+#define QT3DRENDER_QSPOTLIGHT_H
 
 #include <Qt3DRenderer/qabstractlight.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QSpotLightPrivate;
 
@@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QSpotLight : public QAbstractLight
     Q_PROPERTY(float cutOffAngle READ cutOffAngle WRITE setCutOffAngle NOTIFY cutOffAngleChanged)
 
 public:
-    explicit QSpotLight(QNode *parent = 0);
+    explicit QSpotLight(Qt3D::QNode *parent = 0);
 
     QVector3D direction() const;
     float cutOffAngle() const;
@@ -65,16 +65,16 @@ Q_SIGNALS:
     void cutOffAngleChanged();
 
 protected:
-    QSpotLight(QSpotLightPrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QSpotLight(QSpotLightPrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QSpotLight)
     QT3D_CLONEABLE(QSpotLight)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSPOTLIGHT_H
+#endif // QT3DRENDER_QSPOTLIGHT_H
diff --git a/src/render/frontend/qspotlight_p.h b/src/render/frontend/qspotlight_p.h
index d05ec446d..673438a33 100644
--- a/src/render/frontend/qspotlight_p.h
+++ b/src/render/frontend/qspotlight_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSPOTLIGHT_P_H
-#define QT3D_QSPOTLIGHT_P_H
+#ifndef QT3DRENDER_QSPOTLIGHT_P_H
+#define QT3DRENDER_QSPOTLIGHT_P_H
 
 #include <private/qabstractlight_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QT3DRENDERERSHARED_EXPORT QSpotLightPrivate : public QAbstractLightPrivate
 {
@@ -53,8 +53,8 @@ public:
     QVector3D m_direction;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSPOTLIGHT_P_H
+#endif // QT3DRENDER_QSPOTLIGHT_P_H
diff --git a/src/render/frontend/qstencilmask.cpp b/src/render/frontend/qstencilmask.cpp
index 79a436e5b..44098296a 100644
--- a/src/render/frontend/qstencilmask.cpp
+++ b/src/render/frontend/qstencilmask.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QStencilMaskPrivate : public QRenderStatePrivate
 {
@@ -106,6 +106,6 @@ void QStencilMask::copy(const QNode *ref)
     d_func()->m_backMask = otherRef->backMask();
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qstencilmask.h b/src/render/frontend/qstencilmask.h
index 58da93891..6e11cff68 100644
--- a/src/render/frontend/qstencilmask.h
+++ b/src/render/frontend/qstencilmask.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSTENCILMASK_H
-#define QT3D_QSTENCILMASK_H
+#ifndef QT3DRENDER_QSTENCILMASK_H
+#define QT3DRENDER_QSTENCILMASK_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QStencilMaskPrivate;
 
@@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QStencilMask : public QRenderState
     Q_PROPERTY(uint frontMask READ frontMask WRITE setFrontMask NOTIFY frontMaskChanged)
     Q_PROPERTY(uint backMask READ backMask WRITE setBackMask NOTIFY backMaskChanged)
 public:
-    explicit QStencilMask(QNode *parent = 0);
+    explicit QStencilMask(Qt3D::QNode *parent = 0);
     ~QStencilMask();
 
     void setFrontMask(uint mask);
@@ -64,15 +64,15 @@ Q_SIGNALS:
     void backMaskChanged();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_FINAL;
+    void copy(const Qt3D::QNode *ref) Q_DECL_FINAL;
 
 private:
     Q_DECLARE_PRIVATE(QStencilMask)
     QT3D_CLONEABLE(QStencilMask)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSTENCILMASK_H
+#endif // QT3DRENDER_QSTENCILMASK_H
diff --git a/src/render/frontend/qstencilop.cpp b/src/render/frontend/qstencilop.cpp
index 54aa4a1bc..67a571202 100644
--- a/src/render/frontend/qstencilop.cpp
+++ b/src/render/frontend/qstencilop.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QStencilOpPrivate : public QRenderStatePrivate
 {
@@ -90,6 +90,6 @@ void QStencilOp::copy(const QNode *ref)
     d_func()->m_front->setStencilDepthPass(refState->d_func()->m_front->stencilDepthPass());
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qstencilop.h b/src/render/frontend/qstencilop.h
index 83baebaed..bc212af48 100644
--- a/src/render/frontend/qstencilop.h
+++ b/src/render/frontend/qstencilop.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSTENCILOP_H
-#define QT3D_QSTENCILOP_H
+#ifndef QT3DRENDER_QSTENCILOP_H
+#define QT3DRENDER_QSTENCILOP_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QStencilOpPrivate;
 class QStencilOpSeparate;
@@ -49,26 +49,26 @@ class QStencilOpSeparate;
 class QT3DRENDERERSHARED_EXPORT QStencilOp : public QRenderState
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QStencilOpSeparate *front READ front CONSTANT)
-    Q_PROPERTY(Qt3D::QStencilOpSeparate *back READ back CONSTANT)
+    Q_PROPERTY(Qt3DRender::QStencilOpSeparate *front READ front CONSTANT)
+    Q_PROPERTY(Qt3DRender::QStencilOpSeparate *back READ back CONSTANT)
 
 public:
-    explicit QStencilOp(QNode *parent = 0);
+    explicit QStencilOp(Qt3D::QNode *parent = 0);
     ~QStencilOp();
 
     QStencilOpSeparate *front() const;
     QStencilOpSeparate *back() const;
 
 protected:
-    void copy(const QNode *ref) Q_DECL_FINAL;
+    void copy(const Qt3D::QNode *ref) Q_DECL_FINAL;
 
 private:
     Q_DECLARE_PRIVATE(QStencilOp)
     QT3D_CLONEABLE(QStencilOp)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSTENCILOP_H
+#endif // QT3DRENDER_QSTENCILOP_H
diff --git a/src/render/frontend/qstencilopseparate.cpp b/src/render/frontend/qstencilopseparate.cpp
index 2a778a398..ec2c4e40c 100644
--- a/src/render/frontend/qstencilopseparate.cpp
+++ b/src/render/frontend/qstencilopseparate.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QStencilOpSeparatePrivate : public QObjectPrivate
 {
@@ -120,6 +120,6 @@ QStencilOpSeparate::StencilOp QStencilOpSeparate::stencilDepthPass() const
     return d->m_stencilDepthPassOp;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qstencilopseparate.h b/src/render/frontend/qstencilopseparate.h
index 341a0495c..44561131c 100644
--- a/src/render/frontend/qstencilopseparate.h
+++ b/src/render/frontend/qstencilopseparate.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSTENCILOPSEPARATE_H
-#define QT3D_QSTENCILOPSEPARATE_H
+#ifndef QT3DRENDER_QSTENCILOPSEPARATE_H
+#define QT3DRENDER_QSTENCILOPSEPARATE_H
 
 #include <QObject>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QStencilOpPrivate;
 class QStencilOpSeparatePrivate;
@@ -103,8 +103,8 @@ private:
     friend class QStencilOpPrivate;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSTENCILOPSEPARATE_H
+#endif // QT3DRENDER_QSTENCILOPSEPARATE_H
diff --git a/src/render/frontend/qstenciltest.cpp b/src/render/frontend/qstenciltest.cpp
index 2f315deab..2533d71a9 100644
--- a/src/render/frontend/qstenciltest.cpp
+++ b/src/render/frontend/qstenciltest.cpp
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QStencilTestPrivate : public QRenderStatePrivate
 {
@@ -96,6 +96,6 @@ void QStencilTest::copy(const QNode *ref)
 }
 
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qstenciltest.h b/src/render/frontend/qstenciltest.h
index a31e072eb..51469f69c 100644
--- a/src/render/frontend/qstenciltest.h
+++ b/src/render/frontend/qstenciltest.h
@@ -35,14 +35,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSTENCILTEST_H
-#define QT3D_QSTENCILTEST_H
+#ifndef QT3DRENDER_QSTENCILTEST_H
+#define QT3DRENDER_QSTENCILTEST_H
 
 #include <Qt3DRenderer/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QStencilTestPrivate;
 class QStencilTestSeparate;
@@ -50,27 +50,27 @@ class QStencilTestSeparate;
 class QT3DRENDERERSHARED_EXPORT QStencilTest : public QRenderState
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QStencilTestSeparate *front READ front CONSTANT)
-    Q_PROPERTY(Qt3D::QStencilTestSeparate *back READ back CONSTANT)
+    Q_PROPERTY(Qt3DRender::QStencilTestSeparate *front READ front CONSTANT)
+    Q_PROPERTY(Qt3DRender::QStencilTestSeparate *back READ back CONSTANT)
 public:
 
-    explicit QStencilTest(QNode *parent = 0);
+    explicit QStencilTest(Qt3D::QNode *parent = 0);
     ~QStencilTest();
 
     QStencilTestSeparate *front() const;
     QStencilTestSeparate *back() const;
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QStencilTest)
     QT3D_CLONEABLE(QStencilTest)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
 
-#endif // QT3D_QSTENCILTEST_H
+#endif // QT3DRENDER_QSTENCILTEST_H
diff --git a/src/render/frontend/qstenciltestseparate.cpp b/src/render/frontend/qstenciltestseparate.cpp
index 5d10e4db7..87b9fc798 100644
--- a/src/render/frontend/qstenciltestseparate.cpp
+++ b/src/render/frontend/qstenciltestseparate.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QStencilTestSeparatePrivate : public QObjectPrivate
 {
@@ -121,6 +121,6 @@ QStencilTestSeparate::StencilFaceMode QStencilTestSeparate::faceMode() const
     return d->m_face;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qstenciltestseparate.h b/src/render/frontend/qstenciltestseparate.h
index 0322fc1de..5689a1cfb 100644
--- a/src/render/frontend/qstenciltestseparate.h
+++ b/src/render/frontend/qstenciltestseparate.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSTENCILTESTSEPARATE_H
-#define QT3D_QSTENCILTESTSEPARATE_H
+#ifndef QT3DRENDER_QSTENCILTESTSEPARATE_H
+#define QT3DRENDER_QSTENCILTESTSEPARATE_H
 
 #include <QObject>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QStencilTestPrivate;
 class QStencilTestSeparatePrivate;
@@ -104,8 +104,8 @@ private:
     Q_DECLARE_PRIVATE(QStencilTestSeparate)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSTENCILTESTSEPARATE_H
+#endif // QT3DRENDER_QSTENCILTESTSEPARATE_H
diff --git a/src/render/frontend/qtechnique.cpp b/src/render/frontend/qtechnique.cpp
index 01699715e..52578e267 100644
--- a/src/render/frontend/qtechnique.cpp
+++ b/src/render/frontend/qtechnique.cpp
@@ -43,10 +43,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QTechniquePrivate
+    \class Qt3DRender::QTechniquePrivate
     \internal
 */
 QTechniquePrivate::QTechniquePrivate()
@@ -244,7 +246,7 @@ QOpenGLFilter *QTechnique::openGLFilter()
     return &d->m_openGLFilter;
 }
 
-} // of namespace Qt3D
+} // of namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/frontend/qtechnique.h b/src/render/frontend/qtechnique.h
index b1df01dd3..d45892991 100644
--- a/src/render/frontend/qtechnique.h
+++ b/src/render/frontend/qtechnique.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTECHNIQUE_H
-#define QT3D_QTECHNIQUE_H
+#ifndef QT3DRENDER_QTECHNIQUE_H
+#define QT3DRENDER_QTECHNIQUE_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qnode.h>
@@ -46,19 +46,19 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QParameter;
 class QTechniquePrivate;
 class QOpenGLFilter;
 
-class QT3DRENDERERSHARED_EXPORT QTechnique : public QNode
+class QT3DRENDERERSHARED_EXPORT QTechnique : public Qt3D::QNode
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QOpenGLFilter *openGLFilter READ openGLFilter)
+    Q_PROPERTY(Qt3DRender::QOpenGLFilter *openGLFilter READ openGLFilter)
 
 public:
-    explicit QTechnique(QNode *parent = 0);
+    explicit QTechnique(Qt3D::QNode *parent = 0);
     ~QTechnique();
 
     void addAnnotation(QAnnotation *criterion);
@@ -76,8 +76,8 @@ public:
     QOpenGLFilter *openGLFilter();
 
 protected:
-    QTechnique(QTechniquePrivate &dd, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QTechnique(QTechniquePrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QTechnique)
@@ -89,4 +89,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTECHNIQUE_H
+#endif // QT3DRENDER_QTECHNIQUE_H
diff --git a/src/render/frontend/qtechnique_p.h b/src/render/frontend/qtechnique_p.h
index 6ae35f1e1..87fa18647 100644
--- a/src/render/frontend/qtechnique_p.h
+++ b/src/render/frontend/qtechnique_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTECHNIQUE_P_H
-#define QT3D_QTECHNIQUE_P_H
+#ifndef QT3DRENDER_QTECHNIQUE_P_H
+#define QT3DRENDER_QTECHNIQUE_P_H
 
 #include <private/qnode_p.h>
 #include <Qt3DRenderer/qopenglfilter.h>
@@ -43,14 +43,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QTechnique;
 class QAnnotation;
 class QParameter;
 class QRenderPass;
 
-class QT3DRENDERERSHARED_EXPORT QTechniquePrivate : public QNodePrivate
+class QT3DRENDERERSHARED_EXPORT QTechniquePrivate : public Qt3D::QNodePrivate
 {
 public:
     QTechniquePrivate();
@@ -66,8 +66,8 @@ private:
     void _q_openGLFilterChanged();
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTECHNIQUE_P_H
+#endif // QT3DRENDER_QTECHNIQUE_P_H
diff --git a/src/render/frontend/qtexture.h b/src/render/frontend/qtexture.h
index 68b18aa02..d794f5b08 100644
--- a/src/render/frontend/qtexture.h
+++ b/src/render/frontend/qtexture.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTEXTURE_H
-#define QT3D_QTEXTURE_H
+#ifndef QT3DRENDER_QTEXTURE_H
+#define QT3DRENDER_QTEXTURE_H
 
 #include <QOpenGLTexture>
 #include <Qt3DRenderer/texturedata.h>
@@ -53,4 +53,4 @@ QT_BEGIN_NAMESPACE
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTEXTURE_H
+#endif // QT3DRENDER_QTEXTURE_H
diff --git a/src/render/frontend/qtextureimage.cpp b/src/render/frontend/qtextureimage.cpp
index c61703f5f..3d8a58b3e 100644
--- a/src/render/frontend/qtextureimage.cpp
+++ b/src/render/frontend/qtextureimage.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QTextureImagePrivate: public QAbstractTextureImagePrivate
 {
@@ -67,7 +67,7 @@ public:
     {
         TexImageDataPtr dataPtr;
         if (m_url.isLocalFile() || m_url.scheme() == QStringLiteral("qrc")) {
-            QString source = QUrlHelper::urlToLocalFileOrQrc(m_url);
+            QString source = Qt3D::QUrlHelper::urlToLocalFileOrQrc(m_url);
             dataPtr.reset(new TexImageData());
             if (dataPtr->setCompressedFile(source))
                 return dataPtr;
@@ -109,7 +109,7 @@ private:
 
 /*!
     \qmltype TextureImage
-    \instantiates Qt3D::QTextureImage
+    \instantiates Qt3DRender::QTextureImage
     \inherits AbstractTextureImage
     \inqmlmodule Qt3D.Renderer
     \since 5.5
@@ -118,7 +118,7 @@ private:
 */
 
 /*!
-    Constructs a new Qt3D::QTextureImage instance with \a parent as parent.
+    Constructs a new Qt3DRender::QTextureImage instance with \a parent as parent.
  */
 QTextureImage::QTextureImage(QNode *parent)
     : QAbstractTextureImage(*new QTextureImagePrivate, parent)
@@ -143,7 +143,7 @@ QUrl QTextureImage::source() const
 }
 
 /*!
-  \property Qt3D::QTextureImage::source
+  \property Qt3DRender::QTextureImage::source
 
   This property holdsthe source url from which data for the texture
   image will be loaded.
@@ -171,7 +171,7 @@ void QTextureImage::setSource(const QUrl &source)
 }
 
 /*!
-    Returns the Qt3D::QTextureDataFunctorPtr functor to be used by the
+    Returns the Qt3DRender::QTextureDataFunctorPtr functor to be used by the
     backend to load the texture image data into an OpenGL texture object.
  */
 QTextureDataFunctorPtr QTextureImage::dataFunctor() const
@@ -189,7 +189,7 @@ void QTextureImage::copy(const QNode *ref)
     d_func()->m_source = img->source();
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/frontend/qtextureimage.h b/src/render/frontend/qtextureimage.h
index cf08f7b2b..f77c2d47e 100644
--- a/src/render/frontend/qtextureimage.h
+++ b/src/render/frontend/qtextureimage.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTEXTUREIMAGE_H
-#define QT3D_QTEXTUREIMAGE_H
+#ifndef QT3DRENDER_QTEXTUREIMAGE_H
+#define QT3DRENDER_QTEXTUREIMAGE_H
 
 #include <QUrl>
 #include <Qt3DRenderer/qabstracttextureimage.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QTextureImagePrivate;
 
@@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureImage : public QAbstractTextureImage
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
 
 public:
-    explicit QTextureImage(QNode *parent = 0);
+    explicit QTextureImage(Qt3D::QNode *parent = 0);
     ~QTextureImage();
 
     QUrl source() const;
@@ -64,15 +64,15 @@ Q_SIGNALS:
     void sourceChanged();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QTextureImage)
     QT3D_CLONEABLE(QTextureImage)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTEXTUREIMAGE_H
+#endif // QT3DRENDER_QTEXTUREIMAGE_H
diff --git a/src/render/frontend/qtextureproviders.cpp b/src/render/frontend/qtextureproviders.cpp
index 0292c19a5..62c8f66c7 100644
--- a/src/render/frontend/qtextureproviders.cpp
+++ b/src/render/frontend/qtextureproviders.cpp
@@ -38,17 +38,17 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QTexture1D
+    \class Qt3DRender::QTexture1D
     \inmodule Qt3DRenderer
     \since 5.5
     \brief A QAbstractTextureProvider with a Target1D target format.
  */
 
 /*!
-    Constructs a new Qt3D::QTexture1D instance with \a parent as parent.
+    Constructs a new Qt3DRender::QTexture1D instance with \a parent as parent.
  */
 QTexture1D::QTexture1D(QNode *parent)
     : QAbstractTextureProvider(Target1D, parent)
@@ -60,14 +60,14 @@ QTexture1D::~QTexture1D()
 }
 
 /*!
-    \class Qt3D::QTexture1DArray
+    \class Qt3DRender::QTexture1DArray
     \inmodule Qt3DRenderer
     \since 5.5
     \brief A QAbstractTextureProvider with a Target1DArray target format.
  */
 
 /*!
-    Constructs a new Qt3D::QTexture1DArray instance with \a parent as parent.
+    Constructs a new Qt3DRender::QTexture1DArray instance with \a parent as parent.
  */
 QTexture1DArray::QTexture1DArray(QNode *parent)
     : QAbstractTextureProvider(Target1DArray, parent)
@@ -79,14 +79,14 @@ QTexture1DArray::~QTexture1DArray()
 }
 
 /*!
-    \class Qt3D::QTexture2D
+    \class Qt3DRender::QTexture2D
     \inmodule Qt3DRenderer
     \since 5.5
     \brief A QAbstractTextureProvider with a Target2D target format.
  */
 
 /*!
-    Constructs a new Qt3D::QTexture2D instance with \a parent as parent.
+    Constructs a new Qt3DRender::QTexture2D instance with \a parent as parent.
  */
 QTexture2D::QTexture2D(QNode *parent)
     : QAbstractTextureProvider(Target2D, parent)
@@ -98,14 +98,14 @@ QTexture2D::~QTexture2D()
 }
 
 /*!
-    \class Qt3D::QTexture2DArray
+    \class Qt3DRender::QTexture2DArray
     \inmodule Qt3DRenderer
     \since 5.5
     \brief A QAbstractTextureProvider with a Target2DArray target format.
  */
 
 /*!
-    Constructs a new Qt3D::QTexture2DArray instance with \a parent as parent.
+    Constructs a new Qt3DRender::QTexture2DArray instance with \a parent as parent.
  */
 QTexture2DArray::QTexture2DArray(QNode *parent)
     : QAbstractTextureProvider(Target2DArray, parent)
@@ -118,14 +118,14 @@ QTexture2DArray::~QTexture2DArray()
 
 
 /*!
-    \class Qt3D::QTexture3D
+    \class Qt3DRender::QTexture3D
     \inmodule Qt3DRenderer
     \since 5.5
     \brief A QAbstractTextureProvider with a Target3D target format.
  */
 
 /*!
-    Constructs a new Qt3D::QTexture3D instance with \a parent as parent.
+    Constructs a new Qt3DRender::QTexture3D instance with \a parent as parent.
  */
 QTexture3D::QTexture3D(QNode *parent)
     : QAbstractTextureProvider(Target2D, parent)
@@ -137,14 +137,14 @@ QTexture3D::~QTexture3D()
 }
 
 /*!
-    \class Qt3D::QTextureCubeMap
+    \class Qt3DRender::QTextureCubeMap
     \inmodule Qt3DRenderer
     \since 5.5
     \brief A QAbstractTextureProvider with a TargetCubeMap target format.
  */
 
 /*!
-    Constructs a new Qt3D::QTextureCubeMap instance with \a parent as parent.
+    Constructs a new Qt3DRender::QTextureCubeMap instance with \a parent as parent.
  */
 QTextureCubeMap::QTextureCubeMap(QNode *parent)
     : QAbstractTextureProvider(TargetCubeMap, parent)
@@ -156,14 +156,14 @@ QTextureCubeMap::~QTextureCubeMap()
 }
 
 /*!
-    \class Qt3D::QTextureCubeMapArray
+    \class Qt3DRender::QTextureCubeMapArray
     \inmodule Qt3DRenderer
     \since 5.5
     \brief A QAbstractTextureProvider with a TargetCubeMapArray target format.
  */
 
 /*!
-    Constructs a new Qt3D::QTextureCubeMapArray instance with \a parent as parent.
+    Constructs a new Qt3DRender::QTextureCubeMapArray instance with \a parent as parent.
  */
 QTextureCubeMapArray::QTextureCubeMapArray(QNode *parent)
     : QAbstractTextureProvider(TargetCubeMapArray, parent)
@@ -176,14 +176,14 @@ QTextureCubeMapArray::~QTextureCubeMapArray()
 }
 
 /*!
-    \class Qt3D::QTexture2DMultisample
+    \class Qt3DRender::QTexture2DMultisample
     \inmodule Qt3DRenderer
     \since 5.5
     \brief A QAbstractTextureProvider with a Target2DMultisample target format.
  */
 
 /*!
-    Constructs a new Qt3D::QTexture2DMultisample instance with \a parent as parent.
+    Constructs a new Qt3DRender::QTexture2DMultisample instance with \a parent as parent.
  */
 QTexture2DMultisample::QTexture2DMultisample(QNode *parent)
     : QAbstractTextureProvider(Target2DMultisample, parent)
@@ -195,14 +195,14 @@ QTexture2DMultisample::~QTexture2DMultisample()
 }
 
 /*!
-    \class Qt3D::QTexture2DMultisampleArray
+    \class Qt3DRender::QTexture2DMultisampleArray
     \inmodule Qt3DRenderer
     \since 5.5
     \brief A QAbstractTextureProvider with a Target2DMultisampleArray target format.
  */
 
 /*!
-    Constructs a new Qt3D::QTexture2DMultisampleArray instance with \a parent as parent.
+    Constructs a new Qt3DRender::QTexture2DMultisampleArray instance with \a parent as parent.
  */
 QTexture2DMultisampleArray::QTexture2DMultisampleArray(QNode *parent)
     : QAbstractTextureProvider(Target2DMultisampleArray, parent)
@@ -214,14 +214,14 @@ QTexture2DMultisampleArray::~QTexture2DMultisampleArray()
 }
 
 /*!
-    \class Qt3D::QTextureRectangle
+    \class Qt3DRender::QTextureRectangle
     \inmodule Qt3DRenderer
     \since 5.5
     \brief A QAbstractTextureProvider with a TargetRectangle target format.
  */
 
 /*!
-    Constructs a new Qt3D::QTextureRectangle instance with \a parent as parent.
+    Constructs a new Qt3DRender::QTextureRectangle instance with \a parent as parent.
  */
 QTextureRectangle::QTextureRectangle(QNode *parent)
     : QAbstractTextureProvider(TargetRectangle, parent)
@@ -233,14 +233,14 @@ QTextureRectangle::~QTextureRectangle()
 }
 
 /*!
-    \class Qt3D::QTextureBuffer
+    \class Qt3DRender::QTextureBuffer
     \inmodule Qt3DRenderer
     \since 5.5
     \brief A QAbstractTextureProvider with a TargetBuffer target format.
  */
 
 /*!
-    Constructs a new Qt3D::QTextureBuffer instance with \a parent as parent.
+    Constructs a new Qt3DRender::QTextureBuffer instance with \a parent as parent.
  */
 QTextureBuffer::QTextureBuffer(QNode *parent)
     : QAbstractTextureProvider(TargetBuffer, parent)
@@ -251,7 +251,7 @@ QTextureBuffer::~QTextureBuffer()
 {
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/frontend/qtextureproviders.h b/src/render/frontend/qtextureproviders.h
index 4f5ed03f8..dc54b7999 100644
--- a/src/render/frontend/qtextureproviders.h
+++ b/src/render/frontend/qtextureproviders.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTEXTUREPROVIDERS_H
-#define QT3D_QTEXTUREPROVIDERS_H
+#ifndef QT3DRENDER_QTEXTUREPROVIDERS_H
+#define QT3DRENDER_QTEXTUREPROVIDERS_H
 
 #include <Qt3DRenderer/qabstracttextureprovider.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QT3DRENDERERSHARED_EXPORT QTexture1D : public QAbstractTextureProvider
 {
@@ -131,8 +131,8 @@ public:
     ~QTextureBuffer();
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTEXTUREPROVIDERS_H
+#endif // QT3DRENDER_QTEXTUREPROVIDERS_H
diff --git a/src/render/frontend/qtorusmesh.cpp b/src/render/frontend/qtorusmesh.cpp
index cb0f8c536..fcd10b24e 100644
--- a/src/render/frontend/qtorusmesh.cpp
+++ b/src/render/frontend/qtorusmesh.cpp
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace {
 
@@ -396,7 +396,7 @@ float QTorusMesh::minorRadius() const
     return static_cast<TorusGeometry *>(geometry())->minorRadius();
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/frontend/qtorusmesh.h b/src/render/frontend/qtorusmesh.h
index 746951266..b1cca55f9 100644
--- a/src/render/frontend/qtorusmesh.h
+++ b/src/render/frontend/qtorusmesh.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTORUSMESH_H
-#define QT3D_QTORUSMESH_H
+#ifndef QT3DRENDER_QTORUSMESH_H
+#define QT3DRENDER_QTORUSMESH_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/qgeometryrenderer.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QT3DRENDERERSHARED_EXPORT QTorusMesh : public QGeometryRenderer
 {
@@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QTorusMesh : public QGeometryRenderer
     Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged)
     Q_PROPERTY(float minorRadius READ minorRadius WRITE setMinorRadius NOTIFY minorRadiusChanged)
 public:
-    explicit QTorusMesh(QNode *parent = 0);
+    explicit QTorusMesh(Qt3D::QNode *parent = 0);
     ~QTorusMesh();
 
     void setRings(int rings);
@@ -85,8 +85,8 @@ private:
     void setPrimitiveType(PrimitiveType primitiveType);
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTORUSMESH_H
+#endif // QT3DRENDER_QTORUSMESH_H
diff --git a/src/render/frontend/qwindow.cpp b/src/render/frontend/qwindow.cpp
index 2f2ba80f1..3b6c3786e 100644
--- a/src/render/frontend/qwindow.cpp
+++ b/src/render/frontend/qwindow.cpp
@@ -47,7 +47,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 QWindowPrivate::QWindowPrivate()
     : ::QWindowPrivate()
@@ -125,13 +127,13 @@ QFrameGraph *QWindow::frameGraph() const
     return d->m_frameGraph;
 }
 
-QCamera *QWindow::defaultCamera()
+Qt3D::QCamera *QWindow::defaultCamera()
 {
     Q_D(const QWindow);
     return d->m_defaultCamera;
 }
 
-void QWindow::registerAspect(QAbstractAspect *aspect)
+void QWindow::registerAspect(Qt3D::QAbstractAspect *aspect)
 {
     Q_ASSERT(!isVisible());
     Q_D(QWindow);
@@ -145,7 +147,7 @@ void QWindow::registerAspect(const QString &name)
     d->m_engine->registerAspect(name);
 }
 
-void QWindow::setRootEntity(QEntity *root)
+void QWindow::setRootEntity(Qt3D::QEntity *root)
 {
     Q_ASSERT(!isVisible());
     Q_D(QWindow);
@@ -178,6 +180,6 @@ void QWindow::show()
     ::QWindow::show();
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qwindow.h b/src/render/frontend/qwindow.h
index a2df2c8d8..b1acb2ba1 100644
--- a/src/render/frontend/qwindow.h
+++ b/src/render/frontend/qwindow.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QWINDOW_H
-#define QT3D_QWINDOW_H
+#ifndef QT3DRENDER_QWINDOW_H
+#define QT3DRENDER_QWINDOW_H
 
 #include <QtGui/qwindow.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
@@ -43,12 +43,15 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
-
+class QAbstractAspect;
+class QCamera;
 class QEntity;
+}
+
+namespace Qt3DRender {
+
 class QWindowPrivate;
 class QFrameGraph;
-class QAbstractAspect;
-class QCamera;
 
 class QT3DRENDERERSHARED_EXPORT QWindow : public ::QWindow
 {
@@ -58,12 +61,12 @@ public:
 
     void setFrameGraph(QFrameGraph *frameGraph);
     QFrameGraph *frameGraph() const;
-    QCamera *defaultCamera();
+    Qt3D::QCamera *defaultCamera();
 
-    void registerAspect(QAbstractAspect *aspect);
+    void registerAspect(Qt3D::QAbstractAspect *aspect);
     void registerAspect(const QString &name);
 
-    void setRootEntity(QEntity *root);
+    void setRootEntity(Qt3D::QEntity *root);
     void show();
 
 protected:
@@ -74,8 +77,8 @@ private:
     Q_DECLARE_PRIVATE(QWindow)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QWINDOW_H
+#endif // QT3DRENDER_QWINDOW_H
diff --git a/src/render/frontend/qwindow_p.h b/src/render/frontend/qwindow_p.h
index c7029e2fb..bb5c0d091 100644
--- a/src/render/frontend/qwindow_p.h
+++ b/src/render/frontend/qwindow_p.h
@@ -34,21 +34,24 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QWINDOW_P_H
-#define QT3D_QWINDOW_P_H
+#ifndef QT3DRENDER_QWINDOW_P_H
+#define QT3DRENDER_QWINDOW_P_H
 
 #include <QtGui/private/qwindow_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
+class QAspectEngine;
+class QCamera;
+class QEntity;
+}
+
+namespace Qt3DRender {
 
 class QWindow;
-class QEntity;
 class QFrameGraph;
-class QAspectEngine;
 class QRenderAspect;
-class QCamera;
 
 class QWindowPrivate : public ::QWindowPrivate
 {
@@ -56,18 +59,18 @@ public:
     QWindowPrivate();
 
     Q_DECLARE_PUBLIC(QWindow)
-    QEntity *m_root;
-    QEntity *   m_userRoot;
-    QCamera *m_defaultCamera;
+    Qt3D::QEntity *m_root;
+    Qt3D::QEntity *   m_userRoot;
+    Qt3D::QCamera *m_defaultCamera;
     QFrameGraph *m_frameGraph;
-    QScopedPointer<QAspectEngine> m_engine;
+    QScopedPointer<Qt3D::QAspectEngine> m_engine;
     QRenderAspect *m_renderAspect;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
 
-#endif // QT3D_QWINDOW_P_H
+#endif // QT3DRENDER_QWINDOW_P_H
 
diff --git a/src/render/frontend/qwrapmode.cpp b/src/render/frontend/qwrapmode.cpp
index d25a2f11e..2e5ace4d2 100644
--- a/src/render/frontend/qwrapmode.cpp
+++ b/src/render/frontend/qwrapmode.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QTextureWrapModePrivate : public QObjectPrivate
 {
@@ -59,11 +59,11 @@ public:
 };
 
 /*!
-    \class Qt3D::QTextureWrapMode
+    \class Qt3DRender::QTextureWrapMode
     \inmodule Qt3DRenderer
     \since 5.5
 
-    \brief Defines the wrap mode a Qt3D::QAbstractTextureProvider
+    \brief Defines the wrap mode a Qt3DRender::QAbstractTextureProvider
     should apply to a texture.
  */
 
@@ -76,7 +76,7 @@ QTextureWrapMode::QTextureWrapMode(WrapMode wrapMode, QObject *parent)
 }
 
 /*!
-    Contrusts a new Qt3D::QTextureWrapMode instance with the wrap mode to apply to
+    Contrusts a new Qt3DRender::QTextureWrapMode instance with the wrap mode to apply to
     each dimension \a x, \a y \a z of the texture and \a parent as parent.
  */
 QTextureWrapMode::QTextureWrapMode(WrapMode x,WrapMode y, WrapMode z, QObject *parent)
@@ -152,6 +152,6 @@ QTextureWrapMode::WrapMode QTextureWrapMode::z() const
     return d->m_z;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qwrapmode.h b/src/render/frontend/qwrapmode.h
index e6c1e24f1..6254fe5bf 100644
--- a/src/render/frontend/qwrapmode.h
+++ b/src/render/frontend/qwrapmode.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QWRAPMODE_H
-#define QT3D_QWRAPMODE_H
+#ifndef QT3DRENDER_QWRAPMODE_H
+#define QT3DRENDER_QWRAPMODE_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <QObject>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QTextureWrapModePrivate;
 
@@ -83,8 +83,8 @@ private:
     Q_DECLARE_PRIVATE(QTextureWrapMode)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QWRAPMODE_H
+#endif // QT3DRENDER_QWRAPMODE_H
diff --git a/src/render/frontend/sphere.cpp b/src/render/frontend/sphere.cpp
index 0c7620dcf..a8b9cd6de 100644
--- a/src/render/frontend/sphere.cpp
+++ b/src/render/frontend/sphere.cpp
@@ -50,7 +50,7 @@ namespace {
 
 // Intersects ray r = p + td, |d| = 1, with sphere s and, if intersecting,
 // returns true and intersection point q; false otherwise
-bool intersectRaySphere(const Qt3D::QRay3D &ray, const Qt3D::Sphere &s, QVector3D *q = Q_NULLPTR)
+bool intersectRaySphere(const Qt3D::QRay3D &ray, const Qt3DRender::Sphere &s, QVector3D *q = Q_NULLPTR)
 {
     const QVector3D p = ray.origin();
     const QVector3D d = ray.direction();
@@ -121,7 +121,7 @@ inline QPair<int, int> findExtremePoints(const QVector<QVector3D> &points)
     return extremeIndices;
 }
 
-inline void sphereFromExtremePoints(Qt3D::Sphere &s, const QVector<QVector3D> &points)
+inline void sphereFromExtremePoints(Qt3DRender::Sphere &s, const QVector<QVector3D> &points)
 {
     // Find two most separated points on any of the basis vectors
     QPair<int, int> extremeIndices = findExtremePoints(points);
@@ -134,7 +134,7 @@ inline void sphereFromExtremePoints(Qt3D::Sphere &s, const QVector<QVector3D> &p
     s.setRadius((q - c).length());
 }
 
-inline void constructRitterSphere(Qt3D::Sphere &s, const QVector<QVector3D> &points)
+inline void constructRitterSphere(Qt3DRender::Sphere &s, const QVector<QVector3D> &points)
 {
     // Calculate the sphere encompassing two axially extreme points
     sphereFromExtremePoints(s, points);
@@ -145,7 +145,7 @@ inline void constructRitterSphere(Qt3D::Sphere &s, const QVector<QVector3D> &poi
 
 } // anonymous namespace
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 const float Sphere::ms_epsilon = 1.0e-7f;
 
@@ -211,17 +211,17 @@ Sphere Sphere::transformed(const QMatrix4x4 &mat)
     return Sphere(c, sqrt(rSquared));
 }
 
-QNodeId Sphere::id() const
+Qt3D::QNodeId Sphere::id() const
 {
     return m_id;
 }
 
-bool Sphere::intersects(const QRay3D &ray, QVector3D *q) const
+bool Sphere::intersects(const Qt3D::QRay3D &ray, QVector3D *q) const
 {
     return intersectRaySphere(ray, *this, q);
 }
 
-QBoundingVolume::Type Sphere::type() const
+Qt3D::QBoundingVolume::Type Sphere::type() const
 {
     return QBoundingVolume::Sphere;
 }
diff --git a/src/render/frontend/sphere.h b/src/render/frontend/sphere.h
index 8d01b4771..e14ecc38b 100644
--- a/src/render/frontend/sphere.h
+++ b/src/render/frontend/sphere.h
@@ -46,18 +46,18 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT Sphere : public QBoundingSphere
+class QT3DRENDERERSHARED_EXPORT Sphere : public Qt3D::QBoundingSphere
 {
 public:
-    inline Sphere(const QNodeId &i = QNodeId())
+    inline Sphere(const Qt3D::QNodeId &i = Qt3D::QNodeId())
         : m_center()
         , m_radius(0.0f)
         , m_id(i)
     {}
 
-    inline Sphere(const QVector3D &c, float r, const QNodeId &i = QNodeId())
+    inline Sphere(const QVector3D &c, float r, const Qt3D::QNodeId &i = Qt3D::QNodeId())
         : m_center(c)
         , m_radius(r)
         , m_id(i)
@@ -89,8 +89,8 @@ public:
         return *this;
     }
 
-    QNodeId id() const Q_DECL_FINAL;
-    bool intersects(const QRay3D &ray, QVector3D *q) const Q_DECL_FINAL;
+    Qt3D::QNodeId id() const Q_DECL_FINAL;
+    bool intersects(const Qt3D::QRay3D &ray, QVector3D *q) const Q_DECL_FINAL;
     Type type() const Q_DECL_FINAL;
 
     static Sphere fromPoints(const QVector<QVector3D> &points);
@@ -98,7 +98,7 @@ public:
 private:
     QVector3D m_center;
     float m_radius;
-    QNodeId m_id;
+    Qt3D::QNodeId m_id;
 
     static const float ms_epsilon;
 };
@@ -145,6 +145,6 @@ inline bool intersects(const Sphere &a, const Sphere &b)
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::Sphere)
+Q_DECLARE_METATYPE(Qt3DRender::Sphere)
 
 #endif // SPHERE_H
diff --git a/src/render/io/abstractsceneparser.cpp b/src/render/io/abstractsceneparser.cpp
index 3019e0b77..b7756f6cd 100644
--- a/src/render/io/abstractsceneparser.cpp
+++ b/src/render/io/abstractsceneparser.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 AbstractSceneParser::AbstractSceneParser() : QObject(),
     m_parserStatus(Empty)
@@ -80,6 +80,6 @@ void AbstractSceneParser::logInfo(const QString &info)
     qCDebug(Render::Io) << info;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/io/abstractsceneparser_p.h b/src/render/io/abstractsceneparser_p.h
index 7577cb738..1d12c81ff 100644
--- a/src/render/io/abstractsceneparser_p.h
+++ b/src/render/io/abstractsceneparser_p.h
@@ -46,8 +46,10 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
-
 class QEntity;
+}
+
+namespace Qt3DRender {
 
 Q_DECLARE_LOGGING_CATEGORY(SceneParsers)
 
@@ -71,8 +73,8 @@ public:
 
     virtual void setSource(const QUrl &source) = 0;
     virtual bool isExtensionSupported(const QUrl &source) const = 0;
-    virtual QEntity *scene(const QString &id = QString()) = 0;
-    virtual QEntity *node(const QString &id) = 0;
+    virtual Qt3D::QEntity *scene(const QString &id = QString()) = 0;
+    virtual Qt3D::QEntity *node(const QString &id) = 0;
 
     ParserStatus parserStatus() const;
     QStringList errors() const;
@@ -91,7 +93,7 @@ private:
     QStringList m_errors;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/io/objloader.cpp b/src/render/io/objloader.cpp
index 0e7d58ea4..89c5ee672 100644
--- a/src/render/io/objloader.cpp
+++ b/src/render/io/objloader.cpp
@@ -54,9 +54,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-inline uint qHash(const Qt3D::FaceIndices &faceIndices)
+inline uint qHash(const FaceIndices &faceIndices)
 {
     return faceIndices.positionIndex
             + 10 * faceIndices.texCoordIndex
@@ -429,7 +429,7 @@ void ObjLoader::center( QVector<QVector3D>& points )
     if ( points.isEmpty() )
         return;
 
-    QAxisAlignedBoundingBox bb(points);
+    Qt3D::QAxisAlignedBoundingBox bb(points);
     QVector3D center = bb.center();
 
     // Translate center of the AABB to the origin
diff --git a/src/render/io/objloader_p.h b/src/render/io/objloader_p.h
index ab9f57d43..1a2ba3d3c 100644
--- a/src/render/io/objloader_p.h
+++ b/src/render/io/objloader_p.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 class QString;
 class QIODevice;
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QGeometry;
 
diff --git a/src/render/io/qattribute.cpp b/src/render/io/qattribute.cpp
index 80fa9dd49..09b858128 100644
--- a/src/render/io/qattribute.cpp
+++ b/src/render/io/qattribute.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
     class Qt3D::AttributePrivate
@@ -259,6 +259,6 @@ QString QAttribute::defaultTangentAttributeName()
     return QStringLiteral("vertexTangent");
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/io/qattribute.h b/src/render/io/qattribute.h
index ec281973f..9106cbda9 100644
--- a/src/render/io/qattribute.h
+++ b/src/render/io/qattribute.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QATTRIBUTE_H
-#define QT3D_QATTRIBUTE_H
+#ifndef QT3DRENDER_QATTRIBUTE_H
+#define QT3DRENDER_QATTRIBUTE_H
 
 #include <Qt3DCore/qabstractattribute.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
@@ -43,17 +43,17 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAttributePrivate;
 class QBuffer;
 
-class QT3DRENDERERSHARED_EXPORT QAttribute : public QAbstractAttribute
+class QT3DRENDERERSHARED_EXPORT QAttribute : public Qt3D::QAbstractAttribute
 {
     Q_OBJECT
 
 public:
-    explicit QAttribute(QNode *parent = 0);
+    explicit QAttribute(Qt3D::QNode *parent = 0);
     QAttribute(QBuffer *buf, DataType type, uint dataSize, int count, int offset=0, int stride = 0);
     QAttribute(QBuffer *buf, const QString &name, DataType type, uint dataSize, int count, int offset=0, int stride = 0);
     ~QAttribute();
@@ -73,15 +73,15 @@ public:
     static QString defaultTangentAttributeName();
 
 protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     QT3D_CLONEABLE(QAttribute)
     Q_DECLARE_PRIVATE(QAttribute)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QATTRIBUTE_H
+#endif // QT3DRENDER_QATTRIBUTE_H
diff --git a/src/render/io/qattribute_p.h b/src/render/io/qattribute_p.h
index bd660b1eb..0e7ef390f 100644
--- a/src/render/io/qattribute_p.h
+++ b/src/render/io/qattribute_p.h
@@ -34,26 +34,26 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QATTRIBUTE_P_H
-#define QT3D_QATTRIBUTE_P_H
+#ifndef QT3DRENDER_QATTRIBUTE_P_H
+#define QT3DRENDER_QATTRIBUTE_P_H
 
 #include <private/qabstractattribute_p.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAttribute;
 
-class QT3DRENDERERSHARED_EXPORT QAttributePrivate : public QAbstractAttributePrivate
+class QT3DRENDERERSHARED_EXPORT QAttributePrivate : public Qt3D::QAbstractAttributePrivate
 {
 public:
     QAttributePrivate();
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QATTRIBUTE_P_H
+#endif // QT3DRENDER_QATTRIBUTE_P_H
diff --git a/src/render/io/qbuffer.cpp b/src/render/io/qbuffer.cpp
index 7f28151ec..6a86f74f7 100644
--- a/src/render/io/qbuffer.cpp
+++ b/src/render/io/qbuffer.cpp
@@ -41,7 +41,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
+
+namespace Qt3DRender {
 
 /*!
     \class Qt3D::BufferPrivate
@@ -133,6 +135,6 @@ void QBuffer::setType(QBuffer::BufferType type)
     }
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/io/qbuffer.h b/src/render/io/qbuffer.h
index aad1ebcaa..d1d9f9929 100644
--- a/src/render/io/qbuffer.h
+++ b/src/render/io/qbuffer.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBUFFER_H
-#define QT3D_QBUFFER_H
+#ifndef QT3DRENDER_QBUFFER_H
+#define QT3DRENDER_QBUFFER_H
 
 #include <Qt3DCore/qabstractbuffer.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 GLint elementType(GLint type);
 GLint tupleSizeFromType(GLint type);
@@ -54,7 +54,7 @@ class QBufferPrivate;
 class QBufferFunctor;
 typedef QSharedPointer<QBufferFunctor> QBufferFunctorPtr;
 
-class QT3DRENDERERSHARED_EXPORT QBuffer : public QAbstractBuffer
+class QT3DRENDERERSHARED_EXPORT QBuffer : public Qt3D::QAbstractBuffer
 {
     Q_OBJECT
     Q_PROPERTY(BufferType type READ type WRITE setType NOTIFY typeChanged)
@@ -84,7 +84,7 @@ public:
     };
     Q_ENUM(UsageType)
 
-    QBuffer(BufferType ty = QBuffer::VertexBuffer, QNode *parent = 0);
+    QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3D::QNode *parent = 0);
     ~QBuffer();
 
     void setUsage(UsageType usage);
@@ -97,8 +97,8 @@ public:
     QBufferFunctorPtr bufferFunctor() const;
 
 protected:
-    QBuffer(QBufferPrivate &dd, QBuffer::BufferType ty, QNode *parent = 0);
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QBuffer(QBufferPrivate &dd, QBuffer::BufferType ty, Qt3D::QNode *parent = 0);
+    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
     void typeChanged();
@@ -109,8 +109,8 @@ private:
     QT3D_CLONEABLE(QBuffer)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBUFFER_H
+#endif // QT3DRENDER_QBUFFER_H
diff --git a/src/render/io/qbuffer_p.h b/src/render/io/qbuffer_p.h
index bab9e95f9..53bea6359 100644
--- a/src/render/io/qbuffer_p.h
+++ b/src/render/io/qbuffer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBUFFER_P_H
-#define QT3D_QBUFFER_P_H
+#ifndef QT3DRENDER_QBUFFER_P_H
+#define QT3DRENDER_QBUFFER_P_H
 
 #include <private/qabstractbuffer_p.h>
 #include <Qt3DRenderer/qbuffer.h>
@@ -45,9 +45,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QBufferPrivate : public QAbstractBufferPrivate
+class QT3DRENDERERSHARED_EXPORT QBufferPrivate : public Qt3D::QAbstractBufferPrivate
 {
 public:
     QBufferPrivate();
@@ -57,8 +57,8 @@ public:
     QBufferFunctorPtr m_functor;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBUFFER_P_H
+#endif // QT3DRENDER_QBUFFER_P_H
diff --git a/src/render/io/qbufferfunctor.h b/src/render/io/qbufferfunctor.h
index 550905042..4a508b975 100644
--- a/src/render/io/qbufferfunctor.h
+++ b/src/render/io/qbufferfunctor.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBUFFERFUNCTOR
-#define QT3D_QBUFFERFUNCTOR
+#ifndef QT3DRENDER_QBUFFERFUNCTOR
+#define QT3DRENDER_QBUFFERFUNCTOR
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qabstractfunctor.h>
@@ -43,9 +43,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QBufferFunctor : public QAbstractFunctor
+class QT3DRENDERERSHARED_EXPORT QBufferFunctor : public Qt3D::QAbstractFunctor
 {
 public:
     virtual ~QBufferFunctor() {}
@@ -55,11 +55,11 @@ public:
 
 typedef QSharedPointer<QBufferFunctor> QBufferFunctorPtr;
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QBufferFunctorPtr)
+Q_DECLARE_METATYPE(Qt3DRender::QBufferFunctorPtr)
 
-#endif // QT3D_QBUFFERFUNCTOR
+#endif // QT3DRENDER_QBUFFERFUNCTOR
 
diff --git a/src/render/io/qgeometryfunctor.h b/src/render/io/qgeometryfunctor.h
index e64a6ef80..4290fbe7b 100644
--- a/src/render/io/qgeometryfunctor.h
+++ b/src/render/io/qgeometryfunctor.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QGEOMETRYFUNCTOR
-#define QT3D_QGEOMETRYFUNCTOR
+#ifndef QT3DRENDER_QGEOMETRYFUNCTOR
+#define QT3DRENDER_QGEOMETRYFUNCTOR
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qabstractfunctor.h>
@@ -43,11 +43,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QGeometry;
 
-class QT3DRENDERERSHARED_EXPORT QGeometryFunctor : public QAbstractFunctor
+class QT3DRENDERERSHARED_EXPORT QGeometryFunctor : public Qt3D::QAbstractFunctor
 {
 public:
     virtual ~QGeometryFunctor() {}
@@ -57,11 +57,11 @@ public:
 
 typedef QSharedPointer<QGeometryFunctor> QGeometryFunctorPtr;
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QGeometryFunctorPtr)
+Q_DECLARE_METATYPE(Qt3DRender::QGeometryFunctorPtr)
 
-#endif // QT3D_QGEOMETRYFUNCTOR
+#endif // QT3DRENDER_QGEOMETRYFUNCTOR
 
diff --git a/src/render/io/texturedata.cpp b/src/render/io/texturedata.cpp
index c0aafff02..b54c526f9 100644
--- a/src/render/io/texturedata.cpp
+++ b/src/render/io/texturedata.cpp
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 TexImageData::TexImageData()
     : m_width(-1)
@@ -122,6 +122,6 @@ bool TexImageData::setCompressedFile(const QString &source)
     return false;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/io/texturedata.h b/src/render/io/texturedata.h
index 427453d6e..2f3fdb9a9 100644
--- a/src/render/io/texturedata.h
+++ b/src/render/io/texturedata.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_TEXTUREDATA_H
-#define QT3D_TEXTUREDATA_H
+#ifndef QT3DRENDER_TEXTUREDATA_H
+#define QT3DRENDER_TEXTUREDATA_H
 
 #include <QOpenGLTexture>
 #include <QImage>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QT3DRENDERERSHARED_EXPORT TexImageData
 {
@@ -91,9 +91,9 @@ private:
 
 typedef QSharedPointer<TexImageData> TexImageDataPtr;
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 
 QT_END_NAMESPACE
 
-#endif // QT3D_TEXTUREDATA_H
+#endif // QT3DRENDER_TEXTUREDATA_H
diff --git a/src/render/io/uniformbuffer.cpp b/src/render/io/uniformbuffer.cpp
index b07715ebf..00ba26657 100644
--- a/src/render/io/uniformbuffer.cpp
+++ b/src/render/io/uniformbuffer.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -89,8 +89,8 @@ void UniformBuffer::bindToUniformBlock(QGraphicsContext *ctx, int bindingPoint)
     ctx->bindBufferBase(GL_UNIFORM_BUFFER, bindingPoint, m_bufferId);
 }
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/io/uniformbuffer_p.h b/src/render/io/uniformbuffer_p.h
index b759dd364..6d489c248 100644
--- a/src/render/io/uniformbuffer_p.h
+++ b/src/render/io/uniformbuffer_p.h
@@ -34,21 +34,21 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_UNIFORMBUFFER_P_H
-#define QT3D_RENDER_UNIFORMBUFFER_P_H
+#ifndef QT3DRENDER_RENDER_UNIFORMBUFFER_P_H
+#define QT3DRENDER_RENDER_UNIFORMBUFFER_P_H
 
 #include <QOpenGLContext>
 #include <Qt3DCore/qnodeid.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
 class QGraphicsContext;
 
-typedef QPair<QNodeId, QNodeId> ShaderDataShaderUboKey;
+typedef QPair<Qt3D::QNodeId, Qt3D::QNodeId> ShaderDataShaderUboKey;
 
 class UniformBuffer
 {
@@ -70,10 +70,10 @@ private:
     bool m_isCreated;
 };
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_UNIFORMBUFFER_P_H
+#endif // QT3DRENDER_RENDER_UNIFORMBUFFER_P_H
diff --git a/src/render/renderlogging.cpp b/src/render/renderlogging.cpp
index 780a52a53..d002a3bb1 100644
--- a/src/render/renderlogging.cpp
+++ b/src/render/renderlogging.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -54,8 +54,8 @@ Q_LOGGING_CATEGORY(Shaders, "Qt3D.Renderer.Shaders")
 Q_LOGGING_CATEGORY(RenderStates, "Qt3D.Renderer.RenderStates")
 Q_LOGGING_CATEGORY(VSyncAdvanceService, "Qt3D.Renderer.VsyncAdvanceService")
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/renderlogging_p.h b/src/render/renderlogging_p.h
index c52d5d4d4..fe3a35a57 100644
--- a/src/render/renderlogging_p.h
+++ b/src/render/renderlogging_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_RENDERLOGGING_P_H
-#define QT3D_RENDER_RENDERLOGGING_P_H
+#ifndef QT3DRENDER_RENDER_RENDERLOGGING_P_H
+#define QT3DRENDER_RENDER_RENDERLOGGING_P_H
 
 #include <QLoggingCategory>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 namespace Render {
 
@@ -57,10 +57,10 @@ Q_DECLARE_LOGGING_CATEGORY(Shaders)
 Q_DECLARE_LOGGING_CATEGORY(RenderStates)
 Q_DECLARE_LOGGING_CATEGORY(VSyncAdvanceService)
 
-} // Render
+} // namespace Render
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_RENDERLOGGING_P_H
+#endif // QT3DRENDER_RENDER_RENDERLOGGING_P_H
diff --git a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp
index a7d0f91a7..36a0f7316 100644
--- a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp
+++ b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp
@@ -38,7 +38,7 @@
 #include <Qt3DRenderer/qgeometryfunctor.h>
 #include <Qt3DRenderer/qgeometry.h>
 
-class MeshFunctorA : public Qt3D::QGeometryFunctor
+class MeshFunctorA : public Qt3DRender::QGeometryFunctor
 {
 public:
     MeshFunctorA()
@@ -47,12 +47,12 @@ public:
     ~MeshFunctorA()
     {}
 
-    Qt3D::QGeometry *operator ()() Q_DECL_OVERRIDE
+    Qt3DRender::QGeometry *operator ()() Q_DECL_OVERRIDE
     {
         return Q_NULLPTR;
     }
 
-    bool operator ==(const Qt3D::QGeometryFunctor &other) const Q_DECL_OVERRIDE
+    bool operator ==(const Qt3DRender::QGeometryFunctor &other) const Q_DECL_OVERRIDE
     {
         return functor_cast<MeshFunctorA>(&other);
     }
@@ -60,7 +60,7 @@ public:
     QT3D_FUNCTOR(MeshFunctorA)
 };
 
-class MeshFunctorB : public Qt3D::QGeometryFunctor
+class MeshFunctorB : public Qt3DRender::QGeometryFunctor
 {
 public:
     MeshFunctorB()
@@ -69,12 +69,12 @@ public:
     ~MeshFunctorB()
     {}
 
-    Qt3D::QGeometry *operator ()() Q_DECL_OVERRIDE
+    Qt3DRender::QGeometry *operator ()() Q_DECL_OVERRIDE
     {
         return Q_NULLPTR;
     }
 
-    bool operator ==(const Qt3D::QGeometryFunctor &other) const Q_DECL_OVERRIDE
+    bool operator ==(const Qt3DRender::QGeometryFunctor &other) const Q_DECL_OVERRIDE
     {
         return functor_cast<MeshFunctorB>(&other);
     }
@@ -91,7 +91,7 @@ public:
     ~MeshFunctorASub()
     {}
 
-    bool operator ==(const Qt3D::QGeometryFunctor &other) const Q_DECL_OVERRIDE
+    bool operator ==(const Qt3DRender::QGeometryFunctor &other) const Q_DECL_OVERRIDE
     {
         return functor_cast<MeshFunctorASub>(&other);
     }
diff --git a/tests/auto/render/qattribute/tst_qattribute.cpp b/tests/auto/render/qattribute/tst_qattribute.cpp
index 889a9c244..937e9c200 100644
--- a/tests/auto/render/qattribute/tst_qattribute.cpp
+++ b/tests/auto/render/qattribute/tst_qattribute.cpp
@@ -134,13 +134,13 @@ private Q_SLOTS:
 
     void checkCloning_data()
     {
-        QTest::addColumn<Qt3D::QAttribute *>("attribute");
+        QTest::addColumn<Qt3DRender::QAttribute *>("attribute");
 
-        Qt3D::QAttribute *defaultConstructed = new Qt3D::QAttribute();
+        Qt3DRender::QAttribute *defaultConstructed = new Qt3DRender::QAttribute();
         QTest::newRow("defaultConstructed") << defaultConstructed;
 
-        Qt3D::QAttribute *customVertex = new Qt3D::QAttribute();
-        Qt3D::QBuffer *buffer = new Qt3D::QBuffer(Qt3D::QBuffer::VertexBuffer);
+        Qt3DRender::QAttribute *customVertex = new Qt3DRender::QAttribute();
+        Qt3DRender::QBuffer *buffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer);
         customVertex->setBuffer(buffer);
         customVertex->setAttributeType(Qt3D::QAbstractAttribute::VertexAttribute);
         customVertex->setCount(454);
@@ -148,12 +148,12 @@ private Q_SLOTS:
         customVertex->setByteOffset(305);
         customVertex->setDivisor(235);
         customVertex->setName("BB");
-        customVertex->setDataType(Qt3D::QAttribute::Float);
+        customVertex->setDataType(Qt3DRender::QAttribute::Float);
         customVertex->setDataSize(4);
         QTest::newRow("vertex") << customVertex;
 
-        Qt3D::QAttribute *customIndex = new Qt3D::QAttribute();
-        Qt3D::QBuffer *indexBuffer = new Qt3D::QBuffer(Qt3D::QBuffer::IndexBuffer);
+        Qt3DRender::QAttribute *customIndex = new Qt3DRender::QAttribute();
+        Qt3DRender::QBuffer *indexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer);
         customIndex->setBuffer(indexBuffer);
         customIndex->setAttributeType(Qt3D::QAbstractAttribute::IndexAttribute);
         customIndex->setCount(383);
@@ -161,7 +161,7 @@ private Q_SLOTS:
         customIndex->setByteOffset(327);
         customIndex->setDivisor(355);
         customIndex->setName("SB");
-        customIndex->setDataType(Qt3D::QAttribute::Float);
+        customIndex->setDataType(Qt3DRender::QAttribute::Float);
         customIndex->setDataSize(3);
         QTest::newRow("index") << customIndex;
     }
@@ -169,10 +169,10 @@ private Q_SLOTS:
     void checkCloning()
     {
         // GIVEN
-        QFETCH(Qt3D::QAttribute *, attribute);
+        QFETCH(Qt3DRender::QAttribute *, attribute);
 
         // WHEN
-        Qt3D::QAttribute *clone = static_cast<Qt3D::QAttribute *>(QNode::clone(attribute));
+        Qt3DRender::QAttribute *clone = static_cast<Qt3DRender::QAttribute *>(QNode::clone(attribute));
         QCoreApplication::processEvents();
 
         // THEN
@@ -198,18 +198,18 @@ private Q_SLOTS:
     void checkPropertyUpdates()
     {
         // GIVEN
-        QScopedPointer<Qt3D::QAttribute> attribute(new Qt3D::QAttribute());
+        QScopedPointer<Qt3DRender::QAttribute> attribute(new Qt3DRender::QAttribute());
         TestArbiter arbiter(attribute.data());
 
         // WHEN
-        attribute->setDataType(Qt3D::QAttribute::Double);
+        attribute->setDataType(Qt3DRender::QAttribute::Double);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
         Qt3D::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "dataType");
-        QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3D::QAttribute::Double));
+        QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QAttribute::Double));
         QCOMPARE(change->type(), Qt3D::NodeUpdated);
 
         arbiter.events.clear();
@@ -306,7 +306,7 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN
-        Qt3D::QBuffer buf;
+        Qt3DRender::QBuffer buf;
         attribute->setBuffer(&buf);
         QCoreApplication::processEvents();
 
@@ -320,7 +320,7 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN
-        Qt3D::QBuffer buf2;
+        Qt3DRender::QBuffer buf2;
         attribute->setBuffer(&buf2);
         QCoreApplication::processEvents();
 
diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp
index 6ebe841ea..20dcc28ba 100644
--- a/tests/auto/render/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp
@@ -119,7 +119,7 @@ void TestPostman::notifyBackend(const Qt3D::QSceneChangePtr &e)
     m_arbiter->sceneChangeEventWithLock(e);
 }
 
-class TestFunctor : public Qt3D::QBufferFunctor
+class TestFunctor : public Qt3DRender::QBufferFunctor
 {
 public:
     explicit TestFunctor(int size)
@@ -131,7 +131,7 @@ public:
         return QByteArray();
     }
 
-    bool operator ==(const Qt3D::QBufferFunctor &other) const
+    bool operator ==(const Qt3DRender::QBufferFunctor &other) const
     {
         const TestFunctor *otherFunctor = functor_cast<TestFunctor>(&other);
         if (otherFunctor != Q_NULLPTR)
@@ -160,31 +160,31 @@ private Q_SLOTS:
 
     void checkCloning_data()
     {
-        QTest::addColumn<Qt3D::QBuffer *>("buffer");
+        QTest::addColumn<Qt3DRender::QBuffer *>("buffer");
 
-        Qt3D::QBuffer *defaultConstructed = new Qt3D::QBuffer();
+        Qt3DRender::QBuffer *defaultConstructed = new Qt3DRender::QBuffer();
         QTest::newRow("defaultConstructed") << defaultConstructed;
 
-        Qt3D::QBuffer *buffer = new Qt3D::QBuffer(Qt3D::QBuffer::VertexBuffer);
-        buffer->setUsage(Qt3D::QBuffer::DynamicRead);
+        Qt3DRender::QBuffer *buffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer);
+        buffer->setUsage(Qt3DRender::QBuffer::DynamicRead);
         buffer->setData(QByteArrayLiteral("There's no replacement"));
-        buffer->setBufferFunctor(Qt3D::QBufferFunctorPtr(new TestFunctor(883)));
+        buffer->setBufferFunctor(Qt3DRender::QBufferFunctorPtr(new TestFunctor(883)));
         QTest::newRow("vertex") << buffer;
 
-        Qt3D::QBuffer *indexBuffer = new Qt3D::QBuffer(Qt3D::QBuffer::IndexBuffer);
-        indexBuffer->setUsage(Qt3D::QBuffer::StaticCopy);
+        Qt3DRender::QBuffer *indexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer);
+        indexBuffer->setUsage(Qt3DRender::QBuffer::StaticCopy);
         indexBuffer->setData(QByteArrayLiteral("For displacement"));
-        indexBuffer->setBufferFunctor(Qt3D::QBufferFunctorPtr(new TestFunctor(1340)));
+        indexBuffer->setBufferFunctor(Qt3DRender::QBufferFunctorPtr(new TestFunctor(1340)));
         QTest::newRow("index") << indexBuffer;
     }
 
     void checkCloning()
     {
         // GIVEN
-        QFETCH(Qt3D::QBuffer *, buffer);
+        QFETCH(Qt3DRender::QBuffer *, buffer);
 
         // WHEN
-        Qt3D::QBuffer *clone = static_cast<Qt3D::QBuffer *>(QNode::clone(buffer));
+        Qt3DRender::QBuffer *clone = static_cast<Qt3DRender::QBuffer *>(QNode::clone(buffer));
 
         // THEN
         QVERIFY(clone != Q_NULLPTR);
@@ -203,30 +203,30 @@ private Q_SLOTS:
     void checkPropertyUpdates()
     {
         // GIVEN
-        QScopedPointer<Qt3D::QBuffer> buffer(new Qt3D::QBuffer(Qt3D::QBuffer::VertexBuffer));
+        QScopedPointer<Qt3DRender::QBuffer> buffer(new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer));
         TestArbiter arbiter(buffer.data());
 
         // WHEN
-        buffer->setType(Qt3D::QBuffer::IndexBuffer);
+        buffer->setType(Qt3DRender::QBuffer::IndexBuffer);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
         Qt3D::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "type");
-        QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3D::QBuffer::IndexBuffer));
+        QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QBuffer::IndexBuffer));
 
         arbiter.events.clear();
 
         // WHEN
-        buffer->setUsage(Qt3D::QBuffer::DynamicCopy);
+        buffer->setUsage(Qt3DRender::QBuffer::DynamicCopy);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
         change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "usage");
-        QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3D::QBuffer::DynamicCopy));
+        QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QBuffer::DynamicCopy));
 
         arbiter.events.clear();
 
@@ -243,7 +243,7 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN
-        Qt3D::QBufferFunctorPtr functor(new TestFunctor(355));
+        Qt3DRender::QBufferFunctorPtr functor(new TestFunctor(355));
         buffer->setBufferFunctor(functor);
         QCoreApplication::processEvents();
 
@@ -251,7 +251,7 @@ private Q_SLOTS:
         QCOMPARE(arbiter.events.size(), 1);
         change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "bufferFunctor");
-        QCOMPARE(change->value().value<Qt3D::QBufferFunctorPtr>(), functor);
+        QCOMPARE(change->value().value<Qt3DRender::QBufferFunctorPtr>(), functor);
 
         arbiter.events.clear();
     }
diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp
index d7fb2c3de..00c44d953 100644
--- a/tests/auto/render/qgeometry/tst_qgeometry.cpp
+++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp
@@ -135,24 +135,24 @@ private Q_SLOTS:
 
     void checkCloning_data()
     {
-        QTest::addColumn<Qt3D::QGeometry *>("geometry");
+        QTest::addColumn<Qt3DRender::QGeometry *>("geometry");
         QTest::addColumn<int>("attributeCount");
 
-        Qt3D::QGeometry *defaultConstructed = new Qt3D::QGeometry();
+        Qt3DRender::QGeometry *defaultConstructed = new Qt3DRender::QGeometry();
         QTest::newRow("defaultConstructed") << defaultConstructed << 0;
 
-        Qt3D::QGeometry *geometry1 = new Qt3D::QGeometry();
+        Qt3DRender::QGeometry *geometry1 = new Qt3DRender::QGeometry();
         geometry1->setVerticesPerPatch(2);
-        geometry1->addAttribute(new Qt3D::QAttribute(Q_NULLPTR, QStringLiteral("Attr1"), Qt3D::QAttribute::Float, 3, 454));
-        geometry1->addAttribute(new Qt3D::QAttribute(Q_NULLPTR, QStringLiteral("Attr2"), Qt3D::QAttribute::Float, 4, 555));
+        geometry1->addAttribute(new Qt3DRender::QAttribute(Q_NULLPTR, QStringLiteral("Attr1"), Qt3DRender::QAttribute::Float, 3, 454));
+        geometry1->addAttribute(new Qt3DRender::QAttribute(Q_NULLPTR, QStringLiteral("Attr2"), Qt3DRender::QAttribute::Float, 4, 555));
         QTest::newRow("2 attributes") << geometry1 << 2;
 
 
-        Qt3D::QGeometry *geometry2 = new Qt3D::QGeometry();
-        Qt3D::QAttribute *attribute = new Qt3D::QAttribute(Q_NULLPTR, QStringLiteral("Attr2"), Qt3D::QAttribute::Float, 4, 383);
-        geometry2->addAttribute(new Qt3D::QAttribute(Q_NULLPTR, QStringLiteral("Attr1"), Qt3D::QAttribute::Float, 3, 427));
+        Qt3DRender::QGeometry *geometry2 = new Qt3DRender::QGeometry();
+        Qt3DRender::QAttribute *attribute = new Qt3DRender::QAttribute(Q_NULLPTR, QStringLiteral("Attr2"), Qt3DRender::QAttribute::Float, 4, 383);
+        geometry2->addAttribute(new Qt3DRender::QAttribute(Q_NULLPTR, QStringLiteral("Attr1"), Qt3DRender::QAttribute::Float, 3, 427));
         geometry2->addAttribute(attribute);
-        geometry2->addAttribute(new Qt3D::QAttribute(Q_NULLPTR, QStringLiteral("Attr3"), Qt3D::QAttribute::Float, 2, 327));
+        geometry2->addAttribute(new Qt3DRender::QAttribute(Q_NULLPTR, QStringLiteral("Attr3"), Qt3DRender::QAttribute::Float, 2, 327));
         geometry2->removeAttribute(attribute);
         geometry2->setVerticesPerPatch(3);
         QTest::newRow("3 - 1 attributes") << geometry2 << 2;
@@ -161,11 +161,11 @@ private Q_SLOTS:
     void checkCloning()
     {
         // GIVEN
-        QFETCH(Qt3D::QGeometry *, geometry);
+        QFETCH(Qt3DRender::QGeometry *, geometry);
         QFETCH(int, attributeCount);
 
         // WHEN
-        Qt3D::QGeometry *clone = static_cast<Qt3D::QGeometry *>(QNode::clone(geometry));
+        Qt3DRender::QGeometry *clone = static_cast<Qt3DRender::QGeometry *>(QNode::clone(geometry));
 
         // THEN
         QVERIFY(clone != Q_NULLPTR);
@@ -176,8 +176,8 @@ private Q_SLOTS:
         QCOMPARE(geometry->verticesPerPatch(), clone->verticesPerPatch());
 
         for (int i = 0; i < attributeCount; ++i) {
-            Qt3D::QAttribute *originalAttribute = static_cast<Qt3D::QAttribute *>(geometry->attributes()[i]);
-            Qt3D::QAttribute *cloneAttribute = static_cast<Qt3D::QAttribute *>(clone->attributes()[i]);
+            Qt3DRender::QAttribute *originalAttribute = static_cast<Qt3DRender::QAttribute *>(geometry->attributes()[i]);
+            Qt3DRender::QAttribute *cloneAttribute = static_cast<Qt3DRender::QAttribute *>(clone->attributes()[i]);
 
             QCOMPARE(originalAttribute->id(), cloneAttribute->id());
             QCOMPARE(originalAttribute->name(), cloneAttribute->name());
@@ -193,11 +193,11 @@ private Q_SLOTS:
     void checkPropertyUpdates()
     {
         // GIVEN
-        QScopedPointer<Qt3D::QGeometry> geometry(new Qt3D::QGeometry());
+        QScopedPointer<Qt3DRender::QGeometry> geometry(new Qt3DRender::QGeometry());
         TestArbiter arbiter(geometry.data());
 
         // WHEN
-        Qt3D::QAttribute attr;
+        Qt3DRender::QAttribute attr;
         geometry->addAttribute(&attr);
         QCoreApplication::processEvents();
 
diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
index b5e8c5592..291a767d4 100644
--- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
+++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
@@ -122,19 +122,19 @@ void TestPostman::notifyBackend(const Qt3D::QSceneChangePtr &e)
     m_arbiter->sceneChangeEventWithLock(e);
 }
 
-class TestFunctor : public Qt3D::QGeometryFunctor
+class TestFunctor : public Qt3DRender::QGeometryFunctor
 {
 public:
     explicit TestFunctor(int size)
         : m_size(size)
     {}
 
-    Qt3D::QGeometry *operator ()() Q_DECL_FINAL
+    Qt3DRender::QGeometry *operator ()() Q_DECL_FINAL
     {
         return Q_NULLPTR;
     }
 
-    bool operator ==(const Qt3D::QGeometryFunctor &other) const
+    bool operator ==(const Qt3DRender::QGeometryFunctor &other) const
     {
         const TestFunctor *otherFunctor = functor_cast<TestFunctor>(&other);
         if (otherFunctor != Q_NULLPTR)
@@ -163,43 +163,43 @@ private Q_SLOTS:
 
     void checkCloning_data()
     {
-        QTest::addColumn<Qt3D::QGeometryRenderer *>("geometryRenderer");
+        QTest::addColumn<Qt3DRender::QGeometryRenderer *>("geometryRenderer");
 
-        Qt3D::QGeometryRenderer *defaultConstructed = new Qt3D::QGeometryRenderer();
+        Qt3DRender::QGeometryRenderer *defaultConstructed = new Qt3DRender::QGeometryRenderer();
         QTest::newRow("defaultConstructed") << defaultConstructed ;
 
-        Qt3D::QGeometryRenderer *geometry1 = new Qt3D::QGeometryRenderer();
-        geometry1->setGeometry(new Qt3D::QGeometry());
+        Qt3DRender::QGeometryRenderer *geometry1 = new Qt3DRender::QGeometryRenderer();
+        geometry1->setGeometry(new Qt3DRender::QGeometry());
         geometry1->setInstanceCount(1);
         geometry1->setBaseVertex(0);
         geometry1->setBaseInstance(55);
         geometry1->setRestartIndex(-1);
         geometry1->setPrimitiveRestart(false);
-        geometry1->setPrimitiveType(Qt3D::QGeometryRenderer::Triangles);
+        geometry1->setPrimitiveType(Qt3DRender::QGeometryRenderer::Triangles);
         geometry1->setPrimitiveCount(15);
-        geometry1->setGeometryFunctor(Qt3D::QGeometryFunctorPtr(new TestFunctor(383)));
+        geometry1->setGeometryFunctor(Qt3DRender::QGeometryFunctorPtr(new TestFunctor(383)));
         QTest::newRow("triangle") << geometry1;
 
-        Qt3D::QGeometryRenderer *geometry2 = new Qt3D::QGeometryRenderer();
-        geometry2->setGeometry(new Qt3D::QGeometry());
+        Qt3DRender::QGeometryRenderer *geometry2 = new Qt3DRender::QGeometryRenderer();
+        geometry2->setGeometry(new Qt3DRender::QGeometry());
         geometry2->setInstanceCount(200);
         geometry2->setBaseVertex(58);
         geometry2->setBaseInstance(10);
         geometry2->setRestartIndex(65535);
         geometry1->setPrimitiveCount(2056);
         geometry2->setPrimitiveRestart(true);
-        geometry2->setPrimitiveType(Qt3D::QGeometryRenderer::Lines);
-        geometry2->setGeometryFunctor(Qt3D::QGeometryFunctorPtr(new TestFunctor(305)));
+        geometry2->setPrimitiveType(Qt3DRender::QGeometryRenderer::Lines);
+        geometry2->setGeometryFunctor(Qt3DRender::QGeometryFunctorPtr(new TestFunctor(305)));
         QTest::newRow("lines with restart") << geometry2;
     }
 
     void checkCloning()
     {
         // GIVEN
-        QFETCH(Qt3D::QGeometryRenderer *, geometryRenderer);
+        QFETCH(Qt3DRender::QGeometryRenderer *, geometryRenderer);
 
         // WHEN
-        Qt3D::QGeometryRenderer *clone = static_cast<Qt3D::QGeometryRenderer *>(QNode::clone(geometryRenderer));
+        Qt3DRender::QGeometryRenderer *clone = static_cast<Qt3DRender::QGeometryRenderer *>(QNode::clone(geometryRenderer));
 
         // THEN
         QVERIFY(clone != Q_NULLPTR);
@@ -228,7 +228,7 @@ private Q_SLOTS:
     void checkPropertyUpdates()
     {
         // GIVEN
-        QScopedPointer<Qt3D::QGeometryRenderer> geometryRenderer(new Qt3D::QGeometryRenderer());
+        QScopedPointer<Qt3DRender::QGeometryRenderer> geometryRenderer(new Qt3DRender::QGeometryRenderer());
         TestArbiter arbiter(geometryRenderer.data());
 
         // WHEN
@@ -310,20 +310,20 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN
-        geometryRenderer->setPrimitiveType(Qt3D::QGeometryRenderer::Patches);
+        geometryRenderer->setPrimitiveType(Qt3DRender::QGeometryRenderer::Patches);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
         change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "primitiveType");
-        QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3D::QGeometryRenderer::Patches));
+        QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QGeometryRenderer::Patches));
         QCOMPARE(change->type(), Qt3D::NodeUpdated);
 
         arbiter.events.clear();
 
         // WHEN
-        Qt3D::QGeometryFunctorPtr functor(new TestFunctor(555));
+        Qt3DRender::QGeometryFunctorPtr functor(new TestFunctor(555));
         geometryRenderer->setGeometryFunctor(functor);
         QCoreApplication::processEvents();
 
@@ -331,13 +331,13 @@ private Q_SLOTS:
         QCOMPARE(arbiter.events.size(), 1);
         change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "geometryFunctor");
-        QCOMPARE(change->value().value<Qt3D::QGeometryFunctorPtr>(), functor);
+        QCOMPARE(change->value().value<Qt3DRender::QGeometryFunctorPtr>(), functor);
         QCOMPARE(change->type(), Qt3D::NodeUpdated);
 
         arbiter.events.clear();
 
         // WHEN
-        Qt3D::QGeometry geom;
+        Qt3DRender::QGeometry geom;
         geometryRenderer->setGeometry(&geom);
         QCoreApplication::processEvents();
 
@@ -351,7 +351,7 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN
-        Qt3D::QGeometry geom2;
+        Qt3DRender::QGeometry geom2;
         geometryRenderer->setGeometry(&geom2);
         QCoreApplication::processEvents();
 
diff --git a/tests/auto/render/qgraphicsutils/tst_qgraphicsutils.cpp b/tests/auto/render/qgraphicsutils/tst_qgraphicsutils.cpp
index 6ca270a2b..c1cff2511 100644
--- a/tests/auto/render/qgraphicsutils/tst_qgraphicsutils.cpp
+++ b/tests/auto/render/qgraphicsutils/tst_qgraphicsutils.cpp
@@ -52,14 +52,14 @@ private slots:
 
 void tst_QGraphicsUtils::fillScalarInDataArray()
 {
-    Qt3D::Render::ShaderUniform description;
+    Qt3DRender::Render::ShaderUniform description;
 
     description.m_size = 1;
     description.m_offset = 0;
     description.m_arrayStride = 10;
 
     QVector4D testVector(8.0f, 8.0f, 3.0f, 1.0f);
-    const GLfloat *vectorData = Qt3D::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(testVector, 1, 4);
+    const GLfloat *vectorData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(testVector, 1, 4);
 
     for (int i = 0; i < 4; i++) {
         if (i == 0)
@@ -76,7 +76,7 @@ void tst_QGraphicsUtils::fillScalarInDataArray()
     char *innerData = data.data();
 
     // Checked that we are not overflowing
-    Qt3D::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 2);
+    Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 2);
     for (int i = 0; i < 4; ++i) {
         if (i < 2)
             QVERIFY(vectorData[i] == ((GLfloat*)innerData)[i]);
@@ -85,7 +85,7 @@ void tst_QGraphicsUtils::fillScalarInDataArray()
     }
 
     // Check that all values are copied
-    Qt3D::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4);
+    Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4);
     for (int i = 0; i < 4; ++i)
         QVERIFY(vectorData[i] == ((GLfloat*)innerData)[i]);
 
@@ -94,7 +94,7 @@ void tst_QGraphicsUtils::fillScalarInDataArray()
     data = QByteArray(description.m_size * 8 * sizeof(GLfloat), 0);
     innerData = data.data();
 
-    Qt3D::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4);
+    Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4);
     for (int i = 0; i < 8; ++i) {
         if (i < 4)
             QVERIFY(((GLfloat*)innerData)[i] == 0.0f);
@@ -110,9 +110,9 @@ void tst_QGraphicsUtils::fillArray()
     QVector4D testVector3(4.0f, 5.0f, 4.0f, 2.0f);
 
     QVariantList variantList = QVariantList() << testVector << testVector2 << testVector3;
-    const GLfloat *vectorData = Qt3D::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant(variantList), 3, 4);
+    const GLfloat *vectorData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant(variantList), 3, 4);
 
-    Qt3D::Render::ShaderUniform description;
+    Qt3DRender::Render::ShaderUniform description;
 
     description.m_size = 3;
     description.m_offset = 16;
@@ -120,7 +120,7 @@ void tst_QGraphicsUtils::fillArray()
 
     QByteArray data(description.m_size * (4 + description.m_arrayStride) * sizeof(GLfloat) + description.m_offset, 0);
     char *innerData = data.data();
-    Qt3D::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4);
+    Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4);
 
     int offset = description.m_offset / sizeof(GLfloat);
     int stride = description.m_arrayStride / sizeof(GLfloat);
@@ -152,25 +152,25 @@ void tst_QGraphicsUtils::fillScalarWithOffsets()
     QVector4D color(4.0f, 5.0f, 4.0f, 1.0f);
     float intensity = 1.0f;
 
-    Qt3D::Render::ShaderUniform posUniform;
+    Qt3DRender::Render::ShaderUniform posUniform;
     posUniform.m_size = 1;
     posUniform.m_arrayStride = 0;
     posUniform.m_matrixStride = 0;
     posUniform.m_offset = 0;
 
-    Qt3D::Render::ShaderUniform dirUniform;
+    Qt3DRender::Render::ShaderUniform dirUniform;
     dirUniform.m_size = 1;
     dirUniform.m_arrayStride = 0;
     dirUniform.m_matrixStride = 0;
     dirUniform.m_offset = 16;
 
-    Qt3D::Render::ShaderUniform colUniform;
+    Qt3DRender::Render::ShaderUniform colUniform;
     colUniform.m_size = 1;
     colUniform.m_arrayStride = 0;
     colUniform.m_matrixStride = 0;
     colUniform.m_offset = 32;
 
-    Qt3D::Render::ShaderUniform intUniform;
+    Qt3DRender::Render::ShaderUniform intUniform;
     intUniform.m_size = 1;
     intUniform.m_arrayStride = 0;
     intUniform.m_matrixStride = 0;
@@ -179,17 +179,17 @@ void tst_QGraphicsUtils::fillScalarWithOffsets()
     QVector<GLfloat> data(16);
     void *innerData = data.data();
 
-    Qt3D::Render::QGraphicsUtils::fillDataArray(innerData,
-                                                Qt3D::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(position, 1, 3),
+    Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData,
+                                                Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(position, 1, 3),
                                                 posUniform, 3);
-    Qt3D::Render::QGraphicsUtils::fillDataArray(innerData,
-                                                Qt3D::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(direction, 1, 3),
+    Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData,
+                                                Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(direction, 1, 3),
                                                 dirUniform, 3);
-    Qt3D::Render::QGraphicsUtils::fillDataArray(innerData,
-                                                Qt3D::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(color, 1, 4),
+    Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData,
+                                                Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(color, 1, 4),
                                                 colUniform, 4);
-    Qt3D::Render::QGraphicsUtils::fillDataArray(innerData,
-                                                Qt3D::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(intensity, 1, 1),
+    Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData,
+                                                Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(intensity, 1, 1),
                                                 intUniform, 1);
 
     GLfloat *floatData = (GLfloat*)innerData;
@@ -222,9 +222,9 @@ void tst_QGraphicsUtils::fillMatrix4x4()
     QMatrix4x4 mat(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 16.0f);
 
     // column major
-    const GLfloat *matData = Qt3D::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(mat, 1, 16);
+    const GLfloat *matData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(mat, 1, 16);
 
-    Qt3D::Render::ShaderUniform description;
+    Qt3DRender::Render::ShaderUniform description;
 
     description.m_size = 1;
     description.m_offset = 0;
@@ -234,7 +234,7 @@ void tst_QGraphicsUtils::fillMatrix4x4()
 
     QByteArray data(description.m_size * 16 * sizeof(GLfloat), 0);
     char *innerData = data.data();
-    Qt3D::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4);
+    Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4);
     // Check for no offset/no stride
     for (int i = 0; i < 16; ++i)
         QVERIFY((((GLfloat *)innerData)[i]) == matData[i]);
@@ -242,7 +242,7 @@ void tst_QGraphicsUtils::fillMatrix4x4()
     description.m_offset = 12;
     data = QByteArray((description.m_size * 16  + description.m_offset) * sizeof(GLfloat), 0);
     innerData = data.data();
-    Qt3D::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4);
+    Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4);
     // Check with 12 offset/no stride
     for (int i = 0; i < 16; ++i)
         QVERIFY((((GLfloat *)innerData)[3 + i]) == matData[i]);
@@ -250,7 +250,7 @@ void tst_QGraphicsUtils::fillMatrix4x4()
     description.m_matrixStride = 16;
     data = QByteArray((description.m_size * 16 + 4 * description.m_matrixStride + description.m_offset) * sizeof(GLfloat), 0);
     innerData = data.data();
-    Qt3D::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4);
+    Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4);
     // Check with 10 offset/ 16 stride
     int offset = description.m_offset / sizeof(GLfloat);
     int matrixStride = description.m_matrixStride / sizeof(GLfloat);
@@ -267,9 +267,9 @@ void tst_QGraphicsUtils::fillMatrix3x4()
     QMatrix3x4 mat;
 
     mat.fill(6.0f);
-    const GLfloat *matData = Qt3D::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(mat), 1, 12);
+    const GLfloat *matData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(mat), 1, 12);
 
-    Qt3D::Render::ShaderUniform description;
+    Qt3DRender::Render::ShaderUniform description;
 
     description.m_size = 1;
     description.m_offset = 16;
@@ -278,7 +278,7 @@ void tst_QGraphicsUtils::fillMatrix3x4()
 
     QByteArray data((description.m_size * 12 + 3 * description.m_matrixStride + description.m_offset) * sizeof(GLfloat), 0);
     char *innerData = data.data();
-    Qt3D::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 3, 4);
+    Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 3, 4);
     // Check with 16 offset/ 12 stride
     int offset = description.m_offset / sizeof(GLfloat);
     int matrixStride = description.m_matrixStride / sizeof(GLfloat);
@@ -295,9 +295,9 @@ void tst_QGraphicsUtils::fillMatrix4x3()
     QMatrix4x3 mat;
 
     mat.fill(6.0f);
-    const GLfloat *matData = Qt3D::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(mat), 1, 12);
+    const GLfloat *matData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(mat), 1, 12);
 
-    Qt3D::Render::ShaderUniform description;
+    Qt3DRender::Render::ShaderUniform description;
 
     description.m_size = 1;
     description.m_offset = 16;
@@ -306,7 +306,7 @@ void tst_QGraphicsUtils::fillMatrix4x3()
 
     QByteArray data((description.m_size * 12 + 4 * description.m_matrixStride + description.m_offset) * sizeof(GLfloat), 0);
     char *innerData = data.data();
-    Qt3D::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 3);
+    Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 3);
     // Check with 16 offset/ 16 stride
     int offset = description.m_offset / sizeof(GLfloat);
     int matrixStride = description.m_matrixStride / sizeof(GLfloat);
@@ -329,9 +329,9 @@ void tst_QGraphicsUtils::fillMatrixArray()
 
     QVariantList matrices = QVariantList() << QVariant::fromValue(mat1) << QVariant::fromValue(mat2) << QVariant::fromValue(mat3);
 
-    const GLfloat *matData = Qt3D::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(matrices), 3, 12);
+    const GLfloat *matData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(matrices), 3, 12);
 
-    Qt3D::Render::ShaderUniform description;
+    Qt3DRender::Render::ShaderUniform description;
 
     description.m_size = 3;
     description.m_offset = 12;
@@ -340,7 +340,7 @@ void tst_QGraphicsUtils::fillMatrixArray()
 
     QByteArray data((description.m_size * (12 + 4 * description.m_matrixStride + description.m_arrayStride) + description.m_offset) * sizeof(GLfloat), 0);
     char *innerData = data.data();
-    Qt3D::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 3);
+    Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 3);
     // Check with 12 offset/ 4 array stride / 16 matrix stride
     int offset = description.m_offset / sizeof(GLfloat);
     int matrixStride = description.m_matrixStride / sizeof(GLfloat);
diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp
index 682a73d2f..01bd361b1 100644
--- a/tests/auto/render/qmaterial/tst_qmaterial.cpp
+++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp
@@ -55,15 +55,15 @@
 #include <Qt3DRenderer/QNormalDiffuseMapAlphaMaterial>
 #include <Qt3DRenderer/QNormalDiffuseSpecularMapMaterial>
 
-class TestMaterial : public Qt3D::QMaterial
+class TestMaterial : public Qt3DRender::QMaterial
 {
 public:
     explicit TestMaterial(Qt3D::QNode *parent = 0)
-        : Qt3D::QMaterial(parent)
-        , m_effect(new Qt3D::QEffect(this))
-        , m_technique(new Qt3D::QTechnique(this))
-        , m_renderPass(new Qt3D::QRenderPass(this))
-        , m_shaderProgram(new Qt3D::QShaderProgram(this))
+        : Qt3DRender::QMaterial(parent)
+        , m_effect(new Qt3DRender::QEffect(this))
+        , m_technique(new Qt3DRender::QTechnique(this))
+        , m_renderPass(new Qt3DRender::QRenderPass(this))
+        , m_shaderProgram(new Qt3DRender::QShaderProgram(this))
     {
         m_renderPass->setShaderProgram(m_shaderProgram);
         m_technique->addPass(m_renderPass);
@@ -76,10 +76,10 @@ public:
         QNode::cleanup();
     }
 
-    Qt3D::QEffect *m_effect;
-    Qt3D::QTechnique *m_technique;
-    Qt3D::QRenderPass *m_renderPass;
-    Qt3D::QShaderProgram *m_shaderProgram;
+    Qt3DRender::QEffect *m_effect;
+    Qt3DRender::QTechnique *m_technique;
+    Qt3DRender::QRenderPass *m_renderPass;
+    Qt3DRender::QShaderProgram *m_shaderProgram;
 };
 
 class TestArbiter;
@@ -170,7 +170,7 @@ public:
 
 private:
 
-    void compareEffects(const Qt3D::QEffect *original, const Qt3D::QEffect *clone)
+    void compareEffects(const Qt3DRender::QEffect *original, const Qt3DRender::QEffect *clone)
     {
         bool isEffectNull = (original == Q_NULLPTR);
         if (isEffectNull) {
@@ -189,7 +189,7 @@ private:
         }
     }
 
-    void compareTechniques(const Qt3D::QTechnique *original, const Qt3D::QTechnique *clone)
+    void compareTechniques(const Qt3DRender::QTechnique *original, const Qt3DRender::QTechnique *clone)
     {
         QCOMPARE(original->id(), clone->id());
 
@@ -202,7 +202,7 @@ private:
             compareRenderPasses(original->renderPasses().at(i), clone->renderPasses().at(i));
     }
 
-    void compareRenderPasses(const Qt3D::QRenderPass *original, const Qt3D::QRenderPass *clone)
+    void compareRenderPasses(const Qt3DRender::QRenderPass *original, const Qt3DRender::QRenderPass *clone)
     {
         QCOMPARE(original->id(), clone->id());
 
@@ -213,41 +213,41 @@ private:
         compareShaderPrograms(original->shaderProgram(), clone->shaderProgram());
     }
 
-    void compareParameters(const Qt3D::ParameterList &original, const Qt3D::ParameterList &clone)
+    void compareParameters(const Qt3DRender::ParameterList &original, const Qt3DRender::ParameterList &clone)
     {
         QCOMPARE(original.size(), clone.size());
         const int parametersCount = original.size();
         for (int i = 0; i < parametersCount; ++i) {
-            const Qt3D::QParameter *originParam = original.at(i);
-            const Qt3D::QParameter *cloneParam = clone.at(i);
+            const Qt3DRender::QParameter *originParam = original.at(i);
+            const Qt3DRender::QParameter *cloneParam = clone.at(i);
             QCOMPARE(originParam->id(), cloneParam->id());
             QCOMPARE(cloneParam->name(), originParam->name());
             QCOMPARE(cloneParam->value(), originParam->value());
         }
     }
 
-    void compareAnnotations(const QList<Qt3D::QAnnotation *> &original, const QList<Qt3D::QAnnotation *> &clone)
+    void compareAnnotations(const QList<Qt3DRender::QAnnotation *> &original, const QList<Qt3DRender::QAnnotation *> &clone)
     {
         const int annotationsCount = original.size();
         QCOMPARE(annotationsCount, clone.size());
 
         for (int i = 0; i < annotationsCount; ++i) {
-            const Qt3D::QAnnotation *origAnnotation = original.at(i);
-            const Qt3D::QAnnotation *cloneAnnotation = clone.at(i);
+            const Qt3DRender::QAnnotation *origAnnotation = original.at(i);
+            const Qt3DRender::QAnnotation *cloneAnnotation = clone.at(i);
             QCOMPARE(origAnnotation->id(), cloneAnnotation->id());
             QCOMPARE(origAnnotation->name(), cloneAnnotation->name());
             QCOMPARE(origAnnotation->value(), cloneAnnotation->value());
         }
     }
 
-    void compareBindings(const QList<Qt3D::QParameterMapping *> &original, const QList<Qt3D::QParameterMapping *> &clone)
+    void compareBindings(const QList<Qt3DRender::QParameterMapping *> &original, const QList<Qt3DRender::QParameterMapping *> &clone)
     {
         const int bindingsCount = original.size();
         QCOMPARE(bindingsCount, clone.size());
 
         for (int i = 0; i < bindingsCount; ++i) {
-            const Qt3D::QParameterMapping *origMapping = original.at(i);
-            const Qt3D::QParameterMapping *cloneMapping = clone.at(i);
+            const Qt3DRender::QParameterMapping *origMapping = original.at(i);
+            const Qt3DRender::QParameterMapping *cloneMapping = clone.at(i);
 
             QCOMPARE(origMapping->id(), cloneMapping->id());
             QCOMPARE(origMapping->bindingType(), cloneMapping->bindingType());
@@ -256,20 +256,20 @@ private:
         }
     }
 
-    void compareRenderStates(const QList<Qt3D::QRenderState *> &original, const QList<Qt3D::QRenderState *> &clone)
+    void compareRenderStates(const QList<Qt3DRender::QRenderState *> &original, const QList<Qt3DRender::QRenderState *> &clone)
     {
         const int renderStatesCount = original.size();
         QCOMPARE(renderStatesCount, clone.size());
 
         for (int i = 0; i < renderStatesCount; ++i) {
-            const Qt3D::QRenderState *originState = original.at(i);
-            const Qt3D::QRenderState *cloneState = clone.at(i);
+            const Qt3DRender::QRenderState *originState = original.at(i);
+            const Qt3DRender::QRenderState *cloneState = clone.at(i);
             QCOMPARE(originState->id(), originState->id());
             QVERIFY(originState->type() == cloneState->type());
         }
     }
 
-    void compareShaderPrograms(const Qt3D::QShaderProgram *original, const Qt3D::QShaderProgram *clone)
+    void compareShaderPrograms(const Qt3DRender::QShaderProgram *original, const Qt3DRender::QShaderProgram *clone)
     {
         bool isOriginalNull = (original == Q_NULLPTR);
         if (isOriginalNull) {
@@ -290,35 +290,35 @@ private Q_SLOTS:
 
     void checkCloning_data()
     {
-        QTest::addColumn<Qt3D::QMaterial *>("material");
+        QTest::addColumn<Qt3DRender::QMaterial *>("material");
 
-        Qt3D::QMaterial *material = new Qt3D::QMaterial();
+        Qt3DRender::QMaterial *material = new Qt3DRender::QMaterial();
         QTest::newRow("empty material") << material;
         material = new TestMaterial();
         QTest::newRow("test material") << material;
-        material = new Qt3D::QPhongMaterial();
+        material = new Qt3DRender::QPhongMaterial();
         QTest::newRow("QPhongMaterial") << material;
-        material = new Qt3D::QDiffuseMapMaterial();
+        material = new Qt3DRender::QDiffuseMapMaterial();
         QTest::newRow("QDiffuseMapMaterial") << material;
-        material = new Qt3D::QDiffuseSpecularMapMaterial();
+        material = new Qt3DRender::QDiffuseSpecularMapMaterial();
         QTest::newRow("QDiffuseMapSpecularMaterial") << material;
-        material = new Qt3D::QPerVertexColorMaterial();
+        material = new Qt3DRender::QPerVertexColorMaterial();
         QTest::newRow("QPerVertexColorMaterial") << material;
-        material = new Qt3D::QNormalDiffuseMapMaterial();
+        material = new Qt3DRender::QNormalDiffuseMapMaterial();
         QTest::newRow("QNormalDiffuseMapMaterial") << material;
-        material = new Qt3D::QNormalDiffuseMapAlphaMaterial();
+        material = new Qt3DRender::QNormalDiffuseMapAlphaMaterial();
         QTest::newRow("QNormalDiffuseMapAlphaMaterial") << material;
-        material = new Qt3D::QNormalDiffuseSpecularMapMaterial();
+        material = new Qt3DRender::QNormalDiffuseSpecularMapMaterial();
         QTest::newRow("QNormalDiffuseSpecularMapMaterial") << material;
     }
 
     void checkCloning()
     {
         // GIVEN
-        QFETCH(Qt3D::QMaterial *, material);
+        QFETCH(Qt3DRender::QMaterial *, material);
 
         // WHEN
-        Qt3D::QMaterial *clone = static_cast<Qt3D::QMaterial *>(QNode::clone(material));
+        Qt3DRender::QMaterial *clone = static_cast<Qt3DRender::QMaterial *>(QNode::clone(material));
         QCoreApplication::processEvents();
 
         // THEN
@@ -330,11 +330,11 @@ private Q_SLOTS:
     void checkEffectUpdate()
     {
         // GIVEN
-        QScopedPointer<Qt3D::QMaterial> material(new Qt3D::QMaterial());
+        QScopedPointer<Qt3DRender::QMaterial> material(new Qt3DRender::QMaterial());
         TestArbiter arbiter(material.data());
 
         // WHEN
-        Qt3D::QEffect effect;
+        Qt3DRender::QEffect effect;
         material->setEffect(&effect);
         QCoreApplication::processEvents();
 
@@ -352,7 +352,7 @@ private Q_SLOTS:
         TestArbiter arbiter2(material2.data());
 
         // WHEN
-        Qt3D::QEffect *oldEffect = material2->effect();
+        Qt3DRender::QEffect *oldEffect = material2->effect();
         material2->setEffect(&effect);
         QCoreApplication::processEvents();
 
@@ -376,7 +376,7 @@ private Q_SLOTS:
         TestArbiter arbiter(material);
 
         // WHEN (add parameter to material)
-        Qt3D::QParameter *param = new Qt3D::QParameter("testParamMaterial", QVariant::fromValue(383.0f));
+        Qt3DRender::QParameter *param = new Qt3DRender::QParameter("testParamMaterial", QVariant::fromValue(383.0f));
         material->addParameter(param);
         QCoreApplication::processEvents();
 
@@ -390,7 +390,7 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN (add parameter to effect)
-        param = new Qt3D::QParameter("testParamEffect", QVariant::fromValue(383.0f));
+        param = new Qt3DRender::QParameter("testParamEffect", QVariant::fromValue(383.0f));
         material->effect()->addParameter(param);
         QCoreApplication::processEvents();
 
@@ -404,7 +404,7 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN (add parameter to technique)
-        param = new Qt3D::QParameter("testParamTechnique", QVariant::fromValue(383.0f));
+        param = new Qt3DRender::QParameter("testParamTechnique", QVariant::fromValue(383.0f));
         material->m_technique->addParameter(param);
         QCoreApplication::processEvents();
 
@@ -418,7 +418,7 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN (add parameter to renderpass)
-        param = new Qt3D::QParameter("testParamRenderPass", QVariant::fromValue(383.0f));
+        param = new Qt3DRender::QParameter("testParamRenderPass", QVariant::fromValue(383.0f));
         material->m_renderPass->addParameter(param);
         QCoreApplication::processEvents();
 
diff --git a/tests/auto/render/raycasting/tst_raycasting.cpp b/tests/auto/render/raycasting/tst_raycasting.cpp
index a41f6c9a1..84be49fee 100644
--- a/tests/auto/render/raycasting/tst_raycasting.cpp
+++ b/tests/auto/render/raycasting/tst_raycasting.cpp
@@ -42,7 +42,8 @@
 #include <Qt3DCore/qray3d.h>
 
 using namespace Qt3D;
-using namespace Qt3D::Render;
+using namespace Qt3DRender;
+using namespace Qt3DRender::Render;
 
 class tst_RayCasting : public QObject
 {
diff --git a/tests/auto/render/renderattribute/tst_renderattribute.cpp b/tests/auto/render/renderattribute/tst_renderattribute.cpp
index bbf800e42..892a33a38 100644
--- a/tests/auto/render/renderattribute/tst_renderattribute.cpp
+++ b/tests/auto/render/renderattribute/tst_renderattribute.cpp
@@ -47,10 +47,10 @@ private Q_SLOTS:
     void checkPeerPropertyMirroring()
     {
         // GIVEN
-        Qt3D::Render::RenderAttribute renderAttribute;
+        Qt3DRender::Render::RenderAttribute renderAttribute;
 
-        Qt3D::QAttribute attribute;
-        attribute.setAttributeType(Qt3D::QAttribute::IndexAttribute);
+        Qt3DRender::QAttribute attribute;
+        attribute.setAttributeType(Qt3DRender::QAttribute::IndexAttribute);
         attribute.setByteOffset(1200);
         attribute.setByteStride(883);
         attribute.setCount(427);
@@ -59,8 +59,8 @@ private Q_SLOTS:
         attribute.setDataType(Qt3D::QAbstractAttribute::UnsignedShort);
         attribute.setDataSize(3);
 
-        Qt3D::QBuffer buffer(Qt3D::QBuffer::IndexBuffer);
-        buffer.setUsage(Qt3D::QBuffer::DynamicCopy);
+        Qt3DRender::QBuffer buffer(Qt3DRender::QBuffer::IndexBuffer);
+        buffer.setUsage(Qt3DRender::QBuffer::DynamicCopy);
         buffer.setData(QByteArrayLiteral("Corvette"));
         attribute.setBuffer(&buffer);
 
@@ -84,7 +84,7 @@ private Q_SLOTS:
     void checkInitialAndCleanedUpState()
     {
         // GIVEN
-        Qt3D::Render::RenderAttribute renderAttribute;
+        Qt3DRender::Render::RenderAttribute renderAttribute;
 
         // THEN
         QVERIFY(renderAttribute.peerUuid().isNull());
@@ -93,15 +93,15 @@ private Q_SLOTS:
         QCOMPARE(renderAttribute.isDirty(), false);
         QCOMPARE(renderAttribute.dataType(), Qt3D::QAbstractAttribute::Float);
         QCOMPARE(renderAttribute.dataSize(), 1U);
-        QCOMPARE(renderAttribute.attributeType(), Qt3D::QAttribute::VertexAttribute);
+        QCOMPARE(renderAttribute.attributeType(), Qt3DRender::QAttribute::VertexAttribute);
         QCOMPARE(renderAttribute.byteOffset(), 0U);
         QCOMPARE(renderAttribute.byteStride(), 0U);
         QCOMPARE(renderAttribute.count(), 0U);
         QCOMPARE(renderAttribute.divisor(), 0U);
 
         // GIVEN
-        Qt3D::QAttribute attribute;
-        attribute.setAttributeType(Qt3D::QAttribute::IndexAttribute);
+        Qt3DRender::QAttribute attribute;
+        attribute.setAttributeType(Qt3DRender::QAttribute::IndexAttribute);
         attribute.setByteOffset(1200);
         attribute.setByteStride(883);
         attribute.setCount(427);
@@ -109,8 +109,8 @@ private Q_SLOTS:
         attribute.setName(QStringLiteral("C3"));
         attribute.setDataType(Qt3D::QAbstractAttribute::Double);
         attribute.setDataSize(4);
-        Qt3D::QBuffer buffer(Qt3D::QBuffer::IndexBuffer);
-        buffer.setUsage(Qt3D::QBuffer::DynamicCopy);
+        Qt3DRender::QBuffer buffer(Qt3DRender::QBuffer::IndexBuffer);
+        buffer.setUsage(Qt3DRender::QBuffer::DynamicCopy);
         buffer.setData(QByteArrayLiteral("C7"));
         attribute.setBuffer(&buffer);
 
@@ -125,7 +125,7 @@ private Q_SLOTS:
         QCOMPARE(renderAttribute.isDirty(), false);
         QCOMPARE(renderAttribute.dataType(), Qt3D::QAbstractAttribute::Float);
         QCOMPARE(renderAttribute.dataSize(), 1U);
-        QCOMPARE(renderAttribute.attributeType(), Qt3D::QAttribute::VertexAttribute);
+        QCOMPARE(renderAttribute.attributeType(), Qt3DRender::QAttribute::VertexAttribute);
         QCOMPARE(renderAttribute.byteOffset(), 0U);
         QCOMPARE(renderAttribute.byteStride(), 0U);
         QCOMPARE(renderAttribute.count(), 0U);
@@ -135,7 +135,7 @@ private Q_SLOTS:
     void checkPropertyChanges()
     {
         // GIVEN
-        Qt3D::Render::RenderAttribute renderAttribute;
+        Qt3DRender::Render::RenderAttribute renderAttribute;
 
         QVERIFY(!renderAttribute.isDirty());
 
@@ -167,12 +167,12 @@ private Q_SLOTS:
 
         // WHEN
         updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
-        updateChange->setValue(static_cast<int>(Qt3D::QAttribute::IndexAttribute));
+        updateChange->setValue(static_cast<int>(Qt3DRender::QAttribute::IndexAttribute));
         updateChange->setPropertyName("attributeType");
         renderAttribute.sceneChangeEvent(updateChange);
 
         // THEN
-        QCOMPARE(renderAttribute.attributeType(), Qt3D::QAttribute::IndexAttribute);
+        QCOMPARE(renderAttribute.attributeType(), Qt3DRender::QAttribute::IndexAttribute);
         QVERIFY(renderAttribute.isDirty());
 
         renderAttribute.unsetDirty();
diff --git a/tests/auto/render/renderbuffer/tst_renderbuffer.cpp b/tests/auto/render/renderbuffer/tst_renderbuffer.cpp
index 0f66e1cf2..1f74f2809 100644
--- a/tests/auto/render/renderbuffer/tst_renderbuffer.cpp
+++ b/tests/auto/render/renderbuffer/tst_renderbuffer.cpp
@@ -38,7 +38,7 @@
 #include <Qt3DRenderer/private/renderbuffer_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
 
-class TestFunctor : public Qt3D::QBufferFunctor
+class TestFunctor : public Qt3DRender::QBufferFunctor
 {
 public:
     explicit TestFunctor(int size)
@@ -50,7 +50,7 @@ public:
         return QByteArray();
     }
 
-    bool operator ==(const Qt3D::QBufferFunctor &other) const
+    bool operator ==(const Qt3DRender::QBufferFunctor &other) const
     {
         const TestFunctor *otherFunctor = functor_cast<TestFunctor>(&other);
         if (otherFunctor != Q_NULLPTR)
@@ -72,11 +72,11 @@ private Q_SLOTS:
     void checkPeerPropertyMirroring()
     {
         // GIVEN
-        Qt3D::Render::RenderBuffer renderBuffer;
-        Qt3D::QBuffer buffer(Qt3D::QBuffer::IndexBuffer);
-        buffer.setUsage(Qt3D::QBuffer::DynamicCopy);
+        Qt3DRender::Render::RenderBuffer renderBuffer;
+        Qt3DRender::QBuffer buffer(Qt3DRender::QBuffer::IndexBuffer);
+        buffer.setUsage(Qt3DRender::QBuffer::DynamicCopy);
         buffer.setData(QByteArrayLiteral("Corvette"));
-        buffer.setBufferFunctor(Qt3D::QBufferFunctorPtr(new TestFunctor(883)));
+        buffer.setBufferFunctor(Qt3DRender::QBufferFunctorPtr(new TestFunctor(883)));
 
         // WHEN
         renderBuffer.setPeer(&buffer);
@@ -94,21 +94,21 @@ private Q_SLOTS:
     void checkInitialAndCleanedUpState()
     {
         // GIVEN
-        Qt3D::Render::RenderBuffer renderBuffer;
+        Qt3DRender::Render::RenderBuffer renderBuffer;
 
         // THEN
         QCOMPARE(renderBuffer.isDirty(), false);
-        QCOMPARE(renderBuffer.type(), Qt3D::QBuffer::VertexBuffer);
-        QCOMPARE(renderBuffer.usage(), Qt3D::QBuffer::StaticDraw);
+        QCOMPARE(renderBuffer.type(), Qt3DRender::QBuffer::VertexBuffer);
+        QCOMPARE(renderBuffer.usage(), Qt3DRender::QBuffer::StaticDraw);
         QVERIFY(renderBuffer.data().isEmpty());
         QVERIFY(renderBuffer.peerUuid().isNull());
         QVERIFY(renderBuffer.bufferFunctor().isNull());
 
         // GIVEN
-        Qt3D::QBuffer buffer(Qt3D::QBuffer::IndexBuffer);
-        buffer.setUsage(Qt3D::QBuffer::DynamicCopy);
+        Qt3DRender::QBuffer buffer(Qt3DRender::QBuffer::IndexBuffer);
+        buffer.setUsage(Qt3DRender::QBuffer::DynamicCopy);
         buffer.setData(QByteArrayLiteral("C7"));
-        buffer.setBufferFunctor(Qt3D::QBufferFunctorPtr(new TestFunctor(73)));
+        buffer.setBufferFunctor(Qt3DRender::QBufferFunctorPtr(new TestFunctor(73)));
 
         // WHEN
         renderBuffer.updateFromPeer(&buffer);
@@ -116,8 +116,8 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(renderBuffer.isDirty(), false);
-        QCOMPARE(renderBuffer.type(), Qt3D::QBuffer::VertexBuffer);
-        QCOMPARE(renderBuffer.usage(), Qt3D::QBuffer::StaticDraw);
+        QCOMPARE(renderBuffer.type(), Qt3DRender::QBuffer::VertexBuffer);
+        QCOMPARE(renderBuffer.usage(), Qt3DRender::QBuffer::StaticDraw);
         QVERIFY(renderBuffer.data().isEmpty());
         QVERIFY(renderBuffer.bufferFunctor().isNull());
     }
@@ -125,22 +125,22 @@ private Q_SLOTS:
     void checkPropertyChanges()
     {
         // GIVEN
-        Qt3D::Render::RenderBuffer renderBuffer;
+        Qt3DRender::Render::RenderBuffer renderBuffer;
 
         // THEN
-        QVERIFY(renderBuffer.type() != Qt3D::QBuffer::IndexBuffer);
+        QVERIFY(renderBuffer.type() != Qt3DRender::QBuffer::IndexBuffer);
         QVERIFY(renderBuffer.data().isEmpty());
-        QVERIFY(renderBuffer.usage() != Qt3D::QBuffer::DynamicRead);
+        QVERIFY(renderBuffer.usage() != Qt3DRender::QBuffer::DynamicRead);
         QVERIFY(!renderBuffer.isDirty());
 
         // WHEN
         Qt3D::QScenePropertyChangePtr updateChange(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
-        updateChange->setValue(static_cast<int>(Qt3D::QBuffer::IndexBuffer));
+        updateChange->setValue(static_cast<int>(Qt3DRender::QBuffer::IndexBuffer));
         updateChange->setPropertyName("type");
         renderBuffer.sceneChangeEvent(updateChange);
 
         // THEN
-        QCOMPARE(renderBuffer.type(), Qt3D::QBuffer::IndexBuffer);
+        QCOMPARE(renderBuffer.type(), Qt3DRender::QBuffer::IndexBuffer);
         QVERIFY(renderBuffer.isDirty());
 
         renderBuffer.unsetDirty();
@@ -148,12 +148,12 @@ private Q_SLOTS:
 
         // WHEN
         updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
-        updateChange->setValue(static_cast<int>(Qt3D::QBuffer::DynamicRead));
+        updateChange->setValue(static_cast<int>(Qt3DRender::QBuffer::DynamicRead));
         updateChange->setPropertyName("usage");
         renderBuffer.sceneChangeEvent(updateChange);
 
         // THEN
-        QCOMPARE(renderBuffer.usage(), Qt3D::QBuffer::DynamicRead);
+        QCOMPARE(renderBuffer.usage(), Qt3DRender::QBuffer::DynamicRead);
         QVERIFY(renderBuffer.isDirty());
 
         renderBuffer.unsetDirty();
@@ -175,7 +175,7 @@ private Q_SLOTS:
 
 
         // WHEN
-        Qt3D::QBufferFunctorPtr functor(new TestFunctor(355));
+        Qt3DRender::QBufferFunctorPtr functor(new TestFunctor(355));
         updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
         updateChange->setValue(QVariant::fromValue(functor));
         updateChange->setPropertyName("bufferFunctor");
diff --git a/tests/auto/render/renderentity/tst_renderentity.cpp b/tests/auto/render/renderentity/tst_renderentity.cpp
index f6ba098d6..a692c44d8 100644
--- a/tests/auto/render/renderentity/tst_renderentity.cpp
+++ b/tests/auto/render/renderentity/tst_renderentity.cpp
@@ -47,11 +47,12 @@
 #include <Qt3DRenderer/QShaderData>
 #include <Qt3DRenderer/QGeometryRenderer>
 
-typedef Qt3D::QNodeId (*UuidMethod)(Qt3D::Render::RenderEntity *);
-typedef QList<Qt3D::QNodeId> (*UuidListMethod)(Qt3D::Render::RenderEntity *);
+typedef Qt3D::QNodeId (*UuidMethod)(Qt3DRender::Render::RenderEntity *);
+typedef QList<Qt3D::QNodeId> (*UuidListMethod)(Qt3DRender::Render::RenderEntity *);
 
 using namespace Qt3D;
-using namespace Qt3D::Render;
+using namespace Qt3DRender;
+using namespace Qt3DRender::Render;
 
 void noopDeleter(QNode *) {}
 
diff --git a/tests/auto/render/rendergeometry/tst_rendergeometry.cpp b/tests/auto/render/rendergeometry/tst_rendergeometry.cpp
index df48997d9..0d1a3d0b3 100644
--- a/tests/auto/render/rendergeometry/tst_rendergeometry.cpp
+++ b/tests/auto/render/rendergeometry/tst_rendergeometry.cpp
@@ -48,13 +48,13 @@ private Q_SLOTS:
     void checkPeerPropertyMirroring()
     {
         // GIVEN
-        Qt3D::Render::RenderGeometry renderGeometry;
+        Qt3DRender::Render::RenderGeometry renderGeometry;
 
-        Qt3D::QGeometry geometry;
-        Qt3D::QAttribute attr1;
-        Qt3D::QAttribute attr2;
-        Qt3D::QAttribute attr4;
-        Qt3D::QAttribute attr3;
+        Qt3DRender::QGeometry geometry;
+        Qt3DRender::QAttribute attr1;
+        Qt3DRender::QAttribute attr2;
+        Qt3DRender::QAttribute attr4;
+        Qt3DRender::QAttribute attr3;
 
         geometry.addAttribute(&attr1);
         geometry.addAttribute(&attr2);
@@ -78,7 +78,7 @@ private Q_SLOTS:
     void checkInitialAndCleanedUpState()
     {
         // GIVEN
-        Qt3D::Render::RenderGeometry renderGeometry;
+        Qt3DRender::Render::RenderGeometry renderGeometry;
 
         // THEN
         QCOMPARE(renderGeometry.isDirty(), false);
@@ -87,11 +87,11 @@ private Q_SLOTS:
         QCOMPARE(renderGeometry.verticesPerPatch(), 0);
 
         // GIVEN
-        Qt3D::QGeometry geometry;
-        Qt3D::QAttribute attr1;
-        Qt3D::QAttribute attr2;
-        Qt3D::QAttribute attr4;
-        Qt3D::QAttribute attr3;
+        Qt3DRender::QGeometry geometry;
+        Qt3DRender::QAttribute attr1;
+        Qt3DRender::QAttribute attr2;
+        Qt3DRender::QAttribute attr4;
+        Qt3DRender::QAttribute attr3;
 
         geometry.addAttribute(&attr1);
         geometry.addAttribute(&attr2);
@@ -112,7 +112,7 @@ private Q_SLOTS:
     void checkPropertyChanges()
     {
         // GIVEN
-        Qt3D::Render::RenderGeometry renderGeometry;
+        Qt3DRender::Render::RenderGeometry renderGeometry;
         Qt3D::QNodeId geometryId = Qt3D::QNodeId::createId();
 
         // WHEN
diff --git a/tests/auto/render/rendergeometryrenderer/tst_rendergeometryrenderer.cpp b/tests/auto/render/rendergeometryrenderer/tst_rendergeometryrenderer.cpp
index 1c018865b..ab0d917c9 100644
--- a/tests/auto/render/rendergeometryrenderer/tst_rendergeometryrenderer.cpp
+++ b/tests/auto/render/rendergeometryrenderer/tst_rendergeometryrenderer.cpp
@@ -40,19 +40,19 @@
 #include <Qt3DRenderer/qgeometryfunctor.h>
 #include <Qt3DCore/qscenepropertychange.h>
 
-class TestFunctor : public Qt3D::QGeometryFunctor
+class TestFunctor : public Qt3DRender::QGeometryFunctor
 {
 public:
     explicit TestFunctor(int size)
         : m_size(size)
     {}
 
-    Qt3D::QGeometry *operator ()() Q_DECL_FINAL
+    Qt3DRender::QGeometry *operator ()() Q_DECL_FINAL
     {
         return Q_NULLPTR;
     }
 
-    bool operator ==(const Qt3D::QGeometryFunctor &other) const
+    bool operator ==(const Qt3DRender::QGeometryFunctor &other) const
     {
         const TestFunctor *otherFunctor = functor_cast<TestFunctor>(&other);
         if (otherFunctor != Q_NULLPTR)
@@ -74,10 +74,10 @@ private Q_SLOTS:
     void checkPeerPropertyMirroring()
     {
         // GIVEN
-        Qt3D::Render::RenderGeometryRenderer renderGeometryRenderer;
-        Qt3D::QGeometryRenderer geometryRenderer;
-        Qt3D::QGeometry geometry;
-        Qt3D::QGeometryFunctorPtr functor(new TestFunctor(1200));
+        Qt3DRender::Render::RenderGeometryRenderer renderGeometryRenderer;
+        Qt3DRender::QGeometryRenderer geometryRenderer;
+        Qt3DRender::QGeometry geometry;
+        Qt3DRender::QGeometryFunctorPtr functor(new TestFunctor(1200));
 
         geometryRenderer.setInstanceCount(1584);
         geometryRenderer.setPrimitiveCount(1609);
@@ -85,7 +85,7 @@ private Q_SLOTS:
         geometryRenderer.setBaseInstance(883);
         geometryRenderer.setRestartIndex(65536);
         geometryRenderer.setPrimitiveRestart(true);
-        geometryRenderer.setPrimitiveType(Qt3D::QGeometryRenderer::Patches);
+        geometryRenderer.setPrimitiveType(Qt3DRender::QGeometryRenderer::Patches);
         geometryRenderer.setGeometry(&geometry);
         geometryRenderer.setGeometryFunctor(functor);
 
@@ -110,7 +110,7 @@ private Q_SLOTS:
     void checkInitialAndCleanedUpState()
     {
         // GIVEN
-        Qt3D::Render::RenderGeometryRenderer renderGeometryRenderer;
+        Qt3DRender::Render::RenderGeometryRenderer renderGeometryRenderer;
 
         // THEN
         QVERIFY(renderGeometryRenderer.peerUuid().isNull());
@@ -122,13 +122,13 @@ private Q_SLOTS:
         QCOMPARE(renderGeometryRenderer.baseInstance(), 0);
         QCOMPARE(renderGeometryRenderer.restartIndex(), -1);
         QCOMPARE(renderGeometryRenderer.primitiveRestart(), false);
-        QCOMPARE(renderGeometryRenderer.primitiveType(), Qt3D::QGeometryRenderer::Triangles);
+        QCOMPARE(renderGeometryRenderer.primitiveType(), Qt3DRender::QGeometryRenderer::Triangles);
         QVERIFY(renderGeometryRenderer.geometryFunctor().isNull());
 
         // GIVEN
-        Qt3D::QGeometryRenderer geometryRenderer;
-        Qt3D::QGeometry geometry;
-        Qt3D::QGeometryFunctorPtr functor(new TestFunctor(1200));
+        Qt3DRender::QGeometryRenderer geometryRenderer;
+        Qt3DRender::QGeometry geometry;
+        Qt3DRender::QGeometryFunctorPtr functor(new TestFunctor(1200));
 
 
         geometryRenderer.setInstanceCount(454);
@@ -137,7 +137,7 @@ private Q_SLOTS:
         geometryRenderer.setBaseInstance(383);
         geometryRenderer.setRestartIndex(555);
         geometryRenderer.setPrimitiveRestart(true);
-        geometryRenderer.setPrimitiveType(Qt3D::QGeometryRenderer::Patches);
+        geometryRenderer.setPrimitiveType(Qt3DRender::QGeometryRenderer::Patches);
         geometryRenderer.setGeometry(&geometry);
         geometryRenderer.setGeometryFunctor(functor);
 
@@ -155,14 +155,14 @@ private Q_SLOTS:
         QCOMPARE(renderGeometryRenderer.baseInstance(), 0);
         QCOMPARE(renderGeometryRenderer.restartIndex(), -1);
         QCOMPARE(renderGeometryRenderer.primitiveRestart(), false);
-        QCOMPARE(renderGeometryRenderer.primitiveType(), Qt3D::QGeometryRenderer::Triangles);
+        QCOMPARE(renderGeometryRenderer.primitiveType(), Qt3DRender::QGeometryRenderer::Triangles);
         QVERIFY(renderGeometryRenderer.geometryFunctor().isNull());
     }
 
     void checkPropertyChanges()
     {
         // GIVEN
-        Qt3D::Render::RenderGeometryRenderer renderGeometryRenderer;
+        Qt3DRender::Render::RenderGeometryRenderer renderGeometryRenderer;
 
         QVERIFY(!renderGeometryRenderer.isDirty());
 
@@ -247,11 +247,11 @@ private Q_SLOTS:
         // WHEN
         updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
         updateChange->setPropertyName("primitiveType");
-        updateChange->setValue(static_cast<int>(Qt3D::QGeometryRenderer::LineLoop));
+        updateChange->setValue(static_cast<int>(Qt3DRender::QGeometryRenderer::LineLoop));
         renderGeometryRenderer.sceneChangeEvent(updateChange);
 
         // THEN
-        QCOMPARE(renderGeometryRenderer.primitiveType(), Qt3D::QGeometryRenderer::LineLoop);
+        QCOMPARE(renderGeometryRenderer.primitiveType(), Qt3DRender::QGeometryRenderer::LineLoop);
         QVERIFY(renderGeometryRenderer.isDirty());
 
         renderGeometryRenderer.unsetDirty();
@@ -260,7 +260,7 @@ private Q_SLOTS:
         // WHEN
         updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
         updateChange->setPropertyName("geometryFunctor");
-        Qt3D::QGeometryFunctorPtr functor(new TestFunctor(1450));
+        Qt3DRender::QGeometryFunctorPtr functor(new TestFunctor(1450));
         updateChange->setValue(QVariant::fromValue(functor));
         renderGeometryRenderer.sceneChangeEvent(updateChange);
 
diff --git a/tests/auto/render/rendermaterial/tst_rendermaterial.cpp b/tests/auto/render/rendermaterial/tst_rendermaterial.cpp
index dcd3edd5e..c4669630a 100644
--- a/tests/auto/render/rendermaterial/tst_rendermaterial.cpp
+++ b/tests/auto/render/rendermaterial/tst_rendermaterial.cpp
@@ -44,7 +44,8 @@
 
 
 using namespace Qt3D;
-using namespace Qt3D::Render;
+using namespace Qt3DRender;
+using namespace Qt3DRender::Render;
 
 class tst_RenderMaterial : public QObject
 {
diff --git a/tests/auto/render/renderqueue/tst_renderqueue.cpp b/tests/auto/render/renderqueue/tst_renderqueue.cpp
index df0c96c2e..2fb01554b 100644
--- a/tests/auto/render/renderqueue/tst_renderqueue.cpp
+++ b/tests/auto/render/renderqueue/tst_renderqueue.cpp
@@ -61,7 +61,7 @@ private Q_SLOTS:
 void tst_RenderQueue::setRenderViewCount()
 {
     // GIVEN
-    Qt3D::Render::RenderQueue renderQueue;
+    Qt3DRender::Render::RenderQueue renderQueue;
 
     // WHEN
     renderQueue.setTargetRenderViewCount(7);
@@ -74,7 +74,7 @@ void tst_RenderQueue::setRenderViewCount()
 void tst_RenderQueue::circleQueues()
 {
     // GIVEN
-    Qt3D::Render::RenderQueue renderQueue;
+    Qt3DRender::Render::RenderQueue renderQueue;
     renderQueue.setTargetRenderViewCount(7);
 
     // WHEN
@@ -88,9 +88,9 @@ void tst_RenderQueue::circleQueues()
         QCOMPARE(renderQueue.currentRenderViewCount(), 0);
 
         // WHEN
-        QList<Qt3D::Render::RenderView *> renderViews;
+        QList<Qt3DRender::Render::RenderView *> renderViews;
         for (int i = 0; i < 7; i++) {
-            renderViews << new Qt3D::Render::RenderView();
+            renderViews << new Qt3DRender::Render::RenderView();
             renderQueue.queueRenderView(renderViews.at(i), i);
         }
 
@@ -102,19 +102,19 @@ void tst_RenderQueue::circleQueues()
 void tst_RenderQueue::checkOrder()
 {
     // GIVEN
-    Qt3D::Render::RenderQueue renderQueue;
+    Qt3DRender::Render::RenderQueue renderQueue;
     renderQueue.setTargetRenderViewCount(7);
-    QVector<Qt3D::Render::RenderView *> renderViews(7);
+    QVector<Qt3DRender::Render::RenderView *> renderViews(7);
 
     // WHEN
     for (int i = 0; i < 7; ++i) {
         int processingOrder = (i % 2 == 0) ? (6 - i) : i;
-        renderViews[processingOrder] = new Qt3D::Render::RenderView();
+        renderViews[processingOrder] = new Qt3DRender::Render::RenderView();
         renderQueue.queueRenderView(renderViews[processingOrder], processingOrder);
     }
 
     // THEN
-    QVector<Qt3D::Render::RenderView *> frame = renderQueue.nextFrameQueue();
+    QVector<Qt3DRender::Render::RenderView *> frame = renderQueue.nextFrameQueue();
     for (int i = 0; i < 7; ++i) {
         QVERIFY(frame[i] == renderViews[i]);
     }
@@ -123,14 +123,14 @@ void tst_RenderQueue::checkOrder()
 void tst_RenderQueue::checkTimeToSubmit()
 {
     // GIVEN
-    Qt3D::Render::RenderQueue renderQueue;
+    Qt3DRender::Render::RenderQueue renderQueue;
     renderQueue.setTargetRenderViewCount(7);
-    QVector<Qt3D::Render::RenderView *> renderViews(7);
+    QVector<Qt3DRender::Render::RenderView *> renderViews(7);
 
     // WHEN
     for (int i = 0; i < 7; i++) {
         int processingOrder = (i % 2 == 0) ? (6 - i) : i;
-        renderViews[processingOrder] = new Qt3D::Render::RenderView();
+        renderViews[processingOrder] = new Qt3DRender::Render::RenderView();
         renderQueue.queueRenderView(renderViews[processingOrder], processingOrder);
 
         // THEN
@@ -148,7 +148,7 @@ public:
     QWaitCondition m_waitTimeToSubmit;
     QWaitCondition m_waitToFillQueue;
     QMutex m_mutex;
-    Qt3D::Render::RenderQueue *m_renderQueues;
+    Qt3DRender::Render::RenderQueue *m_renderQueues;
 
 public Q_SLOTS:
 
@@ -166,7 +166,7 @@ public Q_SLOTS:
                 // THEN
                 QCOMPARE(m_renderQueues->currentRenderViewCount(), j);
                 // WHEN
-                m_renderQueues->queueRenderView(new Qt3D::Render::RenderView(), j);
+                m_renderQueues->queueRenderView(new Qt3DRender::Render::RenderView(), j);
                 // THEN
                 QVERIFY(m_renderQueues->targetRenderViewCount() == 7);
                 QCOMPARE(m_renderQueues->currentRenderViewCount(), j + 1);
@@ -184,7 +184,7 @@ public Q_SLOTS:
 void tst_RenderQueue::concurrentQueueAccess()
 {
     // GIVEN
-    Qt3D::Render::RenderQueue *renderQueue = new Qt3D::Render::RenderQueue;
+    Qt3DRender::Render::RenderQueue *renderQueue = new Qt3DRender::Render::RenderQueue;
 
     SimpleWorker *jobsThread = new SimpleWorker();
     renderQueue->setTargetRenderViewCount(7);
@@ -222,7 +222,7 @@ void tst_RenderQueue::concurrentQueueAccess()
 void tst_RenderQueue::resetQueue()
 {
     // GIVEN
-    Qt3D::Render::RenderQueue renderQueue;
+    Qt3DRender::Render::RenderQueue renderQueue;
 
     for (int j = 0; j < 5; j++) {
         // WHEN
@@ -231,7 +231,7 @@ void tst_RenderQueue::resetQueue()
         QVERIFY(renderQueue.currentRenderViewCount() == 0);
 
         // WHEN
-        QVector<Qt3D::Render::RenderView *> renderViews(5);
+        QVector<Qt3DRender::Render::RenderView *> renderViews(5);
         for (int i = 0; i < 5; ++i) {
             renderQueue.queueRenderView(renderViews.at(i), i);
         }
diff --git a/tests/auto/render/renderrenderpass/tst_renderrenderpass.cpp b/tests/auto/render/renderrenderpass/tst_renderrenderpass.cpp
index bd97abb00..3bc709d3f 100644
--- a/tests/auto/render/renderrenderpass/tst_renderrenderpass.cpp
+++ b/tests/auto/render/renderrenderpass/tst_renderrenderpass.cpp
@@ -67,7 +67,8 @@
 #include <Qt3DRenderer/private/blendstate_p.h>
 
 using namespace Qt3D;
-using namespace Qt3D::Render;
+using namespace Qt3DRender;
+using namespace Qt3DRender::Render;
 
 Q_DECLARE_METATYPE(RenderState*)
 
diff --git a/tests/auto/render/rendershader/tst_rendershader.cpp b/tests/auto/render/rendershader/tst_rendershader.cpp
index 980058285..54f020aa1 100644
--- a/tests/auto/render/rendershader/tst_rendershader.cpp
+++ b/tests/auto/render/rendershader/tst_rendershader.cpp
@@ -49,9 +49,9 @@ private slots:
 };
 
 
-Qt3D::QShaderProgram *createFrontendShader()
+Qt3DRender::QShaderProgram *createFrontendShader()
 {
-    Qt3D::QShaderProgram *shader = new Qt3D::QShaderProgram();
+    Qt3DRender::QShaderProgram *shader = new Qt3DRender::QShaderProgram();
 
     shader->setVertexShaderCode(QByteArrayLiteral(
                                     "#version 150"\
@@ -78,7 +78,7 @@ Qt3D::QShaderProgram *createFrontendShader()
 
 void tst_RenderShader::hasCoherentInitialState()
 {
-    Qt3D::Render::RenderShader *shader = new Qt3D::Render::RenderShader();
+    Qt3DRender::Render::RenderShader *shader = new Qt3DRender::Render::RenderShader();
 
     QCOMPARE(shader->isLoaded(), false);
     QCOMPARE(shader->dna(), 0U);
@@ -92,22 +92,22 @@ void tst_RenderShader::hasCoherentInitialState()
 
 void tst_RenderShader::matchesFrontendPeer()
 {
-    Qt3D::QShaderProgram *frontend = createFrontendShader();
-    Qt3D::Render::RenderShader *backend = new Qt3D::Render::RenderShader();
+    Qt3DRender::QShaderProgram *frontend = createFrontendShader();
+    Qt3DRender::Render::RenderShader *backend = new Qt3DRender::Render::RenderShader();
 
     backend->updateFromPeer(frontend);
     QCOMPARE(backend->isLoaded(), false);
     QVERIFY(backend->dna() != 0U);
 
-    for (int i = Qt3D::QShaderProgram::Vertex; i <= Qt3D::QShaderProgram::Compute; ++i)
+    for (int i = Qt3DRender::QShaderProgram::Vertex; i <= Qt3DRender::QShaderProgram::Compute; ++i)
         QCOMPARE(backend->shaderCode()[i],
-                 frontend->shaderCode( static_cast<const Qt3D::QShaderProgram::ShaderType>(i)));
+                 frontend->shaderCode( static_cast<const Qt3DRender::QShaderProgram::ShaderType>(i)));
 }
 
 void tst_RenderShader::cleanupLeavesACoherentState()
 {
-    Qt3D::QShaderProgram *frontend = createFrontendShader();
-    Qt3D::Render::RenderShader *shader = new Qt3D::Render::RenderShader();
+    Qt3DRender::QShaderProgram *frontend = createFrontendShader();
+    Qt3DRender::Render::RenderShader *shader = new Qt3DRender::Render::RenderShader();
 
     shader->updateFromPeer(frontend);
 
diff --git a/tests/auto/render/renderviews/tst_renderviews.cpp b/tests/auto/render/renderviews/tst_renderviews.cpp
index a07a62f0d..ca4ecf6cc 100644
--- a/tests/auto/render/renderviews/tst_renderviews.cpp
+++ b/tests/auto/render/renderviews/tst_renderviews.cpp
@@ -45,8 +45,8 @@ private Q_SLOTS:
 
     void checkRenderViewSizeFitsWithAllocator()
     {
-        QVERIFY(sizeof(Qt3D::Render::RenderView) <= 128);
-        QVERIFY(sizeof(Qt3D::Render::RenderView::InnerData) <= 128);
+        QVERIFY(sizeof(Qt3DRender::Render::RenderView) <= 128);
+        QVERIFY(sizeof(Qt3DRender::Render::RenderView::InnerData) <= 128);
     }
 
     void testSort()
@@ -58,7 +58,7 @@ private Q_SLOTS:
     {
         // GIVEN
         Qt3D::QFrameAllocator allocator(128, 16, 128);
-        Qt3D::Render::RenderView *rv = allocator.allocate<Qt3D::Render::RenderView>();
+        Qt3DRender::Render::RenderView *rv = allocator.allocate<Qt3DRender::Render::RenderView>();
         rv->setAllocator(&allocator);
 
         // THEN
diff --git a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
index 61348100c..87a8a36de 100644
--- a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
+++ b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
@@ -53,14 +53,14 @@ private Q_SLOTS:
     void topLevelStructValue();
 };
 
-class ScalarShaderData : public Qt3D::QShaderData
+class ScalarShaderData : public Qt3DRender::QShaderData
 {
     Q_OBJECT
     Q_PROPERTY(float scalar READ scalar WRITE setScalar NOTIFY scalarChanged)
 
 public:
     ScalarShaderData()
-        : Qt3D::QShaderData()
+        : Qt3DRender::QShaderData()
         , m_scalar(0.0f)
     {
     }
@@ -78,11 +78,11 @@ public:
         return m_scalar;
     }
 
-    QHash<QString, Qt3D::Render::ShaderUniform> buildUniformMap(const QString &blockName)
+    QHash<QString, Qt3DRender::Render::ShaderUniform> buildUniformMap(const QString &blockName)
     {
-        QHash<QString, Qt3D::Render::ShaderUniform> uniforms;
+        QHash<QString, Qt3DRender::Render::ShaderUniform> uniforms;
 
-        uniforms.insert(blockName + QStringLiteral(".scalar"), Qt3D::Render::ShaderUniform());
+        uniforms.insert(blockName + QStringLiteral(".scalar"), Qt3DRender::Render::ShaderUniform());
 
         return uniforms;
     }
@@ -95,14 +95,14 @@ private:
 };
 
 
-class ArrayShaderData : public Qt3D::QShaderData
+class ArrayShaderData : public Qt3DRender::QShaderData
 {
     Q_OBJECT
     Q_PROPERTY(QVariantList array READ array WRITE setArray NOTIFY arrayChanged)
 
 public:
     ArrayShaderData()
-        : Qt3D::QShaderData()
+        : Qt3DRender::QShaderData()
     {
     }
 
@@ -119,11 +119,11 @@ public:
         return m_array;
     }
 
-    QHash<QString, Qt3D::Render::ShaderUniform> buildUniformMap(const QString &blockName)
+    QHash<QString, Qt3DRender::Render::ShaderUniform> buildUniformMap(const QString &blockName)
     {
-        QHash<QString, Qt3D::Render::ShaderUniform> uniforms;
+        QHash<QString, Qt3DRender::Render::ShaderUniform> uniforms;
 
-        uniforms.insert(blockName + QStringLiteral(".array[0]"), Qt3D::Render::ShaderUniform());
+        uniforms.insert(blockName + QStringLiteral(".array[0]"), Qt3DRender::Render::ShaderUniform());
 
         return uniforms;
     }
@@ -135,7 +135,7 @@ private:
     QVariantList m_array;
 };
 
-class StructShaderData : public Qt3D::QShaderData
+class StructShaderData : public Qt3DRender::QShaderData
 {
     Q_OBJECT
     Q_PROPERTY(float scalar READ scalar WRITE setScalar NOTIFY scalarChanged)
@@ -143,7 +143,7 @@ class StructShaderData : public Qt3D::QShaderData
 
 public:
     StructShaderData()
-        : Qt3D::QShaderData()
+        : Qt3DRender::QShaderData()
         , m_scalar(0.0f)
     {
     }
@@ -174,12 +174,12 @@ public:
         return m_array;
     }
 
-    virtual QHash<QString, Qt3D::Render::ShaderUniform> buildUniformMap(const QString &blockName)
+    virtual QHash<QString, Qt3DRender::Render::ShaderUniform> buildUniformMap(const QString &blockName)
     {
-        QHash<QString, Qt3D::Render::ShaderUniform> uniforms;
+        QHash<QString, Qt3DRender::Render::ShaderUniform> uniforms;
 
-        uniforms.insert(blockName + QStringLiteral(".scalar"), Qt3D::Render::ShaderUniform());
-        uniforms.insert(blockName + QStringLiteral(".array[0]"), Qt3D::Render::ShaderUniform());
+        uniforms.insert(blockName + QStringLiteral(".scalar"), Qt3DRender::Render::ShaderUniform());
+        uniforms.insert(blockName + QStringLiteral(".array[0]"), Qt3DRender::Render::ShaderUniform());
 
         return uniforms;
     }
@@ -206,7 +206,7 @@ private:
 class MultiLevelStructShaderData : public StructShaderData
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QShaderData *inner READ inner WRITE setInner NOTIFY innerChanged)
+    Q_PROPERTY(Qt3DRender::QShaderData *inner READ inner WRITE setInner NOTIFY innerChanged)
 
 public:
     MultiLevelStructShaderData()
@@ -215,7 +215,7 @@ public:
     {
     }
 
-    void setInner(Qt3D::QShaderData *inner)
+    void setInner(Qt3DRender::QShaderData *inner)
     {
         if (inner != m_inner) {
             m_inner = inner;
@@ -223,22 +223,22 @@ public:
         }
     }
 
-    Qt3D::QShaderData *inner() const
+    Qt3DRender::QShaderData *inner() const
     {
         return m_inner;
     }
 
-    QHash<QString, Qt3D::Render::ShaderUniform> buildUniformMap(const QString &blockName) Q_DECL_OVERRIDE
+    QHash<QString, Qt3DRender::Render::ShaderUniform> buildUniformMap(const QString &blockName) Q_DECL_OVERRIDE
     {
-        QHash<QString, Qt3D::Render::ShaderUniform> innerUniforms;
+        QHash<QString, Qt3DRender::Render::ShaderUniform> innerUniforms;
 
         StructShaderData *innerData = Q_NULLPTR;
         if ((innerData = qobject_cast<StructShaderData *>(m_inner)) != Q_NULLPTR)
             innerUniforms = innerData->buildUniformMap(QStringLiteral(".inner"));
 
-        QHash<QString, Qt3D::Render::ShaderUniform> uniforms = StructShaderData::buildUniformMap(blockName);
-        QHash<QString, Qt3D::Render::ShaderUniform>::const_iterator it = innerUniforms.begin();
-        const QHash<QString, Qt3D::Render::ShaderUniform>::const_iterator end = innerUniforms.end();
+        QHash<QString, Qt3DRender::Render::ShaderUniform> uniforms = StructShaderData::buildUniformMap(blockName);
+        QHash<QString, Qt3DRender::Render::ShaderUniform>::const_iterator it = innerUniforms.begin();
+        const QHash<QString, Qt3DRender::Render::ShaderUniform>::const_iterator end = innerUniforms.end();
 
         while (it != end) {
             uniforms.insert(blockName + it.key(), it.value());
@@ -271,23 +271,23 @@ Q_SIGNALS:
     void innerChanged();
 
 private:
-    Qt3D::QShaderData *m_inner;
+    Qt3DRender::QShaderData *m_inner;
 };
 
 namespace {
 
-void initBackendShaderData(Qt3D::QShaderData *frontend,
-                           Qt3D::Render::ShaderDataManager *manager)
+void initBackendShaderData(Qt3DRender::QShaderData *frontend,
+                           Qt3DRender::Render::ShaderDataManager *manager)
 {
     // Create children first
     Q_FOREACH (QObject *c, frontend->children()) {
-        Qt3D::QShaderData *cShaderData = qobject_cast<Qt3D::QShaderData *>(c);
+        Qt3DRender::QShaderData *cShaderData = qobject_cast<Qt3DRender::QShaderData *>(c);
         if (cShaderData)
             initBackendShaderData(cShaderData, manager);
     }
 
     // Create backend element for frontend one
-    Qt3D::Render::RenderShaderData *backend = manager->getOrCreateResource(frontend->id());
+    Qt3DRender::Render::RenderShaderData *backend = manager->getOrCreateResource(frontend->id());
     // Init the backend element
     backend->updateFromPeer(frontend);
 }
@@ -298,15 +298,15 @@ void initBackendShaderData(Qt3D::QShaderData *frontend,
 void tst_RenderViewUtils::topLevelScalarValueNoUniforms()
 {
     QScopedPointer<ScalarShaderData> shaderData(new ScalarShaderData());
-    QScopedPointer<Qt3D::Render::ShaderDataManager> manager(new Qt3D::Render::ShaderDataManager());
+    QScopedPointer<Qt3DRender::Render::ShaderDataManager> manager(new Qt3DRender::Render::ShaderDataManager());
 
     shaderData->setScalar(883.0f);
     initBackendShaderData(shaderData.data(), manager.data());
 
-    Qt3D::Render::RenderShaderData *backendShaderData = manager->lookupResource(shaderData->id());
+    Qt3DRender::Render::RenderShaderData *backendShaderData = manager->lookupResource(shaderData->id());
     QVERIFY(backendShaderData != Q_NULLPTR);
 
-    Qt3D::Render::UniformBlockValueBuilder blockBuilder;
+    Qt3DRender::Render::UniformBlockValueBuilder blockBuilder;
     blockBuilder.shaderDataManager = manager.data();
     blockBuilder.updatedPropertiesOnly = false;
     // build name-value map
@@ -318,15 +318,15 @@ void tst_RenderViewUtils::topLevelScalarValueNoUniforms()
 void tst_RenderViewUtils::topLevelScalarValue()
 {
     QScopedPointer<ScalarShaderData> shaderData(new ScalarShaderData());
-    QScopedPointer<Qt3D::Render::ShaderDataManager> manager(new Qt3D::Render::ShaderDataManager());
+    QScopedPointer<Qt3DRender::Render::ShaderDataManager> manager(new Qt3DRender::Render::ShaderDataManager());
 
     shaderData->setScalar(883.0f);
     initBackendShaderData(shaderData.data(), manager.data());
 
-    Qt3D::Render::RenderShaderData *backendShaderData = manager->lookupResource(shaderData->id());
+    Qt3DRender::Render::RenderShaderData *backendShaderData = manager->lookupResource(shaderData->id());
     QVERIFY(backendShaderData != Q_NULLPTR);
 
-    Qt3D::Render::UniformBlockValueBuilder blockBuilder;
+    Qt3DRender::Render::UniformBlockValueBuilder blockBuilder;
     blockBuilder.shaderDataManager = manager.data();
     blockBuilder.updatedPropertiesOnly = false;
     blockBuilder.uniforms = shaderData->buildUniformMap(QStringLiteral("MyBlock"));
@@ -349,16 +349,16 @@ void tst_RenderViewUtils::topLevelScalarValue()
 void tst_RenderViewUtils::topLevelArrayValue()
 {
     QScopedPointer<ArrayShaderData> shaderData(new ArrayShaderData());
-    QScopedPointer<Qt3D::Render::ShaderDataManager> manager(new Qt3D::Render::ShaderDataManager());
+    QScopedPointer<Qt3DRender::Render::ShaderDataManager> manager(new Qt3DRender::Render::ShaderDataManager());
 
     QVariantList arrayValues = QVariantList() << 454 << 350 << 383 << 427 << 552;
     shaderData->setArray(arrayValues);
     initBackendShaderData(shaderData.data(), manager.data());
 
-    Qt3D::Render::RenderShaderData *backendShaderData = manager->lookupResource(shaderData->id());
+    Qt3DRender::Render::RenderShaderData *backendShaderData = manager->lookupResource(shaderData->id());
     QVERIFY(backendShaderData != Q_NULLPTR);
 
-    Qt3D::Render::UniformBlockValueBuilder blockBuilder;
+    Qt3DRender::Render::UniformBlockValueBuilder blockBuilder;
     blockBuilder.shaderDataManager = manager.data();
     blockBuilder.updatedPropertiesOnly = false;
     blockBuilder.uniforms = shaderData->buildUniformMap(QStringLiteral("MyBlock"));
@@ -414,14 +414,14 @@ void tst_RenderViewUtils::topLevelStructValue()
 {
     QFETCH(StructShaderData *, shaderData);
     QFETCH(QString, blockName);
-    QScopedPointer<Qt3D::Render::ShaderDataManager> manager(new Qt3D::Render::ShaderDataManager());
+    QScopedPointer<Qt3DRender::Render::ShaderDataManager> manager(new Qt3DRender::Render::ShaderDataManager());
 
     initBackendShaderData(shaderData, manager.data());
 
-    Qt3D::Render::RenderShaderData *backendShaderData = manager->lookupResource(shaderData->id());
+    Qt3DRender::Render::RenderShaderData *backendShaderData = manager->lookupResource(shaderData->id());
     QVERIFY(backendShaderData != Q_NULLPTR);
 
-    Qt3D::Render::UniformBlockValueBuilder blockBuilder;
+    Qt3DRender::Render::UniformBlockValueBuilder blockBuilder;
     blockBuilder.shaderDataManager = manager.data();
     blockBuilder.updatedPropertiesOnly = false;
     blockBuilder.uniforms = shaderData->buildUniformMap(blockName);
diff --git a/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp b/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp
index be19a3ada..48bfef9f3 100644
--- a/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp
+++ b/tests/auto/render/vsyncframeadvanceservice/tst_vsyncframeadvanceservice.cpp
@@ -41,7 +41,7 @@
 class FakeRenderThread Q_DECL_FINAL : public QThread
 {
 public:
-    FakeRenderThread(Qt3D::Render::VSyncFrameAdvanceService *tickService)
+    FakeRenderThread(Qt3DRender::Render::VSyncFrameAdvanceService *tickService)
         : m_tickService(tickService)
     {
     }
@@ -55,7 +55,7 @@ protected:
     }
 
 private:
-    Qt3D::Render::VSyncFrameAdvanceService *m_tickService;
+    Qt3DRender::Render::VSyncFrameAdvanceService *m_tickService;
 };
 
 class tst_VSyncFrameAdvanceService : public QObject
@@ -67,7 +67,7 @@ private Q_SLOTS:
     void checkSynchronisation()
     {
         // GIVEN
-        Qt3D::Render::VSyncFrameAdvanceService tickService;
+        Qt3DRender::Render::VSyncFrameAdvanceService tickService;
         FakeRenderThread renderThread(&tickService);
         QElapsedTimer t;