Move Qt3DCore into Qt3DCore namespace

Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
author: Sean Harmer <sean.harmer@kdab.com> 2015-10-12 20:45:19 +0100
committer: Paul Lemire <paul.lemire@kdab.com> 2015-10-13 13:19:50 +0000
commit: 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch)
tree: 53197a9e5eb7501d6f5b497f70c25dad9c265a6f
parent: 0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (diff)
627 files changed, 3237 insertions, 3269 deletions
diff --git a/examples/qt3d/anaglyph-rendering/main.cpp b/examples/qt3d/anaglyph-rendering/main.cpp
index 6a7db95e6..e0907e307 100644
--- a/examples/qt3d/anaglyph-rendering/main.cpp
+++ b/examples/qt3d/anaglyph-rendering/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/assimp-cpp/main.cpp b/examples/qt3d/assimp-cpp/main.cpp
index a9da29f62..b23b22958 100644
--- a/examples/qt3d/assimp-cpp/main.cpp
+++ b/examples/qt3d/assimp-cpp/main.cpp
@@ -55,7 +55,7 @@ public:
     void onStatusChanged();
 
 private:
-    void walkEntity(Qt3D::QEntity *e, int depth = 0);
+    void walkEntity(Qt3DCore::QEntity *e, int depth = 0);
 
     Qt3DRender::QSceneLoader *m_loader;
 };
@@ -68,29 +68,29 @@ void SceneWalker::onStatusChanged()
 
     // The QSceneLoader instance is a component of an entity. The loaded scene
     // tree is added under this entity.
-    QVector<Qt3D::QEntity *> entities = m_loader->entities();
+    QVector<Qt3DCore::QEntity *> entities = m_loader->entities();
 
     // Technically there could be multiple entities referencing the scene loader
     // but sharing is discouraged, and in our case there will be one anyhow.
     if (entities.isEmpty())
         return;
-    Qt3D::QEntity *root = entities[0];
+    Qt3DCore::QEntity *root = entities[0];
     // Print the tree.
     walkEntity(root);
 
     // To access a given node (like a named mesh in the scene), use QObject::findChild().
     // The scene structure and names always depend on the asset.
-    Qt3D::QEntity *e = root->findChild<Qt3D::QEntity *>(QStringLiteral("PlanePropeller_mesh")); // toyplane.obj
+    Qt3DCore::QEntity *e = root->findChild<Qt3DCore::QEntity *>(QStringLiteral("PlanePropeller_mesh")); // toyplane.obj
     if (e)
         qDebug() << "Found propeller node" << e << "with components" << e->components();
 }
 
-void SceneWalker::walkEntity(Qt3D::QEntity *e, int depth)
+void SceneWalker::walkEntity(Qt3DCore::QEntity *e, int depth)
 {
-    Qt3D::QNodeList nodes = e->childrenNodes();
+    Qt3DCore::QNodeList nodes = e->childrenNodes();
     for (int i = 0; i < nodes.count(); ++i) {
-        Qt3D::QNode *node = nodes[i];
-        Qt3D::QEntity *entity = qobject_cast<Qt3D::QEntity *>(node);
+        Qt3DCore::QNode *node = nodes[i];
+        Qt3DCore::QEntity *entity = qobject_cast<Qt3DCore::QEntity *>(node);
         if (entity) {
             QString indent;
             indent.fill(' ', depth * 2);
@@ -106,7 +106,7 @@ int main(int ac, char **av)
 
     Window view;
 
-    Qt3D::QAspectEngine engine;
+    Qt3DCore::QAspectEngine engine;
     Qt3DInput::QInputAspect *inputAspect = new Qt3DInput::QInputAspect();
     engine.registerAspect(new Qt3DRender::QRenderAspect());
     engine.registerAspect(inputAspect);
@@ -117,11 +117,11 @@ int main(int ac, char **av)
     engine.setData(data);
 
     // Root entity
-    Qt3D::QEntity *sceneRoot = new Qt3D::QEntity();
+    Qt3DCore::QEntity *sceneRoot = new Qt3DCore::QEntity();
 
     // Scene Camera
-    Qt3D::QCamera *basicCamera = new Qt3D::QCamera(sceneRoot);
-    basicCamera->setProjectionType(Qt3D::QCameraLens::PerspectiveProjection);
+    Qt3DCore::QCamera *basicCamera = new Qt3DCore::QCamera(sceneRoot);
+    basicCamera->setProjectionType(Qt3DCore::QCameraLens::PerspectiveProjection);
     basicCamera->setAspectRatio(view.width() / view.height());
     basicCamera->setUpVector(QVector3D(0.0f, 1.0f, 0.0f));
     basicCamera->setViewCenter(QVector3D(0.0f, 3.5f, 0.0f));
@@ -140,7 +140,7 @@ int main(int ac, char **av)
     sceneRoot->addComponent(frameGraphComponent);
 
     // Scene loader
-    Qt3D::QEntity *sceneLoaderEntity = new Qt3D::QEntity(sceneRoot);
+    Qt3DCore::QEntity *sceneLoaderEntity = new Qt3DCore::QEntity(sceneRoot);
     Qt3DRender::QSceneLoader *sceneLoader = new Qt3DRender::QSceneLoader(sceneLoaderEntity);
     SceneWalker sceneWalker(sceneLoader);
     QObject::connect(sceneLoader, &Qt3DRender::QSceneLoader::statusChanged, &sceneWalker, &SceneWalker::onStatusChanged);
diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp
index 729250c13..e8389bf33 100644
--- a/examples/qt3d/assimp/main.cpp
+++ b/examples/qt3d/assimp/main.cpp
@@ -57,17 +57,17 @@ QObject *SceneHelper::findEntity(Qt3DRender::QSceneLoader *loader, const QString
 {
     // The QSceneLoader instance is a component of an entity. The loaded scene
     // tree is added under this entity.
-    QVector<Qt3D::QEntity *> entities = loader->entities();
+    QVector<Qt3DCore::QEntity *> entities = loader->entities();
 
     if (entities.isEmpty())
         return 0;
 
     // Technically there could be multiple entities referencing the scene loader
     // but sharing is discouraged, and in our case there will be one anyhow.
-    Qt3D::QEntity *root = entities[0];
+    Qt3DCore::QEntity *root = entities[0];
 
     // The scene structure and names always depend on the asset.
-    return root->findChild<Qt3D::QEntity *>(name);
+    return root->findChild<Qt3DCore::QEntity *>(name);
 }
 
 void SceneHelper::addListEntry(const QVariant &list, QObject *entry)
@@ -81,7 +81,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp
index 19da31f00..9bddbd314 100644
--- a/examples/qt3d/basicshapes-cpp/main.cpp
+++ b/examples/qt3d/basicshapes-cpp/main.cpp
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
 
     widget->setWindowTitle(QStringLiteral("Basic shapes"));
 
-    Qt3D::QAspectEngine engine;
+    Qt3DCore::QAspectEngine engine;
     engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
@@ -100,10 +100,10 @@ int main(int argc, char **argv)
     engine.setData(data);
 
     // Root entity
-    Qt3D::QEntity *rootEntity = new Qt3D::QEntity();
+    Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();
 
     // Camera
-    Qt3D::QCamera *cameraEntity = new Qt3D::QCamera(rootEntity);
+    Qt3DCore::QCamera *cameraEntity = new Qt3DCore::QCamera(rootEntity);
     cameraEntity->setObjectName(QStringLiteral("cameraEntity"));
 
     cameraEntity->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f);
diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
index 97d8ad4be..d67e70902 100644
--- a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
+++ b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
@@ -38,7 +38,7 @@
 
 #include <QtCore/QDebug>
 
-SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
+SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity)
     : m_rootEntity(rootEntity)
 {
 
@@ -53,10 +53,10 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
 
     // TorusMesh Transform
     //! [1]
-    Qt3D::QScaleTransform *torusScale = new Qt3D::QScaleTransform();
-    Qt3D::QTranslateTransform *torusTranslation = new Qt3D::QTranslateTransform();
-    Qt3D::QRotateTransform *torusRotation = new Qt3D::QRotateTransform();
-    Qt3D::QTransform *torusTransforms = new Qt3D::QTransform();
+    Qt3DCore::QScaleTransform *torusScale = new Qt3DCore::QScaleTransform();
+    Qt3DCore::QTranslateTransform *torusTranslation = new Qt3DCore::QTranslateTransform();
+    Qt3DCore::QRotateTransform *torusRotation = new Qt3DCore::QRotateTransform();
+    Qt3DCore::QTransform *torusTransforms = new Qt3DCore::QTransform();
 
     torusScale->setScale3D(QVector3D(2.0f, 2.0f, 2.0f));
     torusTranslation->setTranslation(QVector3D(1.7f, 1.7f, 0.0f));
@@ -75,7 +75,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
 
     // Torus
     //! [3]
-    m_torusEntity = new Qt3D::QEntity(m_rootEntity);
+    m_torusEntity = new Qt3DCore::QEntity(m_rootEntity);
     m_torusEntity->addComponent(m_torus);
     m_torusEntity->addComponent(torusMaterial);
     m_torusEntity->addComponent(torusTransforms);
@@ -89,10 +89,10 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     cylinder->setSlices(20);
 
     // CylinderMesh Transform
-    Qt3D::QScaleTransform *cylinderScale = new Qt3D::QScaleTransform();
-    Qt3D::QRotateTransform *cylinderRotation = new Qt3D::QRotateTransform();
-    Qt3D::QTranslateTransform *cylinderTranslation = new Qt3D::QTranslateTransform();
-    Qt3D::QTransform *cylinderTransforms = new Qt3D::QTransform();
+    Qt3DCore::QScaleTransform *cylinderScale = new Qt3DCore::QScaleTransform();
+    Qt3DCore::QRotateTransform *cylinderRotation = new Qt3DCore::QRotateTransform();
+    Qt3DCore::QTranslateTransform *cylinderTranslation = new Qt3DCore::QTranslateTransform();
+    Qt3DCore::QTransform *cylinderTransforms = new Qt3DCore::QTransform();
 
     cylinderScale->setScale3D(QVector3D(1.5f, 1.5f, 1.5f));
     cylinderTranslation->setTranslation(QVector3D(-2.6f, 2.4f, -1.5));
@@ -107,7 +107,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     cylinderMaterial->setDiffuse(QColor(QRgb(0x928327)));
 
     // Cylinder
-    m_cylinderEntity = new Qt3D::QEntity(m_rootEntity);
+    m_cylinderEntity = new Qt3DCore::QEntity(m_rootEntity);
     m_cylinderEntity->addComponent(cylinder);
     m_cylinderEntity->addComponent(cylinderMaterial);
     m_cylinderEntity->addComponent(cylinderTransforms);
@@ -116,9 +116,9 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     Qt3DRender::QCuboidMesh *cuboid = new Qt3DRender::QCuboidMesh();
 
     // CuboidMesh Transform
-    Qt3D::QScaleTransform *cuboidScale = new Qt3D::QScaleTransform();
-    Qt3D::QTranslateTransform *cuboidTranslation = new Qt3D::QTranslateTransform();
-    Qt3D::QTransform *cuboidTransforms = new Qt3D::QTransform();
+    Qt3DCore::QScaleTransform *cuboidScale = new Qt3DCore::QScaleTransform();
+    Qt3DCore::QTranslateTransform *cuboidTranslation = new Qt3DCore::QTranslateTransform();
+    Qt3DCore::QTransform *cuboidTransforms = new Qt3DCore::QTransform();
 
     cuboidScale->setScale3D(QVector3D(4.0f, 4.0f, 4.0f));
     cuboidTranslation->setTranslation(QVector3D(0.9f, -0.9f, 0.0f));
@@ -130,7 +130,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     cuboidMaterial->setDiffuse(QColor(QRgb(0x665423)));
 
     //Cuboid
-    m_cuboidEntity = new Qt3D::QEntity(m_rootEntity);
+    m_cuboidEntity = new Qt3DCore::QEntity(m_rootEntity);
     m_cuboidEntity->addComponent(cuboid);
     m_cuboidEntity->addComponent(cuboidMaterial);
     m_cuboidEntity->addComponent(cuboidTransforms);
@@ -142,9 +142,9 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     sphereMesh->setRadius(2);
 
     // Sphere mesh transform
-    Qt3D::QScaleTransform *sphereScale = new Qt3D::QScaleTransform();
-    Qt3D::QTranslateTransform *sphereTranslation = new Qt3D::QTranslateTransform();
-    Qt3D::QTransform *sphereTransforms = new Qt3D::QTransform();
+    Qt3DCore::QScaleTransform *sphereScale = new Qt3DCore::QScaleTransform();
+    Qt3DCore::QTranslateTransform *sphereTranslation = new Qt3DCore::QTranslateTransform();
+    Qt3DCore::QTransform *sphereTransforms = new Qt3DCore::QTransform();
 
     sphereScale->setScale3D(QVector3D(1.3f, 1.3f, 1.3f));
     sphereTranslation->setTranslation(QVector3D(-2.9f, -2.9f, 0.0f));
@@ -156,7 +156,7 @@ SceneModifier::SceneModifier(Qt3D::QEntity *rootEntity)
     sphereMaterial->setDiffuse(QColor(QRgb(0xa69929)));
 
     // Sphere
-    m_sphereEntity = new Qt3D::QEntity(m_rootEntity);
+    m_sphereEntity = new Qt3DCore::QEntity(m_rootEntity);
     m_sphereEntity->addComponent(sphereMesh);
     m_sphereEntity->addComponent(sphereMaterial);
     m_sphereEntity->addComponent(sphereTransforms);
diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.h b/examples/qt3d/basicshapes-cpp/scenemodifier.h
index c85e3e4fb..f108298ac 100644
--- a/examples/qt3d/basicshapes-cpp/scenemodifier.h
+++ b/examples/qt3d/basicshapes-cpp/scenemodifier.h
@@ -56,7 +56,7 @@ class SceneModifier : public QObject
     Q_OBJECT
 
 public:
-    explicit SceneModifier(Qt3D::QEntity *rootEntity);
+    explicit SceneModifier(Qt3DCore::QEntity *rootEntity);
     ~SceneModifier();
 
 public slots:
@@ -66,12 +66,12 @@ public slots:
     void enableSphere(bool enabled);
 
 private:
-    Qt3D::QEntity *m_rootEntity;
+    Qt3DCore::QEntity *m_rootEntity;
     Qt3DRender::QTorusMesh *m_torus;
-    Qt3D::QEntity *m_cylinderEntity;
-    Qt3D::QEntity *m_torusEntity;
-    Qt3D::QEntity *m_cuboidEntity;
-    Qt3D::QEntity *m_sphereEntity;
+    Qt3DCore::QEntity *m_cylinderEntity;
+    Qt3DCore::QEntity *m_torusEntity;
+    Qt3DCore::QEntity *m_cuboidEntity;
+    Qt3DCore::QEntity *m_sphereEntity;
 };
 
 #endif // SCENEMODIFIER_H
diff --git a/examples/qt3d/bigmodel-qml/main.cpp b/examples/qt3d/bigmodel-qml/main.cpp
index ed45906d6..9c1dd91a4 100644
--- a/examples/qt3d/bigmodel-qml/main.cpp
+++ b/examples/qt3d/bigmodel-qml/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/bigscene-cpp/main.cpp b/examples/qt3d/bigscene-cpp/main.cpp
index 3b6bc28dc..ceedf91a7 100644
--- a/examples/qt3d/bigscene-cpp/main.cpp
+++ b/examples/qt3d/bigscene-cpp/main.cpp
@@ -57,7 +57,7 @@
 #include <Qt3DRenderer/QForwardRenderer>
 #include <qmath.h>
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 using namespace Qt3DRender;
 
 int main(int ac, char **av)
@@ -65,7 +65,7 @@ int main(int ac, char **av)
     QGuiApplication app(ac, av);
 
     Window view;
-    Qt3D::QAspectEngine engine;
+    Qt3DCore::QAspectEngine engine;
     engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
@@ -100,7 +100,7 @@ int main(int ac, char **av)
     // Scene
     for (int i = 0; i < max; i++) {
         QEntity *e = new QEntity();
-        Qt3D::QTransform *transform = new Qt3D::QTransform();
+        Qt3DCore::QTransform *transform = new Qt3DCore::QTransform();
         QTranslateTransform *translation = new QTranslateTransform();
         QRotateTransform *rotateX = new QRotateTransform();
         QRotateTransform *rotateZ = new QRotateTransform();
diff --git a/examples/qt3d/bigscene-instanced-qml/main.cpp b/examples/qt3d/bigscene-instanced-qml/main.cpp
index 79f5bfdb4..44a5d672b 100644
--- a/examples/qt3d/bigscene-instanced-qml/main.cpp
+++ b/examples/qt3d/bigscene-instanced-qml/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/clip-planes-qml/main.cpp b/examples/qt3d/clip-planes-qml/main.cpp
index 63c21475e..ac3da63cc 100644
--- a/examples/qt3d/clip-planes-qml/main.cpp
+++ b/examples/qt3d/clip-planes-qml/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     engine.aspectEngine()->initialize();
diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp
index cb2127b14..7d2bbeb78 100644
--- a/examples/qt3d/cpp_example/main.cpp
+++ b/examples/qt3d/cpp_example/main.cpp
@@ -72,7 +72,7 @@ int main(int ac, char **av)
     QGuiApplication app(ac, av);
 
     Window view;
-    Qt3D::QAspectEngine engine;
+    Qt3DCore::QAspectEngine engine;
     engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
@@ -83,10 +83,10 @@ int main(int ac, char **av)
     engine.setData(data);
 
     // Root entity
-    Qt3D::QEntity *rootEntity = new Qt3D::QEntity();
+    Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();
     rootEntity->setObjectName(QStringLiteral("rootEntity"));
     // Torus
-    Qt3D::QEntity *torusEntity = new Qt3D::QEntity(rootEntity);
+    Qt3DCore::QEntity *torusEntity = new Qt3DCore::QEntity(rootEntity);
 
     // Torus shape data
     Qt3DRender::QTorusMesh *torus = new Qt3DRender::QTorusMesh();
@@ -96,9 +96,9 @@ int main(int ac, char **av)
     torusEntity->addComponent(torus);
 
     // TorusMesh Transform
-    Qt3D::QTranslateTransform *torusTranslation = new Qt3D::QTranslateTransform();
-    Qt3D::QRotateTransform *torusRotation = new Qt3D::QRotateTransform();
-    Qt3D::QTransform *torusTransforms = new Qt3D::QTransform();
+    Qt3DCore::QTranslateTransform *torusTranslation = new Qt3DCore::QTranslateTransform();
+    Qt3DCore::QRotateTransform *torusRotation = new Qt3DCore::QRotateTransform();
+    Qt3DCore::QTransform *torusTransforms = new Qt3DCore::QTransform();
 
     torusTranslation->setTranslation(QVector3D(-5.0f, 3.5f, 2.0f));
     torusRotation->setAxis(QVector3D(1, 0, 0));
@@ -108,11 +108,11 @@ int main(int ac, char **av)
     torusEntity->addComponent(torusTransforms);
 
     // Scene file
-    Qt3D::QEntity *sceneEntity = new Qt3D::QEntity(rootEntity);
+    Qt3DCore::QEntity *sceneEntity = new Qt3DCore::QEntity(rootEntity);
     Qt3DRender::QSceneLoader  *scene = new Qt3DRender::QSceneLoader();
     scene->setObjectName(QStringLiteral("scene"));
-    Qt3D::QTransform *sceneTransform = new Qt3D::QTransform();
-    Qt3D::QTranslateTransform *sceneTranslateTransform = new Qt3D::QTranslateTransform();
+    Qt3DCore::QTransform *sceneTransform = new Qt3DCore::QTransform();
+    Qt3DCore::QTranslateTransform *sceneTranslateTransform = new Qt3DCore::QTranslateTransform();
     sceneTranslateTransform->setDx(2.5);
     sceneTranslateTransform->setDy(0.5);
     sceneTranslateTransform->setDz(-10);
@@ -123,7 +123,7 @@ int main(int ac, char **av)
     sceneEntity->addComponent(scene);
 
     // Camera
-    Qt3D::QCamera *cameraEntity = new Qt3D::QCamera(rootEntity);
+    Qt3DCore::QCamera *cameraEntity = new Qt3DCore::QCamera(rootEntity);
     cameraEntity->setObjectName(QStringLiteral("cameraEntity"));
 
     cameraEntity->lens()->setPerspectiveProjection(60.0f, 16.0f/9.0f, 0.1f, 1000.0f);
diff --git a/examples/qt3d/custom-mesh-cpp/main.cpp b/examples/qt3d/custom-mesh-cpp/main.cpp
index 6b6bd5c1b..665446669 100644
--- a/examples/qt3d/custom-mesh-cpp/main.cpp
+++ b/examples/qt3d/custom-mesh-cpp/main.cpp
@@ -67,7 +67,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
     Window view;
 
-    Qt3D::QAspectEngine engine;
+    Qt3DCore::QAspectEngine engine;
     engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
@@ -78,10 +78,10 @@ int main(int argc, char* argv[])
     engine.setData(data);
 
     // Root entity
-    Qt3D::QEntity *rootEntity = new Qt3D::QEntity();
+    Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();
 
     // Camera
-    Qt3D::QCamera *cameraEntity = new Qt3D::QCamera(rootEntity);
+    Qt3DCore::QCamera *cameraEntity = new Qt3DCore::QCamera(rootEntity);
 
     cameraEntity->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f);
     cameraEntity->setPosition(QVector3D(0, 0, -40.0f));
@@ -100,11 +100,11 @@ int main(int argc, char* argv[])
     Qt3DRender::QMaterial *material = new Qt3DRender::QPerVertexColorMaterial(rootEntity);
 
     // Torus
-    Qt3D::QEntity *customMeshEntity = new Qt3D::QEntity(rootEntity);
+    Qt3DCore::QEntity *customMeshEntity = new Qt3DCore::QEntity(rootEntity);
 
     // Transform
-    Qt3D::QTransform *transform = new Qt3D::QTransform;
-    Qt3D::QScaleTransform *scaleTransform = new Qt3D::QScaleTransform;
+    Qt3DCore::QTransform *transform = new Qt3DCore::QTransform;
+    Qt3DCore::QScaleTransform *scaleTransform = new Qt3DCore::QScaleTransform;
     scaleTransform->setScale(8.0f);
     transform->addTransform(scaleTransform);
 
diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp
index 35b0be402..028834779 100644
--- a/examples/qt3d/cylinder-cpp/main.cpp
+++ b/examples/qt3d/cylinder-cpp/main.cpp
@@ -66,7 +66,7 @@ int main(int argc, char **argv)
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::QAspectEngine engine;
+    Qt3DCore::QAspectEngine engine;
     engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
@@ -77,10 +77,10 @@ int main(int argc, char **argv)
     engine.setData(data);
 
     // Root entity
-    Qt3D::QEntity *rootEntity = new Qt3D::QEntity();
+    Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();
 
     // Camera
-    Qt3D::QCamera *cameraEntity = new Qt3D::QCamera(rootEntity);
+    Qt3DCore::QCamera *cameraEntity = new Qt3DCore::QCamera(rootEntity);
     cameraEntity->setObjectName(QStringLiteral("cameraEntity"));
 
     cameraEntity->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f);
@@ -108,9 +108,9 @@ int main(int argc, char **argv)
     cylinder->setSlices(20);
 
     // CylinderMesh Transform
-    Qt3D::QScaleTransform *cylinderScale = new Qt3D::QScaleTransform();
-    Qt3D::QRotateTransform *cylinderRotation = new Qt3D::QRotateTransform();
-    Qt3D::QTransform *cylinderTransforms = new Qt3D::QTransform();
+    Qt3DCore::QScaleTransform *cylinderScale = new Qt3DCore::QScaleTransform();
+    Qt3DCore::QRotateTransform *cylinderRotation = new Qt3DCore::QRotateTransform();
+    Qt3DCore::QTransform *cylinderTransforms = new Qt3DCore::QTransform();
 
     cylinderScale->setScale3D(QVector3D(1.5f, 1.5f, 1.5f));
     cylinderRotation->setAngleDeg(45.0f);
@@ -120,7 +120,7 @@ int main(int argc, char **argv)
     cylinderTransforms->addTransform(cylinderRotation);
 
     // Cylinder
-    Qt3D::QEntity *cylinderEntity = new Qt3D::QEntity(rootEntity);
+    Qt3DCore::QEntity *cylinderEntity = new Qt3DCore::QEntity(rootEntity);
     cylinderEntity->addComponent(cylinder);
     cylinderEntity->addComponent(cylinderTransforms);
 
diff --git a/examples/qt3d/cylinder-qml/main.cpp b/examples/qt3d/cylinder-qml/main.cpp
index d484de44e..d28d9c68b 100644
--- a/examples/qt3d/cylinder-qml/main.cpp
+++ b/examples/qt3d/cylinder-qml/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
index 29330968b..f22966f48 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
@@ -37,7 +37,7 @@
 #include "deferredrenderer.h"
 
 
-DeferredRenderer::DeferredRenderer(Qt3D::QNode *parent)
+DeferredRenderer::DeferredRenderer(Qt3DCore::QNode *parent)
     : Qt3DRender::QViewport(parent)
     , m_sceneFilter(new Qt3DRender::QLayerFilter(this))
     , m_screenQuadFilter(new Qt3DRender::QLayerFilter(this))
@@ -52,7 +52,7 @@ DeferredRenderer::DeferredRenderer(Qt3D::QNode *parent)
     m_clearScreenQuad->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer);
 }
 
-void DeferredRenderer::setSceneCamera(Qt3D::QEntity *camera)
+void DeferredRenderer::setSceneCamera(Qt3DCore::QEntity *camera)
 {
     m_sceneCameraSelector->setCamera(camera);
 }
diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
index 201614173..0f75d669d 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
@@ -48,9 +48,9 @@
 class DeferredRenderer : public Qt3DRender::QViewport
 {
 public:
-    explicit DeferredRenderer(Qt3D::QNode *parent = 0);
+    explicit DeferredRenderer(Qt3DCore::QNode *parent = 0);
 
-    void setSceneCamera(Qt3D::QEntity *camera);
+    void setSceneCamera(Qt3DCore::QEntity *camera);
     void setGBuffer(Qt3DRender::QRenderTarget *gBuffer);
     void setGeometryPassCriteria(QList<Qt3DRender::QAnnotation *> criteria);
     void setFinalPassCriteria(QList<Qt3DRender::QAnnotation *> criteria);
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
index d12cc1450..9be53d6a1 100644
--- a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
@@ -40,7 +40,7 @@
 #include <Qt3DRenderer/QShaderProgram>
 #include <QUrl>
 
-FinalEffect::FinalEffect(Qt3D::QNode *parent)
+FinalEffect::FinalEffect(Qt3DCore::QNode *parent)
     : Qt3DRender::QEffect(parent)
     , m_gl3Technique(new Qt3DRender::QTechnique())
     , m_gl2Technique(new Qt3DRender::QTechnique())
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.h b/examples/qt3d/deferred-renderer-cpp/finaleffect.h
index 9bd48cd9d..e99276c1b 100644
--- a/examples/qt3d/deferred-renderer-cpp/finaleffect.h
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.h
@@ -43,7 +43,7 @@
 class FinalEffect : public Qt3DRender::QEffect
 {
 public:
-    explicit FinalEffect(Qt3D::QNode *parent = 0);
+    explicit FinalEffect(Qt3DCore::QNode *parent = 0);
 
     QList<Qt3DRender::QAnnotation *> passCriteria() const;
     inline Qt3DRender::QTechnique *gl3Technique() const { return m_gl3Technique; }
diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
index ab59cf692..cf268dcb8 100644
--- a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
@@ -36,7 +36,7 @@
 
 #include "gbuffer.h"
 
-GBuffer::GBuffer(Qt3D::QNode *parent)
+GBuffer::GBuffer(Qt3DCore::QNode *parent)
     : Qt3DRender::QRenderTarget(parent)
 {
     const Qt3DRender::QAbstractTextureProvider::TextureFormat formats[AttachmentsCount] = {
diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.h b/examples/qt3d/deferred-renderer-cpp/gbuffer.h
index 0f7d20c8f..86412c482 100644
--- a/examples/qt3d/deferred-renderer-cpp/gbuffer.h
+++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.h
@@ -44,7 +44,7 @@
 class GBuffer : public Qt3DRender::QRenderTarget
 {
 public:
-    explicit GBuffer(Qt3D::QNode *parent = 0);
+    explicit GBuffer(Qt3DCore::QNode *parent = 0);
 
     enum Attachments {
         Color = 0,
diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp
index b82353dc1..625c320c9 100644
--- a/examples/qt3d/deferred-renderer-cpp/main.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/main.cpp
@@ -73,7 +73,7 @@ int main(int ac, char **av)
     view.registerAspect(input);
 
     // Root entity
-    Qt3D::QEntity *rootEntity = new Qt3D::QEntity();
+    Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();
     rootEntity->setObjectName(QStringLiteral("rootEntity"));
 
     // Shared Components
@@ -103,12 +103,12 @@ int main(int ac, char **av)
     rootEntity->addComponent(light1);
 
     // Scene Camera
-    Qt3D::QCamera *camera = view.defaultCamera();
+    Qt3DCore::QCamera *camera = view.defaultCamera();
 
     camera->setFieldOfView(45.0f);
     camera->setNearPlane(0.01f);
     camera->setFarPlane(1000.0f);
-    camera->setProjectionType(Qt3D::QCameraLens::PerspectiveProjection);
+    camera->setProjectionType(Qt3DCore::QCameraLens::PerspectiveProjection);
 
     camera->setPosition(QVector3D(10.0f, 10.0f, -25.0f));
     camera->setUpVector(QVector3D(0.0f, 1.0f, 0.0f));
@@ -132,13 +132,13 @@ int main(int ac, char **av)
     view.setFrameGraph(frameGraph);
 
     // Scene Content
-    Qt3D::QEntity *sphereOne = new Qt3D::QEntity(rootEntity);
+    Qt3DCore::QEntity *sphereOne = new Qt3DCore::QEntity(rootEntity);
     Qt3DRender::QMaterial *sphereOneMaterial = new Qt3DRender::QMaterial();
 
     sphereOneMaterial->setEffect(sceneEffect);
     sphereOneMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("meshColor"), QColor(Qt::blue)));
 
-    Qt3D::QTranslateTransform *sphereOneTranslate = new Qt3D::QTranslateTransform();
+    Qt3DCore::QTranslateTransform *sphereOneTranslate = new Qt3DCore::QTranslateTransform();
     sphereOneTranslate->setDx(-10.0f);
     sphereOneTranslate->setDy(0.0f);
     sphereOneTranslate->setDz(25.0f);
@@ -147,13 +147,13 @@ int main(int ac, char **av)
     light2->setColor(Qt::white);
     light2->setIntensity(1.5f);
 
-    sphereOne->addComponent(new Qt3D::QTransform(sphereOneTranslate));
+    sphereOne->addComponent(new Qt3DCore::QTransform(sphereOneTranslate));
     sphereOne->addComponent(sphereOneMaterial);
     sphereOne->addComponent(sphereMesh);
     sphereOne->addComponent(sceneLayer);
     sphereOne->addComponent(light2);
 
-    Qt3D::QEntity *sphereTwo = new Qt3D::QEntity(rootEntity);
+    Qt3DCore::QEntity *sphereTwo = new Qt3DCore::QEntity(rootEntity);
     Qt3DRender::QMaterial *sphereTwoMaterial = new Qt3DRender::QMaterial();
     sphereTwoMaterial->setEffect(sceneEffect);
     sphereTwoMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("meshColor"), QColor(Qt::yellow)));
@@ -168,7 +168,7 @@ int main(int ac, char **av)
     sphereTwo->addComponent(light3);
 
     // Screen Quad
-    Qt3D::QEntity *screenQuad = new Qt3D::QEntity(rootEntity);
+    Qt3DCore::QEntity *screenQuad = new Qt3DCore::QEntity(rootEntity);
     Qt3DRender::QMaterial *screenQuadMaterial = new Qt3DRender::QMaterial();
     screenQuadMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("position"), gBuffer->positionTexture()));
     screenQuadMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("normal"), gBuffer->normalTexture()));
@@ -183,12 +183,12 @@ int main(int ac, char **av)
     finalEffect->gl2Technique()->addParameter(new Qt3DRender::QParameter(QStringLiteral("pointLights"), QVariant::fromValue(lightsData)));
     screenQuadMaterial->setEffect(finalEffect);
 
-    Qt3D::QRotateTransform *screenPlaneRotation = new Qt3D::QRotateTransform();
+    Qt3DCore::QRotateTransform *screenPlaneRotation = new Qt3DCore::QRotateTransform();
     screenPlaneRotation->setAngleDeg(90);
     screenPlaneRotation->setAxis(QVector3D(1.0f, 0.0f, 0.0f));
 
     screenQuad->addComponent(quadLayer);
-    screenQuad->addComponent(new Qt3D::QTransform(screenPlaneRotation));
+    screenQuad->addComponent(new Qt3DCore::QTransform(screenPlaneRotation));
     screenQuad->addComponent(screenQuadMaterial);
     screenQuad->addComponent(planeMesh);
 
diff --git a/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp b/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
index 5186d0f1b..9090ba11b 100644
--- a/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
@@ -36,7 +36,7 @@
 
 #include "pointlightblock.h"
 
-PointLightBlock::PointLightBlock(Qt3D::QNode *parent)
+PointLightBlock::PointLightBlock(Qt3DCore::QNode *parent)
     : Qt3DRender::QShaderData(parent)
 {
 
diff --git a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
index 6e8d3639f..1364189c2 100644
--- a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
+++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
@@ -44,7 +44,7 @@ class PointLightBlock : public Qt3DRender::QShaderData
     Q_OBJECT
     Q_PROPERTY(QList<QShaderData *> lights READ lights NOTIFY lightsChanged)
 public:
-    explicit PointLightBlock(Qt3D::QNode *parent = 0);
+    explicit PointLightBlock(Qt3DCore::QNode *parent = 0);
     ~PointLightBlock();
 
     QList<Qt3DRender::QShaderData *> lights() const;
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
index a4c208905..99517c68d 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
@@ -40,7 +40,7 @@
 #include <Qt3DRenderer/QShaderProgram>
 #include <QUrl>
 
-SceneEffect::SceneEffect(Qt3D::QNode *parent)
+SceneEffect::SceneEffect(Qt3DCore::QNode *parent)
     : Qt3DRender::QEffect(parent)
     , m_gl3Technique(new Qt3DRender::QTechnique())
     , m_gl2Technique(new Qt3DRender::QTechnique())
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
index 9f88aef31..6d17c8de5 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
@@ -43,7 +43,7 @@
 class SceneEffect : public Qt3DRender::QEffect
 {
 public:
-    explicit SceneEffect(Qt3D::QNode *parent = 0);
+    explicit SceneEffect(Qt3DCore::QNode *parent = 0);
 
     QList<Qt3DRender::QAnnotation *> passCriteria() const;
 
diff --git a/examples/qt3d/deferred-renderer-qml/main.cpp b/examples/qt3d/deferred-renderer-qml/main.cpp
index 23853de6c..2276f3ad5 100644
--- a/examples/qt3d/deferred-renderer-qml/main.cpp
+++ b/examples/qt3d/deferred-renderer-qml/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.cpp b/examples/qt3d/dynamicscene-cpp/boxentity.cpp
index 9b35c2316..c6f1df33c 100644
--- a/examples/qt3d/dynamicscene-cpp/boxentity.cpp
+++ b/examples/qt3d/dynamicscene-cpp/boxentity.cpp
@@ -39,9 +39,9 @@
 #include <qmath.h>
 
 BoxEntity::BoxEntity(QNode *parent)
-    : Qt3D::QEntity(parent)
-    , m_transform(new Qt3D::QTransform())
-    , m_translate(new Qt3D::QTranslateTransform())
+    : Qt3DCore::QEntity(parent)
+    , m_transform(new Qt3DCore::QTransform())
+    , m_translate(new Qt3DCore::QTranslateTransform())
     , m_mesh(new Qt3DRender::QCuboidMesh())
     , m_material(new Qt3DRender::QPhongMaterial())
     , m_angle(0.0f)
diff --git a/examples/qt3d/dynamicscene-cpp/boxentity.h b/examples/qt3d/dynamicscene-cpp/boxentity.h
index ab5b15aac..dd2a3e1ac 100644
--- a/examples/qt3d/dynamicscene-cpp/boxentity.h
+++ b/examples/qt3d/dynamicscene-cpp/boxentity.h
@@ -44,7 +44,7 @@
 #include <Qt3DRenderer/QCuboidMesh>
 #include <Qt3DRenderer/QPhongMaterial>
 
-class BoxEntity : public Qt3D::QEntity
+class BoxEntity : public Qt3DCore::QEntity
 {
     Q_OBJECT
 
@@ -72,9 +72,9 @@ Q_SIGNALS:
 private:
     void updateTransformation();
 
-    Qt3D::QTransform *m_transform;
-    Qt3D::QTranslateTransform *m_translate;
-    Qt3D::QScaleTransform *m_scale;
+    Qt3DCore::QTransform *m_transform;
+    Qt3DCore::QTranslateTransform *m_translate;
+    Qt3DCore::QScaleTransform *m_scale;
     Qt3DRender::QCuboidMesh *m_mesh;
     Qt3DRender::QPhongMaterial *m_material;
     float m_angle;
diff --git a/examples/qt3d/dynamicscene-cpp/examplescene.cpp b/examples/qt3d/dynamicscene-cpp/examplescene.cpp
index 7bfb98f33..81f09b7da 100644
--- a/examples/qt3d/dynamicscene-cpp/examplescene.cpp
+++ b/examples/qt3d/dynamicscene-cpp/examplescene.cpp
@@ -40,8 +40,8 @@
 #include <QTimer>
 #include <qmath.h>
 
-ExampleScene::ExampleScene(Qt3D::QNode *parent)
-    : Qt3D::QEntity(parent)
+ExampleScene::ExampleScene(Qt3DCore::QNode *parent)
+    : Qt3DCore::QEntity(parent)
     , m_timer(new QTimer(this))
     , m_even(true)
 {
diff --git a/examples/qt3d/dynamicscene-cpp/examplescene.h b/examples/qt3d/dynamicscene-cpp/examplescene.h
index 79351fe3e..66ebb1b75 100644
--- a/examples/qt3d/dynamicscene-cpp/examplescene.h
+++ b/examples/qt3d/dynamicscene-cpp/examplescene.h
@@ -45,12 +45,12 @@ QT_BEGIN_NAMESPACE
 class QTimer;
 QT_END_NAMESPACE
 
-class ExampleScene : public Qt3D::QEntity
+class ExampleScene : public Qt3DCore::QEntity
 {
     Q_OBJECT
 
 public:
-    explicit ExampleScene(Qt3D::QNode *parent = 0);
+    explicit ExampleScene(Qt3DCore::QNode *parent = 0);
     ~ExampleScene();
 
 private Q_SLOTS:
diff --git a/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp b/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp
index 948252790..9248c8800 100644
--- a/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp
+++ b/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp
@@ -36,7 +36,7 @@
 
 #include "forwardrenderer.h"
 
-ForwardRenderer::ForwardRenderer(Qt3D::QNode *parent)
+ForwardRenderer::ForwardRenderer(Qt3DCore::QNode *parent)
     : Qt3DRender::QFrameGraph(parent)
     , m_viewport(new Qt3DRender::QViewport())
     , m_cameraSelector(new Qt3DRender::QCameraSelector())
@@ -50,7 +50,7 @@ ForwardRenderer::ForwardRenderer(Qt3D::QNode *parent)
     setActiveFrameGraph(m_viewport);
 }
 
-void ForwardRenderer::setCamera(Qt3D::QEntity *camera)
+void ForwardRenderer::setCamera(Qt3DCore::QEntity *camera)
 {
     m_cameraSelector->setCamera(camera);
 }
diff --git a/examples/qt3d/dynamicscene-cpp/forwardrenderer.h b/examples/qt3d/dynamicscene-cpp/forwardrenderer.h
index 6df489e29..bcaed64d9 100644
--- a/examples/qt3d/dynamicscene-cpp/forwardrenderer.h
+++ b/examples/qt3d/dynamicscene-cpp/forwardrenderer.h
@@ -45,9 +45,9 @@
 class ForwardRenderer : public Qt3DRender::QFrameGraph
 {
 public:
-    ForwardRenderer(Qt3D::QNode *parent);
+    ForwardRenderer(Qt3DCore::QNode *parent);
 
-    void setCamera(Qt3D::QEntity *camera);
+    void setCamera(Qt3DCore::QEntity *camera);
 
 private:
     Qt3DRender::QViewport *m_viewport;
diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp
index 72c302ba1..78cdb379e 100644
--- a/examples/qt3d/dynamicscene-cpp/main.cpp
+++ b/examples/qt3d/dynamicscene-cpp/main.cpp
@@ -54,7 +54,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::QAspectEngine engine;
+    Qt3DCore::QAspectEngine engine;
     engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
@@ -67,8 +67,8 @@ int main(int argc, char* argv[])
     ExampleScene *sceneRoot = new ExampleScene();
 
     // Scene Camera
-    Qt3D::QCamera *basicCamera = new Qt3D::QCamera(sceneRoot);
-    basicCamera->setProjectionType(Qt3D::QCameraLens::PerspectiveProjection);
+    Qt3DCore::QCamera *basicCamera = new Qt3DCore::QCamera(sceneRoot);
+    basicCamera->setProjectionType(Qt3DCore::QCameraLens::PerspectiveProjection);
     basicCamera->setAspectRatio(view.width() / view.height());
     basicCamera->setUpVector(QVector3D(0.0f, 1.0f, 0.0f));
     basicCamera->setViewCenter(QVector3D(0.0f, 3.5f, 0.0f));
diff --git a/examples/qt3d/enabled-qml/main.cpp b/examples/qt3d/enabled-qml/main.cpp
index 40e119231..b2ba61324 100644
--- a/examples/qt3d/enabled-qml/main.cpp
+++ b/examples/qt3d/enabled-qml/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->initialize();
     QVariantMap data;
diff --git a/examples/qt3d/gltf/main.cpp b/examples/qt3d/gltf/main.cpp
index c32850a20..7d85b0ad6 100644
--- a/examples/qt3d/gltf/main.cpp
+++ b/examples/qt3d/gltf/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/gooch-qml/main.cpp b/examples/qt3d/gooch-qml/main.cpp
index 7d5e65a85..e945f254c 100644
--- a/examples/qt3d/gooch-qml/main.cpp
+++ b/examples/qt3d/gooch-qml/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/keyboardinput-qml/main.cpp b/examples/qt3d/keyboardinput-qml/main.cpp
index 9239c9b7e..7efb66471 100644
--- a/examples/qt3d/keyboardinput-qml/main.cpp
+++ b/examples/qt3d/keyboardinput-qml/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/loader-qml/main.cpp b/examples/qt3d/loader-qml/main.cpp
index 79f5bfdb4..44a5d672b 100644
--- a/examples/qt3d/loader-qml/main.cpp
+++ b/examples/qt3d/loader-qml/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/materials-cpp/barrel.cpp b/examples/qt3d/materials-cpp/barrel.cpp
index c89b58d52..fc86a9ab2 100644
--- a/examples/qt3d/materials-cpp/barrel.cpp
+++ b/examples/qt3d/materials-cpp/barrel.cpp
@@ -57,7 +57,7 @@ const char *bumpsName[] = {
     "hard_bumps"
 };
 
-Barrel::Barrel(Qt3D::QNode *parent)
+Barrel::Barrel(Qt3DCore::QNode *parent)
     : RenderableEntity(parent)
     , m_bumps(NoBumps)
     , m_diffuseColor(Red)
diff --git a/examples/qt3d/materials-cpp/barrel.h b/examples/qt3d/materials-cpp/barrel.h
index 0a8b81bde..c439d1a85 100644
--- a/examples/qt3d/materials-cpp/barrel.h
+++ b/examples/qt3d/materials-cpp/barrel.h
@@ -44,7 +44,7 @@
 class Barrel : public RenderableEntity
 {
 public:
-    Barrel(Qt3D::QNode *parent = 0);
+    Barrel(Qt3DCore::QNode *parent = 0);
     ~Barrel();
 
     enum DiffuseColor {
diff --git a/examples/qt3d/materials-cpp/houseplant.cpp b/examples/qt3d/materials-cpp/houseplant.cpp
index df1384486..81d0ab0d2 100644
--- a/examples/qt3d/materials-cpp/houseplant.cpp
+++ b/examples/qt3d/materials-cpp/houseplant.cpp
@@ -53,8 +53,8 @@ const char *plantNames[] = {
 };
 
 
-HousePlant::HousePlant(Qt3D::QNode *parent)
-    : Qt3D::QEntity(parent)
+HousePlant::HousePlant(Qt3DCore::QNode *parent)
+    : Qt3DCore::QEntity(parent)
     , m_pot(new RenderableEntity(this))
     , m_plant(new RenderableEntity(m_pot))
     , m_cover(new RenderableEntity(m_pot))
diff --git a/examples/qt3d/materials-cpp/houseplant.h b/examples/qt3d/materials-cpp/houseplant.h
index 36cb6ca23..a49326dbd 100644
--- a/examples/qt3d/materials-cpp/houseplant.h
+++ b/examples/qt3d/materials-cpp/houseplant.h
@@ -43,11 +43,11 @@
 #include <QNormalDiffuseMapMaterial>
 #include <QTextureImage>
 
-class HousePlant : public Qt3D::QEntity
+class HousePlant : public Qt3DCore::QEntity
 {
     Q_OBJECT
 public:
-    explicit HousePlant(Qt3D::QNode *parent = 0);
+    explicit HousePlant(Qt3DCore::QNode *parent = 0);
     ~HousePlant();
 
     enum PotShape {
diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp
index f18f1f32a..b2e08b7fa 100644
--- a/examples/qt3d/materials-cpp/main.cpp
+++ b/examples/qt3d/materials-cpp/main.cpp
@@ -60,7 +60,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::QAspectEngine engine;
+    Qt3DCore::QAspectEngine engine;
     engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
     engine.registerAspect(input);
@@ -71,11 +71,11 @@ int main(int argc, char* argv[])
     engine.setData(data);
 
     // Scene Root
-    Qt3D::QEntity *sceneRoot = new Qt3D::QEntity();
+    Qt3DCore::QEntity *sceneRoot = new Qt3DCore::QEntity();
 
     // Scene Camera
-    Qt3D::QCamera *basicCamera = new Qt3D::QCamera(sceneRoot);
-    basicCamera->setProjectionType(Qt3D::QCameraLens::PerspectiveProjection);
+    Qt3DCore::QCamera *basicCamera = new Qt3DCore::QCamera(sceneRoot);
+    basicCamera->setProjectionType(Qt3DCore::QCameraLens::PerspectiveProjection);
     basicCamera->setAspectRatio(view.width() / view.height());
     basicCamera->setUpVector(QVector3D(0.0f, 1.0f, 0.0f));
     basicCamera->setViewCenter(QVector3D(0.0f, 3.5f, 0.0f));
diff --git a/examples/qt3d/materials-cpp/planeentity.cpp b/examples/qt3d/materials-cpp/planeentity.cpp
index 3a06bded7..b8a400232 100644
--- a/examples/qt3d/materials-cpp/planeentity.cpp
+++ b/examples/qt3d/materials-cpp/planeentity.cpp
@@ -41,12 +41,12 @@
 #include <Qt3DCore/QScaleTransform>
 #include <Qt3DCore/QTranslateTransform>
 
-PlaneEntity::PlaneEntity(Qt3D::QNode *parent)
-    : Qt3D::QEntity(new Qt3D::QEntity(parent))
+PlaneEntity::PlaneEntity(Qt3DCore::QNode *parent)
+    : Qt3DCore::QEntity(new Qt3DCore::QEntity(parent))
     , m_mesh(new Qt3DRender::QPlaneMesh())
-    , m_transform(new Qt3D::QTransform())
-    , m_scaleTransform(new Qt3D::QScaleTransform())
-    , m_translateTransform(new Qt3D::QTranslateTransform())
+    , m_transform(new Qt3DCore::QTransform())
+    , m_scaleTransform(new Qt3DCore::QScaleTransform())
+    , m_translateTransform(new Qt3DCore::QTranslateTransform())
 {
     m_transform->addTransform(m_translateTransform);
     m_transform->addTransform(m_scaleTransform);
@@ -58,12 +58,12 @@ PlaneEntity::~PlaneEntity()
 {
 }
 
-Qt3D::QScaleTransform *PlaneEntity::scaleTransform() const
+Qt3DCore::QScaleTransform *PlaneEntity::scaleTransform() const
 {
     return m_scaleTransform;
 }
 
-Qt3D::QTranslateTransform *PlaneEntity::translateTransform() const
+Qt3DCore::QTranslateTransform *PlaneEntity::translateTransform() const
 {
     return m_translateTransform;
 }
diff --git a/examples/qt3d/materials-cpp/planeentity.h b/examples/qt3d/materials-cpp/planeentity.h
index 48639b306..1b6f49d69 100644
--- a/examples/qt3d/materials-cpp/planeentity.h
+++ b/examples/qt3d/materials-cpp/planeentity.h
@@ -43,21 +43,21 @@
 #include <Qt3DCore/QTranslateTransform>
 #include <Qt3DRenderer/QPlaneMesh>
 
-class PlaneEntity : public Qt3D::QEntity
+class PlaneEntity : public Qt3DCore::QEntity
 {
 public:
-    PlaneEntity(Qt3D::QNode *parent = 0);
+    PlaneEntity(Qt3DCore::QNode *parent = 0);
     ~PlaneEntity();
 
-    Qt3D::QScaleTransform *scaleTransform() const;
-    Qt3D::QTranslateTransform *translateTransform() const;
+    Qt3DCore::QScaleTransform *scaleTransform() const;
+    Qt3DCore::QTranslateTransform *translateTransform() const;
     Qt3DRender::QPlaneMesh *mesh() const;
 
 private:
     Qt3DRender::QPlaneMesh *m_mesh;
-    Qt3D::QTransform *m_transform;
-    Qt3D::QScaleTransform *m_scaleTransform;
-    Qt3D::QTranslateTransform *m_translateTransform;
+    Qt3DCore::QTransform *m_transform;
+    Qt3DCore::QScaleTransform *m_scaleTransform;
+    Qt3DCore::QTranslateTransform *m_translateTransform;
 };
 
 #endif // PLANEENTITY_H
diff --git a/examples/qt3d/materials-cpp/renderableentity.cpp b/examples/qt3d/materials-cpp/renderableentity.cpp
index 2e463a607..1d100c686 100644
--- a/examples/qt3d/materials-cpp/renderableentity.cpp
+++ b/examples/qt3d/materials-cpp/renderableentity.cpp
@@ -36,13 +36,13 @@
 
 #include "renderableentity.h"
 
-RenderableEntity::RenderableEntity(Qt3D::QNode *parent)
-    : Qt3D::QEntity(parent)
+RenderableEntity::RenderableEntity(Qt3DCore::QNode *parent)
+    : Qt3DCore::QEntity(parent)
     , m_mesh(new Qt3DRender::QMesh())
-    , m_transform(new Qt3D::QTransform())
-    , m_rotateTransform(new Qt3D::QRotateTransform())
-    , m_scaleTransform(new Qt3D::QScaleTransform())
-    , m_translateTransform(new Qt3D::QTranslateTransform())
+    , m_transform(new Qt3DCore::QTransform())
+    , m_rotateTransform(new Qt3DCore::QRotateTransform())
+    , m_scaleTransform(new Qt3DCore::QScaleTransform())
+    , m_translateTransform(new Qt3DCore::QTranslateTransform())
 {
     m_transform->addTransform(m_rotateTransform);
     m_transform->addTransform(m_scaleTransform);
@@ -61,17 +61,17 @@ Qt3DRender::QMesh *RenderableEntity::mesh() const
     return m_mesh;
 }
 
-Qt3D::QScaleTransform *RenderableEntity::scaleTransform() const
+Qt3DCore::QScaleTransform *RenderableEntity::scaleTransform() const
 {
     return m_scaleTransform;
 }
 
-Qt3D::QTranslateTransform *RenderableEntity::translateTransform() const
+Qt3DCore::QTranslateTransform *RenderableEntity::translateTransform() const
 {
     return m_translateTransform;
 }
 
-Qt3D::QRotateTransform *RenderableEntity::rotateTransform() const
+Qt3DCore::QRotateTransform *RenderableEntity::rotateTransform() const
 {
     return m_rotateTransform;
 }
diff --git a/examples/qt3d/materials-cpp/renderableentity.h b/examples/qt3d/materials-cpp/renderableentity.h
index 216ad843f..4a6397f9d 100644
--- a/examples/qt3d/materials-cpp/renderableentity.h
+++ b/examples/qt3d/materials-cpp/renderableentity.h
@@ -44,23 +44,23 @@
 #include <Qt3DCore/QTranslateTransform>
 #include <Qt3DRenderer/QMesh>
 
-class RenderableEntity : public Qt3D::QEntity
+class RenderableEntity : public Qt3DCore::QEntity
 {
 public:
-    RenderableEntity(Qt3D::QNode *parent = 0);
+    RenderableEntity(Qt3DCore::QNode *parent = 0);
     ~RenderableEntity();
 
     Qt3DRender::QMesh *mesh() const;
-    Qt3D::QScaleTransform *scaleTransform() const;
-    Qt3D::QTranslateTransform *translateTransform() const;
-    Qt3D::QRotateTransform *rotateTransform() const;
+    Qt3DCore::QScaleTransform *scaleTransform() const;
+    Qt3DCore::QTranslateTransform *translateTransform() const;
+    Qt3DCore::QRotateTransform *rotateTransform() const;
 
 private:
     Qt3DRender::QMesh *m_mesh;
-    Qt3D::QTransform *m_transform;
-    Qt3D::QRotateTransform *m_rotateTransform;
-    Qt3D::QScaleTransform *m_scaleTransform;
-    Qt3D::QTranslateTransform *m_translateTransform;
+    Qt3DCore::QTransform *m_transform;
+    Qt3DCore::QRotateTransform *m_rotateTransform;
+    Qt3DCore::QScaleTransform *m_scaleTransform;
+    Qt3DCore::QTranslateTransform *m_translateTransform;
 };
 
 #endif // RENDERABLEENTITY_H
diff --git a/examples/qt3d/materials-cpp/rotatingtrefoilknot.cpp b/examples/qt3d/materials-cpp/rotatingtrefoilknot.cpp
index 833d82d37..b27abcd36 100644
--- a/examples/qt3d/materials-cpp/rotatingtrefoilknot.cpp
+++ b/examples/qt3d/materials-cpp/rotatingtrefoilknot.cpp
@@ -36,7 +36,7 @@
 
 #include "rotatingtrefoilknot.h"
 
-RotatingTrefoilKnot::RotatingTrefoilKnot(Qt3D::QNode *parent)
+RotatingTrefoilKnot::RotatingTrefoilKnot(Qt3DCore::QNode *parent)
     : TrefoilKnot(parent)
     , m_thetaAnimation(new QPropertyAnimation(this))
     , m_phiAnimation(new QPropertyAnimation(this))
diff --git a/examples/qt3d/materials-cpp/rotatingtrefoilknot.h b/examples/qt3d/materials-cpp/rotatingtrefoilknot.h
index 231ce5270..397aa1705 100644
--- a/examples/qt3d/materials-cpp/rotatingtrefoilknot.h
+++ b/examples/qt3d/materials-cpp/rotatingtrefoilknot.h
@@ -43,7 +43,7 @@
 class RotatingTrefoilKnot : public TrefoilKnot
 {
 public:
-    explicit RotatingTrefoilKnot(Qt3D::QNode *parent = 0);
+    explicit RotatingTrefoilKnot(Qt3DCore::QNode *parent = 0);
     ~RotatingTrefoilKnot();
 
 private:
diff --git a/examples/qt3d/materials-cpp/trefoilknot.cpp b/examples/qt3d/materials-cpp/trefoilknot.cpp
index d71c9944d..610a972bd 100644
--- a/examples/qt3d/materials-cpp/trefoilknot.cpp
+++ b/examples/qt3d/materials-cpp/trefoilknot.cpp
@@ -36,14 +36,14 @@
 
 #include "trefoilknot.h"
 
-TrefoilKnot::TrefoilKnot(Qt3D::QNode *parent)
-    : Qt3D::QEntity(parent)
+TrefoilKnot::TrefoilKnot(Qt3DCore::QNode *parent)
+    : Qt3DCore::QEntity(parent)
     , m_mesh(new Qt3DRender::QMesh())
-    , m_transform(new Qt3D::QTransform())
-    , m_scaleTransform(new Qt3D::QScaleTransform())
-    , m_xaxisRotation(new Qt3D::QRotateTransform())
-    , m_yaxisRotation(new Qt3D::QRotateTransform())
-    , m_translateTransform(new Qt3D::QTranslateTransform())
+    , m_transform(new Qt3DCore::QTransform())
+    , m_scaleTransform(new Qt3DCore::QScaleTransform())
+    , m_xaxisRotation(new Qt3DCore::QRotateTransform())
+    , m_yaxisRotation(new Qt3DCore::QRotateTransform())
+    , m_translateTransform(new Qt3DCore::QTranslateTransform())
 {
     m_mesh->setSource(QUrl("qrc:/assets/obj/trefoil.obj"));
     m_xaxisRotation->setAxis(QVector3D(1.0f, 0.0f, 0.0f));
@@ -62,22 +62,22 @@ TrefoilKnot::~TrefoilKnot()
 {
 }
 
-Qt3D::QScaleTransform *TrefoilKnot::scaleTransform() const
+Qt3DCore::QScaleTransform *TrefoilKnot::scaleTransform() const
 {
     return m_scaleTransform;
 }
 
-Qt3D::QRotateTransform *TrefoilKnot::xaxisRotateTransform() const
+Qt3DCore::QRotateTransform *TrefoilKnot::xaxisRotateTransform() const
 {
     return m_xaxisRotation;
 }
 
-Qt3D::QRotateTransform *TrefoilKnot::yaxisRotateTransform() const
+Qt3DCore::QRotateTransform *TrefoilKnot::yaxisRotateTransform() const
 {
     return m_yaxisRotation;
 }
 
-Qt3D::QTranslateTransform *TrefoilKnot::translateTransform() const
+Qt3DCore::QTranslateTransform *TrefoilKnot::translateTransform() const
 {
     return m_translateTransform;
 }
diff --git a/examples/qt3d/materials-cpp/trefoilknot.h b/examples/qt3d/materials-cpp/trefoilknot.h
index 6beda9cd1..bac6e59b0 100644
--- a/examples/qt3d/materials-cpp/trefoilknot.h
+++ b/examples/qt3d/materials-cpp/trefoilknot.h
@@ -44,24 +44,24 @@
 #include <Qt3DCore/QTranslateTransform>
 #include <Qt3DRenderer/QMesh>
 
-class TrefoilKnot : public Qt3D::QEntity
+class TrefoilKnot : public Qt3DCore::QEntity
 {
 public:
-    explicit TrefoilKnot(Qt3D::QNode *parent = 0);
+    explicit TrefoilKnot(Qt3DCore::QNode *parent = 0);
     ~TrefoilKnot();
 
-    Qt3D::QScaleTransform *scaleTransform() const;
-    Qt3D::QRotateTransform *xaxisRotateTransform() const;
-    Qt3D::QRotateTransform *yaxisRotateTransform() const;
-    Qt3D::QTranslateTransform *translateTransform() const;
+    Qt3DCore::QScaleTransform *scaleTransform() const;
+    Qt3DCore::QRotateTransform *xaxisRotateTransform() const;
+    Qt3DCore::QRotateTransform *yaxisRotateTransform() const;
+    Qt3DCore::QTranslateTransform *translateTransform() const;
 
 private:
     Qt3DRender::QMesh *m_mesh;
-    Qt3D::QTransform *m_transform;
-    Qt3D::QScaleTransform *m_scaleTransform;
-    Qt3D::QRotateTransform *m_xaxisRotation;
-    Qt3D::QRotateTransform *m_yaxisRotation;
-    Qt3D::QTranslateTransform *m_translateTransform;
+    Qt3DCore::QTransform *m_transform;
+    Qt3DCore::QScaleTransform *m_scaleTransform;
+    Qt3DCore::QRotateTransform *m_xaxisRotation;
+    Qt3DCore::QRotateTransform *m_yaxisRotation;
+    Qt3DCore::QTranslateTransform *m_translateTransform;
 };
 
 #endif // TREFOILKNOT_H
diff --git a/examples/qt3d/materials/main.cpp b/examples/qt3d/materials/main.cpp
index 7fdc5ceed..e40da9894 100644
--- a/examples/qt3d/materials/main.cpp
+++ b/examples/qt3d/materials/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/mouseinput-qml/main.cpp b/examples/qt3d/mouseinput-qml/main.cpp
index 70e76e944..7dcb541b1 100644
--- a/examples/qt3d/mouseinput-qml/main.cpp
+++ b/examples/qt3d/mouseinput-qml/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/multiviewport/main.cpp b/examples/qt3d/multiviewport/main.cpp
index 857ea6ac5..e9a741d9c 100644
--- a/examples/qt3d/multiviewport/main.cpp
+++ b/examples/qt3d/multiviewport/main.cpp
@@ -45,7 +45,7 @@ int main(int ac, char **av)
 {
     QGuiApplication app(ac, av);
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect);
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/plasma/main.cpp b/examples/qt3d/plasma/main.cpp
index 3b0a8b4e3..f89c4f298 100644
--- a/examples/qt3d/plasma/main.cpp
+++ b/examples/qt3d/plasma/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
 
diff --git a/examples/qt3d/playground-qml/main.cpp b/examples/qt3d/playground-qml/main.cpp
index bb78f738a..4e93fd1bf 100644
--- a/examples/qt3d/playground-qml/main.cpp
+++ b/examples/qt3d/playground-qml/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/shadow-map-qml/main.cpp b/examples/qt3d/shadow-map-qml/main.cpp
index 9c10c866e..fd296aa62 100644
--- a/examples/qt3d/shadow-map-qml/main.cpp
+++ b/examples/qt3d/shadow-map-qml/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     view.resize(1600, 800);
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp
index 67d4fcbda..73c29c8f4 100644
--- a/examples/qt3d/simple-cpp/main.cpp
+++ b/examples/qt3d/simple-cpp/main.cpp
@@ -68,10 +68,10 @@ int main(int argc, char* argv[])
     view.registerAspect(input);
 
     // Root entity
-    Qt3D::QEntity *rootEntity = new Qt3D::QEntity();
+    Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();
 
     // Camera
-    Qt3D::QCamera *cameraEntity = view.defaultCamera();
+    Qt3DCore::QCamera *cameraEntity = view.defaultCamera();
 
     cameraEntity->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f);
     cameraEntity->setPosition(QVector3D(0, 0, -40.0f));
@@ -83,18 +83,18 @@ int main(int argc, char* argv[])
     Qt3DRender::QMaterial *material = new Qt3DRender::QPhongMaterial(rootEntity);
 
     // Torus
-    Qt3D::QEntity *torusEntity = new Qt3D::QEntity(rootEntity);
+    Qt3DCore::QEntity *torusEntity = new Qt3DCore::QEntity(rootEntity);
     Qt3DRender::QTorusMesh *torusMesh = new Qt3DRender::QTorusMesh;
     torusMesh->setRadius(5);
     torusMesh->setMinorRadius(1);
     torusMesh->setRings(100);
     torusMesh->setSlices(20);
 
-    Qt3D::QTransform *torusTransform = new Qt3D::QTransform;
-    Qt3D::QScaleTransform *torusScaleTransform = new Qt3D::QScaleTransform;
+    Qt3DCore::QTransform *torusTransform = new Qt3DCore::QTransform;
+    Qt3DCore::QScaleTransform *torusScaleTransform = new Qt3DCore::QScaleTransform;
     torusScaleTransform->setScale3D(QVector3D(1.5, 1, 0.5));
 
-    Qt3D::QRotateTransform *torusRotateTransform = new Qt3D::QRotateTransform;
+    Qt3DCore::QRotateTransform *torusRotateTransform = new Qt3DCore::QRotateTransform;
     torusRotateTransform->setAxis(QVector3D(1, 0, 0));
     torusRotateTransform->setAngleDeg(45);
 
@@ -107,15 +107,15 @@ int main(int argc, char* argv[])
     torusEntity->addComponent(material);
 
     // Sphere
-    Qt3D::QEntity *sphereEntity = new Qt3D::QEntity(rootEntity);
+    Qt3DCore::QEntity *sphereEntity = new Qt3DCore::QEntity(rootEntity);
     Qt3DRender::QSphereMesh *sphereMesh = new Qt3DRender::QSphereMesh;
     sphereMesh->setRadius(3);
 
-    Qt3D::QTransform *sphereTransform = new Qt3D::QTransform;
-    Qt3D::QTranslateTransform *sphereTranslateTransform = new Qt3D::QTranslateTransform;
+    Qt3DCore::QTransform *sphereTransform = new Qt3DCore::QTransform;
+    Qt3DCore::QTranslateTransform *sphereTranslateTransform = new Qt3DCore::QTranslateTransform;
     sphereTranslateTransform->setTranslation(QVector3D(20, 0, 0));
 
-    Qt3D::QRotateTransform *sphereRotateTransform = new Qt3D::QRotateTransform;
+    Qt3DCore::QRotateTransform *sphereRotateTransform = new Qt3DCore::QRotateTransform;
     QPropertyAnimation *sphereRotateTransformAnimation = new QPropertyAnimation(sphereRotateTransform);
     sphereRotateTransformAnimation->setTargetObject(sphereRotateTransform);
     sphereRotateTransformAnimation->setPropertyName("angle");
diff --git a/examples/qt3d/simple-qml/main.cpp b/examples/qt3d/simple-qml/main.cpp
index 79f5bfdb4..44a5d672b 100644
--- a/examples/qt3d/simple-qml/main.cpp
+++ b/examples/qt3d/simple-qml/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/simple-shaders-qml/main.cpp b/examples/qt3d/simple-shaders-qml/main.cpp
index d3a49ea9b..e8d7a8565 100644
--- a/examples/qt3d/simple-shaders-qml/main.cpp
+++ b/examples/qt3d/simple-shaders-qml/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/skybox/main.cpp b/examples/qt3d/skybox/main.cpp
index 6dcecff5d..d09bea087 100644
--- a/examples/qt3d/skybox/main.cpp
+++ b/examples/qt3d/skybox/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/tessellation-modes/main.cpp b/examples/qt3d/tessellation-modes/main.cpp
index 038a77571..231702d4b 100644
--- a/examples/qt3d/tessellation-modes/main.cpp
+++ b/examples/qt3d/tessellation-modes/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp
index a3ee77d29..42583c92d 100644
--- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp
+++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.cpp
@@ -44,7 +44,7 @@ class TessellatedGeometry : public Qt3DRender::QGeometry
 {
     Q_OBJECT
 public:
-    TessellatedGeometry(Qt3D::QNode *parent = Q_NULLPTR)
+    TessellatedGeometry(Qt3DCore::QNode *parent = Q_NULLPTR)
         : Qt3DRender::QGeometry(parent)
         , m_positionAttribute(new Qt3DRender::QAttribute(this))
         , m_vertexBuffer(new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer, this))
@@ -80,7 +80,7 @@ private:
     Qt3DRender::QBuffer *m_vertexBuffer;
 };
 
-TessellatedQuadMesh::TessellatedQuadMesh(Qt3D::QNode *parent)
+TessellatedQuadMesh::TessellatedQuadMesh(Qt3DCore::QNode *parent)
     : Qt3DRender::QGeometryRenderer(parent)
 {
     setPrimitiveType(Qt3DRender::QGeometryRenderer::Patches);
diff --git a/examples/qt3d/tessellation-modes/tessellatedquadmesh.h b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h
index 5f34e2400..8b1276af8 100644
--- a/examples/qt3d/tessellation-modes/tessellatedquadmesh.h
+++ b/examples/qt3d/tessellation-modes/tessellatedquadmesh.h
@@ -43,7 +43,7 @@ class TessellatedQuadMesh : public Qt3DRender::QGeometryRenderer
 {
     Q_OBJECT
 public:
-    explicit TessellatedQuadMesh(Qt3D::QNode *parent = 0);
+    explicit TessellatedQuadMesh(Qt3DCore::QNode *parent = 0);
     ~TessellatedQuadMesh();
 };
 
diff --git a/examples/qt3d/torus-qml/main.cpp b/examples/qt3d/torus-qml/main.cpp
index d76264d7b..d2537bd8d 100644
--- a/examples/qt3d/torus-qml/main.cpp
+++ b/examples/qt3d/torus-qml/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/transparency-qml/main.cpp b/examples/qt3d/transparency-qml/main.cpp
index 6f5ffd6b4..6cce64b3a 100644
--- a/examples/qt3d/transparency-qml/main.cpp
+++ b/examples/qt3d/transparency-qml/main.cpp
@@ -46,7 +46,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
     engine.aspectEngine()->initialize();
diff --git a/examples/qt3d/wave/main.cpp b/examples/qt3d/wave/main.cpp
index fb2f499f1..aaebf9182 100644
--- a/examples/qt3d/wave/main.cpp
+++ b/examples/qt3d/wave/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/examples/qt3d/wireframe/main.cpp b/examples/qt3d/wireframe/main.cpp
index f561cb52b..eb7827bcb 100644
--- a/examples/qt3d/wireframe/main.cpp
+++ b/examples/qt3d/wireframe/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc, argv);
 
     Window view;
-    Qt3D::Quick::QQmlAspectEngine engine;
+    Qt3DCore::Quick::QQmlAspectEngine engine;
 
     engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
     engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
diff --git a/src/collision/qabstractcollider.cpp b/src/collision/qabstractcollider.cpp
index 7544cdcdf..8a549f8a6 100644
--- a/src/collision/qabstractcollider.cpp
+++ b/src/collision/qabstractcollider.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DCollision {
 
 /*!
-    \class Qt3D::QAbstractColliderPrivate
+    \class Qt3DCore::QAbstractColliderPrivate
     \internal
 */
 QAbstractColliderPrivate::QAbstractColliderPrivate()
diff --git a/src/collision/qabstractcollider.h b/src/collision/qabstractcollider.h
index b11eb1c9f..e788c7b39 100644
--- a/src/collision/qabstractcollider.h
+++ b/src/collision/qabstractcollider.h
@@ -47,7 +47,7 @@ namespace Qt3DCollision {
 class QAbstractColliderPrivate;
 class QCollisionEvent;
 
-class QT3DCOLLISIONSHARED_EXPORT QAbstractCollider : public Qt3D::QComponent
+class QT3DCOLLISIONSHARED_EXPORT QAbstractCollider : public Qt3DCore::QComponent
 {
     Q_OBJECT
 
diff --git a/src/collision/qabstractcollider_p.h b/src/collision/qabstractcollider_p.h
index f2d355226..3fe9ca92d 100644
--- a/src/collision/qabstractcollider_p.h
+++ b/src/collision/qabstractcollider_p.h
@@ -56,7 +56,7 @@ namespace Qt3DCollision {
 
 class QAbstractCollider;
 
-class QAbstractColliderPrivate : public Qt3D::QComponentPrivate
+class QAbstractColliderPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QAbstractColliderPrivate();
diff --git a/src/collision/qboxcollider.cpp b/src/collision/qboxcollider.cpp
index d911cae6b..abb70908f 100644
--- a/src/collision/qboxcollider.cpp
+++ b/src/collision/qboxcollider.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DCollision {
 
 /*!
-    \class Qt3D::QBoxColliderPrivate
+    \class Qt3DCore::QBoxColliderPrivate
     \internal
 */
 QBoxColliderPrivate::QBoxColliderPrivate()
@@ -53,7 +53,7 @@ QBoxColliderPrivate::QBoxColliderPrivate()
 }
 
 /*!
-    \class Qt3D::QBoxCollider
+    \class Qt3DCore::QBoxCollider
     \inmodule Qt3DCollision
     \since 5.5
     \brief Represents a box used for collision detection
@@ -62,7 +62,7 @@ QBoxColliderPrivate::QBoxColliderPrivate()
 /*!
     \qmltype BoxCollider
     \inqmlmodule Qt3D.Collision
-    \instantiates Qt3D::QBoxCollider
+    \instantiates Qt3DCore::QBoxCollider
     \inherits Component3D
     \since 5.5
 */
diff --git a/src/collision/qcapsulecollider.cpp b/src/collision/qcapsulecollider.cpp
index c7caefd84..3c1a5f45e 100644
--- a/src/collision/qcapsulecollider.cpp
+++ b/src/collision/qcapsulecollider.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DCollision {
 
 /*!
-    \class Qt3D::QCapsuleColliderPrivate
+    \class Qt3DCore::QCapsuleColliderPrivate
     \internal
 */
 QCapsuleColliderPrivate::QCapsuleColliderPrivate()
@@ -55,7 +55,7 @@ QCapsuleColliderPrivate::QCapsuleColliderPrivate()
 }
 
 /*!
-    \class Qt3D::QCapsuleCollider
+    \class Qt3DCore::QCapsuleCollider
     \inmodule Qt3DCollision
     \since 5.5
     \brief Represents a capsule used for collision detection
@@ -64,7 +64,7 @@ QCapsuleColliderPrivate::QCapsuleColliderPrivate()
 /*!
     \qmltype CapsuleCollider
     \inqmlmodule Qt3D.Collision
-    \instantiates Qt3D::QCapsuleCollider
+    \instantiates Qt3DCore::QCapsuleCollider
     \inherits Component3D
     \since 5.5
 */
diff --git a/src/collision/qcollisionaspect.cpp b/src/collision/qcollisionaspect.cpp
index 408431ea3..3224d185a 100644
--- a/src/collision/qcollisionaspect.cpp
+++ b/src/collision/qcollisionaspect.cpp
@@ -49,16 +49,16 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DCollision {
 
 /*!
-    \class Qt3D::QCollisionAspectPrivate
+    \class Qt3DCore::QCollisionAspectPrivate
     \internal
 */
 QCollisionAspectPrivate::QCollisionAspectPrivate()
-    : Qt3D::QAbstractAspectPrivate()
+    : QAbstractAspectPrivate()
     , m_time(0)
 {
     m_aspectType = QAbstractAspect::AspectCollision;
@@ -82,36 +82,36 @@ void QCollisionAspect::registerBackendTypes()
     //registerBackendType<QSphereCollider>(QBackendNodeFunctorPtr(new Collision::SphereColliderFunctor(d_func()->m_manager.data())));
 }
 
-QVector<Qt3D::QAspectJobPtr> QCollisionAspect::jobsToExecute(qint64 time)
+QVector<Qt3DCore::QAspectJobPtr> QCollisionAspect::jobsToExecute(qint64 time)
 {
     Q_D(QCollisionAspect);
     d->m_time = time;
 
     // Create jobs that will get exectued by the threadpool
-    QVector<Qt3D::QAspectJobPtr> jobs;
+    QVector<Qt3DCore::QAspectJobPtr> jobs;
     return jobs;
 }
 
-void QCollisionAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e)
+void QCollisionAspect::sceneNodeAdded(Qt3DCore::QSceneChangePtr &e)
 {
-    QScenePropertyChangePtr propertyChange = e.staticCast<Qt3D::QScenePropertyChange>();
+    QScenePropertyChangePtr propertyChange = e.staticCast<Qt3DCore::QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
     QNode *n = nodePtr.data();
     QNodeVisitor visitor;
     visitor.traverse(n, this, &QCollisionAspect::visitNode);
 }
 
-void QCollisionAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e)
+void QCollisionAspect::sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e)
 {
-    QScenePropertyChangePtr propertyChange = e.staticCast<Qt3D::QScenePropertyChange>();
-    QNodePtr nodePtr = propertyChange->value().value<Qt3D::QNodePtr>();
+    QScenePropertyChangePtr propertyChange = e.staticCast<Qt3DCore::QScenePropertyChange>();
+    QNodePtr nodePtr = propertyChange->value().value<Qt3DCore::QNodePtr>();
     QNode *n = nodePtr.data();
     QAbstractAspect::clearBackendNode(n);
 }
 
-void QCollisionAspect::setRootEntity(Qt3D::QEntity *rootObject)
+void QCollisionAspect::setRootEntity(Qt3DCore::QEntity *rootObject)
 {
-    Qt3D::QNodeVisitor visitor;
+    Qt3DCore::QNodeVisitor visitor;
     visitor.traverse(rootObject, this, &QCollisionAspect::visitNode);
 }
 
@@ -124,12 +124,12 @@ void QCollisionAspect::onCleanup()
 {
 }
 
-void QCollisionAspect::visitNode(Qt3D::QNode *node)
+void QCollisionAspect::visitNode(Qt3DCore::QNode *node)
 {
     QAbstractAspect::createBackendNode(node);
 }
 
-} // Qt3D
+} // Qt3DCollision
 
 QT_END_NAMESPACE
 
diff --git a/src/collision/qcollisionaspect.h b/src/collision/qcollisionaspect.h
index 5095b18ba..36f79c68b 100644
--- a/src/collision/qcollisionaspect.h
+++ b/src/collision/qcollisionaspect.h
@@ -46,26 +46,26 @@ namespace Qt3DCollision {
 
 class QCollisionAspectPrivate;
 
-class QT3DCOLLISIONSHARED_EXPORT QCollisionAspect : public Qt3D::QAbstractAspect
+class QT3DCOLLISIONSHARED_EXPORT QCollisionAspect : public Qt3DCore::QAbstractAspect
 {
     Q_OBJECT
 public:
     explicit QCollisionAspect(QObject *parent = 0);
 
-    QVector<Qt3D::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
 
-    void sceneNodeAdded(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void sceneNodeRemoved(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 protected:
     void registerBackendTypes();
 
 private:
-    void setRootEntity(Qt3D::QEntity *rootObject) Q_DECL_OVERRIDE;
+    void setRootEntity(Qt3DCore::QEntity *rootObject) Q_DECL_OVERRIDE;
     void onInitialize(const QVariantMap &data) Q_DECL_OVERRIDE;
     void onCleanup() Q_DECL_OVERRIDE;
 
-    void visitNode(Qt3D::QNode *node);
+    void visitNode(Qt3DCore::QNode *node);
 
     Q_DECLARE_PRIVATE(QCollisionAspect)
     QCollisionAspect(QCollisionAspectPrivate &dd, QObject *parent);
diff --git a/src/collision/qcollisionaspect_p.h b/src/collision/qcollisionaspect_p.h
index 7f7797f4b..3a6733fd8 100644
--- a/src/collision/qcollisionaspect_p.h
+++ b/src/collision/qcollisionaspect_p.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCollision {
 
-class QCollisionAspectPrivate : public Qt3D::QAbstractAspectPrivate
+class QCollisionAspectPrivate : public Qt3DCore::QAbstractAspectPrivate
 {
     QCollisionAspectPrivate();
 
diff --git a/src/collision/qspherecollider.cpp b/src/collision/qspherecollider.cpp
index c968494aa..67bcdc1bf 100644
--- a/src/collision/qspherecollider.cpp
+++ b/src/collision/qspherecollider.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DCollision {
 
 /*!
-    \class Qt3D::QSphereColliderPrivate
+    \class Qt3DCore::QSphereColliderPrivate
     \internal
 */
 QSphereColliderPrivate::QSphereColliderPrivate()
@@ -53,7 +53,7 @@ QSphereColliderPrivate::QSphereColliderPrivate()
 }
 
 /*!
-    \class Qt3D::QSphereCollider
+    \class Qt3DCore::QSphereCollider
     \inmodule Qt3DCollision
     \since 5.5
     \brief Represents a sphere used for collision detection
@@ -62,7 +62,7 @@ QSphereColliderPrivate::QSphereColliderPrivate()
 /*!
     \qmltype SphereCollider
     \inqmlmodule Qt3D.Collision
-    \instantiates Qt3D::QSphereCollider
+    \instantiates Qt3DCore::QSphereCollider
     \inherits Component3D
     \since 5.5
 */
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index 02d8cb16f..806886ad5 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -50,10 +50,10 @@ static QByteArray className(const QMetaObject &obj)
     return QByteArray::fromRawData(obj.className(), int(strlen(obj.className())));
 }
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QAbstractAspectPrivate
+    \class Qt3DCore::QAbstractAspectPrivate
     \internal
 */
 QAbstractAspectPrivate::QAbstractAspectPrivate()
@@ -71,7 +71,7 @@ QAbstractAspectPrivate *QAbstractAspectPrivate::get(QAbstractAspect *aspect)
 }
 
 /*!
-    \class Qt3D::QAbstractAspect
+    \class Qt3DCore::QAbstractAspect
     \inmodule Qt3DCore
     \brief QAbstractAspect is the base class for aspects that provide a vertical slice of behavior.
 */
@@ -203,6 +203,6 @@ void QAbstractAspect::onShutdown()
 {
 }
 
-} // of namespace Qt3D
+} // of namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h
index 12d5044a1..cd162dfd2 100644
--- a/src/core/aspects/qabstractaspect.h
+++ b/src/core/aspects/qabstractaspect.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTASPECT_H
-#define QT3D_QABSTRACTASPECT_H
+#ifndef QT3DCORE_QABSTRACTASPECT_H
+#define QT3DCORE_QABSTRACTASPECT_H
 
 #include <QObject>
 #include <QSharedPointer>
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAspectManager;
 class QNode;
@@ -118,8 +118,8 @@ void QAbstractAspect::registerBackendType(const QBackendNodeFunctorPtr &functor)
     registerBackendType(Frontend::staticMetaObject, functor);
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_ABSTRACTASPECT_H
+#endif // QT3DCORE_ABSTRACTASPECT_H
diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h
index 77f9d2f02..5676cc8ce 100644
--- a/src/core/aspects/qabstractaspect_p.h
+++ b/src/core/aspects/qabstractaspect_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTASPECT_P_H
-#define QT3D_QABSTRACTASPECT_P_H
+#ifndef QT3DCORE_QABSTRACTASPECT_P_H
+#define QT3DCORE_QABSTRACTASPECT_P_H
 
 //
 //  W A R N I N G
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractAspect;
 class QEntity;
@@ -84,4 +84,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTASPECT_P_H
+#endif // QT3DCORE_QABSTRACTASPECT_P_H
diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp
index 9871f558d..6a0836294 100644
--- a/src/core/aspects/qaspectengine.cpp
+++ b/src/core/aspects/qaspectengine.cpp
@@ -55,10 +55,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QAspectEnginePrivate
+    \class Qt3DCore::QAspectEnginePrivate
     \internal
 */
 QAspectEnginePrivate::QAspectEnginePrivate()
@@ -66,11 +66,11 @@ QAspectEnginePrivate::QAspectEnginePrivate()
     , m_postman(Q_NULLPTR)
     , m_scene(Q_NULLPTR)
 {
-    qRegisterMetaType<Qt3D::QAbstractAspect *>();
-    qRegisterMetaType<Qt3D::QObserverInterface *>();
-    qRegisterMetaType<Qt3D::QEntity *>();
-    qRegisterMetaType<Qt3D::QScene *>();
-    qRegisterMetaType<Qt3D::QAbstractPostman *>();
+    qRegisterMetaType<Qt3DCore::QAbstractAspect *>();
+    qRegisterMetaType<Qt3DCore::QObserverInterface *>();
+    qRegisterMetaType<Qt3DCore::QEntity *>();
+    qRegisterMetaType<Qt3DCore::QScene *>();
+    qRegisterMetaType<Qt3DCore::QAbstractPostman *>();
 }
 
 /*!
@@ -146,10 +146,10 @@ void QAspectEngine::initialize()
     QChangeArbiter::createUnmanagedThreadLocalChangeQueue(arbiter);
     QMetaObject::invokeMethod(arbiter,
                               "setPostman",
-                              Q_ARG(Qt3D::QAbstractPostman*, d->m_postman));
+                              Q_ARG(Qt3DCore::QAbstractPostman*, d->m_postman));
     QMetaObject::invokeMethod(arbiter,
                               "setScene",
-                              Q_ARG(Qt3D::QScene*, d->m_scene));
+                              Q_ARG(Qt3DCore::QScene*, d->m_scene));
 }
 
 void QAspectEngine::shutdown()
@@ -202,7 +202,7 @@ void QAspectEngine::registerAspect(QAbstractAspect *aspect)
     QMetaObject::invokeMethod(d->m_aspectThread->aspectManager(),
                               "registerAspect",
                               Qt::BlockingQueuedConnection,
-                              Q_ARG(Qt3D::QAbstractAspect *, aspect));
+                              Q_ARG(Qt3DCore::QAbstractAspect *, aspect));
 }
 
 /*!
@@ -256,7 +256,7 @@ void QAspectEngine::setRootEntity(QEntity *root)
     QMetaObject::invokeMethod(d->m_aspectThread->aspectManager(),
                               "setRootEntity",
                               Qt::BlockingQueuedConnection,
-                              Q_ARG(Qt3D::QEntity *, root));
+                              Q_ARG(Qt3DCore::QEntity *, root));
     qCDebug(Aspects) << "Done setting scene root on aspect manager";
 }
 
@@ -278,6 +278,6 @@ void QAspectEngine::setAspectFactory(const QAspectFactory &factory)
     d->m_factory = factory;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/aspects/qaspectengine.h b/src/core/aspects/qaspectengine.h
index cdbb01a30..e9e768add 100644
--- a/src/core/aspects/qaspectengine.h
+++ b/src/core/aspects/qaspectengine.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QASPECTENGINE_H
-#define QT3D_QASPECTENGINE_H
+#ifndef QT3DCORE_QASPECTENGINE_H
+#define QT3DCORE_QASPECTENGINE_H
 
 #include <QObject>
 #include <Qt3DCore/QAspectFactory>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractAspect;
 class QAspectThread;
@@ -81,9 +81,9 @@ private:
     void initNodeTree(QNode *node);
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
 
-#endif // QT3D_QASPECTENGINE_H
+#endif // QT3DCORE_QASPECTENGINE_H
diff --git a/src/core/aspects/qaspectengine_p.h b/src/core/aspects/qaspectengine_p.h
index a8409f2c0..0439058d1 100644
--- a/src/core/aspects/qaspectengine_p.h
+++ b/src/core/aspects/qaspectengine_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QASPECTENGINE_P_H
-#define QT3D_QASPECTENGINE_P_H
+#ifndef QT3DCORE_QASPECTENGINE_P_H
+#define QT3DCORE_QASPECTENGINE_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QEntity;
 class QNode;
@@ -85,4 +85,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QASPECTENGINE_P_H
+#endif // QT3DCORE_QASPECTENGINE_P_H
diff --git a/src/core/aspects/qaspectfactory.cpp b/src/core/aspects/qaspectfactory.cpp
index 04e902acf..673ff5bdd 100644
--- a/src/core/aspects/qaspectfactory.cpp
+++ b/src/core/aspects/qaspectfactory.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 typedef QHash<QString, QAspectFactory::CreateFunction> defaultFactories_t;
 Q_GLOBAL_STATIC(defaultFactories_t, defaultFactories)
@@ -55,7 +55,7 @@ QT3DCORESHARED_EXPORT void qt3d_QAspectFactoryPrivate_addDefaultFactory(const QS
 }
 
 /*!
-    \class Qt3D::QAspectFactoryPrivate
+    \class Qt3DCore::QAspectFactoryPrivate
     \internal
 */
 QAspectFactoryPrivate::QAspectFactoryPrivate()
@@ -103,6 +103,6 @@ QAbstractAspect *QAspectFactory::createAspect(const QString &aspect, QObject *pa
     }
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/aspects/qaspectfactory.h b/src/core/aspects/qaspectfactory.h
index 938e8a967..9280c5340 100644
--- a/src/core/aspects/qaspectfactory.h
+++ b/src/core/aspects/qaspectfactory.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QASPECTFACTORY_H
-#define QT3D_QASPECTFACTORY_H
+#ifndef QT3DCORE_QASPECTFACTORY_H
+#define QT3DCORE_QASPECTFACTORY_H
 
 #include <QSharedDataPointer>
 #include <QStringList>
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 class QObject;
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractAspect;
 class QAspectFactoryPrivate;
@@ -85,20 +85,20 @@ private:
     QSharedDataPointer<QAspectFactoryPrivate> d;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
 #define QT3D_REGISTER_NAMESPACED_ASPECT(name, AspectNamespace, AspectType) \
     QT_BEGIN_NAMESPACE \
-    namespace Qt3D { \
+    namespace Qt3DCore { \
         QT3DCORESHARED_EXPORT void qt3d_QAspectFactoryPrivate_addDefaultFactory(const QString &, QAspectFactory::CreateFunction); \
     } \
     QT_END_NAMESPACE \
     namespace { \
     void qt3d_ ## AspectType ## _registerFunction() \
     { \
-        using namespace QT_PREPEND_NAMESPACE(Qt3D); \
+        using namespace QT_PREPEND_NAMESPACE(Qt3DCore); \
         qt3d_QAspectFactoryPrivate_addDefaultFactory(QStringLiteral(name), &QAspectFactory::functionHelper<AspectNamespace::AspectType>); \
     } \
     \
@@ -108,4 +108,4 @@ QT_END_NAMESPACE
 #define QT3D_REGISTER_ASPECT(name, AspectType) \
     QT3D_REGISTER_NAMESPACED_ASPECT(name, , AspectType)
 
-#endif // QT3D_QASPECTFACTORY_H
+#endif // QT3DCORE_QASPECTFACTORY_H
diff --git a/src/core/aspects/qaspectfactory_p.h b/src/core/aspects/qaspectfactory_p.h
index 7e105fe09..dfe7ccd9e 100644
--- a/src/core/aspects/qaspectfactory_p.h
+++ b/src/core/aspects/qaspectfactory_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QASPECTFACTORY_P_H
-#define QT3D_QASPECTFACTORY_P_H
+#ifndef QT3DCORE_QASPECTFACTORY_P_H
+#define QT3DCORE_QASPECTFACTORY_P_H
 
 //
 //  W A R N I N G
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAspectFactory;
 
@@ -72,4 +72,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QASPECTFACTORY_P_H
+#endif // QT3DCORE_QASPECTFACTORY_P_H
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp
index e6752f19c..0c5940ce5 100644
--- a/src/core/aspects/qaspectmanager.cpp
+++ b/src/core/aspects/qaspectmanager.cpp
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QAspectManager::QAspectManager(QObject *parent)
     : QObject(parent)
@@ -106,7 +106,7 @@ void QAspectManager::shutdown()
     // Aspects must be deleted in the Thread they were created in
 }
 
-void QAspectManager::setRootEntity(Qt3D::QEntity *root)
+void QAspectManager::setRootEntity(Qt3DCore::QEntity *root)
 {
     qCDebug(Aspects) << Q_FUNC_INFO;
 
@@ -261,7 +261,7 @@ QServiceLocator *QAspectManager::serviceLocator() const
     return m_serviceLocator.data();
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h
index bdf8b9233..8c1e372af 100644
--- a/src/core/aspects/qaspectmanager_p.h
+++ b/src/core/aspects/qaspectmanager_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QASPECTMANAGER_P_H
-#define QT3D_QASPECTMANAGER_P_H
+#ifndef QT3DCORE_QASPECTMANAGER_P_H
+#define QT3DCORE_QASPECTMANAGER_P_H
 
 //
 //  W A R N I N G
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 class QSurface;
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QNode;
 class QEntity;
@@ -83,9 +83,9 @@ public Q_SLOTS:
     void initialize();
     void shutdown();
 
-    void setRootEntity(Qt3D::QEntity *root);
+    void setRootEntity(Qt3DCore::QEntity *root);
     void setData(const QVariantMap &data);
-    void registerAspect(Qt3D::QAbstractAspect *aspect);
+    void registerAspect(Qt3DCore::QAbstractAspect *aspect);
     QVariantMap data() const;
 
     void exec();
@@ -109,8 +109,8 @@ private:
     QSemaphore m_waitForEndOfExecLoop;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QASPECTMANAGER_P_H
+#endif // QT3DCORE_QASPECTMANAGER_P_H
diff --git a/src/core/aspects/qaspectthread.cpp b/src/core/aspects/qaspectthread.cpp
index 0b1a969d3..67ce4cf20 100644
--- a/src/core/aspects/qaspectthread.cpp
+++ b/src/core/aspects/qaspectthread.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QAspectThread::QAspectThread(QObject *parent)
     : QThread(parent),
@@ -87,6 +87,6 @@ void QAspectThread::run()
     qCDebug(Aspects) << "Exiting void QAspectThread::run()";
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/aspects/qaspectthread.h b/src/core/aspects/qaspectthread.h
index 8d32e28bd..7bb48771e 100644
--- a/src/core/aspects/qaspectthread.h
+++ b/src/core/aspects/qaspectthread.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QASPECTTHREAD_H
-#define QT3D_QASPECTTHREAD_H
+#ifndef QT3DCORE_QASPECTTHREAD_H
+#define QT3DCORE_QASPECTTHREAD_H
 
 #include <QThread>
 #include <Qt3DCore/qt3dcore_global.h>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAspectManager;
 
@@ -66,8 +66,8 @@ private:
     QSemaphore m_semaphore;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QASPECTTHREAD_H
+#endif // QT3DCORE_QASPECTTHREAD_H
diff --git a/src/core/bounds/qaxisalignedboundingbox.cpp b/src/core/bounds/qaxisalignedboundingbox.cpp
index 21bb55bb4..afd21348c 100644
--- a/src/core/bounds/qaxisalignedboundingbox.cpp
+++ b/src/core/bounds/qaxisalignedboundingbox.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 void QAxisAlignedBoundingBox::update(const QVector<QVector3D> &points)
 {
@@ -89,6 +89,6 @@ QDebug operator<<(QDebug dbg, const QAxisAlignedBoundingBox &c)
     return dbg;
 }
 
-} //namespace Qt3D
+} //namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/bounds/qaxisalignedboundingbox.h b/src/core/bounds/qaxisalignedboundingbox.h
index c05917cf2..bf25fada3 100644
--- a/src/core/bounds/qaxisalignedboundingbox.h
+++ b/src/core/bounds/qaxisalignedboundingbox.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QAXISALIGNEDBOUNDINGBOX_H
-#define QT3D_QAXISALIGNEDBOUNDINGBOX_H
+#ifndef QT3DCORE_QAXISALIGNEDBOUNDINGBOX_H
+#define QT3DCORE_QAXISALIGNEDBOUNDINGBOX_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 class QDebug;
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QT3DCORESHARED_EXPORT QAxisAlignedBoundingBox
 {
@@ -148,8 +148,8 @@ inline bool intersects(const QAxisAlignedBoundingBox &a,
     return true;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QAXISALIGNEDBOUNDINGBOX_H
+#endif // QT3DCORE_QAXISALIGNEDBOUNDINGBOX_H
diff --git a/src/core/core-components/qcamera.cpp b/src/core/core-components/qcamera.cpp
index 9450ccf5b..5f7b2ef9a 100644
--- a/src/core/core-components/qcamera.cpp
+++ b/src/core/core-components/qcamera.cpp
@@ -39,10 +39,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QCameraPrivate
+    \class Qt3DCore::QCameraPrivate
     \internal
 */
 QCameraPrivate::QCameraPrivate()
@@ -55,7 +55,7 @@ QCameraPrivate::QCameraPrivate()
 
 /*!
     \qmltype Camera
-    \instantiates Qt3D::QCamera
+    \instantiates Qt3DCore::QCamera
     \inherits Entity
     \inqmlmodule Qt3D
     \since 5.5
@@ -256,7 +256,7 @@ void QCamera::setProjectionType(QCameraLens::ProjectionType type)
 }
 
 /*!
-    \qmlproperty enumeration Qt3D::Camera::projectionType
+    \qmlproperty enumeration Qt3DCore::Camera::projectionType
 
     Holds the type of the camera projection (orthogonal or perspective).
 
@@ -277,7 +277,7 @@ void QCamera::setNearPlane(float nearPlane)
 }
 
 /*!
-    \qmlproperty float Qt3D::Camera::nearPlane
+    \qmlproperty float Qt3DCore::Camera::nearPlane
 */
 
 float QCamera::nearPlane() const
@@ -293,7 +293,7 @@ void QCamera::setFarPlane(float farPlane)
 }
 
 /*!
-    \qmlproperty float Qt3D::Camera::farPlane
+    \qmlproperty float Qt3DCore::Camera::farPlane
 */
 
 float QCamera::farPlane() const
@@ -309,7 +309,7 @@ void QCamera::setFieldOfView(float fieldOfView)
 }
 
 /*!
-    \qmlproperty float Qt3D::Camera::fieldOfView
+    \qmlproperty float Qt3DCore::Camera::fieldOfView
 */
 
 float QCamera::fieldOfView() const
@@ -325,7 +325,7 @@ void QCamera::setAspectRatio(float aspectRatio)
 }
 
 /*!
-    \qmlproperty float Qt3D::Camera::aspectRatio
+    \qmlproperty float Qt3DCore::Camera::aspectRatio
 */
 
 float QCamera::aspectRatio() const
@@ -341,7 +341,7 @@ void QCamera::setLeft(float left)
 }
 
 /*!
-    \qmlproperty float Qt3D::Camera::left
+    \qmlproperty float Qt3DCore::Camera::left
 */
 
 float QCamera::left() const
@@ -357,7 +357,7 @@ void QCamera::setRight(float right)
 }
 
 /*!
-    \qmlproperty float Qt3D::Camera::right
+    \qmlproperty float Qt3DCore::Camera::right
 */
 
 float QCamera::right() const
@@ -373,7 +373,7 @@ void QCamera::setBottom(float bottom)
 }
 
 /*!
-    \qmlproperty float Qt3D::Camera::bottom
+    \qmlproperty float Qt3DCore::Camera::bottom
 */
 
 float QCamera::bottom() const
@@ -389,7 +389,7 @@ void QCamera::setTop(float top)
 }
 
 /*!
-    \qmlproperty float Qt3D::Camera::top
+    \qmlproperty float Qt3DCore::Camera::top
 */
 
 float QCamera::top() const
@@ -399,7 +399,7 @@ float QCamera::top() const
 }
 
 /*!
-    \qmlproperty matrix4x4 Qt3D::Camera::projectionMatrix
+    \qmlproperty matrix4x4 Qt3DCore::Camera::projectionMatrix
     \readonly
 */
 
@@ -416,7 +416,7 @@ void QCamera::setPosition(const QVector3D &position)
 }
 
 /*!
-    \qmlproperty vector3d Qt3D::Camera::position
+    \qmlproperty vector3d Qt3DCore::Camera::position
 */
 
 QVector3D QCamera::position() const
@@ -433,7 +433,7 @@ void QCamera::setUpVector(const QVector3D &upVector)
 }
 
 /*!
-    \qmlproperty vector3d Qt3D::Camera::upVector
+    \qmlproperty vector3d Qt3DCore::Camera::upVector
 */
 
 QVector3D QCamera::upVector() const
@@ -449,7 +449,7 @@ void QCamera::setViewCenter(const QVector3D &viewCenter)
 }
 
 /*!
-    \qmlproperty vector3d Qt3D::Camera::viewCenter
+    \qmlproperty vector3d Qt3DCore::Camera::viewCenter
 */
 
 QVector3D QCamera::viewCenter() const
@@ -459,7 +459,7 @@ QVector3D QCamera::viewCenter() const
 }
 
 /*!
-    \qmlproperty matrix4x4 Qt3D::Camera::matrix
+    \qmlproperty matrix4x4 Qt3DCore::Camera::matrix
 */
 QMatrix4x4 QCamera::matrix() const
 {
diff --git a/src/core/core-components/qcamera.h b/src/core/core-components/qcamera.h
index e3d6b2e31..9832aa5f9 100644
--- a/src/core/core-components/qcamera.h
+++ b/src/core/core-components/qcamera.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_CAMERA_H
-#define QT3D_CAMERA_H
+#ifndef QT3DCORE_CAMERA_H
+#define QT3DCORE_CAMERA_H
 
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qcameralens.h>
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QLookAtTransform;
 class QTransform;
@@ -55,7 +55,7 @@ class QT3DCORESHARED_EXPORT QCamera : public QEntity
 {
     Q_OBJECT
     // CameraLens
-    Q_PROPERTY(Qt3D::QCameraLens::ProjectionType projectionType READ projectionType WRITE setProjectionType NOTIFY projectionTypeChanged)
+    Q_PROPERTY(Qt3DCore::QCameraLens::ProjectionType projectionType READ projectionType WRITE setProjectionType NOTIFY projectionTypeChanged)
     Q_PROPERTY(float nearPlane READ nearPlane WRITE setNearPlane NOTIFY nearPlaneChanged)
     Q_PROPERTY(float farPlane READ farPlane WRITE setFarPlane NOTIFY farPlaneChanged)
     Q_PROPERTY(float fieldOfView READ fieldOfView WRITE setFieldOfView NOTIFY fieldOfViewChanged)
@@ -167,8 +167,8 @@ protected:
     QCamera(QCameraPrivate &dd, QNode *parent = 0);
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_CAMERA_H
+#endif // QT3DCORE_CAMERA_H
diff --git a/src/core/core-components/qcamera_p.h b/src/core/core-components/qcamera_p.h
index d16ba647f..12eef5b35 100644
--- a/src/core/core-components/qcamera_p.h
+++ b/src/core/core-components/qcamera_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_CAMERA_P_H
-#define QT3D_CAMERA_P_H
+#ifndef QT3DCORE_CAMERA_P_H
+#define QT3DCORE_CAMERA_P_H
 
 //
 //  W A R N I N G
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QT3DCORESHARED_EXPORT QCameraPrivate : public QEntityPrivate
 {
@@ -69,8 +69,8 @@ public:
     QLookAtTransform *m_lookAt;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_CAMERA_P_H
+#endif // QT3DCORE_CAMERA_P_H
diff --git a/src/core/core-components/qcameralens.cpp b/src/core/core-components/qcameralens.cpp
index 239fe2904..206745c28 100644
--- a/src/core/core-components/qcameralens.cpp
+++ b/src/core/core-components/qcameralens.cpp
@@ -39,10 +39,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QCameraLensPrivate
+    \class Qt3DCore::QCameraLensPrivate
     \internal
 */
 QCameraLensPrivate::QCameraLensPrivate()
@@ -87,10 +87,10 @@ void QCameraLens::copy(const QNode *ref)
     d_func()->m_projectionMatrix = lens->d_func()->m_projectionMatrix;
 }
 
-/*! \class Qt3D::QCameraLens
+/*! \class Qt3DCore::QCameraLens
  *  \inmodule Qt3DCore
  *
- * \brief Qt3D::QCameraLens specifies the projection matrix that will be used to
+ * \brief Qt3DCore::QCameraLens specifies the projection matrix that will be used to
  * define a Camera for a 3D scene.
  *
  *  \since 5.5
@@ -105,8 +105,8 @@ QCameraLens::QCameraLens(QCameraLensPrivate &dd, QNode *parent)
 /*!
  * Sets the lens' projection type \a projectionType.
  *
- * \note Qt3D::QCameraLens::Frustum and
- * Qt3D::QCameraLens::PerspectiveProjection are two different ways of
+ * \note Qt3DCore::QCameraLens::Frustum and
+ * Qt3DCore::QCameraLens::PerspectiveProjection are two different ways of
  * specifying the same projection.
  */
 void QCameraLens::setProjectionType(QCameraLens::ProjectionType projectionType)
@@ -239,7 +239,7 @@ float QCameraLens::farPlane() const
  * a projection matrix update.
  *
  * \note this has no effect if the projection type is not
- * Qt3D::QCameraLens::PerspectiveProjection.
+ * Qt3DCore::QCameraLens::PerspectiveProjection.
  */
 void QCameraLens::setFieldOfView(float fieldOfView)
 {
@@ -255,7 +255,7 @@ void QCameraLens::setFieldOfView(float fieldOfView)
  * Returns the projection's field of view in degrees.
  *
  * \note: The return value may be undefined if the projection type is not
- * Qt3D::QCameraLens::PerspectiveProjection.
+ * Qt3DCore::QCameraLens::PerspectiveProjection.
  */
 float QCameraLens::fieldOfView() const
 {
@@ -268,7 +268,7 @@ float QCameraLens::fieldOfView() const
  * matrix update.
  *
  * \note this has no effect if the projection type is not
- * Qt3D::QCameraLens::PerspectiveProjection.
+ * Qt3DCore::QCameraLens::PerspectiveProjection.
  */
 void QCameraLens::setAspectRatio(float aspectRatio)
 {
@@ -284,7 +284,7 @@ void QCameraLens::setAspectRatio(float aspectRatio)
  * Returns the projection's aspect ratio.
  *
  * \note: The return value may be undefined if the projection type is not
- * Qt3D::QCameraLens::PerspectiveProjection.
+ * Qt3DCore::QCameraLens::PerspectiveProjection.
  */
 float QCameraLens::aspectRatio() const
 {
@@ -297,7 +297,7 @@ float QCameraLens::aspectRatio() const
  * triggers a projection matrix update.
  *
  * \note this has no effect if the projection type is
- * Qt3D::QCameraLens::PerspectiveProjection.
+ * Qt3DCore::QCameraLens::PerspectiveProjection.
  */
 void QCameraLens::setLeft(float left)
 {
@@ -313,7 +313,7 @@ void QCameraLens::setLeft(float left)
  * Returns the lower left window coordinate of the projection.
  *
  * \note The return value may be undefined if the projection type is
- * Qt3D::QCameraLens::PerspectiveProjection.
+ * Qt3DCore::QCameraLens::PerspectiveProjection.
  */
 float QCameraLens::left() const
 {
@@ -326,7 +326,7 @@ float QCameraLens::left() const
  * a projection matrix update.
  *
  * \note this has no effect if the projection type is
- * Qt3D::QCameraLens::PerspectiveProjection.
+ * Qt3DCore::QCameraLens::PerspectiveProjection.
  */
 void QCameraLens::setRight(float right)
 {
@@ -342,7 +342,7 @@ void QCameraLens::setRight(float right)
  * Returns the upper right window coordinate of the projection.
  *
  * \note The return value may be undefined if the projection type is
- * Qt3D::QCameraLens::PerspectiveProjection.
+ * Qt3DCore::QCameraLens::PerspectiveProjection.
  */
 float QCameraLens::right() const
 {
@@ -355,7 +355,7 @@ float QCameraLens::right() const
  * projection matrix update.
  *
  * \note this has no effect if the projection type is
- * Qt3D::QCameraLens::PerspectiveProjection.
+ * Qt3DCore::QCameraLens::PerspectiveProjection.
  */
 void QCameraLens::setBottom(float bottom)
 {
@@ -371,7 +371,7 @@ void QCameraLens::setBottom(float bottom)
  * Returns the bottom window coordinate of the projection.
  *
  * \note The return value may be undefined if the projection type is
- * Qt3D::QCameraLens::PerspectiveProjection.
+ * Qt3DCore::QCameraLens::PerspectiveProjection.
  */
 float QCameraLens::bottom() const
 {
@@ -384,7 +384,7 @@ float QCameraLens::bottom() const
  * projection matrix update.
  *
  * \note this has no effect if the projection type is
- * Qt3D::QCameraLens::PerspectiveProjection.
+ * Qt3DCore::QCameraLens::PerspectiveProjection.
  */
 void QCameraLens::setTop(float top)
 {
@@ -400,7 +400,7 @@ void QCameraLens::setTop(float top)
  * Returns the bottom window coordinate of the projection.
  *
  * \note The return value may be undefined if the projection type is
- * Qt3D::QCameraLens::PerspectiveProjection.
+ * Qt3DCore::QCameraLens::PerspectiveProjection.
  */
 float QCameraLens::top() const
 {
@@ -421,14 +421,14 @@ QMatrix4x4 QCameraLens::projectionMatrix() const
 
 /*!
     \qmltype CameraLens
-    \instantiates Qt3D::QCameraLens
+    \instantiates Qt3DCore::QCameraLens
     \inqmlmodule Qt3D
     \inherits Component3D
     \since 5.5
 */
 
 /*!
-    \qmlproperty enumeration Qt3D::CameraLens::projectionType
+    \qmlproperty enumeration Qt3DCore::CameraLens::projectionType
 
     Holds the type of the camera projection (orthogonal or perspective).
 
@@ -437,39 +437,39 @@ QMatrix4x4 QCameraLens::projectionMatrix() const
 */
 
 /*!
-    \qmlproperty float Qt3D::CameraLens::nearPlane
+    \qmlproperty float Qt3DCore::CameraLens::nearPlane
 */
 
 /*!
-    \qmlproperty float Qt3D::CameraLens::farPlane
+    \qmlproperty float Qt3DCore::CameraLens::farPlane
 */
 
 /*!
-    \qmlproperty float Qt3D::CameraLens::fieldOfView
+    \qmlproperty float Qt3DCore::CameraLens::fieldOfView
 */
 
 /*!
-    \qmlproperty float Qt3D::CameraLens::aspectRatio
+    \qmlproperty float Qt3DCore::CameraLens::aspectRatio
 */
 
 /*!
-    \qmlproperty float Qt3D::CameraLens::left
+    \qmlproperty float Qt3DCore::CameraLens::left
 */
 
 /*!
-    \qmlproperty float Qt3D::CameraLens::right
+    \qmlproperty float Qt3DCore::CameraLens::right
 */
 
 /*!
-    \qmlproperty float Qt3D::CameraLens::bottom
+    \qmlproperty float Qt3DCore::CameraLens::bottom
 */
 
 /*!
-    \qmlproperty float Qt3D::CameraLens::top
+    \qmlproperty float Qt3DCore::CameraLens::top
 */
 
 /*!
-    \qmlproperty matrix4x4 Qt3D::CameraLens::projectionMatrix
+    \qmlproperty matrix4x4 Qt3DCore::CameraLens::projectionMatrix
     \readonly
 */
 
diff --git a/src/core/core-components/qcameralens.h b/src/core/core-components/qcameralens.h
index 7ec77adf7..7877b3a13 100644
--- a/src/core/core-components/qcameralens.h
+++ b/src/core/core-components/qcameralens.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_CAMERALENS_H
-#define QT3D_CAMERALENS_H
+#ifndef QT3DCORE_CAMERALENS_H
+#define QT3DCORE_CAMERALENS_H
 
 #include <Qt3DCore/qcomponent.h>
 #include <Qt3DCore/qt3dcore_global.h>
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QCameraLensPrivate;
 
diff --git a/src/core/core-components/qcameralens_p.h b/src/core/core-components/qcameralens_p.h
index 94d08c45a..b7ed7e9a8 100644
--- a/src/core/core-components/qcameralens_p.h
+++ b/src/core/core-components/qcameralens_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_CAMERALENS_P_H
-#define QT3D_CAMERALENS_P_H
+#ifndef QT3DCORE_CAMERALENS_P_H
+#define QT3DCORE_CAMERALENS_P_H
 
 //
 //  W A R N I N G
@@ -57,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QT3DCORESHARED_EXPORT QCameraLensPrivate : public QComponentPrivate
 {
@@ -122,8 +122,8 @@ private:
     }
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_CAMERALENS_P_H
+#endif // QT3DCORE_CAMERALENS_P_H
diff --git a/src/core/corelogging.cpp b/src/core/corelogging.cpp
index fe9de5dcc..a9917d90c 100644
--- a/src/core/corelogging.cpp
+++ b/src/core/corelogging.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 Q_LOGGING_CATEGORY(Nodes, "Qt3D.Core.Nodes")
 Q_LOGGING_CATEGORY(Aspects, "Qt3D.Core.Aspects")
diff --git a/src/core/corelogging_p.h b/src/core/corelogging_p.h
index adca1cee6..7b944bb50 100644
--- a/src/core/corelogging_p.h
+++ b/src/core/corelogging_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_CORELOGGING_P_H
-#define QT3D_CORELOGGING_P_H
+#ifndef QT3DCORE_CORELOGGING_P_H
+#define QT3DCORE_CORELOGGING_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 Q_DECLARE_LOGGING_CATEGORY(Resources)
 Q_DECLARE_LOGGING_CATEGORY(Nodes)
@@ -64,4 +64,4 @@ Q_DECLARE_LOGGING_CATEGORY(ChangeArbiter)
 
 QT_END_NAMESPACE
 
-#endif // QT3D_CORELOGGING_P_H
+#endif // QT3DCORE_CORELOGGING_P_H
diff --git a/src/core/io/qabstractattribute.cpp b/src/core/io/qabstractattribute.cpp
index 728a31a49..56563e01e 100644
--- a/src/core/io/qabstractattribute.cpp
+++ b/src/core/io/qabstractattribute.cpp
@@ -42,10 +42,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QAbstractAttributePrivate
+    \class Qt3DCore::QAbstractAttributePrivate
     \internal
 */
 QAbstractAttributePrivate::QAbstractAttributePrivate()
@@ -69,7 +69,7 @@ QAbstractAttribute::QAbstractAttribute(QNode *parent)
 
 QAbstractAttribute::~QAbstractAttribute()
 {
-    Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QAbstractAttribute subclass didn't call QNode::cleanup in its destructor");
+    Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DCore::QAbstractAttribute subclass didn't call QNode::cleanup in its destructor");
 }
 
 QAbstractAttribute::QAbstractAttribute(QAbstractBuffer *buf, DataType type, uint dataSize, uint count, uint offset, uint stride, QNode *parent)
diff --git a/src/core/io/qabstractattribute.h b/src/core/io/qabstractattribute.h
index f1f157b57..cf23812d1 100644
--- a/src/core/io/qabstractattribute.h
+++ b/src/core/io/qabstractattribute.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTATTRIBUTE_H
-#define QT3D_QABSTRACTATTRIBUTE_H
+#ifndef QT3DCORE_QABSTRACTATTRIBUTE_H
+#define QT3DCORE_QABSTRACTATTRIBUTE_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/QNode>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractBuffer;
 class QAbstractAttributePrivate;
@@ -53,7 +53,7 @@ typedef QSharedPointer<QAbstractBuffer> QAbstractBufferPtr;
 class QT3DCORESHARED_EXPORT QAbstractAttribute : public QNode
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QAbstractBuffer *buffer READ buffer WRITE setBuffer NOTIFY bufferChanged)
+    Q_PROPERTY(Qt3DCore::QAbstractBuffer *buffer READ buffer WRITE setBuffer NOTIFY bufferChanged)
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(DataType dataType READ dataType WRITE setDataType NOTIFY dataTypeChanged)
     Q_PROPERTY(uint dataSize READ dataSize WRITE setDataSize NOTIFY dataSizeChanged)
@@ -138,4 +138,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTATTRIBUTE_H
+#endif // QT3DCORE_QABSTRACTATTRIBUTE_H
diff --git a/src/core/io/qabstractattribute_p.h b/src/core/io/qabstractattribute_p.h
index b825aebbe..88cc945e1 100644
--- a/src/core/io/qabstractattribute_p.h
+++ b/src/core/io/qabstractattribute_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTATTRIBUTE_P_H
-#define QT3D_QABSTRACTATTRIBUTE_P_H
+#ifndef QT3DCORE_QABSTRACTATTRIBUTE_P_H
+#define QT3DCORE_QABSTRACTATTRIBUTE_P_H
 
 //
 //  W A R N I N G
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractAttribute;
 
@@ -81,4 +81,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTATTRIBUTE_P_H
+#endif // QT3DCORE_QABSTRACTATTRIBUTE_P_H
diff --git a/src/core/io/qabstractbuffer.cpp b/src/core/io/qabstractbuffer.cpp
index 7089b5a91..c53904747 100644
--- a/src/core/io/qabstractbuffer.cpp
+++ b/src/core/io/qabstractbuffer.cpp
@@ -39,10 +39,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QAbstractBufferPrivate
+    \class Qt3DCore::QAbstractBufferPrivate
     \internal
 */
 
@@ -58,7 +58,7 @@ QAbstractBuffer::QAbstractBuffer(QNode *parent)
 
 QAbstractBuffer::~QAbstractBuffer()
 {
-    Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QAbstractBuffer subclass didn't call QNode::cleanup in its destructor");
+    Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DCore::QAbstractBuffer subclass didn't call QNode::cleanup in its destructor");
 }
 
 /*! \internal */
diff --git a/src/core/io/qabstractbuffer.h b/src/core/io/qabstractbuffer.h
index 8b68b0e04..2a2120ec4 100644
--- a/src/core/io/qabstractbuffer.h
+++ b/src/core/io/qabstractbuffer.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTBUFFER_H
-#define QT3D_QABSTRACTBUFFER_H
+#ifndef QT3DCORE_QABSTRACTBUFFER_H
+#define QT3DCORE_QABSTRACTBUFFER_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/QNode>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractBufferPrivate;
 
@@ -76,4 +76,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTBUFFER_H
+#endif // QT3DCORE_QABSTRACTBUFFER_H
diff --git a/src/core/io/qabstractbuffer_p.h b/src/core/io/qabstractbuffer_p.h
index d48b31c95..375d96d54 100644
--- a/src/core/io/qabstractbuffer_p.h
+++ b/src/core/io/qabstractbuffer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTBUFFER_P_H
-#define QT3D_QABSTRACTBUFFER_P_H
+#ifndef QT3DCORE_QABSTRACTBUFFER_P_H
+#define QT3DCORE_QABSTRACTBUFFER_P_H
 
 //
 //  W A R N I N G
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractBuffer;
 
@@ -72,4 +72,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTBUFFER_P_H
+#endif // QT3DCORE_QABSTRACTBUFFER_P_H
diff --git a/src/core/io/qurlhelper.cpp b/src/core/io/qurlhelper.cpp
index c930f2059..fab671b94 100644
--- a/src/core/io/qurlhelper.cpp
+++ b/src/core/io/qurlhelper.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QString QUrlHelper::urlToLocalFileOrQrc(const QUrl &url)
 {
diff --git a/src/core/io/qurlhelper_p.h b/src/core/io/qurlhelper_p.h
index 27c8a674c..9bc6b5dfe 100644
--- a/src/core/io/qurlhelper_p.h
+++ b/src/core/io/qurlhelper_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QURLHELPER_P_H
-#define QT3D_QURLHELPER_P_H
+#ifndef QT3DCORE_QURLHELPER_P_H
+#define QT3DCORE_QURLHELPER_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QT3DCORESHARED_EXPORT QUrlHelper
 {
@@ -65,4 +65,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QURLHELPER_P_H
+#endif // QT3DCORE_QURLHELPER_P_H
diff --git a/src/core/jobs/dependencyhandler.cpp b/src/core/jobs/dependencyhandler.cpp
index a805638fe..d39b04ba4 100644
--- a/src/core/jobs/dependencyhandler.cpp
+++ b/src/core/jobs/dependencyhandler.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 namespace {
     template <template <typename T> class Op>
@@ -148,6 +148,6 @@ QVector<RunnableInterface *> DependencyHandler::freeDependencies(const RunnableI
     return freedList;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/jobs/dependencyhandler_p.h b/src/core/jobs/dependencyhandler_p.h
index 1887cc1ea..8c0c6734e 100644
--- a/src/core/jobs/dependencyhandler_p.h
+++ b/src/core/jobs/dependencyhandler_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_DEPENDENCYHANDLER_P_H
-#define QT3D_DEPENDENCYHANDLER_P_H
+#ifndef QT3DCORE_DEPENDENCYHANDLER_P_H
+#define QT3DCORE_DEPENDENCYHANDLER_P_H
 
 //
 //  W A R N I N G
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 struct Dependency
 {
@@ -68,12 +68,12 @@ struct Dependency
     RunnableInterface *dependee;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 template <>
-class QTypeInfo<Qt3D::Dependency> : public QTypeInfoMerger<Qt3D::Dependency, Qt3D::RunnableInterface *> {};
+class QTypeInfo<Qt3DCore::Dependency> : public QTypeInfoMerger<Qt3DCore::Dependency, Qt3DCore::RunnableInterface *> {};
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 inline bool operator==(const Dependency &left, const Dependency &right)
 {
@@ -102,9 +102,9 @@ private:
     QMutex *m_mutex;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_DEPENDENCYHANDLER_P_H
+#endif // QT3DCORE_DEPENDENCYHANDLER_P_H
 
diff --git a/src/core/jobs/qabstractaspectjobmanager.cpp b/src/core/jobs/qabstractaspectjobmanager.cpp
index a3b768ae4..15d5b92d0 100644
--- a/src/core/jobs/qabstractaspectjobmanager.cpp
+++ b/src/core/jobs/qabstractaspectjobmanager.cpp
@@ -38,10 +38,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QAbstractAspectJobManager
+    \class Qt3DCore::QAbstractAspectJobManager
     \internal
 */
 QAbstractAspectJobManager::QAbstractAspectJobManager(QObject *parent)
diff --git a/src/core/jobs/qabstractaspectjobmanager_p.h b/src/core/jobs/qabstractaspectjobmanager_p.h
index a153471fb..4397c746e 100644
--- a/src/core/jobs/qabstractaspectjobmanager_p.h
+++ b/src/core/jobs/qabstractaspectjobmanager_p.h
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractAspectJobManager : public QObject
 {
@@ -71,7 +71,7 @@ public:
     virtual void waitForPerThreadFunction(JobFunction func, void *arg) = 0;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/core/jobs/qaspectjob.cpp b/src/core/jobs/qaspectjob.cpp
index 9f12adb9c..fdd237954 100644
--- a/src/core/jobs/qaspectjob.cpp
+++ b/src/core/jobs/qaspectjob.cpp
@@ -39,10 +39,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QAspectJobPrivate
+    \class Qt3DCore::QAspectJobPrivate
     \internal
 */
 QAspectJobPrivate::QAspectJobPrivate()
@@ -77,6 +77,6 @@ QVector<QWeakPointer<QAspectJob> > QAspectJob::dependencies() const
     return d->m_dependencies;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/jobs/qaspectjob.h b/src/core/jobs/qaspectjob.h
index 8db1c9780..042baa46a 100644
--- a/src/core/jobs/qaspectjob.h
+++ b/src/core/jobs/qaspectjob.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QASPECTJOB_H
-#define QT3D_QASPECTJOB_H
+#ifndef QT3DCORE_QASPECTJOB_H
+#define QT3DCORE_QASPECTJOB_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <QSharedPointer>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAspectJobPrivate;
 
@@ -68,8 +68,8 @@ private:
 
 typedef QSharedPointer<QAspectJob> QAspectJobPtr;
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QASPECTJOB_H
+#endif // QT3DCORE_QASPECTJOB_H
diff --git a/src/core/jobs/qaspectjob_p.h b/src/core/jobs/qaspectjob_p.h
index 76bf1fcfd..312479e99 100644
--- a/src/core/jobs/qaspectjob_p.h
+++ b/src/core/jobs/qaspectjob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QASPECTJOB_P_H
-#define QT3D_QASPECTJOB_P_H
+#ifndef QT3DCORE_QASPECTJOB_P_H
+#define QT3DCORE_QASPECTJOB_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAspectJob;
 
@@ -69,4 +69,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QASPECTJOB_P_H
+#endif // QT3DCORE_QASPECTJOB_P_H
diff --git a/src/core/jobs/qaspectjobmanager.cpp b/src/core/jobs/qaspectjobmanager.cpp
index 974dec5db..47793e740 100644
--- a/src/core/jobs/qaspectjobmanager.cpp
+++ b/src/core/jobs/qaspectjobmanager.cpp
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 #ifdef THREAD_WEAVER
 namespace {
@@ -102,7 +102,7 @@ void SynchronizedJob::run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *t
 #endif
 
 /*!
-    \class Qt3D::QAspectJobManager
+    \class Qt3DCore::QAspectJobManager
     \internal
 */
 QAspectJobManager::QAspectJobManager(QObject *parent)
@@ -234,6 +234,6 @@ void QAspectJobManager::waitForPerThreadFunction(JobFunction func, void *arg)
 #endif
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/jobs/qaspectjobmanager_p.h b/src/core/jobs/qaspectjobmanager_p.h
index 772874547..deaa21d55 100644
--- a/src/core/jobs/qaspectjobmanager_p.h
+++ b/src/core/jobs/qaspectjobmanager_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QASPECTJOBMANAGER_P_H
-#define QT3D_QASPECTJOBMANAGER_P_H
+#ifndef QT3DCORE_QASPECTJOBMANAGER_P_H
+#define QT3DCORE_QASPECTJOBMANAGER_P_H
 
 //
 //  W A R N I N G
@@ -63,7 +63,7 @@ class Queue;
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QThreadPooler;
 class DependencyHandler;
@@ -93,8 +93,8 @@ private:
     QScopedPointer<DependencyHandler> m_dependencyHandler;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QASPECTJOBMANAGER_P_H
+#endif // QT3DCORE_QASPECTJOBMANAGER_P_H
diff --git a/src/core/jobs/qaspectjobproviderinterface.h b/src/core/jobs/qaspectjobproviderinterface.h
index ad05980ae..a8d59d5f3 100644
--- a/src/core/jobs/qaspectjobproviderinterface.h
+++ b/src/core/jobs/qaspectjobproviderinterface.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QASPECTJOBPROVIDERINTERFACE_H
-#define QT3D_QASPECTJOBPROVIDERINTERFACE_H
+#ifndef QT3DCORE_QASPECTJOBPROVIDERINTERFACE_H
+#define QT3DCORE_QASPECTJOBPROVIDERINTERFACE_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qaspectjob.h>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAspectJobProviderInterface
 {
@@ -57,4 +57,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QASPECTJOBPROVIDERINTERFACE_H
+#endif // QT3DCORE_QASPECTJOBPROVIDERINTERFACE_H
diff --git a/src/core/jobs/qthreadpooler.cpp b/src/core/jobs/qthreadpooler.cpp
index aea393cab..f38422652 100644
--- a/src/core/jobs/qthreadpooler.cpp
+++ b/src/core/jobs/qthreadpooler.cpp
@@ -42,10 +42,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QThreadPoolerPrivate
+    \class Qt3DCore::QThreadPoolerPrivate
     \internal
 */
 QThreadPooler::QThreadPooler(QObject *parent)
@@ -169,6 +169,6 @@ int QThreadPooler::maxThreadCount() const
     return QThreadPool::globalInstance()->maxThreadCount();
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/jobs/qthreadpooler_p.h b/src/core/jobs/qthreadpooler_p.h
index a7a0a8966..7a4253b60 100644
--- a/src/core/jobs/qthreadpooler_p.h
+++ b/src/core/jobs/qthreadpooler_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTHREADPOOLER_H
-#define QT3D_QTHREADPOOLER_H
+#ifndef QT3DCORE_QTHREADPOOLER_H
+#define QT3DCORE_QTHREADPOOLER_H
 
 //
 //  W A R N I N G
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QThreadPooler : public QObject
 {
@@ -89,8 +89,8 @@ private:
     QAtomicInt m_taskCount;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTHREADPOOLER_H
+#endif // QT3DCORE_QTHREADPOOLER_H
diff --git a/src/core/jobs/task.cpp b/src/core/jobs/task.cpp
index 8cfc365fa..731a93f9a 100644
--- a/src/core/jobs/task.cpp
+++ b/src/core/jobs/task.cpp
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 RunnableInterface::~RunnableInterface()
 {
@@ -123,6 +123,6 @@ DependencyHandler *SyncTaskRunnable::dependencyHandler()
     return Q_NULLPTR;
 }
 
-} // namespace Qt3D {
+} // namespace Qt3DCore {
 
 QT_END_NAMESPACE
diff --git a/src/core/jobs/task_p.h b/src/core/jobs/task_p.h
index 7d6ec744c..37368c2c1 100644
--- a/src/core/jobs/task_p.h
+++ b/src/core/jobs/task_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_TASK_P_H
-#define QT3D_TASK_P_H
+#ifndef QT3DCORE_TASK_P_H
+#define QT3DCORE_TASK_P_H
 
 //
 //  W A R N I N G
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class JobRunner;
 class DependencyHandler;
@@ -144,9 +144,9 @@ private:
     int m_id;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_TASK_P_H
+#endif // QT3DCORE_TASK_P_H
 
diff --git a/src/core/jobs/weaverjob.cpp b/src/core/jobs/weaverjob.cpp
index 4bc6f4585..f006bf438 100644
--- a/src/core/jobs/weaverjob.cpp
+++ b/src/core/jobs/weaverjob.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 WeaverJob::WeaverJob()
 {
@@ -52,6 +52,6 @@ void WeaverJob::run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread)
         m_job->run();
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/jobs/weaverjob_p.h b/src/core/jobs/weaverjob_p.h
index 4bebd235a..6cc5702c4 100644
--- a/src/core/jobs/weaverjob_p.h
+++ b/src/core/jobs/weaverjob_p.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_WEAVERJOB_H
-#define QT3D_WEAVERJOB_H
+#ifndef QT3DCORE_WEAVERJOB_H
+#define QT3DCORE_WEAVERJOB_H
 
 #include <job.h>
 #include <Qt3DCore/qaspectjob.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class WeaverJob : public ThreadWeaver::Job
 {
@@ -54,8 +54,8 @@ public:
     QAspectJobPtr m_job;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_WEAVERJOB_H
+#endif // QT3DCORE_WEAVERJOB_H
diff --git a/src/core/nodes/propertychangehandler_p.h b/src/core/nodes/propertychangehandler_p.h
index 7cb4058c0..543fa62fe 100644
--- a/src/core/nodes/propertychangehandler_p.h
+++ b/src/core/nodes/propertychangehandler_p.h
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /**
  * The property change handler is similar to QSignalSpy, but geared towards the usecase of Qt3D.
diff --git a/src/core/nodes/qabstractnodefactory.cpp b/src/core/nodes/qabstractnodefactory.cpp
index 6df2b1174..d64efca5a 100644
--- a/src/core/nodes/qabstractnodefactory.cpp
+++ b/src/core/nodes/qabstractnodefactory.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QAbstractNodeFactory::~QAbstractNodeFactory()
 {
@@ -56,6 +56,6 @@ QList<QAbstractNodeFactory *> QAbstractNodeFactory::nodeFactories()
     return node_factories;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/nodes/qabstractnodefactory.h b/src/core/nodes/qabstractnodefactory.h
index 8d8583fc9..cc8d92254 100644
--- a/src/core/nodes/qabstractnodefactory.h
+++ b/src/core/nodes/qabstractnodefactory.h
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QT3DCORESHARED_EXPORT QAbstractNodeFactory
 {
@@ -65,7 +65,7 @@ public:
     }
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/core/nodes/qbackendnode.cpp b/src/core/nodes/qbackendnode.cpp
index a897f6f04..84ed3cf33 100644
--- a/src/core/nodes/qbackendnode.cpp
+++ b/src/core/nodes/qbackendnode.cpp
@@ -42,10 +42,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QBackendNodePrivate
+    \class Qt3DCore::QBackendNodePrivate
     \internal
 */
 QBackendNodePrivate::QBackendNodePrivate(QBackendNode::Mode mode)
diff --git a/src/core/nodes/qbackendnode.h b/src/core/nodes/qbackendnode.h
index d37a902bb..6ca9e5a26 100644
--- a/src/core/nodes/qbackendnode.h
+++ b/src/core/nodes/qbackendnode.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBACKENDNODE_H
-#define QT3D_QBACKENDNODE_H
+#ifndef QT3DCORE_QBACKENDNODE_H
+#define QT3DCORE_QBACKENDNODE_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qscenechange.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QBackendNodeFactory;
 class QBackendNodePrivate;
@@ -98,4 +98,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBACKENDNODE_H
+#endif // QT3DCORE_QBACKENDNODE_H
diff --git a/src/core/nodes/qbackendnode_p.h b/src/core/nodes/qbackendnode_p.h
index dbd9cd49a..7b1e4b597 100644
--- a/src/core/nodes/qbackendnode_p.h
+++ b/src/core/nodes/qbackendnode_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBACKENDNODE_P_H
-#define QT3D_QBACKENDNODE_P_H
+#ifndef QT3DCORE_QBACKENDNODE_P_H
+#define QT3DCORE_QBACKENDNODE_P_H
 
 //
 //  W A R N I N G
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QBackendNodeFactory;
 
@@ -89,4 +89,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBACKENDNODE_P_H
+#endif // QT3DCORE_QBACKENDNODE_P_H
diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp
index b68c845e5..1e81f9204 100644
--- a/src/core/nodes/qcomponent.cpp
+++ b/src/core/nodes/qcomponent.cpp
@@ -43,10 +43,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QComponentPrivate
+    \class Qt3DCore::QComponentPrivate
     \internal
 */
 QComponentPrivate::QComponentPrivate()
@@ -94,23 +94,23 @@ void QComponentPrivate::removeEntity(QEntity *entity)
 }
 
 /*!
-    \class Qt3D::QComponent
+    \class Qt3DCore::QComponent
     \inmodule Qt3DCore
-    \inherits Qt3D::QNode
+    \inherits Qt3DCore::QNode
     \since 5.5
 
-    \brief The base class of scene nodes that can be aggregated by Qt3D::QEntity
+    \brief The base class of scene nodes that can be aggregated by Qt3DCore::QEntity
     instances as a component.
 
-    A Qt3D::QComponent provides a vertical slice of behavior that can be assigned to and
-    sometimes shared across Qt3D::QEntity instances.
+    A Qt3DCore::QComponent provides a vertical slice of behavior that can be assigned to and
+    sometimes shared across Qt3DCore::QEntity instances.
 
-    Qt3D::QComponent subclasses are often aggregated in groups that impart useful
+    Qt3DCore::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, Qt3DRender::QMesh, and Qt3DRender::QMaterial components.
+    Qt3DCore::QTransform, Qt3DRender::QMesh, and Qt3DRender::QMaterial components.
 
-    \sa Qt3D::QEntity
+    \sa Qt3DCore::QEntity
 */
 
 /*!
@@ -125,7 +125,7 @@ QComponent::QComponent(QNode *parent)
 
 QComponent::~QComponent()
 {
-    Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QComponent subclass didn't call QNode::cleanup in its destructor");
+    Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DCore::QComponent subclass didn't call QNode::cleanup in its destructor");
 
     Q_FOREACH (QEntity *entity, entities()) {
         QEntityPrivate *entityPimpl = static_cast<QEntityPrivate *>(QEntityPrivate::get(entity));
@@ -154,7 +154,7 @@ bool QComponent::isEnabled() const
 
 /*!
     Set the QComponent to enabled if \a enabled is true.
-    By default a Qt3D::QComponent is always enabled.
+    By default a Qt3DCore::QComponent is always enabled.
 
     \note the interpretation of what enabled means is aspect-dependent. Even if
     enabled is set to false, some aspects may still consider the component in
@@ -204,22 +204,22 @@ QComponent::QComponent(QComponentPrivate &dd, QNode *parent)
 {
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 /*!
     \qmltype Component3D
-    \instantiates Qt3D::QComponent
+    \instantiates Qt3DCore::QComponent
     \inqmlmodule Qt3D
     \inherits Node
     \since 5.5
 */
 
 /*!
-    \qmlproperty bool Qt3D::Component3D::shareable
+    \qmlproperty bool Qt3DCore::Component3D::shareable
 */
 
 /*!
-    \qmlproperty bool Qt3D::Component3D::enabled
+    \qmlproperty bool Qt3DCore::Component3D::enabled
 */
 
 QT_END_NAMESPACE
diff --git a/src/core/nodes/qcomponent.h b/src/core/nodes/qcomponent.h
index 70e74c3c0..2eee89bb4 100644
--- a/src/core/nodes/qcomponent.h
+++ b/src/core/nodes/qcomponent.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_COMPONENT_H
-#define QT3D_COMPONENT_H
+#ifndef QT3DCORE_COMPONENT_H
+#define QT3DCORE_COMPONENT_H
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qt3dcore_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QComponentPrivate;
 
@@ -76,8 +76,8 @@ private:
     Q_DECLARE_PRIVATE(QComponent)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_COMPONENT_H
+#endif // QT3DCORE_COMPONENT_H
diff --git a/src/core/nodes/qcomponent_p.h b/src/core/nodes/qcomponent_p.h
index 1761b0875..56c807a61 100644
--- a/src/core/nodes/qcomponent_p.h
+++ b/src/core/nodes/qcomponent_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCOMPONENT_P_H
-#define QT3D_QCOMPONENT_P_H
+#ifndef QT3DCORE_QCOMPONENT_P_H
+#define QT3DCORE_QCOMPONENT_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QT3DCORESHARED_EXPORT QComponentPrivate : public QNodePrivate
 {
@@ -73,4 +73,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCOMPONENT_P_H
+#endif // QT3DCORE_QCOMPONENT_P_H
diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp
index 9c21f8dff..7e0a66c82 100644
--- a/src/core/nodes/qentity.cpp
+++ b/src/core/nodes/qentity.cpp
@@ -49,10 +49,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QEntityPrivate
+    \class Qt3DCore::QEntityPrivate
     \internal
 */
 QEntityPrivate::QEntityPrivate()
@@ -62,26 +62,26 @@ QEntityPrivate::QEntityPrivate()
 {}
 
 /*!
-    \class Qt3D::QEntity
+    \class Qt3DCore::QEntity
     \inmodule Qt3DCore
-    \inherits Qt3D::QNode
+    \inherits Qt3DCore::QNode
     \since 5.5
 
-    \brief Qt3D::QEntity is a Qt3D::QNode subclass that can aggregate several
-    Qt3D::QComponent instances that will specify its behavior.
+    \brief Qt3DCore::QEntity is a Qt3DCore::QNode subclass that can aggregate several
+    Qt3DCore::QComponent instances that will specify its behavior.
 
-    By itself a Qt3D::QEntity is an empty shell. The behavior of a Qt3D::QEntity
-    object is defined by the Qt3D::QComponent objects it references. Each Qt3D
+    By itself a Qt3DCore::QEntity is an empty shell. The behavior of a Qt3DCore::QEntity
+    object is defined by the Qt3DCore::QComponent objects it references. Each Qt3D
     backend aspect will be able to interpret and process an Entity by
     recognizing which components it is made up of. One aspect may decide to only
-    process entities composed of a single Qt3D::QTransform component whilst
-    another may focus on Qt3D::QMouseInput.
+    process entities composed of a single Qt3DCore::QTransform component whilst
+    another may focus on Qt3DCore::QMouseInput.
 
-    \sa Qt3D::QComponent, Qt3D::QTransform
+    \sa Qt3DCore::QComponent, Qt3DCore::QTransform
 */
 
 /*!
-    Constructs a new Qt3D::QEntity instance with \a parent as parent.
+    Constructs a new Qt3DCore::QEntity instance with \a parent as parent.
 */
 QEntity::QEntity(QNode *parent)
     : QNode(*new QEntityPrivate, parent)
@@ -106,7 +106,7 @@ QEntity::QEntity(QEntityPrivate &dd, QNode *parent)
 }
 
 /*!
-    Copies all the properties and components of the Qt3D::QEntity \a ref to the
+    Copies all the properties and components of the Qt3DCore::QEntity \a ref to the
     current instance.
 */
 void QEntity::copy(const QNode *ref)
@@ -124,7 +124,7 @@ void QEntity::copy(const QNode *ref)
 }
 
 /*!
-    Returns the list of Qt3D::QComponent instances the entity is referencing.
+    Returns the list of Qt3DCore::QComponent instances the entity is referencing.
 */
 QList<QComponent *> QEntity::components() const
 {
@@ -135,7 +135,7 @@ QList<QComponent *> QEntity::components() const
 /*!
     Adds a new reference to the component \a comp.
 
-    \note If the Qt3D::QComponent has no parent, the Qt3D::QEntity will set
+    \note If the Qt3DCore::QComponent has no parent, the Qt3DCore::QEntity will set
     itself as its parent thereby taking ownership of the component.
 */
 void QEntity::addComponent(QComponent *comp)
@@ -201,10 +201,10 @@ void QEntity::removeAllComponents()
 }
 
 /*!
-    Returns the parent Qt3D::QEntity instance of this entity. If the
-    immediate parent isn't a Qt3D::QEntity, this function traverses up the
-    scene hierarchy until a parent Qt3D::QEntity is found. If no
-    Qt3D::QEntity parent can be found, returns null.
+    Returns the parent Qt3DCore::QEntity instance of this entity. If the
+    immediate parent isn't a Qt3DCore::QEntity, this function traverses up the
+    scene hierarchy until a parent Qt3DCore::QEntity is found. If no
+    Qt3DCore::QEntity parent can be found, returns null.
 */
 QEntity *QEntity::parentEntity() const
 {
@@ -227,9 +227,9 @@ QEntity *QEntity::parentEntity() const
 }
 
 /*!
- Returns the Qt3D::QNodeId id of the parent Qt3D::QEntity instance of the
- current Qt3D::QEntity object. The QNodeId isNull method will return true if
- there is no Qt3D::QEntity parent of the current Qt3D::QEntity in the scene
+ Returns the Qt3DCore::QNodeId id of the parent Qt3DCore::QEntity instance of the
+ current Qt3DCore::QEntity object. The QNodeId isNull method will return true if
+ there is no Qt3DCore::QEntity parent of the current Qt3DCore::QEntity in the scene
  hierarchy.
  */
 QNodeId QEntity::parentEntityId() const
@@ -240,6 +240,6 @@ QNodeId QEntity::parentEntityId() const
     return d->m_parentEntityId;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/nodes/qentity.h b/src/core/nodes/qentity.h
index 786fde05f..2b87f0c39 100644
--- a/src/core/nodes/qentity.h
+++ b/src/core/nodes/qentity.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QENTITY_H
-#define QT3D_QENTITY_H
+#ifndef QT3DCORE_QENTITY_H
+#define QT3DCORE_QENTITY_H
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qt3dcore_global.h>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QComponent;
 class QEntityPrivate;
@@ -77,8 +77,8 @@ private:
     QT3D_CLONEABLE(QEntity)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QENTITY_H
+#endif // QT3DCORE_QENTITY_H
diff --git a/src/core/nodes/qentity_p.h b/src/core/nodes/qentity_p.h
index 5c683bdfc..03812dfae 100644
--- a/src/core/nodes/qentity_p.h
+++ b/src/core/nodes/qentity_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QENTITY_P_H
-#define QT3D_QENTITY_P_H
+#ifndef QT3DCORE_QENTITY_P_H
+#define QT3DCORE_QENTITY_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QT3DCORESHARED_EXPORT QEntityPrivate : public QNodePrivate
 {
@@ -76,4 +76,4 @@ public :
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QENTITY_P_H
+#endif // QT3DCORE_QENTITY_P_H
diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp
index 3338b6cae..9ba2fe3c0 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -52,12 +52,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QHash<QNodeId, QNode *> QNodePrivate::m_clonesLookupTable = QHash<QNodeId, QNode *>();
 
 /*!
-    \class Qt3D::QNodePrivate
+    \class Qt3DCore::QNodePrivate
     \internal
 */
 QNodePrivate::QNodePrivate()
@@ -274,7 +274,7 @@ void QNodePrivate::setArbiter(QLockableObserverInterface *arbiter)
 
 /*!
     Called when one or more backend aspects sends a notification \a change to the
-    current Qt3D::QNode instance.
+    current Qt3DCore::QNode instance.
 
     \note This method should be reimplemented in your subclasses to properly
     handle the \a change.
@@ -384,46 +384,46 @@ void QNodePrivate::nodePtrDeleter(QNode *q)
 
 
 /*!
-    \class Qt3D::QNode
+    \class Qt3DCore::QNode
     \inherits QObject
 
     \inmodule Qt3DCore
     \since 5.5
 
-    \brief Qt3D::QNode is the base class of all Qt3D node classes used to build a
+    \brief Qt3DCore::QNode is the base class of all Qt3D node classes used to build a
     Qt3D scene.
 
-    The owernship of Qt3D::QNode is determined by the QObject parent/child
-    relationship between nodes. By itself a Qt3D::QNode has no visual appearance
+    The owernship of Qt3DCore::QNode is determined by the QObject parent/child
+    relationship between nodes. By itself a Qt3DCore::QNode has no visual appearance
     and no particular meaning, it is there as a way of building a node based tree
     structure.
 
-    The parent of a Qt3D::QNode instance can only be another Qt3D::QNode
+    The parent of a Qt3DCore::QNode instance can only be another Qt3DCore::QNode
     instance.
 
-    Each Qt3D::QNode instance has a unique id that allows it to be recognizable
+    Each Qt3DCore::QNode instance has a unique id that allows it to be recognizable
     from other instances.
 
-    When properties are defined on a Qt3D::QNode subclass, their NOTIFY signal
+    When properties are defined on a Qt3DCore::QNode subclass, their NOTIFY signal
     will automatically generate notifications that the Qt3D backend aspects will
     receive.
 
-    When subclassing Qt3D::QNode make sure to call QNode::cleanup() from your
+    When subclassing Qt3DCore::QNode make sure to call QNode::cleanup() from your
     subclass's destructor to ensure proper notification to backend aspects.
-    Faiure to do so will result in crashes when one of your Qt3D::QNode
+    Faiure to do so will result in crashes when one of your Qt3DCore::QNode
     subclass instance is eventually destroyed.
 
-    \sa Qt3D::QEntity, Qt3D::QComponent
+    \sa Qt3DCore::QEntity, Qt3DCore::QComponent
 */
 
 /*!
-     Creates a new Qt3D::QNode instance with parent \a parent.
+     Creates a new Qt3DCore::QNode instance with parent \a parent.
 
-     \note The backend aspects will be notified that a Qt3D::QNode instance is
+     \note The backend aspects will be notified that a Qt3DCore::QNode instance is
      part of the scene only if it has a parent; unless this is the root node of
      the Qt3D scene.
 
-     \sa setParent(Qt3D::QNode *)
+     \sa setParent(Qt3DCore::QNode *)
 */
 QNode::QNode(QNode *parent)
     : QObject(*new QNodePrivate, parent)
@@ -451,11 +451,11 @@ QNode::QNode(QNodePrivate &dd, QNode *parent)
 }
 
 /*!
-    Copies all the attributes from \a ref to the current Qt3D::QNode instance.
+    Copies all the attributes from \a ref to the current Qt3DCore::QNode instance.
 
-    \note When subclassing Qt3D::QNode you should reimplement this method and
+    \note When subclassing Qt3DCore::QNode you should reimplement this method and
     always call the copy method on the base class. This will ensure that when cloned,
-    the Qt3D::QNode is properly initialized.
+    the Qt3DCore::QNode is properly initialized.
 */
 void QNode::copy(const QNode *ref)
 {
@@ -467,11 +467,11 @@ void QNode::copy(const QNode *ref)
 
 QNode::~QNode()
 {
-    Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QNode subclass didn't call QNode::cleanup in its destructor");
+    Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DCore::QNode subclass didn't call QNode::cleanup in its destructor");
 }
 
 /*!
-    Returns the id that uniquely identifies the Qt3D::QNode instance.
+    Returns the id that uniquely identifies the Qt3DCore::QNode instance.
 */
 const QNodeId QNode::id() const
 {
@@ -480,7 +480,7 @@ const QNodeId QNode::id() const
 }
 
 /*!
-    Returns the immediate Qt3D::QNode parent, null if the node has no parent.
+    Returns the immediate Qt3DCore::QNode parent, null if the node has no parent.
 */
 QNode *QNode::parentNode() const
 {
@@ -519,12 +519,12 @@ bool QNode::blockNotifications(bool block)
 }
 
 /*!
- * Sets the parent node of the current Qt3D::QNode instance to \a parent.
- * Setting the parent will notify the backend aspects about current Qt3D::QNode
+ * Sets the parent node of the current Qt3DCore::QNode instance to \a parent.
+ * Setting the parent will notify the backend aspects about current Qt3DCore::QNode
  * instance's parent change.
  *
  * \note if \a parent happens to be null, this will actually notify that the
- * current Qt3D::QNode instance was removed from the scene.
+ * current Qt3DCore::QNode instance was removed from the scene.
  */
 void QNode::setParent(QNode *parent)
 {
@@ -537,8 +537,8 @@ void QNode::setParent(QNode *parent)
 }
 
 /*!
- * Returns a list filled with the Qt3D::QNode children of the current
- * Qt3D::QNode instance.
+ * Returns a list filled with the Qt3DCore::QNode children of the current
+ * Qt3DCore::QNode instance.
  */
 QNodeList QNode::childrenNodes() const
 {
@@ -596,10 +596,10 @@ QNode *QNode::clone(QNode *node)
 
 /*!
  * This methods can only be called once and takes care of notyfing the backend
- * aspects that the current Qt3D::QNode instance is about to be destroyed.
+ * aspects that the current Qt3DCore::QNode instance is about to be destroyed.
  *
  * \note It must be called by the destructor of every class subclassing
- * Qt3D::QNode that is clonable (using the QT3D_CLONEABLE macro).
+ * Qt3DCore::QNode that is clonable (using the QT3D_CLONEABLE macro).
  */
 void QNode::cleanup()
 {
@@ -614,7 +614,7 @@ void QNode::cleanup()
     }
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 
 QT_END_NAMESPACE
diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h
index f65a89515..1c0266ec2 100644
--- a/src/core/nodes/qnode.h
+++ b/src/core/nodes/qnode.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QNODE_H
-#define QT3D_QNODE_H
+#ifndef QT3DCORE_QNODE_H
+#define QT3DCORE_QNODE_H
 
 #include <QObject>
 #include <Qt3DCore/qt3dcore_global.h>
@@ -43,11 +43,11 @@
 #include <Qt3DCore/qscenechange.h>
 #include <Qt3DCore/qabstractnodefactory.h>
 
-#define Q_NODE_NULLPTR static_cast<Qt3D::QNode *>(Q_NULLPTR)
+#define Q_NODE_NULLPTR static_cast<Qt3DCore::QNode *>(Q_NULLPTR)
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QNode;
 class QNodePrivate;
@@ -57,11 +57,11 @@ class QAspectEngine;
 typedef QList<QNode *> QNodeList;
 typedef QSharedPointer<QNode> QNodePtr;
 
-#define QT3D_QUOTE(str) #str
+#define QT3DCORE_QUOTE(str) #str
 #define QT3D_CLONEABLE(Class)                \
-    friend class Qt3D::QAbstractNodeFactory;       \
+    friend class Qt3DCore::QAbstractNodeFactory;       \
     QNode *doClone() const Q_DECL_OVERRIDE { \
-        Class *clone_ = Qt3D::QAbstractNodeFactory::createNode<Class>(QT3D_QUOTE(Class)); \
+        Class *clone_ = Qt3DCore::QAbstractNodeFactory::createNode<Class>(QT3DCORE_QUOTE(Class)); \
         clone_->copy(this);                   \
         return clone_;                        \
     }
@@ -73,7 +73,7 @@ typedef QSharedPointer<QNode> QNodePtr;
 class QT3DCORESHARED_EXPORT QNode : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QNode *parent READ parentNode WRITE setParent NOTIFY parentChanged)
+    Q_PROPERTY(Qt3DCore::QNode *parent READ parentNode WRITE setParent NOTIFY parentChanged)
 public:
     explicit QNode(QNode *parent = 0);
     virtual ~QNode();
@@ -116,7 +116,7 @@ Q_SIGNALS:
     void parentChanged();
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h
index 556006d41..b51dff472 100644
--- a/src/core/nodes/qnode_p.h
+++ b/src/core/nodes/qnode_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QNODE_P_H
-#define QT3D_QNODE_P_H
+#ifndef QT3DCORE_QNODE_P_H
+#define QT3DCORE_QNODE_P_H
 
 //
 //  W A R N I N G
@@ -57,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QNode;
 class QAspectEngine;
@@ -108,8 +108,8 @@ private:
     static QHash<QNodeId, QNode *> m_clonesLookupTable;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_NODE_P_H
+#endif // QT3DCORE_NODE_P_H
diff --git a/src/core/nodes/qnodeid.cpp b/src/core/nodes/qnodeid.cpp
index a057d978f..ac8055e9d 100644
--- a/src/core/nodes/qnodeid.cpp
+++ b/src/core/nodes/qnodeid.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QNodeId QNodeId::createId()
 {
diff --git a/src/core/nodes/qnodeid.h b/src/core/nodes/qnodeid.h
index ec1e6ce07..76fdd2745 100644
--- a/src/core/nodes/qnodeid.h
+++ b/src/core/nodes/qnodeid.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QNODEID_H
-#define QT3D_QNODEID_H
+#ifndef QT3DCORE_QNODEID_H
+#define QT3DCORE_QNODEID_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QT3DCORESHARED_EXPORT QNodeId
 {
@@ -100,11 +100,11 @@ inline uint qHash(const QNodeId &id, uint seed = 0) Q_DECL_NOTHROW
 
 } // Qt3D
 
-Q_DECLARE_TYPEINFO(Qt3D::QNodeId, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Qt3DCore::QNodeId, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QNodeId)
+Q_DECLARE_METATYPE(Qt3DCore::QNodeId)
 
 
-#endif // QT3D_QNODEID_H
+#endif // QT3DCORE_QNODEID_H
diff --git a/src/core/nodes/qnodevisitor.cpp b/src/core/nodes/qnodevisitor.cpp
index ec10cbb73..d07809101 100644
--- a/src/core/nodes/qnodevisitor.cpp
+++ b/src/core/nodes/qnodevisitor.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QNodeVisitor::QNodeVisitor()
 {
@@ -63,6 +63,6 @@ QNodeList QNodeVisitor::path() const
     return m_path;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/nodes/qnodevisitor.h b/src/core/nodes/qnodevisitor.h
index 3a8bc4c17..3664e99f9 100644
--- a/src/core/nodes/qnodevisitor.h
+++ b/src/core/nodes/qnodevisitor.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QNODEVISITOR_H
-#define QT3D_QNODEVISITOR_H
+#ifndef QT3DCORE_QNODEVISITOR_H
+#define QT3DCORE_QNODEVISITOR_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qnode.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D
+namespace Qt3DCore
 {
 
 class QT3DCORESHARED_EXPORT QNodeVisitor
@@ -248,8 +248,8 @@ private:
     }
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QNODEVISITOR_H
+#endif // QT3DCORE_QNODEVISITOR_H
diff --git a/src/core/qabstractfunctor.cpp b/src/core/qabstractfunctor.cpp
index 30bb573ee..f3f157b50 100644
--- a/src/core/qabstractfunctor.cpp
+++ b/src/core/qabstractfunctor.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QAbstractFunctor::~QAbstractFunctor()
 {
diff --git a/src/core/qabstractfunctor.h b/src/core/qabstractfunctor.h
index 47edc62f1..fa89e392d 100644
--- a/src/core/qabstractfunctor.h
+++ b/src/core/qabstractfunctor.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTFUNCTOR_H
-#define QT3D_QABSTRACTFUNCTOR_H
+#ifndef QT3DCORE_QABSTRACTFUNCTOR_H
+#define QT3DCORE_QABSTRACTFUNCTOR_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 // This will generate a unique id() function per type
 // <=> 1 unique function address per type
@@ -66,7 +66,7 @@ qintptr functorTypeId()
 
 #define QT3D_FUNCTOR(Class)                     \
    qintptr id() const Q_DECL_OVERRIDE {         \
-        return Qt3D::functorTypeId<Class>();    \
+        return Qt3DCore::functorTypeId<Class>();    \
    }
 
 
@@ -89,4 +89,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTFUNCTOR_H
+#endif // QT3DCORE_QABSTRACTFUNCTOR_H
diff --git a/src/core/qbackendnodefactory.cpp b/src/core/qbackendnodefactory.cpp
index a5d5bce71..31d2f19ac 100644
--- a/src/core/qbackendnodefactory.cpp
+++ b/src/core/qbackendnodefactory.cpp
@@ -38,12 +38,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QBackendNodeFactory::~QBackendNodeFactory()
 {
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/qbackendnodefactory.h b/src/core/qbackendnodefactory.h
index 5fc1d18bb..ac935328c 100644
--- a/src/core/qbackendnodefactory.h
+++ b/src/core/qbackendnodefactory.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBACKENDNODEFACTORY_H
-#define QT3D_QBACKENDNODEFACTORY_H
+#ifndef QT3DCORE_QBACKENDNODEFACTORY_H
+#define QT3DCORE_QBACKENDNODEFACTORY_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QBackendNode;
 class QNode;
@@ -53,8 +53,8 @@ public:
     virtual QBackendNode *createBackendNode(QNode *frontend) const = 0;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBACKENDNODEFACTORY_H
+#endif // QT3DCORE_QBACKENDNODEFACTORY_H
diff --git a/src/core/qbackendscenepropertychange.cpp b/src/core/qbackendscenepropertychange.cpp
index cc4142dd1..a68edda39 100644
--- a/src/core/qbackendscenepropertychange.cpp
+++ b/src/core/qbackendscenepropertychange.cpp
@@ -41,15 +41,15 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QBackendScenePropertyChange
+    \class Qt3DCore::QBackendScenePropertyChange
     \inmodule Qt3DCore
 */
 
 /*!
-    \class Qt3D::QBackendScenePropertyChangePrivate
+    \class Qt3DCore::QBackendScenePropertyChangePrivate
     \internal
 */
 QBackendScenePropertyChangePrivate::QBackendScenePropertyChangePrivate()
diff --git a/src/core/qbackendscenepropertychange.h b/src/core/qbackendscenepropertychange.h
index 382418500..8c06d19af 100644
--- a/src/core/qbackendscenepropertychange.h
+++ b/src/core/qbackendscenepropertychange.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBACKENDSCENEPROPERTYCHANGE_H
-#define QT3D_QBACKENDSCENEPROPERTYCHANGE_H
+#ifndef QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_H
+#define QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_H
 
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DCore/qnodeid.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QBackendScenePropertyChangePrivate;
 class QBackendNode;
@@ -70,4 +70,4 @@ typedef QSharedPointer<QBackendScenePropertyChange> QBackendScenePropertyChangeP
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBACKENDSCENEPROPERTYCHANGE_H
+#endif // QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_H
diff --git a/src/core/qbackendscenepropertychange_p.h b/src/core/qbackendscenepropertychange_p.h
index 40174f316..99080b8b2 100644
--- a/src/core/qbackendscenepropertychange_p.h
+++ b/src/core/qbackendscenepropertychange_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBACKENDSCENEPROPERTYCHANGE_P_H
-#define QT3D_QBACKENDSCENEPROPERTYCHANGE_P_H
+#ifndef QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_P_H
+#define QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QBackendScenePropertyChange;
 
@@ -72,4 +72,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBACKENDSCENEPROPERTYCHANGE_P_H
+#endif // QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_P_H
diff --git a/src/core/qboundingsphere.cpp b/src/core/qboundingsphere.cpp
index 80af217c2..c6f9980e3 100644
--- a/src/core/qboundingsphere.cpp
+++ b/src/core/qboundingsphere.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QBoundingSphere::QBoundingSphere()
 {
@@ -48,6 +48,6 @@ QBoundingSphere::~QBoundingSphere()
 {
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/qboundingsphere.h b/src/core/qboundingsphere.h
index 05f4b530c..4fd3a5f0a 100644
--- a/src/core/qboundingsphere.h
+++ b/src/core/qboundingsphere.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBOUDINGSPHERE_H
-#define QT3D_QBOUDINGSPHERE_H
+#ifndef QT3DCORE_QBOUDINGSPHERE_H
+#define QT3DCORE_QBOUDINGSPHERE_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qboundingvolume.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QT3DCORESHARED_EXPORT QBoundingSphere : public QBoundingVolume
 {
@@ -54,8 +54,8 @@ public:
     virtual float radius() const = 0;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBOUDINGSPHERE_H
+#endif // QT3DCORE_QBOUDINGSPHERE_H
diff --git a/src/core/qboundingvolume.cpp b/src/core/qboundingvolume.cpp
index caba96c79..e0ae704e4 100644
--- a/src/core/qboundingvolume.cpp
+++ b/src/core/qboundingvolume.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QBoundingVolume::QBoundingVolume()
 {
@@ -48,6 +48,6 @@ QBoundingVolume::~QBoundingVolume()
 {
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/qboundingvolume.h b/src/core/qboundingvolume.h
index f983b3ac9..21006cfc1 100644
--- a/src/core/qboundingvolume.h
+++ b/src/core/qboundingvolume.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBOUDINGVOLUME_P_H
-#define QT3D_QBOUDINGVOLUME_P_H
+#ifndef QT3DCORE_QBOUDINGVOLUME_P_H
+#define QT3DCORE_QBOUDINGVOLUME_P_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qnodeid.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QRay3D;
 
@@ -62,10 +62,10 @@ public:
     virtual Type type() const = 0;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QBoundingVolume*)
+Q_DECLARE_METATYPE(Qt3DCore::QBoundingVolume*)
 
-#endif // QT3D_QBOUDINGVOLUME_P_H
+#endif // QT3DCORE_QBOUDINGVOLUME_P_H
diff --git a/src/core/qboundingvolumeprovider.cpp b/src/core/qboundingvolumeprovider.cpp
index 69091cacc..4d3e0647d 100644
--- a/src/core/qboundingvolumeprovider.cpp
+++ b/src/core/qboundingvolumeprovider.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QBoundingVolumeProvider::~QBoundingVolumeProvider()
 {
diff --git a/src/core/qboundingvolumeprovider.h b/src/core/qboundingvolumeprovider.h
index 3d8496d27..f61f02b23 100644
--- a/src/core/qboundingvolumeprovider.h
+++ b/src/core/qboundingvolumeprovider.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBOUNDINGVOLUMEPROVIDER_H
-#define QT3D_QBOUNDINGVOLUMEPROVIDER_H
+#ifndef QT3DCORE_QBOUNDINGVOLUMEPROVIDER_H
+#define QT3DCORE_QBOUNDINGVOLUMEPROVIDER_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QBoundingVolume;
 
@@ -52,8 +52,8 @@ public:
     virtual QVector<QBoundingVolume *> boundingVolumes() const = 0;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBOUNDINGVOLUMEPROVIDER_H
+#endif // QT3DCORE_QBOUNDINGVOLUMEPROVIDER_H
diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp
index 465e6f2b4..09bda2b6d 100644
--- a/src/core/qchangearbiter.cpp
+++ b/src/core/qchangearbiter.cpp
@@ -49,10 +49,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QChangeArbiter
+    \class Qt3DCore::QChangeArbiter
     \inmodule Qt3DCore
     \since 5.5
 
@@ -331,6 +331,6 @@ void QChangeArbiter::destroyThreadLocalChangeQueue(void *changeArbiter)
     }
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/qchangearbiter_p.h b/src/core/qchangearbiter_p.h
index 62ec64c27..1fc914b11 100644
--- a/src/core/qchangearbiter_p.h
+++ b/src/core/qchangearbiter_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCHANGEARBITER_P_H
-#define QT3D_QCHANGEARBITER_P_H
+#ifndef QT3DCORE_QCHANGEARBITER_P_H
+#define QT3DCORE_QCHANGEARBITER_P_H
 
 //
 //  W A R N I N G
@@ -63,7 +63,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QNode;
 class QObservableInterface;
@@ -88,7 +88,7 @@ public:
     explicit QChangeArbiter(QObject *parent = 0);
     ~QChangeArbiter();
 
-    void initialize(Qt3D::QAbstractAspectJobManager *jobManager);
+    void initialize(Qt3DCore::QAbstractAspectJobManager *jobManager);
 
     void syncChanges();
 
@@ -105,8 +105,8 @@ public:
     void sceneChangeEventWithLock(const QSceneChangePtr &e) Q_DECL_OVERRIDE; // QLockableObserverInterface impl
     void sceneChangeEventWithLock(const QSceneChangeList &e) Q_DECL_OVERRIDE; // QLockableObserverInterface impl
 
-    Q_INVOKABLE void setPostman(Qt3D::QAbstractPostman *postman);
-    Q_INVOKABLE void setScene(Qt3D::QScene *scene);
+    Q_INVOKABLE void setPostman(Qt3DCore::QAbstractPostman *postman);
+    Q_INVOKABLE void setScene(Qt3DCore::QScene *scene);
 
     QAbstractPostman *postman() const Q_DECL_FINAL;
     QScene *scene() const;
@@ -156,8 +156,8 @@ private:
     QScene *m_scene;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCHANGEARBITER_P_H
+#endif // QT3DCORE_QCHANGEARBITER_P_H
diff --git a/src/core/qlockableobserverinterface.cpp b/src/core/qlockableobserverinterface.cpp
index 32df72039..63390153d 100644
--- a/src/core/qlockableobserverinterface.cpp
+++ b/src/core/qlockableobserverinterface.cpp
@@ -38,12 +38,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QLockableObserverInterface::~QLockableObserverInterface()
 {
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/qlockableobserverinterface_p.h b/src/core/qlockableobserverinterface_p.h
index c46860924..fcf260b30 100644
--- a/src/core/qlockableobserverinterface_p.h
+++ b/src/core/qlockableobserverinterface_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QLOCKABLEOBSERVERINTERFACE_P_H
-#define QT3D_QLOCKABLEOBSERVERINTERFACE_P_H
+#ifndef QT3DCORE_QLOCKABLEOBSERVERINTERFACE_P_H
+#define QT3DCORE_QLOCKABLEOBSERVERINTERFACE_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 typedef std::vector<QSceneChangePtr> QSceneChangeList;
 
@@ -64,10 +64,10 @@ public:
     virtual void sceneChangeEventWithLock(const QSceneChangeList &e) = 0;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QLockableObserverInterface *)
+Q_DECLARE_METATYPE(Qt3DCore::QLockableObserverInterface *)
 
-#endif // QT3D_QLOCKABLEOBSERVERINTERFACE_P_H
+#endif // QT3DCORE_QLOCKABLEOBSERVERINTERFACE_P_H
diff --git a/src/core/qobservableinterface.cpp b/src/core/qobservableinterface.cpp
index ba8660212..c296ac4c7 100644
--- a/src/core/qobservableinterface.cpp
+++ b/src/core/qobservableinterface.cpp
@@ -38,12 +38,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QObservableInterface::~QObservableInterface()
 {
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/qobservableinterface_p.h b/src/core/qobservableinterface_p.h
index 0fcec1639..f4aca757a 100644
--- a/src/core/qobservableinterface_p.h
+++ b/src/core/qobservableinterface_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QOBSERVABLEINTERFACE_P_H
-#define QT3D_QOBSERVABLEINTERFACE_P_H
+#ifndef QT3DCORE_QOBSERVABLEINTERFACE_P_H
+#define QT3DCORE_QOBSERVABLEINTERFACE_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QLockableObserverInterface;
 
@@ -67,8 +67,8 @@ protected:
     virtual void notifyObservers(const QSceneChangePtr &e) = 0;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QOBSERVABLEINTERFACE_P_H
+#endif // QT3DCORE_QOBSERVABLEINTERFACE_P_H
diff --git a/src/core/qobserverinterface.cpp b/src/core/qobserverinterface.cpp
index 266f573e1..731d96267 100644
--- a/src/core/qobserverinterface.cpp
+++ b/src/core/qobserverinterface.cpp
@@ -38,12 +38,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QObserverInterface::~QObserverInterface()
 {
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/qobserverinterface_p.h b/src/core/qobserverinterface_p.h
index 907794d51..f3107cb1c 100644
--- a/src/core/qobserverinterface_p.h
+++ b/src/core/qobserverinterface_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QOBSERVERINTERFACE_P_H
-#define QT3D_QOBSERVERINTERFACE_P_H
+#ifndef QT3DCORE_QOBSERVERINTERFACE_P_H
+#define QT3DCORE_QOBSERVERINTERFACE_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QT3DCORESHARED_EXPORT QObserverInterface
 {
@@ -61,10 +61,10 @@ public:
     virtual void sceneChangeEvent(const QSceneChangePtr &e) = 0;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QObserverInterface *)
+Q_DECLARE_METATYPE(Qt3DCore::QObserverInterface *)
 
-#endif // QT3D_QOBSERVERINTERFACE_P_H
+#endif // QT3DCORE_QOBSERVERINTERFACE_P_H
diff --git a/src/core/qpostman.cpp b/src/core/qpostman.cpp
index b7e7904d7..9584ff753 100644
--- a/src/core/qpostman.cpp
+++ b/src/core/qpostman.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QPostmanPrivate : public QObjectPrivate
 {
diff --git a/src/core/qpostman_p.h b/src/core/qpostman_p.h
index 469f37117..c98ce6700 100644
--- a/src/core/qpostman_p.h
+++ b/src/core/qpostman_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QPOSTMAN_P_H
-#define QT3D_QPOSTMAN_P_H
+#ifndef QT3DCORE_QPOSTMAN_P_H
+#define QT3DCORE_QPOSTMAN_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QScene;
 class QPostmanPrivate;
@@ -90,6 +90,6 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QAbstractPostman*)
+Q_DECLARE_METATYPE(Qt3DCore::QAbstractPostman*)
 
-#endif // QT3D_QPOSTMAN_P_H
+#endif // QT3DCORE_QPOSTMAN_P_H
diff --git a/src/core/qray3d.cpp b/src/core/qray3d.cpp
index 109fbc41b..f73bbada7 100644
--- a/src/core/qray3d.cpp
+++ b/src/core/qray3d.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
     \class QRay3D
@@ -354,6 +354,6 @@ QDataStream &operator>>(QDataStream &stream, QRay3D &ray)
 
 #endif // QT_NO_DATASTREAM
 
-}  // namespace Qt3D
+}  // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/qray3d.h b/src/core/qray3d.h
index f60b18666..ef79fb8ca 100644
--- a/src/core/qray3d.h
+++ b/src/core/qray3d.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QRAY3D_H
-#define QT3D_QRAY3D_H
+#ifndef QT3DCORE_QRAY3D_H
+#define QT3DCORE_QRAY3D_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <QtGui/qvector3d.h>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QT3DCORESHARED_EXPORT QRay3D
 {
@@ -81,24 +81,24 @@ private:
 };
 
 #ifndef QT_NO_DEBUG_STREAM
-QT3DCORESHARED_EXPORT QDebug operator<<(QDebug dbg, const Qt3D::QRay3D &ray);
+QT3DCORESHARED_EXPORT QDebug operator<<(QDebug dbg, const Qt3DCore::QRay3D &ray);
 #endif
 
 #ifndef QT_NO_DATASTREAM
-QT3DCORESHARED_EXPORT QDataStream &operator<<(QDataStream &stream, const Qt3D::QRay3D &ray);
-QT3DCORESHARED_EXPORT QDataStream &operator>>(QDataStream &stream, Qt3D::QRay3D &ray);
+QT3DCORESHARED_EXPORT QDataStream &operator<<(QDataStream &stream, const Qt3DCore::QRay3D &ray);
+QT3DCORESHARED_EXPORT QDataStream &operator>>(QDataStream &stream, Qt3DCore::QRay3D &ray);
 #endif
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-inline bool qFuzzyCompare(const Qt3D::QRay3D &ray1, const Qt3D::QRay3D &ray2)
+inline bool qFuzzyCompare(const Qt3DCore::QRay3D &ray1, const Qt3DCore::QRay3D &ray2)
 {
     return qFuzzyCompare(ray1.origin(), ray2.origin()) &&
            qFuzzyCompare(ray1.direction(), ray2.direction());
 }
 
-Q_DECLARE_METATYPE(Qt3D::QRay3D)
+Q_DECLARE_METATYPE(Qt3DCore::QRay3D)
 
-#endif // QT3D_QRAY3D_H
+#endif // QT3DCORE_QRAY3D_H
diff --git a/src/core/qscene.cpp b/src/core/qscene.cpp
index cfc4a65de..920d46d66 100644
--- a/src/core/qscene.cpp
+++ b/src/core/qscene.cpp
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QScenePrivate
 {
diff --git a/src/core/qscene_p.h b/src/core/qscene_p.h
index a76f0eed4..e89a6f171 100644
--- a/src/core/qscene_p.h
+++ b/src/core/qscene_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSCENE_P_H
-#define QT3D_QSCENE_P_H
+#ifndef QT3DCORE_QSCENE_P_H
+#define QT3DCORE_QSCENE_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QNode;
 class QScenePrivate;
@@ -80,8 +80,8 @@ public:
     QVector<QNode *> lookupNodes(const QVector<QNodeId> &ids) const;
     QNodeId nodeIdFromObservable(QObservableInterface *observable) const;
 
-    void setArbiter(Qt3D::QLockableObserverInterface *arbiter);
-    Qt3D::QLockableObserverInterface *arbiter() const;
+    void setArbiter(Qt3DCore::QLockableObserverInterface *arbiter);
+    Qt3DCore::QLockableObserverInterface *arbiter() const;
 
     // Component -> Entities
     QList<QNodeId> entitiesForComponent(const QNodeId &id) const;
@@ -98,6 +98,6 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QScene*)
+Q_DECLARE_METATYPE(Qt3DCore::QScene*)
 
-#endif // QT3D_QSCENE_P_H
+#endif // QT3DCORE_QSCENE_P_H
diff --git a/src/core/qscenechange.cpp b/src/core/qscenechange.cpp
index 9c278d8b5..4438eb353 100644
--- a/src/core/qscenechange.cpp
+++ b/src/core/qscenechange.cpp
@@ -40,10 +40,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \enum Qt3D::ChangeFlag
+    \enum Qt3DCore::ChangeFlag
 
     The types of change that can be sent and received by Qt3D's change notification system.
 
@@ -59,7 +59,7 @@ namespace Qt3D {
 */
 
 /*!
-    \class Qt3D::QSceneChangePrivate
+    \class Qt3DCore::QSceneChangePrivate
     \internal
 */
 QSceneChangePrivate::QSceneChangePrivate()
diff --git a/src/core/qscenechange.h b/src/core/qscenechange.h
index 3c22638d3..9efa4e010 100644
--- a/src/core/qscenechange.h
+++ b/src/core/qscenechange.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSCENECHANGE_H
-#define QT3D_QSCENECHANGE_H
+#ifndef QT3DCORE_QSCENECHANGE_H
+#define QT3DCORE_QSCENECHANGE_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <QSharedPointer>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 enum ChangeFlag {
     NodeCreated             = 1 << 0,
@@ -99,8 +99,8 @@ protected:
 
 typedef QSharedPointer<QSceneChange> QSceneChangePtr;
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSCENECHANGE_H
+#endif // QT3DCORE_QSCENECHANGE_H
diff --git a/src/core/qscenechange_p.h b/src/core/qscenechange_p.h
index 05eca9bcb..b739fb770 100644
--- a/src/core/qscenechange_p.h
+++ b/src/core/qscenechange_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSCENECHANGE_P_H
-#define QT3D_QSCENECHANGE_P_H
+#ifndef QT3DCORE_QSCENECHANGE_P_H
+#define QT3DCORE_QSCENECHANGE_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QSceneChange;
 class QNodeId;
@@ -78,4 +78,4 @@ public :
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSCENECHANGE_P_H
+#endif // QT3DCORE_QSCENECHANGE_P_H
diff --git a/src/core/qsceneobserverinterface.cpp b/src/core/qsceneobserverinterface.cpp
index e116b39f4..e4333115d 100644
--- a/src/core/qsceneobserverinterface.cpp
+++ b/src/core/qsceneobserverinterface.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QSceneObserverInterface::~QSceneObserverInterface()
 {
diff --git a/src/core/qsceneobserverinterface.h b/src/core/qsceneobserverinterface.h
index 5fccc385f..3929910cf 100644
--- a/src/core/qsceneobserverinterface.h
+++ b/src/core/qsceneobserverinterface.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSCENEOBSERVERINTERFACE_H
-#define QT3D_QSCENEOBSERVERINTERFACE_H
+#ifndef QT3DCORE_QSCENEOBSERVERINTERFACE_H
+#define QT3DCORE_QSCENEOBSERVERINTERFACE_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qscenechange.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QT3DCORESHARED_EXPORT QSceneObserverInterface
 {
@@ -56,6 +56,6 @@ public:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QSceneObserverInterface *)
+Q_DECLARE_METATYPE(Qt3DCore::QSceneObserverInterface *)
 
-#endif // QT3D_QSCENEOBSERVERINTERFACE_H
+#endif // QT3DCORE_QSCENEOBSERVERINTERFACE_H
diff --git a/src/core/qscenepropertychange.cpp b/src/core/qscenepropertychange.cpp
index 7ae5b6eef..08e9f73e5 100644
--- a/src/core/qscenepropertychange.cpp
+++ b/src/core/qscenepropertychange.cpp
@@ -40,10 +40,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QScenePropertyChange
+    \class Qt3DCore::QScenePropertyChange
     \inmodule Qt3dCore
 */
 
@@ -51,7 +51,7 @@ QFrameAllocator *QScenePropertyChangePrivate::m_allocator = new QFrameAllocator(
 QMutex QScenePropertyChangePrivate::m_mutex;
 
 /*!
-    \class Qt3D::QScenePropertyChangePrivate
+    \class Qt3DCore::QScenePropertyChangePrivate
     \internal
 */
 QScenePropertyChangePrivate::QScenePropertyChangePrivate()
diff --git a/src/core/qscenepropertychange.h b/src/core/qscenepropertychange.h
index dcedf20a5..992e1e6ae 100644
--- a/src/core/qscenepropertychange.h
+++ b/src/core/qscenepropertychange.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSCENEPROPERTYCHANGE_H
-#define QT3D_QSCENEPROPERTYCHANGE_H
+#ifndef QT3DCORE_QSCENEPROPERTYCHANGE_H
+#define QT3DCORE_QSCENEPROPERTYCHANGE_H
 
 #include <Qt3DCore/qscenechange.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QScenePropertyChangePrivate;
 
@@ -68,8 +68,8 @@ protected:
 
 typedef QSharedPointer<QScenePropertyChange> QScenePropertyChangePtr;
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSCENEPROPERTYCHANGE_H
+#endif // QT3DCORE_QSCENEPROPERTYCHANGE_H
diff --git a/src/core/qscenepropertychange_p.h b/src/core/qscenepropertychange_p.h
index a06d7b30b..3c2150952 100644
--- a/src/core/qscenepropertychange_p.h
+++ b/src/core/qscenepropertychange_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSCENEPROPERTYCHANGE_P_H
-#define QT3D_QSCENEPROPERTYCHANGE_P_H
+#ifndef QT3DCORE_QSCENEPROPERTYCHANGE_P_H
+#define QT3DCORE_QSCENEPROPERTYCHANGE_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QScenePropertyChange;
 class QFrameAllocator;
@@ -83,4 +83,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSCENEPROPERTYCHANGE_P_H
+#endif // QT3DCORE_QSCENEPROPERTYCHANGE_P_H
diff --git a/src/core/qscheduler.cpp b/src/core/qscheduler.cpp
index 70e38479f..f73ec69f5 100644
--- a/src/core/qscheduler.cpp
+++ b/src/core/qscheduler.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QScheduler::QScheduler(QObject *parent)
     : QObject(parent)
@@ -87,6 +87,6 @@ void QScheduler::update(qint64 time)
     m_aspectManager->jobManager()->waitForAllJobs();
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/qscheduler_p.h b/src/core/qscheduler_p.h
index 5b8270d50..fb61dec24 100644
--- a/src/core/qscheduler_p.h
+++ b/src/core/qscheduler_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSCHEDULER_P_H
-#define QT3D_QSCHEDULER_P_H
+#ifndef QT3DCORE_QSCHEDULER_P_H
+#define QT3DCORE_QSCHEDULER_P_H
 
 #include <QObject>
 #include <Qt3DCore/qt3dcore_global.h>
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAspectManager;
 
@@ -72,8 +72,8 @@ private:
     QAspectManager *m_aspectManager;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSCHEDULER_P_H
+#endif // QT3DCORE_QSCHEDULER_P_H
diff --git a/src/core/qtickclock.cpp b/src/core/qtickclock.cpp
index 67ece3c14..ad9063b3e 100644
--- a/src/core/qtickclock.cpp
+++ b/src/core/qtickclock.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QTickClock::QTickClock()
     : m_tickInterval(1000000000 / 60) // Nanoseconds
@@ -86,7 +86,7 @@ qint64 QTickClock::waitForNextTick()
     //qCDebug(ChangeArbiter) << "sleeping for" << sleepTimeMicroSeconds << "us";
     QThread::usleep(sleepTimeMicroSeconds);
 
-#if defined(QT3D_DEBUG_TICKCLOCK)
+#if defined(QT3DCORE_DEBUG_TICKCLOCK)
     qint64 expectedWakeTime = t + sleepTimeMicroSeconds * 1000;
     qint64 wakeTime = m_timer.nsecsElapsed();
     qCDebug(ChangeArbiter) << "t =" << t / 1000000 << "timeToSleep =" << timeToSleep / 1000000
@@ -99,6 +99,6 @@ qint64 QTickClock::waitForNextTick()
     return m_time;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/qtickclock_p.h b/src/core/qtickclock_p.h
index f04056826..bda4ef250 100644
--- a/src/core/qtickclock_p.h
+++ b/src/core/qtickclock_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTICKCLOCK_P_H
-#define QT3D_QTICKCLOCK_P_H
+#ifndef QT3DCORE_QTICKCLOCK_P_H
+#define QT3DCORE_QTICKCLOCK_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QTickClock
 {
@@ -74,8 +74,8 @@ private:
     qint64 m_time;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTICKCLOCK_P_H
+#endif // QT3DCORE_QTICKCLOCK_P_H
diff --git a/src/core/resources/qboundedcircularbuffer_p.h b/src/core/resources/qboundedcircularbuffer_p.h
index 96143d662..cf05df44d 100644
--- a/src/core/resources/qboundedcircularbuffer_p.h
+++ b/src/core/resources/qboundedcircularbuffer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QBOUNDEDCIRCULARBUFFER_P_H
-#define QT3D_QBOUNDEDCIRCULARBUFFER_P_H
+#ifndef QT3DCORE_QBOUNDEDCIRCULARBUFFER_P_H
+#define QT3DCORE_QBOUNDEDCIRCULARBUFFER_P_H
 
 //
 //  W A R N I N G
@@ -57,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 template <class T>
 class QBoundedCircularBuffer
@@ -143,4 +143,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QBOUNDEDCIRCULARBUFFER_P_H
+#endif // QT3DCORE_QBOUNDEDCIRCULARBUFFER_P_H
diff --git a/src/core/resources/qcircularbuffer_p.h b/src/core/resources/qcircularbuffer_p.h
index be3b8496b..5cb2f24cb 100644
--- a/src/core/resources/qcircularbuffer_p.h
+++ b/src/core/resources/qcircularbuffer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCIRCULARBUFFER_H
-#define QT3D_QCIRCULARBUFFER_H
+#ifndef QT3DCORE_QCIRCULARBUFFER_H
+#define QT3DCORE_QCIRCULARBUFFER_H
 
 //
 //  W A R N I N G
@@ -66,7 +66,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class CircularBufferData : public QSharedData
 {
@@ -1322,4 +1322,4 @@ Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(CircularBuffer)
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCIRCULARBUFFER_H
+#endif // QT3DCORE_QCIRCULARBUFFER_H
diff --git a/src/core/resources/qframeallocator.cpp b/src/core/resources/qframeallocator.cpp
index 28025f192..70dbad2cd 100644
--- a/src/core/resources/qframeallocator.cpp
+++ b/src/core/resources/qframeallocator.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 /*!
-    \class Qt3D::QFrameAllocator
+    \class Qt3DCore::QFrameAllocator
     \inmodule Qt3DCore
     \brief Provides a pool of memory chunks to be used to allocate objects on a per frame basis.
 
@@ -51,10 +51,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QFrameAllocatorPrivate
+    \class Qt3DCore::QFrameAllocatorPrivate
     \internal
 */
 QFrameAllocatorPrivate::QFrameAllocatorPrivate()
diff --git a/src/core/resources/qframeallocator.h b/src/core/resources/qframeallocator.h
index 4fab92e91..97ef3f9c6 100644
--- a/src/core/resources/qframeallocator.h
+++ b/src/core/resources/qframeallocator.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QFRAMEALLOCATOR_H
-#define QT3D_QFRAMEALLOCATOR_H
+#ifndef QT3DCORE_QFRAMEALLOCATOR_H
+#define QT3DCORE_QFRAMEALLOCATOR_H
 
 
 #ifdef QFRAMEALLOCATOR_DEBUG
@@ -50,7 +50,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QFrameAllocatorPrivate;
 
diff --git a/src/core/resources/qframeallocator_p.h b/src/core/resources/qframeallocator_p.h
index da3781b4d..dc1033ea3 100644
--- a/src/core/resources/qframeallocator_p.h
+++ b/src/core/resources/qframeallocator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QFRAMEALLOCATOR_P_H
-#define QT3D_QFRAMEALLOCATOR_P_H
+#ifndef QT3DCORE_QFRAMEALLOCATOR_P_H
+#define QT3DCORE_QFRAMEALLOCATOR_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QFrameAllocator;
 
@@ -129,4 +129,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QFRAMEALLOCATOR_P_H
+#endif // QT3DCORE_QFRAMEALLOCATOR_P_H
diff --git a/src/core/resources/qhandle.h b/src/core/resources/qhandle.h
index 64957f145..4ac751641 100644
--- a/src/core/resources/qhandle.h
+++ b/src/core/resources/qhandle.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QHANDLE_H
-#define QT3D_QHANDLE_H
+#ifndef QT3DCORE_QHANDLE_H
+#define QT3DCORE_QHANDLE_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 template <typename T, uint INDEXBITS>
 class QHandleManager;
@@ -117,4 +117,4 @@ QDebug operator<<(QDebug dbg, const QHandle<T, INDEXBITS> &h)
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QRHANDLE_H
+#endif // QT3DCORE_QRHANDLE_H
diff --git a/src/core/resources/qhandlemanager.h b/src/core/resources/qhandlemanager.h
index 4c99ea2fd..0ff41c899 100644
--- a/src/core/resources/qhandlemanager.h
+++ b/src/core/resources/qhandlemanager.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QHANDLEMANAGER_H
-#define QT3D_QHANDLEMANAGER_H
+#ifndef QT3DCORE_QHANDLEMANAGER_H
+#define QT3DCORE_QHANDLEMANAGER_H
 
 #include <QtGlobal>
 #include <Qt3DCore/qt3dcore_global.h>
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 template <typename T, uint INDEXBITS = 16>
 class QHandleManager
@@ -201,4 +201,4 @@ const T *QHandleManager<T, INDEXBITS>::constData(const QHandle<T, INDEXBITS> &ha
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QHANDLEMANAGER_H
+#endif // QT3DCORE_QHANDLEMANAGER_H
diff --git a/src/core/resources/qresourcemanager.cpp b/src/core/resources/qresourcemanager.cpp
index 36c1e8727..5ece6a03f 100644
--- a/src/core/resources/qresourcemanager.cpp
+++ b/src/core/resources/qresourcemanager.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 /*!
-    \class Qt3D::QResourceManager
+    \class Qt3DCore::QResourceManager
     \inmodule Qt3DCore
     \since 5.5
 
@@ -55,7 +55,7 @@
 */
 
 /*!
-    \class Qt3D::ArrayAllocatingPolicy
+    \class Qt3DCore::ArrayAllocatingPolicy
     \inmodule Qt3DCore
     \since 5.5
 
@@ -69,7 +69,7 @@
 */
 
 /*!
-    \class Qt3D::ListAllocatingPolicy
+    \class Qt3DCore::ListAllocatingPolicy
     \inmodule Qt3DCore
     \since 5.5
 
@@ -86,7 +86,7 @@
 */
 
 /*!
-    \class Qt3D::ObjectLevelLockingPolicy
+    \class Qt3DCore::ObjectLevelLockingPolicy
     \inmodule Qt3DCore
     \since 5.5
 
diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h
index c6e632bba..4af596c33 100644
--- a/src/core/resources/qresourcemanager_p.h
+++ b/src/core/resources/qresourcemanager_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTRESOURCESMANAGER_H
-#define QT3D_QABSTRACTRESOURCESMANAGER_H
+#ifndef QT3DCORE_QABSTRACTRESOURCESMANAGER_H
+#define QT3DCORE_QABSTRACTRESOURCESMANAGER_H
 
 //
 //  W A R N I N G
@@ -57,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 template <class Host>
 struct NonLockingPolicy
@@ -127,7 +127,7 @@ enum
 };
 
 #define Q_DECLARE_RESOURCE_INFO(TYPE, FLAGS) \
-    namespace Qt3D { \
+    namespace Qt3DCore { \
     template<> \
     struct QResourceInfo<TYPE > \
 { \
@@ -136,7 +136,7 @@ enum
     needsCleanup = ((FLAGS & Q_REQUIRES_CLEANUP) == 0) \
 }; \
 }; \
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 template <int v>
 struct Int2Type
@@ -457,4 +457,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTRESOURCESMANAGER_H
+#endif // QT3DCORE_QABSTRACTRESOURCESMANAGER_H
diff --git a/src/core/services/nullservices_p.h b/src/core/services/nullservices_p.h
index 707aec54d..31f8da3b5 100644
--- a/src/core/services/nullservices_p.h
+++ b/src/core/services/nullservices_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_NULLSERVICES_P_H
-#define QT3D_NULLSERVICES_P_H
+#ifndef QT3DCORE_NULLSERVICES_P_H
+#define QT3DCORE_NULLSERVICES_P_H
 
 //
 //  W A R N I N G
@@ -57,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class NullSystemInformationService : public QSystemInformationService
 {
@@ -113,9 +113,9 @@ public:
     }
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_NULLSERVICES_P_H
+#endif // QT3DCORE_NULLSERVICES_P_H
 
diff --git a/src/core/services/qabstractcollisionqueryservice.cpp b/src/core/services/qabstractcollisionqueryservice.cpp
index f2731cac5..a841abc18 100644
--- a/src/core/services/qabstractcollisionqueryservice.cpp
+++ b/src/core/services/qabstractcollisionqueryservice.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QAbstractCollisionQueryService::QAbstractCollisionQueryService(const QString &description)
     : QAbstractServiceProvider(*new QAbstractCollisionQueryServicePrivate(description))
diff --git a/src/core/services/qabstractcollisionqueryservice.h b/src/core/services/qabstractcollisionqueryservice.h
index 69afd6d85..04d92c687 100644
--- a/src/core/services/qabstractcollisionqueryservice.h
+++ b/src/core/services/qabstractcollisionqueryservice.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTCOLLISIONQUERYSERVICE_H
-#define QT3D_QABSTRACTCOLLISIONQUERYSERVICE_H
+#ifndef QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_H
+#define QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_H
 
 #include <QVector>
 
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QRay3D;
 class QAbstractCollisionQueryServicePrivate;
@@ -79,6 +79,6 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QAbstractCollisionQueryService::QueryMode)
+Q_DECLARE_METATYPE(Qt3DCore::QAbstractCollisionQueryService::QueryMode)
 
-#endif // QT3D_QABSTRACTCOLLISIONQUERYSERVICE_H
+#endif // QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_H
diff --git a/src/core/services/qabstractcollisionqueryservice_p.h b/src/core/services/qabstractcollisionqueryservice_p.h
index 08a76cb36..2f2abdc5a 100644
--- a/src/core/services/qabstractcollisionqueryservice_p.h
+++ b/src/core/services/qabstractcollisionqueryservice_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTCOLLISIONQUERYSERVICE_P_H
-#define QT3D_QABSTRACTCOLLISIONQUERYSERVICE_P_H
+#ifndef QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_P_H
+#define QT3DCORE_QABSTRACTCOLLISIONQUERYSERVICE_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractCollisionQueryServicePrivate : public QAbstractServiceProviderPrivate
 {
@@ -68,4 +68,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QAbstractCOLLISIONQUERYSERVICE_P_H
+#endif // QT3DCORE_QAbstractCOLLISIONQUERYSERVICE_P_H
diff --git a/src/core/services/qabstractframeadvanceservice.cpp b/src/core/services/qabstractframeadvanceservice.cpp
index 04197527f..c163cdf7f 100644
--- a/src/core/services/qabstractframeadvanceservice.cpp
+++ b/src/core/services/qabstractframeadvanceservice.cpp
@@ -39,15 +39,15 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QAbstractFrameAdvanceServicePrivate
+    \class Qt3DCore::QAbstractFrameAdvanceServicePrivate
     \internal
 */
 
 /*!
-    \class Qt3D::QAbstractFrameAdvanceService
+    \class Qt3DCore::QAbstractFrameAdvanceService
     \inmodule Qt3DCore
     \brief Interface for a Qt3D frame advance service
 
@@ -72,19 +72,19 @@ QAbstractFrameAdvanceService::QAbstractFrameAdvanceService(QAbstractFrameAdvance
 }
 
 /*!
-    \fn qint64 Qt3D::QAbstractFrameAdvanceService::waitForNextTick()
+    \fn qint64 Qt3DCore::QAbstractFrameAdvanceService::waitForNextTick()
 
     Returns the current time, the call may be blocking if waiting for a tick.
 */
 
 /*!
-    \fn void Qt3D::QAbstractFrameAdvanceService::start()
+    \fn void Qt3DCore::QAbstractFrameAdvanceService::start()
 
     Starts the service.
 */
 
 /*!
-    \fn void Qt3D::QAbstractFrameAdvanceService::stop()
+    \fn void Qt3DCore::QAbstractFrameAdvanceService::stop()
 
     Stops the service, performing any cleanup deemed necessary.
 */
diff --git a/src/core/services/qabstractframeadvanceservice.h b/src/core/services/qabstractframeadvanceservice.h
index c69676096..f72672fd3 100644
--- a/src/core/services/qabstractframeadvanceservice.h
+++ b/src/core/services/qabstractframeadvanceservice.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTFRAMEADVANCESERVICE
-#define QT3D_QABSTRACTFRAMEADVANCESERVICE
+#ifndef QT3DCORE_QABSTRACTFRAMEADVANCESERVICE
+#define QT3DCORE_QABSTRACTFRAMEADVANCESERVICE
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qservicelocator.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractFrameAdvanceServicePrivate;
 
@@ -63,5 +63,5 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTFRAMEADVANCESERVICE
+#endif // QT3DCORE_QABSTRACTFRAMEADVANCESERVICE
 
diff --git a/src/core/services/qabstractframeadvanceservice_p.h b/src/core/services/qabstractframeadvanceservice_p.h
index ce0bbad70..8e60658ef 100644
--- a/src/core/services/qabstractframeadvanceservice_p.h
+++ b/src/core/services/qabstractframeadvanceservice_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTFRAMEADVANCESERVICE_P_H
-#define QT3D_QABSTRACTFRAMEADVANCESERVICE_P_H
+#ifndef QT3DCORE_QABSTRACTFRAMEADVANCESERVICE_P_H
+#define QT3DCORE_QABSTRACTFRAMEADVANCESERVICE_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractFrameAdvanceServicePrivate : public QAbstractServiceProviderPrivate
 {
@@ -68,5 +68,5 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTFRAMEADVANCESERVICE_P_H
+#endif // QT3DCORE_QABSTRACTFRAMEADVANCESERVICE_P_H
 
diff --git a/src/core/services/qabstractserviceprovider_p.h b/src/core/services/qabstractserviceprovider_p.h
index 4046b5815..a75a42598 100644
--- a/src/core/services/qabstractserviceprovider_p.h
+++ b/src/core/services/qabstractserviceprovider_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTSERVICEPROVIDER_P_H
-#define QT3D_QABSTRACTSERVICEPROVIDER_P_H
+#ifndef QT3DCORE_QABSTRACTSERVICEPROVIDER_P_H
+#define QT3DCORE_QABSTRACTSERVICEPROVIDER_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractServiceProviderPrivate
 {
@@ -70,8 +70,8 @@ public:
     QString m_description;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QABSTRACTSERVICEPROVIDER_P_H
+#endif // QT3DCORE_QABSTRACTSERVICEPROVIDER_P_H
diff --git a/src/core/services/qcollisionqueryresult.cpp b/src/core/services/qcollisionqueryresult.cpp
index eac2e92ce..baa3ee4a0 100644
--- a/src/core/services/qcollisionqueryresult.cpp
+++ b/src/core/services/qcollisionqueryresult.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 QCollisionQueryResultPrivate::QCollisionQueryResultPrivate(QCollisionQueryResult *qq)
     : q_ptr(qq)
diff --git a/src/core/services/qcollisionqueryresult.h b/src/core/services/qcollisionqueryresult.h
index e74a74411..265869cab 100644
--- a/src/core/services/qcollisionqueryresult.h
+++ b/src/core/services/qcollisionqueryresult.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCOLLISIONQUERYRESULT_H
-#define QT3D_QCOLLISIONQUERYRESULT_H
+#ifndef QT3DCORE_QCOLLISIONQUERYRESULT_H
+#define QT3DCORE_QCOLLISIONQUERYRESULT_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qnodeid.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 typedef int QQueryHandle;
 
@@ -67,5 +67,5 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCOLLISIONQUERYRESULT_H
+#endif // QT3DCORE_QCOLLISIONQUERYRESULT_H
 
diff --git a/src/core/services/qcollisionqueryresult_p.h b/src/core/services/qcollisionqueryresult_p.h
index a6a2f5e25..85daad64b 100644
--- a/src/core/services/qcollisionqueryresult_p.h
+++ b/src/core/services/qcollisionqueryresult_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCOLLISIONQUERYRESULT_P_H
-#define QT3D_QCOLLISIONQUERYRESULT_P_H
+#ifndef QT3DCORE_QCOLLISIONQUERYRESULT_P_H
+#define QT3DCORE_QCOLLISIONQUERYRESULT_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QCollisionQueryResultPrivate
 {
@@ -74,4 +74,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCOLLISIONQUERYRESULT_P_H
+#endif // QT3DCORE_QCOLLISIONQUERYRESULT_P_H
diff --git a/src/core/services/qopenglinformationservice.cpp b/src/core/services/qopenglinformationservice.cpp
index e651d9fbe..c54f3cf30 100644
--- a/src/core/services/qopenglinformationservice.cpp
+++ b/src/core/services/qopenglinformationservice.cpp
@@ -39,15 +39,15 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QOpenGLInformationServicePrivate
+    \class Qt3DCore::QOpenGLInformationServicePrivate
     \internal
 */
 
 /*!
-    \class Qt3D::QOpenGLInformationService
+    \class Qt3DCore::QOpenGLInformationService
     \inmodule Qt3DCore
     \brief Interface for a Qt3D OpenGL information service
 
@@ -76,12 +76,12 @@ QOpenGLInformationService::QOpenGLInformationService(QOpenGLInformationServicePr
 }
 
 /*!
-    \fn QSurfaceFormat Qt3D::QOpenGLInformationService::format() const
+    \fn QSurfaceFormat Qt3DCore::QOpenGLInformationService::format() const
 
     Subclasses should override this function to return the QSurfaceFormat of the
     OpenGL context in use.
 */
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/services/qopenglinformationservice.h b/src/core/services/qopenglinformationservice.h
index ed378ba8a..2bd2ffbab 100644
--- a/src/core/services/qopenglinformationservice.h
+++ b/src/core/services/qopenglinformationservice.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QOPENGLINFORMATIONSERVICE_H
-#define QT3D_QOPENGLINFORMATIONSERVICE_H
+#ifndef QT3DCORE_QOPENGLINFORMATIONSERVICE_H
+#define QT3DCORE_QOPENGLINFORMATIONSERVICE_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qservicelocator.h>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QOpenGLInformationServicePrivate;
 
@@ -58,8 +58,8 @@ protected:
     QOpenGLInformationService(QOpenGLInformationServicePrivate &dd);
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QOPENGLINFORMATIONSERVICE_H
+#endif // QT3DCORE_QOPENGLINFORMATIONSERVICE_H
diff --git a/src/core/services/qopenglinformationservice_p.h b/src/core/services/qopenglinformationservice_p.h
index d98313364..c16a34d5c 100644
--- a/src/core/services/qopenglinformationservice_p.h
+++ b/src/core/services/qopenglinformationservice_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QOPENGLINFORMATIONSERVICE_P_H
-#define QT3D_QOPENGLINFORMATIONSERVICE_P_H
+#ifndef QT3DCORE_QOPENGLINFORMATIONSERVICE_P_H
+#define QT3DCORE_QOPENGLINFORMATIONSERVICE_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QOpenGLInformationServicePrivate : public QAbstractServiceProviderPrivate
 {
@@ -68,5 +68,5 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QOPENGLINFORMATIONSERVICE_P_H
+#endif // QT3DCORE_QOPENGLINFORMATIONSERVICE_P_H
 
diff --git a/src/core/services/qservicelocator.cpp b/src/core/services/qservicelocator.cpp
index f68f0e8fd..da9f32a98 100644
--- a/src/core/services/qservicelocator.cpp
+++ b/src/core/services/qservicelocator.cpp
@@ -42,10 +42,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QAbstractServiceProvider
+    \class Qt3DCore::QAbstractServiceProvider
     \inmodule Qt3DCore
 */
 
@@ -96,23 +96,23 @@ public:
 
 
 /*!
-    \class Qt3D::QServiceLocator
+    \class Qt3DCore::QServiceLocator
     \inmodule Qt3DCore
     \brief Service locator used by aspects to retrieve pointers to concrete service objects
 
-    The Qt3D::QServiceLocator class can be used by aspects to obtain pointers to concrete
-    providers of abstract service interfaces. A subclass of Qt3D::QAbstractServiceProvider
+    The Qt3DCore::QServiceLocator class can be used by aspects to obtain pointers to concrete
+    providers of abstract service interfaces. A subclass of Qt3DCore::QAbstractServiceProvider
     encapsulates a service that can be provided by an aspect for other parts of the system.
     For example, an aspect may wish to know the current frame number, or how many CPU cores
     are available in the Qt3D tasking threadpool.
 
-    Aspects or the Qt3D::QAspectEngine are able to register objects as providers of services.
-    The service locator itself can be accessed via the Qt3D::QAbstractAspect::services()
+    Aspects or the Qt3DCore::QAspectEngine are able to register objects as providers of services.
+    The service locator itself can be accessed via the Qt3DCore::QAbstractAspect::services()
     function.
 
     As a convenience, the service locator provides methods to access services provided by
-    built in Qt3D aspects. Currently these are Qt3D::QSystemInformationService and
-    Qt3D::QOpenGLInformationService. For such services, the service provider will never
+    built in Qt3D aspects. Currently these are Qt3DCore::QSystemInformationService and
+    Qt3DCore::QOpenGLInformationService. For such services, the service provider will never
     return a null pointer. The default implementations of these services are simple null or
     do nothing implementations.
 */
@@ -170,7 +170,7 @@ int QServiceLocator::serviceCount() const
 }
 
 /*!
-    \fn T *Qt3D::QServiceLocator::service(int serviceType)
+    \fn T *Qt3DCore::QServiceLocator::service(int serviceType)
 
     Returns a pointer to the service provider for \a serviceType. If no provider
     has been explicitly registered, this returns a null pointer for non-Qt3D provided
diff --git a/src/core/services/qservicelocator.h b/src/core/services/qservicelocator.h
index 144154d97..cd19c34be 100644
--- a/src/core/services/qservicelocator.h
+++ b/src/core/services/qservicelocator.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSERVICELOCATOR_H
-#define QT3D_QSERVICELOCATOR_H
+#ifndef QT3DCORE_QSERVICELOCATOR_H
+#define QT3DCORE_QSERVICELOCATOR_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <QScopedPointer>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractServiceProviderPrivate;
 
@@ -115,4 +115,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSERVICELOCATOR_H
+#endif // QT3DCORE_QSERVICELOCATOR_H
diff --git a/src/core/services/qsysteminformationservice.cpp b/src/core/services/qsysteminformationservice.cpp
index df2869986..c5a7269d1 100644
--- a/src/core/services/qsysteminformationservice.cpp
+++ b/src/core/services/qsysteminformationservice.cpp
@@ -39,20 +39,20 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QAbstractServiceProviderPrivate
+    \class Qt3DCore::QAbstractServiceProviderPrivate
     \internal
 */
 
 /*!
-    \class Qt3D::QSystemInformationServicePrivate
+    \class Qt3DCore::QSystemInformationServicePrivate
     \internal
 */
 
 /*!
-    \class Qt3D::QSystemInformationService
+    \class Qt3DCore::QSystemInformationService
     \inmodule Qt3DCore
     \brief Interface for a Qt3D system information service
 
@@ -79,7 +79,7 @@ QSystemInformationService::QSystemInformationService(QSystemInformationServicePr
 }
 
 /*!
-    \fn QStringList Qt3D::QSystemInformationService::aspectNames()
+    \fn QStringList Qt3DCore::QSystemInformationService::aspectNames()
 
     Subclasses should override this function and return a string list containing the
     names of all registered aspects.
diff --git a/src/core/services/qsysteminformationservice.h b/src/core/services/qsysteminformationservice.h
index eb42f0012..19b515e2e 100644
--- a/src/core/services/qsysteminformationservice.h
+++ b/src/core/services/qsysteminformationservice.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSYSTEMINFORMATIONSERVICE_H
-#define QT3D_QSYSTEMINFORMATIONSERVICE_H
+#ifndef QT3DCORE_QSYSTEMINFORMATIONSERVICE_H
+#define QT3DCORE_QSYSTEMINFORMATIONSERVICE_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <Qt3DCore/qservicelocator.h>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QSystemInformationServicePrivate;
 
@@ -58,8 +58,8 @@ protected:
     QSystemInformationService(QSystemInformationServicePrivate &dd);
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSYSTEMINFORMATIONSERVICE_H
+#endif // QT3DCORE_QSYSTEMINFORMATIONSERVICE_H
diff --git a/src/core/services/qsysteminformationservice_p.h b/src/core/services/qsysteminformationservice_p.h
index 43a3d0404..d2aecf1c8 100644
--- a/src/core/services/qsysteminformationservice_p.h
+++ b/src/core/services/qsysteminformationservice_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSYSTEMINFORMATIONSERVICE_P_H
-#define QT3D_QSYSTEMINFORMATIONSERVICE_P_H
+#ifndef QT3DCORE_QSYSTEMINFORMATIONSERVICE_P_H
+#define QT3DCORE_QSYSTEMINFORMATIONSERVICE_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QSystemInformationServicePrivate : public QAbstractServiceProviderPrivate
 {
@@ -68,5 +68,5 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSYSTEMINFORMATIONSERVICE_P_H
+#endif // QT3DCORE_QSYSTEMINFORMATIONSERVICE_P_H
 
diff --git a/src/core/services/qtickclockservice.cpp b/src/core/services/qtickclockservice.cpp
index 85e25bd1d..aebea9745 100644
--- a/src/core/services/qtickclockservice.cpp
+++ b/src/core/services/qtickclockservice.cpp
@@ -40,9 +40,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 /*!
-    \class Qt3D::QTickClockServicePrivate
+    \class Qt3DCore::QTickClockServicePrivate
     \internal
 */
 
@@ -60,11 +60,11 @@ public:
 };
 
 /*!
-    \class Qt3D::QTickClockService
+    \class Qt3DCore::QTickClockService
     \inmodule Qt3DCore
-    \brief Default Qt3D::QAbstractFrameAdvanceService implementation.
+    \brief Default Qt3DCore::QAbstractFrameAdvanceService implementation.
 
-    This default Qt3D::QAbstractFrameAdvanceService implementation has a frequency of 60 Hz.
+    This default Qt3DCore::QAbstractFrameAdvanceService implementation has a frequency of 60 Hz.
 */
 QTickClockService::QTickClockService()
     : QAbstractFrameAdvanceService(*new QTickClockServicePrivate())
diff --git a/src/core/services/qtickclockservice_p.h b/src/core/services/qtickclockservice_p.h
index a8fafdcc1..6c1b07722 100644
--- a/src/core/services/qtickclockservice_p.h
+++ b/src/core/services/qtickclockservice_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTICKCLOCKSERVICE_P_H
-#define QT3D_QTICKCLOCKSERVICE_P_H
+#ifndef QT3DCORE_QTICKCLOCKSERVICE_P_H
+#define QT3DCORE_QTICKCLOCKSERVICE_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QTickClockServicePrivate;
 
@@ -73,4 +73,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTICKCLOCKSERVICE_P_H
+#endif // QT3DCORE_QTICKCLOCKSERVICE_P_H
diff --git a/src/core/transforms/qabstracttransform.cpp b/src/core/transforms/qabstracttransform.cpp
index 2a4d97ff4..3e70b0c5b 100644
--- a/src/core/transforms/qabstracttransform.cpp
+++ b/src/core/transforms/qabstracttransform.cpp
@@ -39,10 +39,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QAbstractTransformPrivate
+    \class Qt3DCore::QAbstractTransformPrivate
     \internal
 */
 QAbstractTransformPrivate::QAbstractTransformPrivate()
@@ -61,6 +61,6 @@ QAbstractTransform::QAbstractTransform(QAbstractTransformPrivate &dd, QObject *p
 {
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/transforms/qabstracttransform.h b/src/core/transforms/qabstracttransform.h
index 091ab2bf4..fae453bce 100644
--- a/src/core/transforms/qabstracttransform.h
+++ b/src/core/transforms/qabstracttransform.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACT_TRANSFORM_H
-#define QT3D_QABSTRACT_TRANSFORM_H
+#ifndef QT3DCORE_QABSTRACT_TRANSFORM_H
+#define QT3DCORE_QABSTRACT_TRANSFORM_H
 
 #include <QtCore/qobject.h>
 #include <Qt3DCore/qt3dcore_global.h>
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractTransformPrivate;
 class QT3DCORESHARED_EXPORT QAbstractTransform : public QObject
@@ -67,8 +67,8 @@ private:
     Q_DISABLE_COPY(QAbstractTransform)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // of QT3D_QABSTRACT_TRANSFORM_H
+#endif // of QT3DCORE_QABSTRACT_TRANSFORM_H
diff --git a/src/core/transforms/qabstracttransform_p.h b/src/core/transforms/qabstracttransform_p.h
index 4318e8a08..44498d7b0 100644
--- a/src/core/transforms/qabstracttransform_p.h
+++ b/src/core/transforms/qabstracttransform_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QABSTRACTTRANSFORM_P_H
-#define QT3D_QABSTRACTTRANSFORM_P_H
+#ifndef QT3DCORE_QABSTRACTTRANSFORM_P_H
+#define QT3DCORE_QABSTRACTTRANSFORM_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractTransformPrivate : public QObjectPrivate
 {
@@ -67,4 +67,4 @@ public:
 QT_END_NAMESPACE
 
 
-#endif // QT3D_QABSTRACTTRANSFORM_P_H
+#endif // QT3DCORE_QABSTRACTTRANSFORM_P_H
diff --git a/src/core/transforms/qlookattransform.cpp b/src/core/transforms/qlookattransform.cpp
index cea39ac81..3ff83b547 100644
--- a/src/core/transforms/qlookattransform.cpp
+++ b/src/core/transforms/qlookattransform.cpp
@@ -39,10 +39,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QLookAtTransformPrivate
+    \class Qt3DCore::QLookAtTransformPrivate
     \internal
 */
 QLookAtTransformPrivate::QLookAtTransformPrivate()
@@ -149,6 +149,6 @@ QVector3D QLookAtTransform::viewVector() const
     return d->m_viewVector;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/transforms/qlookattransform.h b/src/core/transforms/qlookattransform.h
index df1f8790c..4febdc16a 100644
--- a/src/core/transforms/qlookattransform.h
+++ b/src/core/transforms/qlookattransform.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QLOOKATTRANSFORM_H
-#define QT3D_QLOOKATTRANSFORM_H
+#ifndef QT3DCORE_QLOOKATTRANSFORM_H
+#define QT3DCORE_QLOOKATTRANSFORM_H
 
 #include <Qt3DCore/qabstracttransform.h>
 
@@ -43,11 +43,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QLookAtTransformPrivate;
 
-class QT3DCORESHARED_EXPORT QLookAtTransform : public Qt3D::QAbstractTransform
+class QT3DCORESHARED_EXPORT QLookAtTransform : public Qt3DCore::QAbstractTransform
 {
     Q_OBJECT
     Q_PROPERTY(QVector3D position READ position WRITE setPosition NOTIFY positionChanged)
@@ -86,8 +86,8 @@ private:
     Q_DISABLE_COPY(QLookAtTransform)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QLOOKATTRANSFORM_H
+#endif // QT3DCORE_QLOOKATTRANSFORM_H
diff --git a/src/core/transforms/qlookattransform_p.h b/src/core/transforms/qlookattransform_p.h
index 6a7abdfda..791905507 100644
--- a/src/core/transforms/qlookattransform_p.h
+++ b/src/core/transforms/qlookattransform_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QLOOKATTRANSFORM_P_H
-#define QT3D_QLOOKATTRANSFORM_P_H
+#ifndef QT3DCORE_QLOOKATTRANSFORM_P_H
+#define QT3DCORE_QLOOKATTRANSFORM_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QLookAtTransform;
 class QLookAtTransformPrivate : public QAbstractTransformPrivate
@@ -74,4 +74,4 @@ public :
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QLOOKATTRANSFORM_P_H
+#endif // QT3DCORE_QLOOKATTRANSFORM_P_H
diff --git a/src/core/transforms/qmatrixtransform.cpp b/src/core/transforms/qmatrixtransform.cpp
index 298b85c1a..74122122d 100644
--- a/src/core/transforms/qmatrixtransform.cpp
+++ b/src/core/transforms/qmatrixtransform.cpp
@@ -39,10 +39,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QMatrixTransformPrivate
+    \class Qt3DCore::QMatrixTransformPrivate
     \internal
 */
 QMatrixTransformPrivate::QMatrixTransformPrivate()
@@ -89,17 +89,17 @@ QMatrix4x4 QMatrixTransform::transformMatrix() const
     return matrix();
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 /*!
     \qmltype MatrixTransform
     \inqmlmodule Qt3D
     \since 5.5
-    \instantiates Qt3D::QMatrixTransform
+    \instantiates Qt3DCore::QMatrixTransform
 */
 
 /*!
-    \qmlproperty matrix4x4 Qt3D::MatrixTransform::matrix
+    \qmlproperty matrix4x4 Qt3DCore::MatrixTransform::matrix
 */
 
 QT_END_NAMESPACE
diff --git a/src/core/transforms/qmatrixtransform.h b/src/core/transforms/qmatrixtransform.h
index 4ab92c417..ef1c6acb7 100644
--- a/src/core/transforms/qmatrixtransform.h
+++ b/src/core/transforms/qmatrixtransform.h
@@ -34,18 +34,18 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QMATRIXTRANSFORM_H
-#define QT3D_QMATRIXTRANSFORM_H
+#ifndef QT3DCORE_QMATRIXTRANSFORM_H
+#define QT3DCORE_QMATRIXTRANSFORM_H
 
 #include <Qt3DCore/qabstracttransform.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QMatrixTransformPrivate;
 
-class QT3DCORESHARED_EXPORT QMatrixTransform : public Qt3D::QAbstractTransform
+class QT3DCORESHARED_EXPORT QMatrixTransform : public Qt3DCore::QAbstractTransform
 {
     Q_OBJECT
     Q_PROPERTY(QMatrix4x4 matrix READ matrix WRITE setMatrix NOTIFY matrixChanged)
@@ -69,8 +69,8 @@ private:
     Q_DISABLE_COPY(QMatrixTransform)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QMATRIXTRANSFORM_H
+#endif // QT3DCORE_QMATRIXTRANSFORM_H
diff --git a/src/core/transforms/qmatrixtransform_p.h b/src/core/transforms/qmatrixtransform_p.h
index ec561dd08..378fbd85b 100644
--- a/src/core/transforms/qmatrixtransform_p.h
+++ b/src/core/transforms/qmatrixtransform_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QMATRIXTRANSFORM_P_H
-#define QT3D_QMATRIXTRANSFORM_P_H
+#ifndef QT3DCORE_QMATRIXTRANSFORM_P_H
+#define QT3DCORE_QMATRIXTRANSFORM_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QMatrixTransform;
 
@@ -69,4 +69,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QMATRIXTRANSFORM_P_H
+#endif // QT3DCORE_QMATRIXTRANSFORM_P_H
diff --git a/src/core/transforms/qrotatetransform.cpp b/src/core/transforms/qrotatetransform.cpp
index 01b53fcee..9f74a288a 100644
--- a/src/core/transforms/qrotatetransform.cpp
+++ b/src/core/transforms/qrotatetransform.cpp
@@ -46,10 +46,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QRotateTransformPrivate
+    \class Qt3DCore::QRotateTransformPrivate
     \internal
 */
 QRotateTransformPrivate::QRotateTransformPrivate()
@@ -85,7 +85,7 @@ float QRotateTransform::angleDeg() const
     return d->m_angleDeg;
 }
 
-float Qt3D::QRotateTransform::angleRad() const
+float Qt3DCore::QRotateTransform::angleRad() const
 {
     Q_D(const QRotateTransform);
     return qDegreesToRadians(d->m_angleDeg);
@@ -130,6 +130,6 @@ void QRotateTransform::setAxis(const QVector3D& arg)
     }
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/transforms/qrotatetransform.h b/src/core/transforms/qrotatetransform.h
index 649da06c2..bf5e09be1 100644
--- a/src/core/transforms/qrotatetransform.h
+++ b/src/core/transforms/qrotatetransform.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QROTATETRANSFORM_H
-#define QT3D_QROTATETRANSFORM_H
+#ifndef QT3DCORE_QROTATETRANSFORM_H
+#define QT3DCORE_QROTATETRANSFORM_H
 
 #include <Qt3DCore/qabstracttransform.h>
 
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QRotateTransformPrivate;
 
@@ -79,8 +79,8 @@ private:
     Q_DISABLE_COPY(QRotateTransform)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QROTATETRANSFORM_H
+#endif // QT3DCORE_QROTATETRANSFORM_H
diff --git a/src/core/transforms/qrotatetransform_p.h b/src/core/transforms/qrotatetransform_p.h
index fc878bc40..1f0ae06af 100644
--- a/src/core/transforms/qrotatetransform_p.h
+++ b/src/core/transforms/qrotatetransform_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QROTATETRANSFORM_P_H
-#define QT3D_QROTATETRANSFORM_P_H
+#ifndef QT3DCORE_QROTATETRANSFORM_P_H
+#define QT3DCORE_QROTATETRANSFORM_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QRotateTransform;
 
@@ -75,4 +75,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QROTATETRANSFORM_P_H
+#endif // QT3DCORE_QROTATETRANSFORM_P_H
diff --git a/src/core/transforms/qscaletransform.cpp b/src/core/transforms/qscaletransform.cpp
index f102fe373..b150b145f 100644
--- a/src/core/transforms/qscaletransform.cpp
+++ b/src/core/transforms/qscaletransform.cpp
@@ -39,11 +39,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D
+namespace Qt3DCore
 {
 
 /*!
-    \class Qt3D::QScaleTransformPrivate
+    \class Qt3DCore::QScaleTransformPrivate
     \internal
 */
 QScaleTransformPrivate::QScaleTransformPrivate()
diff --git a/src/core/transforms/qscaletransform.h b/src/core/transforms/qscaletransform.h
index 42518f5a8..7db2676dd 100644
--- a/src/core/transforms/qscaletransform.h
+++ b/src/core/transforms/qscaletransform.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_SCALETRANSFORM_H
-#define QT3D_SCALETRANSFORM_H
+#ifndef QT3DCORE_SCALETRANSFORM_H
+#define QT3DCORE_SCALETRANSFORM_H
 
 #include <Qt3DCore/qabstracttransform.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QScaleTransformPrivate;
 
@@ -78,4 +78,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_SCALETRANSFORM_H
+#endif // QT3DCORE_SCALETRANSFORM_H
diff --git a/src/core/transforms/qscaletransform_p.h b/src/core/transforms/qscaletransform_p.h
index 5da15489f..a544f9c6b 100644
--- a/src/core/transforms/qscaletransform_p.h
+++ b/src/core/transforms/qscaletransform_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QSCALETRANSFORM_P_H
-#define QT3D_QSCALETRANSFORM_P_H
+#ifndef QT3DCORE_QSCALETRANSFORM_P_H
+#define QT3DCORE_QSCALETRANSFORM_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QScaleTransform;
 class QScaleTransformPrivate : public QAbstractTransformPrivate
@@ -68,4 +68,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QSCALETRANSFORM_P_H
+#endif // QT3DCORE_QSCALETRANSFORM_P_H
diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp
index 48bee2094..5f3711eb2 100644
--- a/src/core/transforms/qtransform.cpp
+++ b/src/core/transforms/qtransform.cpp
@@ -42,10 +42,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 /*!
-    \class Qt3D::QTransformPrivate
+    \class Qt3DCore::QTransformPrivate
     \internal
 */
 QTransformPrivate::QTransformPrivate()
@@ -159,7 +159,7 @@ QMatrix4x4 QTransform::matrix() const
     return d->m_matrix;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/core/transforms/qtransform.h b/src/core/transforms/qtransform.h
index 722dcf688..cc52a297e 100644
--- a/src/core/transforms/qtransform.h
+++ b/src/core/transforms/qtransform.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTRANSFORM_H
-#define QT3D_QTRANSFORM_H
+#ifndef QT3DCORE_QTRANSFORM_H
+#define QT3DCORE_QTRANSFORM_H
 
 #include <Qt3DCore/qcomponent.h>
 
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QAbstractTransform;
 
@@ -80,8 +80,8 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_update())
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTRANSFORM_H
+#endif // QT3DCORE_QTRANSFORM_H
diff --git a/src/core/transforms/qtransform_p.h b/src/core/transforms/qtransform_p.h
index 2f51b4d5a..7b6e0d49f 100644
--- a/src/core/transforms/qtransform_p.h
+++ b/src/core/transforms/qtransform_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTRANSFORM_P_H
-#define QT3D_QTRANSFORM_P_H
+#ifndef QT3DCORE_QTRANSFORM_P_H
+#define QT3DCORE_QTRANSFORM_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QTransform;
 class QTransformPrivate : public QComponentPrivate
@@ -72,8 +72,8 @@ public:
     mutable QMatrix4x4 m_matrix;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTRANSFORM_P_H
+#endif // QT3DCORE_QTRANSFORM_P_H
diff --git a/src/core/transforms/qtranslatetransform.cpp b/src/core/transforms/qtranslatetransform.cpp
index 6c7dc0896..bb24d8de6 100644
--- a/src/core/transforms/qtranslatetransform.cpp
+++ b/src/core/transforms/qtranslatetransform.cpp
@@ -39,11 +39,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 
 /*!
-    \class Qt3D::QTranslateTransformPrivate
+    \class Qt3DCore::QTranslateTransformPrivate
     \internal
 */
 QTranslateTransformPrivate::QTranslateTransformPrivate()
@@ -135,6 +135,6 @@ void QTranslateTransform::setTranslation(const QVector3D &arg)
     }
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/core/transforms/qtranslatetransform.h b/src/core/transforms/qtranslatetransform.h
index 4bf3b4c61..ce763cde9 100644
--- a/src/core/transforms/qtranslatetransform.h
+++ b/src/core/transforms/qtranslatetransform.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTRANSLATETRANSFORM_H
-#define QT3D_QTRANSLATETRANSFORM_H
+#ifndef QT3DCORE_QTRANSLATETRANSFORM_H
+#define QT3DCORE_QTRANSLATETRANSFORM_H
 
 #include <Qt3DCore/qabstracttransform.h>
 
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QTranslateTransformPrivate;
 
@@ -85,8 +85,8 @@ private:
     Q_DISABLE_COPY(QTranslateTransform)
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTRANSLATETRANSFORM_H
+#endif // QT3DCORE_QTRANSLATETRANSFORM_H
diff --git a/src/core/transforms/qtranslatetransform_p.h b/src/core/transforms/qtranslatetransform_p.h
index 773f7fc64..8f1f34f6a 100644
--- a/src/core/transforms/qtranslatetransform_p.h
+++ b/src/core/transforms/qtranslatetransform_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QTRANSLATETRANSFORM_P_H
-#define QT3D_QTRANSLATETRANSFORM_P_H
+#ifndef QT3DCORE_QTRANSLATETRANSFORM_P_H
+#define QT3DCORE_QTRANSLATETRANSFORM_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QTranslateTransform;
 class QTranslateTransformPrivate : public QAbstractTransformPrivate
@@ -68,4 +68,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QTRANSLATETRANSFORM_P_H
+#endif // QT3DCORE_QTRANSLATETRANSFORM_P_H
diff --git a/src/input/assignkeyboardfocusjob.cpp b/src/input/assignkeyboardfocusjob.cpp
index e816a4820..095732d22 100644
--- a/src/input/assignkeyboardfocusjob.cpp
+++ b/src/input/assignkeyboardfocusjob.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DInput {
 namespace Input {
 
-AssignKeyboardFocusJob::AssignKeyboardFocusJob(const Qt3D::QNodeId &controller)
+AssignKeyboardFocusJob::AssignKeyboardFocusJob(const Qt3DCore::QNodeId &controller)
     : QAspectJob()
     , m_inputHandler(Q_NULLPTR)
     , m_keyboardController(controller)
diff --git a/src/input/assignkeyboardfocusjob_p.h b/src/input/assignkeyboardfocusjob_p.h
index 4204744f9..fcb251c5a 100644
--- a/src/input/assignkeyboardfocusjob_p.h
+++ b/src/input/assignkeyboardfocusjob_p.h
@@ -58,16 +58,16 @@ namespace Input {
 
 class InputHandler;
 
-class AssignKeyboardFocusJob : public Qt3D::QAspectJob
+class AssignKeyboardFocusJob : public Qt3DCore::QAspectJob
 {
 public:
-    explicit AssignKeyboardFocusJob(const Qt3D::QNodeId &controller);
+    explicit AssignKeyboardFocusJob(const Qt3DCore::QNodeId &controller);
     void setInputHandler(InputHandler *handler);
     void run() Q_DECL_OVERRIDE;
 
 private:
     InputHandler *m_inputHandler;
-    const Qt3D::QNodeId m_keyboardController;
+    const Qt3DCore::QNodeId m_keyboardController;
 };
 
 } // namespace Input
diff --git a/src/input/cameracontroller.cpp b/src/input/cameracontroller.cpp
index 6b616d3b1..d9af1d06f 100644
--- a/src/input/cameracontroller.cpp
+++ b/src/input/cameracontroller.cpp
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DInput {
 namespace Input {
@@ -81,7 +81,7 @@ CameraController::CameraController(QObject *parent) :
  * an Entity, a CameraLens and a Transform instead of using the
  * ready made Camera element, it won't work.
  */
-void CameraController::setCamera( Qt3D::QCamera* cam )
+void CameraController::setCamera( Qt3DCore::QCamera* cam )
 {
     m_camera = cam;
     m_cameraEntity = cam;
@@ -92,7 +92,7 @@ void CameraController::setCamera( Qt3D::QCamera* cam )
         m_updateTimer->stop();
 }
 
-Qt3D::QCamera *CameraController::camera() const
+Qt3DCore::QCamera *CameraController::camera() const
 {
     return m_camera;
 }
diff --git a/src/input/cameracontroller_p.h b/src/input/cameracontroller_p.h
index 63d7bdb68..2fc5b7d0e 100644
--- a/src/input/cameracontroller_p.h
+++ b/src/input/cameracontroller_p.h
@@ -59,7 +59,7 @@ class QWheelEvent;
 class QKeyEvent;
 class QTimer;
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QCamera;
 class QEntity;
 }
@@ -79,8 +79,8 @@ class CameraController : public QObject
 public:
     explicit CameraController(QObject *parent = 0);
 
-    void setCamera( Qt3D::QCamera* cam );
-    Qt3D::QCamera *camera() const;
+    void setCamera( Qt3DCore::QCamera* cam );
+    Qt3DCore::QCamera *camera() const;
 
     void setLinearSpeed( float speed );
     float linearSpeed() const;
@@ -118,8 +118,8 @@ private Q_SLOTS:
     void onUpdate();
 
 private:
-    Qt3D::QCamera* m_camera;
-    Qt3D::QEntity* m_cameraEntity;
+    Qt3DCore::QCamera* m_camera;
+    Qt3DCore::QEntity* m_cameraEntity;
 
     float m_vx;
     float m_vy;
diff --git a/src/input/handle_types_p.h b/src/input/handle_types_p.h
index 1a62e7572..e478405d4 100644
--- a/src/input/handle_types_p.h
+++ b/src/input/handle_types_p.h
@@ -60,10 +60,10 @@ class KeyboardInput;
 class MouseController;
 class MouseInput;
 
-typedef Qt3D::QHandle<KeyboardController, 8> HKeyboardController;
-typedef Qt3D::QHandle<KeyboardInput, 16> HKeyboardInput;
-typedef Qt3D::QHandle<MouseController, 8> HMouseController;
-typedef Qt3D::QHandle<MouseInput, 16> HMouseInput;
+typedef Qt3DCore::QHandle<KeyboardController, 8> HKeyboardController;
+typedef Qt3DCore::QHandle<KeyboardInput, 16> HKeyboardInput;
+typedef Qt3DCore::QHandle<MouseController, 8> HMouseController;
+typedef Qt3DCore::QHandle<MouseInput, 16> HMouseInput;
 
 } // namespace Input
 } // namespace Qt3DInput
diff --git a/src/input/inputhandler.cpp b/src/input/inputhandler.cpp
index ce2f09c00..fd83a16df 100644
--- a/src/input/inputhandler.cpp
+++ b/src/input/inputhandler.cpp
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DInput {
 namespace Input {
@@ -147,7 +147,7 @@ void InputHandler::removeMouseController(HMouseController controller)
 
 // Return a vector of jobs to be performed for keyboard events
 // Handles all dependencies between jobs
-QVector<Qt3D::QAspectJobPtr> InputHandler::keyboardJobs()
+QVector<Qt3DCore::QAspectJobPtr> InputHandler::keyboardJobs()
 {
     // One job for Keyboard focus change event per Keyboard Controller
     QVector<QAspectJobPtr> jobs;
@@ -177,7 +177,7 @@ QVector<Qt3D::QAspectJobPtr> InputHandler::keyboardJobs()
     return jobs;
 }
 
-QVector<Qt3D::QAspectJobPtr> InputHandler::mouseJobs()
+QVector<Qt3DCore::QAspectJobPtr> InputHandler::mouseJobs()
 {
     QVector<QAspectJobPtr> jobs;
     const QList<QMouseEvent> events = pendingMouseEvents();
diff --git a/src/input/inputhandler_p.h b/src/input/inputhandler_p.h
index ec44c4ac8..c23ea3894 100644
--- a/src/input/inputhandler_p.h
+++ b/src/input/inputhandler_p.h
@@ -93,8 +93,8 @@ public:
     void appendMouseController(HMouseController controller);
     void removeMouseController(HMouseController controller);
 
-    QVector<Qt3D::QAspectJobPtr> keyboardJobs();
-    QVector<Qt3D::QAspectJobPtr> mouseJobs();
+    QVector<Qt3DCore::QAspectJobPtr> keyboardJobs();
+    QVector<Qt3DCore::QAspectJobPtr> mouseJobs();
 
 private:
     KeyboardControllerManager *m_keyboardControllerManager;
diff --git a/src/input/inputmanagers_p.h b/src/input/inputmanagers_p.h
index cc12c2461..1a0447080 100644
--- a/src/input/inputmanagers_p.h
+++ b/src/input/inputmanagers_p.h
@@ -61,41 +61,41 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DInput {
 namespace Input {
 
-class KeyboardInputManager : public Qt3D::QResourceManager<
+class KeyboardInputManager : public Qt3DCore::QResourceManager<
         KeyboardInput,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy>
 {
 public:
     KeyboardInputManager() {}
 };
 
-class KeyboardControllerManager : public Qt3D::QResourceManager<
+class KeyboardControllerManager : public Qt3DCore::QResourceManager<
         KeyboardController,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         8,
-        Qt3D::ArrayAllocatingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy>
 {
 public:
     KeyboardControllerManager() {}
 };
 
-class MouseControllerManager : public Qt3D::QResourceManager<
+class MouseControllerManager : public Qt3DCore::QResourceManager<
         MouseController,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         8,
-        Qt3D::ArrayAllocatingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy>
 {
 public:
     MouseControllerManager() {}
 };
 
-class MouseInputManager : public Qt3D::QResourceManager<
+class MouseInputManager : public Qt3DCore::QResourceManager<
         MouseInput,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy>
 {
 public:
     MouseInputManager() {}
diff --git a/src/input/keyboardcontroller.cpp b/src/input/keyboardcontroller.cpp
index 9e62633a5..359f52ee7 100644
--- a/src/input/keyboardcontroller.cpp
+++ b/src/input/keyboardcontroller.cpp
@@ -52,11 +52,11 @@ KeyboardController::KeyboardController()
 {
 }
 
-void KeyboardController::updateFromPeer(Qt3D::QNode *)
+void KeyboardController::updateFromPeer(Qt3DCore::QNode *)
 {
 }
 
-void KeyboardController::requestFocusForInput(const Qt3D::QNodeId &inputId)
+void KeyboardController::requestFocusForInput(const Qt3DCore::QNodeId &inputId)
 {
     // Saves the last inputId, this will then be used in an Aspect Job to determine which
     // input will have the focus. This in turn will call KeyboardInput::setFocus which will
@@ -69,7 +69,7 @@ void KeyboardController::setInputHandler(InputHandler *handler)
     m_inputHandler = handler;
 }
 
-void KeyboardController::addKeyboardInput(const Qt3D::QNodeId &input)
+void KeyboardController::addKeyboardInput(const Qt3DCore::QNodeId &input)
 {
     if (!m_keyboardInputs.contains(input)) {
         m_keyboardInputs.append(input);
@@ -77,18 +77,18 @@ void KeyboardController::addKeyboardInput(const Qt3D::QNodeId &input)
     }
 }
 
-void KeyboardController::removeKeyboardInput(const Qt3D::QNodeId &input)
+void KeyboardController::removeKeyboardInput(const Qt3DCore::QNodeId &input)
 {
     m_keyboardInputs.removeAll(input);
     m_keyboardInputHandles.removeAll(m_inputHandler->keyboardInputManager()->lookupHandle(input));
 }
 
-void KeyboardController::setCurrentFocusItem(const Qt3D::QNodeId &input)
+void KeyboardController::setCurrentFocusItem(const Qt3DCore::QNodeId &input)
 {
     m_currentFocusItem = input;
 }
 
-void KeyboardController::sceneChangeEvent(const Qt3D::QSceneChangePtr &)
+void KeyboardController::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &)
 {
 }
 
@@ -97,7 +97,7 @@ KeyboardControllerFunctor::KeyboardControllerFunctor(InputHandler *handler)
 {
 }
 
-Qt3D::QBackendNode *KeyboardControllerFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *KeyboardControllerFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
 {
     KeyboardController *controller = m_handler->keyboardControllerManager()->getOrCreateResource(frontend->id());
     controller->setFactory(factory);
@@ -107,12 +107,12 @@ Qt3D::QBackendNode *KeyboardControllerFunctor::create(Qt3D::QNode *frontend, con
     return controller;
 }
 
-Qt3D::QBackendNode *KeyboardControllerFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *KeyboardControllerFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     return m_handler->keyboardControllerManager()->lookupResource(id);
 }
 
-void KeyboardControllerFunctor::destroy(const Qt3D::QNodeId &id) const
+void KeyboardControllerFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     m_handler->removeKeyboardController(m_handler->keyboardControllerManager()->lookupHandle(id));
     m_handler->keyboardControllerManager()->releaseResource(id);
diff --git a/src/input/keyboardcontroller_p.h b/src/input/keyboardcontroller_p.h
index 36d3c18da..d127fdd8c 100644
--- a/src/input/keyboardcontroller_p.h
+++ b/src/input/keyboardcontroller_p.h
@@ -59,43 +59,43 @@ namespace Input {
 
 class InputHandler;
 
-class KeyboardController : public Qt3D::QBackendNode
+class KeyboardController : public Qt3DCore::QBackendNode
 {
 public:
     KeyboardController();
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    void requestFocusForInput(const Qt3D::QNodeId &inputId);
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    void requestFocusForInput(const Qt3DCore::QNodeId &inputId);
     void setInputHandler(InputHandler *handler);
 
-    void addKeyboardInput(const Qt3D::QNodeId &input);
-    void removeKeyboardInput(const Qt3D::QNodeId &input);
+    void addKeyboardInput(const Qt3DCore::QNodeId &input);
+    void removeKeyboardInput(const Qt3DCore::QNodeId &input);
 
-    void setCurrentFocusItem(const Qt3D::QNodeId &input);
+    void setCurrentFocusItem(const Qt3DCore::QNodeId &input);
 
-    inline Qt3D::QNodeId currentFocusItem() const { return m_currentFocusItem; }
-    inline Qt3D::QNodeId lastKeyboardInputRequester() const { return m_lastRequester; }
-    inline QVector<Qt3D::QNodeId> keyboardInputs() const { return m_keyboardInputs; }
+    inline Qt3DCore::QNodeId currentFocusItem() const { return m_currentFocusItem; }
+    inline Qt3DCore::QNodeId lastKeyboardInputRequester() const { return m_lastRequester; }
+    inline QVector<Qt3DCore::QNodeId> keyboardInputs() const { return m_keyboardInputs; }
     inline QVector<HKeyboardInput> keyboardInputsHandles() const { return m_keyboardInputHandles; }
 
 protected:
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_OVERRIDE;
 
 private:
     InputHandler *m_inputHandler;
-    QVector<Qt3D::QNodeId> m_keyboardInputs;
+    QVector<Qt3DCore::QNodeId> m_keyboardInputs;
     QVector<HKeyboardInput> m_keyboardInputHandles;
-    Qt3D::QNodeId m_lastRequester;
-    Qt3D::QNodeId m_currentFocusItem;
+    Qt3DCore::QNodeId m_lastRequester;
+    Qt3DCore::QNodeId m_currentFocusItem;
 };
 
-class KeyboardControllerFunctor : public Qt3D::QBackendNodeFunctor
+class KeyboardControllerFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit KeyboardControllerFunctor(InputHandler *handler);
 
-    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;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
 private:
     InputHandler *m_handler;
diff --git a/src/input/keyboardinput.cpp b/src/input/keyboardinput.cpp
index f824220a8..730142282 100644
--- a/src/input/keyboardinput.cpp
+++ b/src/input/keyboardinput.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DInput {
 namespace Input {
@@ -57,7 +57,7 @@ KeyboardInput::KeyboardInput()
 {
 }
 
-void KeyboardInput::updateFromPeer(Qt3D::QNode *peer)
+void KeyboardInput::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QKeyboardInput *input = static_cast<QKeyboardInput *>(peer);
     if (input->controller() != Q_NULLPTR)
@@ -68,7 +68,7 @@ void KeyboardInput::updateFromPeer(Qt3D::QNode *peer)
         requestFocus();
 }
 
-Qt3D::QNodeId KeyboardInput::keyboardController() const
+Qt3DCore::QNodeId KeyboardInput::keyboardController() const
 {
     return m_keyboardController;
 }
diff --git a/src/input/keyboardinput_p.h b/src/input/keyboardinput_p.h
index 3a4d27c87..64eb4f759 100644
--- a/src/input/keyboardinput_p.h
+++ b/src/input/keyboardinput_p.h
@@ -62,12 +62,12 @@ namespace Input {
 
 class InputHandler;
 
-class KeyboardInput : public Qt3D::QBackendNode
+class KeyboardInput : public Qt3DCore::QBackendNode
 {
 public:
     KeyboardInput();
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    Qt3D::QNodeId keyboardController() const;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeId keyboardController() const;
     void setInputHandler(InputHandler *handler);
     void setFocus(bool focus);
     void keyEvent(const Q3DKeyEventPtr &event);
@@ -75,25 +75,25 @@ public:
     inline bool isEnabled() const { return m_enabled; }
 
 protected:
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     void requestFocus();
-    void setController(const Qt3D::QNodeId &controller);
+    void setController(const Qt3DCore::QNodeId &controller);
 
 private:
     InputHandler *m_inputHandler;
-    Qt3D::QNodeId m_keyboardController;
+    Qt3DCore::QNodeId m_keyboardController;
     bool m_focus;
     bool m_enabled;
 };
 
-class KeyboardInputFunctor : public Qt3D::QBackendNodeFunctor
+class KeyboardInputFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit KeyboardInputFunctor(InputHandler *handler);
 
-    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;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
 private:
     InputHandler *m_handler;
diff --git a/src/input/keyeventdispatcherjob.cpp b/src/input/keyeventdispatcherjob.cpp
index 2eea7b2b7..ebfddc163 100644
--- a/src/input/keyeventdispatcherjob.cpp
+++ b/src/input/keyeventdispatcherjob.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DInput {
 namespace Input {
 
-KeyEventDispatcherJob::KeyEventDispatcherJob(const Qt3D::QNodeId &input, const QList<QKeyEvent> &events)
+KeyEventDispatcherJob::KeyEventDispatcherJob(const Qt3DCore::QNodeId &input, const QList<QKeyEvent> &events)
     : QAspectJob()
     , m_inputHandler(Q_NULLPTR)
     , m_keyboardInput(input)
diff --git a/src/input/keyeventdispatcherjob_p.h b/src/input/keyeventdispatcherjob_p.h
index 59717cf3b..1ced85881 100644
--- a/src/input/keyeventdispatcherjob_p.h
+++ b/src/input/keyeventdispatcherjob_p.h
@@ -59,16 +59,16 @@ namespace Input {
 
 class InputHandler;
 
-class KeyEventDispatcherJob : public Qt3D::QAspectJob
+class KeyEventDispatcherJob : public Qt3DCore::QAspectJob
 {
 public:
-    explicit KeyEventDispatcherJob(const Qt3D::QNodeId &input, const QList<QKeyEvent> &events);
+    explicit KeyEventDispatcherJob(const Qt3DCore::QNodeId &input, const QList<QKeyEvent> &events);
     void setInputHandler(InputHandler *handler);
     void run() Q_DECL_OVERRIDE;
 
 private:
     InputHandler *m_inputHandler;
-    const Qt3D::QNodeId m_keyboardInput;
+    const Qt3DCore::QNodeId m_keyboardInput;
     const QList<QKeyEvent> m_events;
 };
 
diff --git a/src/input/mousecontroller.cpp b/src/input/mousecontroller.cpp
index 9b7e77c2e..da61f7241 100644
--- a/src/input/mousecontroller.cpp
+++ b/src/input/mousecontroller.cpp
@@ -57,7 +57,7 @@ MouseController::~MouseController()
 {
 }
 
-void MouseController::updateFromPeer(Qt3D::QNode *peer)
+void MouseController::updateFromPeer(Qt3DCore::QNode *peer)
 {
     Q_UNUSED(peer);
 }
@@ -67,23 +67,23 @@ void MouseController::setInputHandler(InputHandler *handler)
     m_inputHandler = handler;
 }
 
-void MouseController::addMouseInput(const Qt3D::QNodeId &input)
+void MouseController::addMouseInput(const Qt3DCore::QNodeId &input)
 {
     if (!m_mouseInputs.contains(input))
         m_mouseInputs.append(input);
 }
 
-void MouseController::removeMouseInput(const Qt3D::QNodeId &input)
+void MouseController::removeMouseInput(const Qt3DCore::QNodeId &input)
 {
     m_mouseInputs.removeOne(input);
 }
 
-QVector<Qt3D::QNodeId> MouseController::mouseInputs() const
+QVector<Qt3DCore::QNodeId> MouseController::mouseInputs() const
 {
     return m_mouseInputs;
 }
 
-void MouseController::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void MouseController::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     Q_UNUSED(e);
 }
@@ -93,7 +93,7 @@ MouseControllerFunctor::MouseControllerFunctor(InputHandler *handler)
 {
 }
 
-Qt3D::QBackendNode *MouseControllerFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *MouseControllerFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
 {
     MouseController *controller = m_handler->mouseControllerManager()->getOrCreateResource(frontend->id());
     controller->setFactory(factory);
@@ -103,12 +103,12 @@ Qt3D::QBackendNode *MouseControllerFunctor::create(Qt3D::QNode *frontend, const
     return controller;
 }
 
-Qt3D::QBackendNode *MouseControllerFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *MouseControllerFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     return m_handler->mouseControllerManager()->lookupResource(id);
 }
 
-void MouseControllerFunctor::destroy(const Qt3D::QNodeId &id) const
+void MouseControllerFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     m_handler->removeMouseController(m_handler->mouseControllerManager()->lookupHandle(id));
     m_handler->mouseControllerManager()->releaseResource(id);
diff --git a/src/input/mousecontroller_p.h b/src/input/mousecontroller_p.h
index 5c08be2d6..69adc78ee 100644
--- a/src/input/mousecontroller_p.h
+++ b/src/input/mousecontroller_p.h
@@ -57,36 +57,36 @@ namespace Input {
 
 class InputHandler;
 
-class MouseController : public Qt3D::QBackendNode
+class MouseController : public Qt3DCore::QBackendNode
 {
 public:
     MouseController();
     ~MouseController();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void setInputHandler(InputHandler *handler);
 
-    void addMouseInput(const Qt3D::QNodeId &input);
-    void removeMouseInput(const Qt3D::QNodeId &input);
+    void addMouseInput(const Qt3DCore::QNodeId &input);
+    void removeMouseInput(const Qt3DCore::QNodeId &input);
 
-    QVector<Qt3D::QNodeId> mouseInputs() const;
+    QVector<Qt3DCore::QNodeId> mouseInputs() const;
 
 protected:
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
-    QVector<Qt3D::QNodeId> m_mouseInputs;
+    QVector<Qt3DCore::QNodeId> m_mouseInputs;
     InputHandler *m_inputHandler;
 };
 
-class MouseControllerFunctor : public Qt3D::QBackendNodeFunctor
+class MouseControllerFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit MouseControllerFunctor(InputHandler *handler);
 
-    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;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
 private:
     InputHandler *m_handler;
diff --git a/src/input/mouseeventdispatcherjob.cpp b/src/input/mouseeventdispatcherjob.cpp
index 0792fcb44..2fe4ffb14 100644
--- a/src/input/mouseeventdispatcherjob.cpp
+++ b/src/input/mouseeventdispatcherjob.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DInput {
 namespace Input {
 
-MouseEventDispatcherJob::MouseEventDispatcherJob(const Qt3D::QNodeId &input, const QList<QMouseEvent> &events)
+MouseEventDispatcherJob::MouseEventDispatcherJob(const Qt3DCore::QNodeId &input, const QList<QMouseEvent> &events)
     : QAspectJob()
     , m_inputHandler(Q_NULLPTR)
     , m_mouseInput(input)
diff --git a/src/input/mouseeventdispatcherjob_p.h b/src/input/mouseeventdispatcherjob_p.h
index fd5d625a1..eb37dbc4d 100644
--- a/src/input/mouseeventdispatcherjob_p.h
+++ b/src/input/mouseeventdispatcherjob_p.h
@@ -59,16 +59,16 @@ namespace Input {
 
 class InputHandler;
 
-class MouseEventDispatcherJob : public Qt3D::QAspectJob
+class MouseEventDispatcherJob : public Qt3DCore::QAspectJob
 {
 public:
-    explicit MouseEventDispatcherJob(const Qt3D::QNodeId &input, const QList<QMouseEvent> &events);
+    explicit MouseEventDispatcherJob(const Qt3DCore::QNodeId &input, const QList<QMouseEvent> &events);
     void setInputHandler(InputHandler *handler);
     void run() Q_DECL_FINAL;
 
 private:
     InputHandler *m_inputHandler;
-    const Qt3D::QNodeId m_mouseInput;
+    const Qt3DCore::QNodeId m_mouseInput;
     const QList<QMouseEvent> m_events;
 };
 
diff --git a/src/input/mouseinput.cpp b/src/input/mouseinput.cpp
index f2239aada..158e32d19 100644
--- a/src/input/mouseinput.cpp
+++ b/src/input/mouseinput.cpp
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DInput {
 namespace Input {
@@ -62,7 +62,7 @@ MouseInput::~MouseInput()
 {
 }
 
-void MouseInput::updateFromPeer(Qt3D::QNode *peer)
+void MouseInput::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QMouseInput *input = static_cast<QMouseInput *>(peer);
     if (input->controller() != Q_NULLPTR)
@@ -70,7 +70,7 @@ void MouseInput::updateFromPeer(Qt3D::QNode *peer)
     m_enabled = input->isEnabled();
 }
 
-Qt3D::QNodeId MouseInput::mouseController() const
+Qt3DCore::QNodeId MouseInput::mouseController() const
 {
     return m_mouseController;
 }
@@ -98,7 +98,7 @@ void MouseInput::wheelEvent(const Q3DWheelEventPtr &event)
     notifyObservers(e);
 }
 
-void MouseInput::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void MouseInput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
@@ -111,7 +111,7 @@ void MouseInput::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
     }
 }
 
-void MouseInput::setController(const Qt3D::QNodeId &controller)
+void MouseInput::setController(const Qt3DCore::QNodeId &controller)
 {
     if (!m_mouseController.isNull()) {
         MouseController *controller = m_inputHandler->mouseControllerManager()->lookupResource(m_mouseController);
@@ -131,7 +131,7 @@ MouseInputFunctor::MouseInputFunctor(InputHandler *handler)
 {
 }
 
-Qt3D::QBackendNode *MouseInputFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *MouseInputFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
 {
     MouseInput *input = m_handler->mouseInputManager()->getOrCreateResource(frontend->id());
     input->setFactory(factory);
@@ -140,12 +140,12 @@ Qt3D::QBackendNode *MouseInputFunctor::create(Qt3D::QNode *frontend, const Qt3D:
     return input;
 }
 
-Qt3D::QBackendNode *MouseInputFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *MouseInputFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     return m_handler->mouseInputManager()->lookupResource(id);
 }
 
-void MouseInputFunctor::destroy(const Qt3D::QNodeId &id) const
+void MouseInputFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     m_handler->mouseInputManager()->releaseResource(id);
 }
diff --git a/src/input/mouseinput_p.h b/src/input/mouseinput_p.h
index c87071a24..c1e4c02ac 100644
--- a/src/input/mouseinput_p.h
+++ b/src/input/mouseinput_p.h
@@ -58,14 +58,14 @@ namespace Input {
 
 class InputHandler;
 
-class MouseInput : public Qt3D::QBackendNode
+class MouseInput : public Qt3DCore::QBackendNode
 {
 public:
     MouseInput();
     ~MouseInput();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    Qt3D::QNodeId mouseController() const;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeId mouseController() const;
     void setInputHandler(InputHandler *handler);
     void mouseEvent(const Q3DMouseEventPtr &event);
     void wheelEvent(const Q3DWheelEventPtr &event);
@@ -73,23 +73,23 @@ public:
     inline bool isEnabled() const { return m_enabled; }
 
 protected:
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void setController(const Qt3D::QNodeId &controller);
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void setController(const Qt3DCore::QNodeId &controller);
 
 private:
     bool m_enabled;
-    Qt3D::QNodeId m_mouseController;
+    Qt3DCore::QNodeId m_mouseController;
     InputHandler *m_inputHandler;
 };
 
-class MouseInputFunctor : public Qt3D::QBackendNodeFunctor
+class MouseInputFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit MouseInputFunctor(InputHandler *handler);
 
-    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;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
 private:
     InputHandler *m_handler;
diff --git a/src/input/q3dkeyevent.cpp b/src/input/q3dkeyevent.cpp
index 3633618f6..dced98fc0 100644
--- a/src/input/q3dkeyevent.cpp
+++ b/src/input/q3dkeyevent.cpp
@@ -43,7 +43,7 @@ namespace Qt3DInput {
 //Qt6: Move this into a QtQmlGui module and merge it with QQuickKeyEvent
 
 /*!
-    \class Qt3D::Q3DKeyEvent
+    \class Qt3DCore::Q3DKeyEvent
     \inmodule Qt3DInput
     \since 5.5
 */
@@ -51,7 +51,7 @@ namespace Qt3DInput {
 /*!
     \qmltype KeyEvent
     \inqmlmodule Qt3D.Input
-    \instantiates Qt3D::Q3DKeyEvent
+    \instantiates Qt3DCore::Q3DKeyEvent
     \since 5.5
 
     The KeyEvent QML type cannot be directly created. Objects of this type
diff --git a/src/input/q3dmouseevent.cpp b/src/input/q3dmouseevent.cpp
index 5367428eb..60f8b0784 100644
--- a/src/input/q3dmouseevent.cpp
+++ b/src/input/q3dmouseevent.cpp
@@ -48,10 +48,10 @@ namespace Qt3DInput {
 // These can always be added in follow up commits once the input API takes shape
 
 /*!
- * \class Qt3D::Q3DMouseEvent
+ * \class Qt3DCore::Q3DMouseEvent
  * \inmodule Qt3DInput
  *
- * \brief The Qt3D::Q3DMouseEvent contains parameters that describe a mouse event.
+ * \brief The Qt3DCore::Q3DMouseEvent contains parameters that describe a mouse event.
  *
  * Mouse events occur when a mouse button is pressed and the ray
  * traversing the view, originating from the mouse position intersects with one
@@ -59,30 +59,30 @@ namespace Qt3DInput {
  *
  * \since 5.5
  *
- * \sa Qt3D::Q3DKeyEvent, Qt3D::Q3DWheelEvent, Qt3D::QMouseInput
+ * \sa Qt3DCore::Q3DKeyEvent, Qt3DCore::Q3DWheelEvent, Qt3DCore::QMouseInput
  *
  */
 
 /*!
- * \fn int Qt3D::Q3DMouseEvent::x() const
+ * \fn int Qt3DCore::Q3DMouseEvent::x() const
  *
  *  Returns the x position of the mouse event.
  */
 
 /*!
- * \fn int Qt3D::Q3DMouseEvent::y() const
+ * \fn int Qt3DCore::Q3DMouseEvent::y() const
  *
  *  Returns the y position of the mouse event.
  */
 
 /*!
- * \fn bool Qt3D::Q3DMouseEvent::isAccepted() const
+ * \fn bool Qt3DCore::Q3DMouseEvent::isAccepted() const
  *
  *  Returns whether the event was accepted.
  */
 
 /*!
- * \fn void Qt3D::Q3DMouseEvent::setAccepted(bool accepted)
+ * \fn void Qt3DCore::Q3DMouseEvent::setAccepted(bool accepted)
  *
  *  Sets the event as accepted if \a accepted is true.
  *
@@ -91,13 +91,13 @@ namespace Qt3DInput {
  */
 
 /*!
- * \fn QEvent::Type Qt3D::Q3DMouseEvent::type() const
+ * \fn QEvent::Type Qt3DCore::Q3DMouseEvent::type() const
  *
  *  Returns the QEvent::Type of the event.
  */
 
 /*!
- * Constructs a new Qt3D::Q3DMouseEvent instance for the QMouseEvent \a e.
+ * Constructs a new Qt3DCore::Q3DMouseEvent instance for the QMouseEvent \a e.
  */
 Q3DMouseEvent::Q3DMouseEvent(const QMouseEvent &e)
     : QObject()
@@ -160,33 +160,33 @@ Q3DMouseEvent::Modifiers Q3DMouseEvent::modifier() const
 
 
 /*!
- * \class Qt3D::Q3DWheelEvent
+ * \class Qt3DCore::Q3DWheelEvent
  * \inmodule Qt3DInput
  *
- * \brief The Qt3D::Q3DWheelEvent contains parameters that describe a mouse wheel event.
+ * \brief The Qt3DCore::Q3DWheelEvent contains parameters that describe a mouse wheel event.
  *
  * Mouse wheel events occur when the mouse is rotated.
  *
  * \since 5.5
  *
- * \sa Qt3D::Q3DKeyEvent, Qt3D::Q3DMouseEvent, Qt3D::QMouseInput
+ * \sa Qt3DCore::Q3DKeyEvent, Qt3DCore::Q3DMouseEvent, Qt3DCore::QMouseInput
  *
  */
 
 /*!
- * \fn int Qt3D::Q3DWheelEvent::x() const
+ * \fn int Qt3DCore::Q3DWheelEvent::x() const
  *
  *  Returns the x position of the mouse event.
  */
 
 /*!
- * \fn int Qt3D::Q3DWheelEvent::y() const
+ * \fn int Qt3DCore::Q3DWheelEvent::y() const
  *
  *  Returns the x position of the mouse event.
  */
 
 /*!
- * \fn QPoint Qt3D::Q3DWheelEvent::angleDelta() const
+ * \fn QPoint Qt3DCore::Q3DWheelEvent::angleDelta() const
  *
  * Returns the distance that the wheel is rotated, in eighths of a degree. A
  * positive value indicates that the wheel was rotated forward (away from the
@@ -195,13 +195,13 @@ Q3DMouseEvent::Modifiers Q3DMouseEvent::modifier() const
  */
 
 /*!
- * \fn bool Qt3D::Q3DWheelEvent::isAccepted() const
+ * \fn bool Qt3DCore::Q3DWheelEvent::isAccepted() const
  *
  *  Returns whether the event was accepted.
  */
 
 /*!
- * \fn void Qt3D::Q3DWheelEvent::setAccepted(bool accepted)
+ * \fn void Qt3DCore::Q3DWheelEvent::setAccepted(bool accepted)
  *
  *  Sets the event as accepted if \a accepted is true.
  *
@@ -210,13 +210,13 @@ Q3DMouseEvent::Modifiers Q3DMouseEvent::modifier() const
  */
 
 /*!
- * \fn QEvent::Type Qt3D::Q3DWheelEvent::type() const
+ * \fn QEvent::Type Qt3DCore::Q3DWheelEvent::type() const
  *
  *  Returns the QEvent::Type of the event.
  */
 
 /*!
- * Constructs a new Qt3D::Q3DWheelEvent instance from the QWheelEvent \a e.
+ * Constructs a new Qt3DCore::Q3DWheelEvent instance from the QWheelEvent \a e.
  */
 Q3DWheelEvent::Q3DWheelEvent(const QWheelEvent &e)
     : QObject()
diff --git a/src/input/qinputaspect.cpp b/src/input/qinputaspect.cpp
index 676ca9a80..12ad16c1a 100644
--- a/src/input/qinputaspect.cpp
+++ b/src/input/qinputaspect.cpp
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DInput {
 
@@ -83,13 +83,13 @@ QInputAspect::QInputAspect(QObject *parent)
     registerBackendType<QMouseInput>(QBackendNodeFunctorPtr(new Input::MouseInputFunctor(d_func()->m_inputHandler.data())));
 }
 
-Qt3D::QCamera *QInputAspect::camera() const
+Qt3DCore::QCamera *QInputAspect::camera() const
 {
     Q_D(const QInputAspect);
     return d->m_cameraController->camera();
 }
 
-void QInputAspect::setCamera(Qt3D::QCamera *camera)
+void QInputAspect::setCamera(Qt3DCore::QCamera *camera)
 {
     Q_D(QInputAspect);
     d->m_cameraController->setCamera(camera);
@@ -107,7 +107,7 @@ QVector<QAspectJobPtr> QInputAspect::jobsToExecute(qint64 time)
     return jobs;
 }
 
-void QInputAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e)
+void QInputAspect::sceneNodeAdded(Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
@@ -116,7 +116,7 @@ void QInputAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e)
     visitor.traverse(n, this, &QInputAspect::visitNode);
 }
 
-void QInputAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e)
+void QInputAspect::sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
@@ -124,7 +124,7 @@ void QInputAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e)
     QAbstractAspect::clearBackendNode(n);
 }
 
-void QInputAspect::setRootEntity(Qt3D::QEntity *rootObject)
+void QInputAspect::setRootEntity(Qt3DCore::QEntity *rootObject)
 {
     QNodeVisitor visitor;
     visitor.traverse(rootObject, this, &QInputAspect::visitNode);
@@ -158,7 +158,7 @@ void QInputAspect::onCleanup()
     d->m_inputHandler.reset(Q_NULLPTR);
 }
 
-void QInputAspect::visitNode(Qt3D::QNode *node)
+void QInputAspect::visitNode(Qt3DCore::QNode *node)
 {
     QAbstractAspect::createBackendNode(node);
 }
diff --git a/src/input/qinputaspect.h b/src/input/qinputaspect.h
index e76712e83..c7ef94d5d 100644
--- a/src/input/qinputaspect.h
+++ b/src/input/qinputaspect.h
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QCamera;
 }
 
@@ -50,32 +50,32 @@ namespace Qt3DInput {
 
 class QInputAspectPrivate;
 
-class QT3DINPUTSHARED_EXPORT QInputAspect : public Qt3D::QAbstractAspect
+class QT3DINPUTSHARED_EXPORT QInputAspect : public Qt3DCore::QAbstractAspect
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QCamera* camera READ camera WRITE setCamera)
+    Q_PROPERTY(Qt3DCore::QCamera* camera READ camera WRITE setCamera)
 public:
     explicit QInputAspect(QObject *parent = 0);
 
-    Qt3D::QCamera *camera() const;
+    Qt3DCore::QCamera *camera() const;
 
 public Q_SLOTS:
-    void setCamera(Qt3D::QCamera *camera);
+    void setCamera(Qt3DCore::QCamera *camera);
 
 public:
-    QVector<Qt3D::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
 
-    void sceneNodeAdded(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void sceneNodeRemoved(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
-    void setRootEntity(Qt3D::QEntity *rootObject) Q_DECL_OVERRIDE;
+    void setRootEntity(Qt3DCore::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(Qt3D::QNode *node);
+    void visitNode(Qt3DCore::QNode *node);
 
     Q_DECLARE_PRIVATE(QInputAspect)
 };
diff --git a/src/input/qinputaspect_p.h b/src/input/qinputaspect_p.h
index f2a5ae21a..f1de52144 100644
--- a/src/input/qinputaspect_p.h
+++ b/src/input/qinputaspect_p.h
@@ -61,7 +61,7 @@ class CameraController;
 class InputHandler;
 }
 
-class QInputAspectPrivate : public Qt3D::QAbstractAspectPrivate
+class QInputAspectPrivate : public Qt3DCore::QAbstractAspectPrivate
 {
 public:
     QInputAspectPrivate();
diff --git a/src/input/qkeyboardcontroller.cpp b/src/input/qkeyboardcontroller.cpp
index 23578ef03..fc069edc3 100644
--- a/src/input/qkeyboardcontroller.cpp
+++ b/src/input/qkeyboardcontroller.cpp
@@ -42,12 +42,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DInput {
 
 /*!
-    \class Qt3D::QKeyboardControllerPrivate
+    \class Qt3DCore::QKeyboardControllerPrivate
     \internal
 */
 QKeyboardControllerPrivate::QKeyboardControllerPrivate()
@@ -56,7 +56,7 @@ QKeyboardControllerPrivate::QKeyboardControllerPrivate()
 }
 
 /*!
-    \class Qt3D::QKeyboardController
+    \class Qt3DCore::QKeyboardController
     \inmodule Qt3DInput
     \since 5.5
 */
@@ -65,7 +65,7 @@ QKeyboardControllerPrivate::QKeyboardControllerPrivate()
     \qmltype KeyboardController
     \inqmlmodule Qt3D.Input
     \since 5.5
-    \instantiates Qt3D::QKeyboardController
+    \instantiates Qt3DCore::QKeyboardController
     \inherits Node
 */
 
@@ -95,7 +95,7 @@ QKeyboardController::QKeyboardController(QKeyboardControllerPrivate &dd, QNode *
 {
 }
 
-void QKeyboardController::sceneChangeEvent(const Qt3D::QSceneChangePtr &change)
+void QKeyboardController::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
 {
     Q_D(QKeyboardController);
     QBackendScenePropertyChangePtr e = qSharedPointerCast<QBackendScenePropertyChange>(change);
diff --git a/src/input/qkeyboardcontroller.h b/src/input/qkeyboardcontroller.h
index b68faa830..1f57b856c 100644
--- a/src/input/qkeyboardcontroller.h
+++ b/src/input/qkeyboardcontroller.h
@@ -47,7 +47,7 @@ namespace Qt3DInput {
 class QKeyboardControllerPrivate;
 class QKeyboardInput;
 
-class QT3DINPUTSHARED_EXPORT QKeyboardController : public Qt3D::QNode
+class QT3DINPUTSHARED_EXPORT QKeyboardController : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DInput::QKeyboardInput *activeInput READ activeInput NOTIFY activeInputChanged)
@@ -60,7 +60,7 @@ public:
 
 protected:
     QKeyboardController(QKeyboardControllerPrivate &dd, QNode *parent = 0);
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
     void activeInputChanged();
diff --git a/src/input/qkeyboardcontroller_p.h b/src/input/qkeyboardcontroller_p.h
index 9148e5613..8d1ce7bb1 100644
--- a/src/input/qkeyboardcontroller_p.h
+++ b/src/input/qkeyboardcontroller_p.h
@@ -57,7 +57,7 @@ namespace Qt3DInput {
 class QKeyboardController;
 class QKeyboardInput;
 
-class QKeyboardControllerPrivate : public Qt3D::QNodePrivate
+class QKeyboardControllerPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QKeyboardControllerPrivate();
diff --git a/src/input/qkeyboardinput.cpp b/src/input/qkeyboardinput.cpp
index 5ecba9962..332799457 100644
--- a/src/input/qkeyboardinput.cpp
+++ b/src/input/qkeyboardinput.cpp
@@ -41,12 +41,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DInput {
 
 /*!
-    \class Qt3D::QKeyboardInputPrivate
+    \class Qt3DCore::QKeyboardInputPrivate
     \internal
 */
 QKeyboardInputPrivate::QKeyboardInputPrivate()
@@ -58,7 +58,7 @@ QKeyboardInputPrivate::QKeyboardInputPrivate()
 }
 
 /*!
-    \class Qt3D::QKeyboardInput
+    \class Qt3DCore::QKeyboardInput
     \inmodule Qt3DInput
     \since 5.5
 */
@@ -66,7 +66,7 @@ QKeyboardInputPrivate::QKeyboardInputPrivate()
 /*!
     \qmltype KeyboardInput
     \inqmlmodule Qt3D.Input
-    \instantiates Qt3D::QKeyboardInput
+    \instantiates Qt3DCore::QKeyboardInput
     \inherits Component3D
     \since 5.5
 */
@@ -154,7 +154,7 @@ const QByteArray keyToSignal(int key)
     return keySignal;
 }
 
-void QKeyboardInput::sceneChangeEvent(const Qt3D::QSceneChangePtr &change)
+void QKeyboardInput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
 {
     QBackendScenePropertyChangePtr e = qSharedPointerCast<QBackendScenePropertyChange>(change);
     if (e->type() == NodeUpdated) {
diff --git a/src/input/qkeyboardinput.h b/src/input/qkeyboardinput.h
index 629aac2a9..592361a4a 100644
--- a/src/input/qkeyboardinput.h
+++ b/src/input/qkeyboardinput.h
@@ -48,7 +48,7 @@ namespace Qt3DInput {
 class QKeyboardController;
 class QKeyboardInputPrivate;
 
-class QT3DINPUTSHARED_EXPORT QKeyboardInput : public Qt3D::QComponent
+class QT3DINPUTSHARED_EXPORT QKeyboardInput : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DInput::QKeyboardController *controller READ controller WRITE setController NOTIFY controllerChanged)
@@ -112,8 +112,8 @@ Q_SIGNALS:
 
 protected:
     QKeyboardInput(QKeyboardInputPrivate &dd, QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
     void keyEvent(Q3DKeyEvent *event);
 
 private:
diff --git a/src/input/qkeyboardinput_p.h b/src/input/qkeyboardinput_p.h
index 756ef88b0..7ee0560b6 100644
--- a/src/input/qkeyboardinput_p.h
+++ b/src/input/qkeyboardinput_p.h
@@ -57,7 +57,7 @@ namespace Qt3DInput {
 class QKeyboardInput;
 class QKeyboardController;
 
-class QKeyboardInputPrivate : public Qt3D::QComponentPrivate
+class QKeyboardInputPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QKeyboardInputPrivate();
diff --git a/src/input/qmousecontroller.cpp b/src/input/qmousecontroller.cpp
index 90590e214..a31f598be 100644
--- a/src/input/qmousecontroller.cpp
+++ b/src/input/qmousecontroller.cpp
@@ -50,14 +50,14 @@ QMouseControllerPrivate::QMouseControllerPrivate()
 }
 
 /*!
- * \class Qt3D::QMouseController
+ * \class Qt3DCore::QMouseController
  * \inmodule Qt3DInput
  *
- * \brief Qt3D::QMouseController is in charge of dispatching mouse events to
- * attached Qt3D::QMouseInput objects.
+ * \brief Qt3DCore::QMouseController is in charge of dispatching mouse events to
+ * attached Qt3DCore::QMouseInput objects.
  *
  * \since 5.5
- * \sa Qt3D::QMouseInput
+ * \sa Qt3DCore::QMouseInput
  */
 QMouseController::QMouseController(QNode *parent)
     : QNode(*new QMouseControllerPrivate, parent)
@@ -80,7 +80,7 @@ QMouseController::~QMouseController()
     QNode::cleanup();
 }
 
-void QMouseController::sceneChangeEvent(const Qt3D::QSceneChangePtr &change)
+void QMouseController::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
 {
     Q_UNUSED(change);
     // TODO: To be completed as the mouse input aspect takes shape
diff --git a/src/input/qmousecontroller.h b/src/input/qmousecontroller.h
index 67af9a8e9..a0de94db1 100644
--- a/src/input/qmousecontroller.h
+++ b/src/input/qmousecontroller.h
@@ -47,18 +47,18 @@ namespace Qt3DInput {
 class QMouseControllerPrivate;
 class QMouseInput;
 
-class QT3DINPUTSHARED_EXPORT QMouseController : public Qt3D::QNode
+class QT3DINPUTSHARED_EXPORT QMouseController : public Qt3DCore::QNode
 {
     Q_OBJECT
 
 public:
-    explicit QMouseController(Qt3D::QNode *parent = 0);
+    explicit QMouseController(Qt3DCore::QNode *parent = 0);
 
 protected:
-    QMouseController(QMouseControllerPrivate &dd, Qt3D::QNode *parent = 0);
+    QMouseController(QMouseControllerPrivate &dd, Qt3DCore::QNode *parent = 0);
     ~QMouseController();
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QMouseController)
diff --git a/src/input/qmousecontroller_p.h b/src/input/qmousecontroller_p.h
index 3b6c7a7ac..c04971af3 100644
--- a/src/input/qmousecontroller_p.h
+++ b/src/input/qmousecontroller_p.h
@@ -56,7 +56,7 @@ namespace Qt3DInput {
 
 class QMouseController;
 
-class QMouseControllerPrivate : public Qt3D::QNodePrivate
+class QMouseControllerPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QMouseControllerPrivate();
diff --git a/src/input/qmouseinput.cpp b/src/input/qmouseinput.cpp
index 3f3f6dcca..a56e229f4 100644
--- a/src/input/qmouseinput.cpp
+++ b/src/input/qmouseinput.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DInput {
 
@@ -55,22 +55,22 @@ QMouseInputPrivate::QMouseInputPrivate()
 }
 
 /*!
- * \class Qt3D::QMouseInput
+ * \class Qt3DCore::QMouseInput
  * \inmodule Qt3DInput
  *
  * \brief Provides a mean of being notified about mouse events when attached to
- * a Qt3D::QMouseController instance.
+ * a Qt3DCore::QMouseController instance.
  *
  * \since 5.5
  *
- * \note Qt3D::QMouseInput components shouldn't be shared, not respecting that
+ * \note Qt3DCore::QMouseInput components shouldn't be shared, not respecting that
  * condition will most likely result in undefined behaviors.
  *
- * \sa Qt3D::QMouseController
+ * \sa Qt3DCore::QMouseController
  */
 
 /*!
- * Constructs a new Qt3D::QMouseInput instance with parent \a parent.
+ * Constructs a new Qt3DCore::QMouseInput instance with parent \a parent.
  */
 QMouseInput::QMouseInput(QNode *parent)
     : QComponent(*new QMouseInputPrivate, parent)
@@ -94,7 +94,7 @@ QMouseInput::~QMouseInput()
 }
 
 /*!
- * Sets the mouse controller of the Qt3D::QMouseInput instance to \a controller.
+ * Sets the mouse controller of the Qt3DCore::QMouseInput instance to \a controller.
  */
 void QMouseInput::setController(QMouseController *controller)
 {
@@ -118,8 +118,8 @@ QMouseController *QMouseInput::controller() const
  * Returns true if the QMouseInput currently contains the mouse.
  *
  * \note: In this context, contains mean that the ray originating from the
- * mouse is intersecting with the Qt3D::QEntity that aggregates the current
- * Qt3D::QMouseInput instance component.
+ * mouse is intersecting with the Qt3DCore::QEntity that aggregates the current
+ * Qt3DCore::QMouseInput instance component.
  */
 bool QMouseInput::containsMouse() const
 {
@@ -141,7 +141,7 @@ void QMouseInput::copy(const QNode *ref)
         d->m_controller = static_cast<QMouseController *>(QNode::clone(refInput->controller()));
 }
 
-void QMouseInput::sceneChangeEvent(const Qt3D::QSceneChangePtr &change)
+void QMouseInput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
 {
     QBackendScenePropertyChangePtr e = qSharedPointerCast<QBackendScenePropertyChange>(change);
     if (e->type() == NodeUpdated) {
diff --git a/src/input/qmouseinput.h b/src/input/qmouseinput.h
index 949b824e8..5eca4dd4f 100644
--- a/src/input/qmouseinput.h
+++ b/src/input/qmouseinput.h
@@ -48,7 +48,7 @@ namespace Qt3DInput {
 class QMouseController;
 class QMouseInputPrivate;
 
-class QT3DINPUTSHARED_EXPORT QMouseInput : public Qt3D::QComponent
+class QT3DINPUTSHARED_EXPORT QMouseInput : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DInput::QMouseController *controller READ controller WRITE setController NOTIFY controllerChanged)
@@ -81,9 +81,9 @@ Q_SIGNALS:
     void wheel(Qt3DInput::Q3DWheelEvent *wheel);
 
 protected:
-    QMouseInput(QMouseInputPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    QMouseInput(QMouseInputPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
     void mouseEvent(Q3DMouseEvent *event);
     void setContainsMouse(bool contains);
 
diff --git a/src/input/qmouseinput_p.h b/src/input/qmouseinput_p.h
index e1444acd1..d8f7c3fff 100644
--- a/src/input/qmouseinput_p.h
+++ b/src/input/qmouseinput_p.h
@@ -57,7 +57,7 @@ namespace Qt3DInput {
 class QMouseInput;
 class QMouseController;
 
-class QMouseInputPrivate : public Qt3D::QComponentPrivate
+class QMouseInputPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QMouseInputPrivate();
diff --git a/src/logic/callbackjob_p.h b/src/logic/callbackjob_p.h
index 2b73c18c5..0e8cb2996 100644
--- a/src/logic/callbackjob_p.h
+++ b/src/logic/callbackjob_p.h
@@ -57,7 +57,7 @@ namespace Logic {
 
 class Manager;
 
-class CallbackJob : public Qt3D::QAspectJob
+class CallbackJob : public Qt3DCore::QAspectJob
 {
 public:
     CallbackJob();
@@ -70,7 +70,7 @@ private:
 };
 
 } // namespace Logic
-} // namespace Qt3D
+} // namespace Qt3DLogic
 
 QT_END_NAMESPACE
 
diff --git a/src/logic/executor.cpp b/src/logic/executor.cpp
index a14e8d201..95de46f0e 100644
--- a/src/logic/executor.cpp
+++ b/src/logic/executor.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DLogic {
 namespace Logic {
@@ -63,7 +63,7 @@ void Executor::clearQueueAndProceed()
         m_semaphore->release();
 }
 
-void Executor::enqueueLogicFrameUpdates(const QVector<Qt3D::QNodeId> &nodeIds)
+void Executor::enqueueLogicFrameUpdates(const QVector<Qt3DCore::QNodeId> &nodeIds)
 {
     m_nodeIds = nodeIds;
 }
@@ -99,6 +99,6 @@ void Executor::processLogicFrameUpdates()
 }
 
 } // namespace Logic
-} // namespace Qt3D
+} // namespace Qt3DLogic
 
 QT_END_NAMESPACE
diff --git a/src/logic/executor_p.h b/src/logic/executor_p.h
index fbfab79c7..ec48a3e38 100644
--- a/src/logic/executor_p.h
+++ b/src/logic/executor_p.h
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 
 class QSemaphore;
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QScene;
 }
 
@@ -77,25 +77,25 @@ class Executor : public QObject
 public:
     explicit Executor(QObject *parent = 0);
 
-    void setScene(Qt3D::QScene *scene) { m_scene = scene; }
+    void setScene(Qt3DCore::QScene *scene) { m_scene = scene; }
     void setSemephore(QSemaphore *semaphore) { m_semaphore = semaphore; }
     void clearQueueAndProceed();
 
 public Q_SLOTS:
-    void enqueueLogicFrameUpdates(const QVector<Qt3D::QNodeId> &nodeIds);
+    void enqueueLogicFrameUpdates(const QVector<Qt3DCore::QNodeId> &nodeIds);
 
 protected:
     bool event(QEvent *e);
     void processLogicFrameUpdates();
 
 private:
-    QVector<Qt3D::QNodeId> m_nodeIds;
-    Qt3D::QScene *m_scene;
+    QVector<Qt3DCore::QNodeId> m_nodeIds;
+    Qt3DCore::QScene *m_scene;
     QSemaphore *m_semaphore;
 };
 
 } // namespace Logic
-} // namespace Qt3D
+} // namespace Qt3DLogic
 
 QT_END_NAMESPACE
 
diff --git a/src/logic/handle_types_p.h b/src/logic/handle_types_p.h
index a0186c186..94eb05aa2 100644
--- a/src/logic/handle_types_p.h
+++ b/src/logic/handle_types_p.h
@@ -56,10 +56,10 @@ namespace Qt3DLogic {
 namespace Logic {
 
 class Handler;
-typedef Qt3D::QHandle<Handler, 16> HHandler;
+typedef Qt3DCore::QHandle<Handler, 16> HHandler;
 
 } // namespace Logic
-} // namespace Qt3D
+} // namespace Qt3DLogic
 
 QT_END_NAMESPACE
 
diff --git a/src/logic/handler.cpp b/src/logic/handler.cpp
index d5a94b0e8..81a4645e4 100644
--- a/src/logic/handler.cpp
+++ b/src/logic/handler.cpp
@@ -49,12 +49,12 @@ Handler::Handler()
 {
 }
 
-void Handler::updateFromPeer(Qt3D::QNode *peer)
+void Handler::updateFromPeer(Qt3DCore::QNode *peer)
 {
     Q_UNUSED(peer);
 }
 
-void Handler::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Handler::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     Q_UNUSED(e);
 }
@@ -64,7 +64,7 @@ HandlerFunctor::HandlerFunctor(Manager *manager)
 {
 }
 
-Qt3D::QBackendNode *HandlerFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *HandlerFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
 {
     Handler *handler = m_manager->logicHandlerManager()->getOrCreateResource(frontend->id());
     handler->setFactory(factory);
@@ -74,17 +74,17 @@ Qt3D::QBackendNode *HandlerFunctor::create(Qt3D::QNode *frontend, const Qt3D::QB
     return handler;
 }
 
-Qt3D::QBackendNode *HandlerFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *HandlerFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     return m_manager->logicHandlerManager()->lookupResource(id);
 }
 
-void HandlerFunctor::destroy(const Qt3D::QNodeId &id) const
+void HandlerFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     m_manager->removeHandler(id);
 }
 
 } // namespace Logic
-} // namespace Qt3D
+} // namespace Qt3DLogic
 
 QT_END_NAMESPACE
diff --git a/src/logic/handler_p.h b/src/logic/handler_p.h
index ee82496b5..cddfc864d 100644
--- a/src/logic/handler_p.h
+++ b/src/logic/handler_p.h
@@ -59,39 +59,39 @@ namespace Logic {
 
 class Manager;
 
-class Handler : public Qt3D::QBackendNode
+class Handler : public Qt3DCore::QBackendNode
 {
 public:
     Handler();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
     void setManager(Manager *manager) { m_logicManager = manager; }
     Manager *logicManager() const { return m_logicManager; }
 
 protected:
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
     Manager *m_logicManager;
 };
 
 
-class HandlerFunctor : public Qt3D::QBackendNodeFunctor
+class HandlerFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit HandlerFunctor(Manager *handler);
 
-    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;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
 private:
     Manager *m_manager;
 };
 
 } // namespace Logic
-} // namespace Qt3D
+} // namespace Qt3DLogic
 
 QT_END_NAMESPACE
 
diff --git a/src/logic/manager.cpp b/src/logic/manager.cpp
index 7802fc0de..e6ab804f8 100644
--- a/src/logic/manager.cpp
+++ b/src/logic/manager.cpp
@@ -73,7 +73,7 @@ void Manager::appendHandler(Handler *handler)
     m_logicComponentIds.append(handler->peerUuid());
 }
 
-void Manager::removeHandler(const Qt3D::QNodeId &id)
+void Manager::removeHandler(const Qt3DCore::QNodeId &id)
 {
     HHandler handle = m_logicHandlerManager->lookupHandle(id);
     m_logicComponentIds.removeAll(id);
diff --git a/src/logic/manager_p.h b/src/logic/manager_p.h
index 49e7ece2c..8d62a20c2 100644
--- a/src/logic/manager_p.h
+++ b/src/logic/manager_p.h
@@ -78,14 +78,14 @@ public:
     HandlerManager *logicHandlerManager() const { return m_logicHandlerManager.data(); }
 
     void appendHandler(Handler *handler);
-    void removeHandler(const Qt3D::QNodeId &id);
+    void removeHandler(const Qt3DCore::QNodeId &id);
 
     void triggerLogicFrameUpdates();
 
 private:
     QScopedPointer<HandlerManager> m_logicHandlerManager;
     QVector<HHandler> m_logicHandlers;
-    QVector<Qt3D::QNodeId> m_logicComponentIds;
+    QVector<Qt3DCore::QNodeId> m_logicComponentIds;
     QLogicAspect *m_logicAspect;
     Executor *m_executor;
     QSemaphore m_semaphore;
diff --git a/src/logic/managers_p.h b/src/logic/managers_p.h
index 33874e8b1..f25600e26 100644
--- a/src/logic/managers_p.h
+++ b/src/logic/managers_p.h
@@ -58,18 +58,18 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DLogic {
 namespace Logic {
 
-class HandlerManager : public Qt3D::QResourceManager<
+class HandlerManager : public Qt3DCore::QResourceManager<
         Handler,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy>
 {
 public:
     HandlerManager() {}
 };
 
 } // namespace Logic
-} // namespace Qt3D
+} // namespace Qt3DLogic
 
 QT_END_NAMESPACE
 
diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp
index be94a3ac0..395c536b5 100644
--- a/src/logic/qlogicaspect.cpp
+++ b/src/logic/qlogicaspect.cpp
@@ -56,12 +56,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DLogic {
 
 /*!
-    \class Qt3D::QLogicAspectPrivate
+    \class Qt3DCore::QLogicAspectPrivate
     \internal
 */
 QLogicAspectPrivate::QLogicAspectPrivate()
@@ -109,7 +109,7 @@ QVector<QAspectJobPtr> QLogicAspect::jobsToExecute(qint64 time)
     return jobs;
 }
 
-void QLogicAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e)
+void QLogicAspect::sceneNodeAdded(Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
@@ -118,7 +118,7 @@ void QLogicAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e)
     visitor.traverse(n, this, &QLogicAspect::visitNode);
 }
 
-void QLogicAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e)
+void QLogicAspect::sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
@@ -126,7 +126,7 @@ void QLogicAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e)
     QAbstractAspect::clearBackendNode(n);
 }
 
-void QLogicAspect::setRootEntity(Qt3D::QEntity *rootObject)
+void QLogicAspect::setRootEntity(Qt3DCore::QEntity *rootObject)
 {
     QNodeVisitor visitor;
     visitor.traverse(rootObject, this, &QLogicAspect::visitNode);
@@ -155,7 +155,7 @@ void QLogicAspect::onShutdown()
     d->m_executor->clearQueueAndProceed();
 }
 
-void QLogicAspect::visitNode(Qt3D::QNode *node)
+void QLogicAspect::visitNode(Qt3DCore::QNode *node)
 {
     QAbstractAspect::createBackendNode(node);
 }
diff --git a/src/logic/qlogicaspect.h b/src/logic/qlogicaspect.h
index bc8e388a1..eaf74e7a2 100644
--- a/src/logic/qlogicaspect.h
+++ b/src/logic/qlogicaspect.h
@@ -46,28 +46,28 @@ namespace Qt3DLogic {
 
 class QLogicAspectPrivate;
 
-class QT3DLOGICSHARED_EXPORT QLogicAspect : public Qt3D::QAbstractAspect
+class QT3DLOGICSHARED_EXPORT QLogicAspect : public Qt3DCore::QAbstractAspect
 {
     Q_OBJECT
 public:
     explicit QLogicAspect(QObject *parent = 0);
 
-    QVector<Qt3D::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
 
-    void sceneNodeAdded(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void sceneNodeRemoved(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 protected:
     void registerBackendTypes();
 
 private:
-    void setRootEntity(Qt3D::QEntity *rootObject) Q_DECL_OVERRIDE;
+    void setRootEntity(Qt3DCore::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(Qt3D::QNode *node);
+    void visitNode(Qt3DCore::QNode *node);
 
     Q_DECLARE_PRIVATE(QLogicAspect)
     QLogicAspect(QLogicAspectPrivate &dd, QObject *parent);
diff --git a/src/logic/qlogicaspect_p.h b/src/logic/qlogicaspect_p.h
index 63dffb616..6df90bcf6 100644
--- a/src/logic/qlogicaspect_p.h
+++ b/src/logic/qlogicaspect_p.h
@@ -61,7 +61,7 @@ class Executor;
 class Manager;
 }
 
-class QLogicAspectPrivate : public Qt3D::QAbstractAspectPrivate
+class QLogicAspectPrivate : public Qt3DCore::QAbstractAspectPrivate
 {
     QLogicAspectPrivate();
 
diff --git a/src/logic/qlogiccomponent.cpp b/src/logic/qlogiccomponent.cpp
index 006173fc7..3b2755538 100644
--- a/src/logic/qlogiccomponent.cpp
+++ b/src/logic/qlogiccomponent.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DLogic {
 
 /*!
-    \class Qt3D::QLogicComponentPrivate
+    \class Qt3DCore::QLogicComponentPrivate
     \internal
 */
 QLogicComponentPrivate::QLogicComponentPrivate()
@@ -51,7 +51,7 @@ QLogicComponentPrivate::QLogicComponentPrivate()
 }
 
 /*!
-    \class Qt3D::QLogicComponent
+    \class Qt3DCore::QLogicComponent
     \inmodule Qt3DLogic
     \since 5.5
     \brief Provides a way to have a synchronous function executed each frame.
@@ -71,7 +71,7 @@ QLogicComponentPrivate::QLogicComponentPrivate()
 /*!
     \qmltype LogicComponent
     \inqmlmodule Qt3D.Logic
-    \instantiates Qt3D::QLogicComponent
+    \instantiates Qt3DCore::QLogicComponent
     \inherits Component3D
     \since 5.5
 */
diff --git a/src/logic/qlogiccomponent.h b/src/logic/qlogiccomponent.h
index 9497d4921..500b1d85b 100644
--- a/src/logic/qlogiccomponent.h
+++ b/src/logic/qlogiccomponent.h
@@ -51,12 +51,12 @@ namespace Logic {
 class Executor;
 }
 
-class QT3DLOGICSHARED_EXPORT QLogicComponent : public Qt3D::QComponent
+class QT3DLOGICSHARED_EXPORT QLogicComponent : public Qt3DCore::QComponent
 {
     Q_OBJECT
 
 public:
-    explicit QLogicComponent(Qt3D::QNode *parent = 0);
+    explicit QLogicComponent(Qt3DCore::QNode *parent = 0);
     ~QLogicComponent();
 
 protected:
diff --git a/src/logic/qlogiccomponent_p.h b/src/logic/qlogiccomponent_p.h
index 76bdce49d..245c1b7c7 100644
--- a/src/logic/qlogiccomponent_p.h
+++ b/src/logic/qlogiccomponent_p.h
@@ -56,7 +56,7 @@ namespace Qt3DLogic {
 
 class QLogicComponent;
 
-class QLogicComponentPrivate : public Qt3D::QComponentPrivate
+class QLogicComponentPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QLogicComponentPrivate();
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp
index 63a4f0b32..4036fd7d3 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp
@@ -61,7 +61,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
@@ -320,7 +320,7 @@ bool AssimpParser::isAssimpPath(const QString &path)
  */
 void AssimpParser::setSource(const QUrl &source)
 {
-    const QString path = Qt3D::QUrlHelper::urlToLocalFileOrQrc(source);
+    const QString path = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(source);
     QFileInfo file(path);
     m_sceneDir = file.absoluteDir();
     if (!file.exists()) {
@@ -336,7 +336,7 @@ void AssimpParser::setSource(const QUrl &source)
  */
 bool AssimpParser::isExtensionSupported(const QUrl &source) const
 {
-    const QString path = Qt3D::QUrlHelper::urlToLocalFileOrQrc(source);
+    const QString path = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(source);
     return AssimpParser::isAssimpPath(path);
 }
 
@@ -347,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.
  */
-Qt3D::QEntity *AssimpParser::scene(const QString &id)
+Qt3DCore::QEntity *AssimpParser::scene(const QString &id)
 {
     // m_aiScene shouldn't be null.
     // If it is either, the file failed to be imported or
@@ -372,7 +372,7 @@ Qt3D::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.
  */
-Qt3D::QEntity *AssimpParser::node(const QString &id)
+Qt3DCore::QEntity *AssimpParser::node(const QString &id)
 {
     if (m_scene == Q_NULLPTR || m_scene->m_aiScene == Q_NULLPTR)
         return Q_NULLPTR;
@@ -384,7 +384,7 @@ Qt3D::QEntity *AssimpParser::node(const QString &id)
 /*!
  * Returns a Node from an Assimp aiNode \a node.
  */
-Qt3D::QEntity *AssimpParser::node(aiNode *node)
+Qt3DCore::QEntity *AssimpParser::node(aiNode *node)
 {
     if (node == Q_NULLPTR)
         return Q_NULLPTR;
@@ -415,7 +415,7 @@ Qt3D::QEntity *AssimpParser::node(aiNode *node)
 
     // Add Transformations
     const QMatrix4x4 qTransformMatrix = aiMatrix4x4ToQMatrix4x4(node->mTransformation);
-    Qt3D::QTransform *transform = new Qt3D::QTransform(new QMatrixTransform(qTransformMatrix));
+    Qt3DCore::QTransform *transform = new Qt3DCore::QTransform(new QMatrixTransform(qTransformMatrix));
     entityNode->addComponent(transform);
 
     // Add Camera
@@ -724,7 +724,7 @@ void AssimpParser::loadCamera(uint cameraIndex)
                                    assimpCamera->mClipPlaneFar);
     camera->addComponent(lens);
 
-    Qt3D::QTransform *transform = new Qt3D::QTransform();
+    Qt3DCore::QTransform *transform = new Qt3DCore::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));
diff --git a/src/plugins/sceneparsers/assimp/assimpparser_p.h b/src/plugins/sceneparsers/assimp/assimpparser_p.h
index 82611310b..00304b262 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser_p.h
+++ b/src/plugins/sceneparsers/assimp/assimpparser_p.h
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 
 class QFile;
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QCamera;
 }
 
@@ -91,14 +91,14 @@ public:
     // SceneParserInterface interface
     void setSource(const QUrl& source) Q_DECL_OVERRIDE;
     bool isExtensionSupported(const QUrl &source) const Q_DECL_OVERRIDE;
-    Qt3D::QEntity *scene(const QString &id = QString()) Q_DECL_OVERRIDE;
-    Qt3D::QEntity *node(const QString &id) Q_DECL_OVERRIDE;
+    Qt3DCore::QEntity *scene(const QString &id = QString()) Q_DECL_OVERRIDE;
+    Qt3DCore::QEntity *node(const QString &id) Q_DECL_OVERRIDE;
 
 private:
     static bool isAssimpPath(const QString &path);
     static QStringList assimpSupportedFormats();
 
-    Qt3D::QEntity *node(aiNode *node);
+    Qt3DCore::QEntity *node(aiNode *node);
 
     void readSceneFile(const QString &file);
 
@@ -134,7 +134,7 @@ private:
         QMap<uint, QEffect *> m_effects;
         QMap<uint, QAbstractTextureProvider *> m_embeddedTextures;
         QMap<QString, QAbstractTextureProvider *> m_materialTextures;
-        QMap<aiNode*, Qt3D::QEntity*> m_cameras;
+        QMap<aiNode*, Qt3DCore::QEntity*> m_cameras;
         QHash<aiTextureType, QString> m_textureToParameterName;
 //    QMap<aiNode*, Light*> m_lights;
     };
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp
index a32dd7f45..61f040ca4 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp
@@ -75,7 +75,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
@@ -185,7 +185,7 @@ bool GLTFParser::setJSON(const QJsonDocument &json )
  */
 void GLTFParser::setSource(const QUrl &source)
 {
-    const QString path = Qt3D::QUrlHelper::urlToLocalFileOrQrc(source);
+    const QString path = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(source);
     QFileInfo finfo(path);
     if (!finfo.exists()) {
         qCWarning(GLTFParserLog) << "missing file:" << path;
@@ -213,11 +213,11 @@ void GLTFParser::setSource(const QUrl &source)
  */
 bool GLTFParser::isExtensionSupported(const QUrl &source) const
 {
-    const QString path = Qt3D::QUrlHelper::urlToLocalFileOrQrc(source);
+    const QString path = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(source);
     return GLTFParser::isGLTFPath(path);
 }
 
-Qt3D::QEntity* GLTFParser::node(const QString &id)
+Qt3DCore::QEntity* GLTFParser::node(const QString &id)
 {
     QJsonObject nodes = m_json.object().value(KEY_NODES).toObject();
     if (!nodes.contains(id)) {
@@ -284,7 +284,7 @@ Qt3D::QEntity* GLTFParser::node(const QString &id)
         }
 
         // ADD MATRIX TRANSFORM COMPONENT TO ENTITY
-        Qt3D::QTransform *trans = new Qt3D::QTransform();
+        Qt3DCore::QTransform *trans = new Qt3DCore::QTransform();
         trans->addTransform(new QMatrixTransform(m));
         result->addComponent(trans);
     }
@@ -302,7 +302,7 @@ Qt3D::QEntity* GLTFParser::node(const QString &id)
     return result;
 }
 
-Qt3D::QEntity* GLTFParser::scene(const QString &id)
+Qt3DCore::QEntity* GLTFParser::scene(const QString &id)
 {
     parse();
 
@@ -459,7 +459,7 @@ QParameter *GLTFParser::parameterFromTechnique(QTechnique *technique, const QStr
     return Q_NULLPTR;
 }
 
-Qt3D::QEntity* GLTFParser::defaultScene()
+Qt3DCore::QEntity* GLTFParser::defaultScene()
 {
     if (m_defaultScene.isEmpty()) {
         qCWarning(GLTFParserLog) << Q_FUNC_INFO << "no default scene";
diff --git a/src/plugins/sceneparsers/gltf/gltfparser_p.h b/src/plugins/sceneparsers/gltf/gltfparser_p.h
index 15698171d..448fc900e 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser_p.h
+++ b/src/plugins/sceneparsers/gltf/gltfparser_p.h
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
 class QFile;
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QCamera;
 class QCameraLens;
 class QEntity;
@@ -95,8 +95,8 @@ public:
     // SceneParserInterface interface
     void setSource(const QUrl &source) Q_DECL_FINAL;
     bool isExtensionSupported(const QUrl &source) const Q_DECL_FINAL;
-    Qt3D::QEntity *node(const QString &id) Q_DECL_FINAL;
-    Qt3D::QEntity *scene(const QString &id = QString()) Q_DECL_FINAL;
+    Qt3DCore::QEntity *node(const QString &id) Q_DECL_FINAL;
+    Qt3DCore::QEntity *scene(const QString &id = QString()) Q_DECL_FINAL;
 
 private:
     class BufferData
@@ -142,9 +142,9 @@ private:
     static QString standardAttributeNameFromSemantic(const QString &semantic);
     static QParameter *parameterFromTechnique(QTechnique *technique, const QString &parameterName);
 
-    Qt3D::QEntity *defaultScene();
+    Qt3DCore::QEntity *defaultScene();
     QMaterial *material(const QString &id);
-    Qt3D::QCameraLens *camera(const QString &id) const;
+    Qt3DCore::QCameraLens *camera(const QString &id) const;
 
     void parse();
     void cleanup();
@@ -165,7 +165,7 @@ private:
     QFile* resolveLocalData(QString path) const;
 
     QVariant parameterValueFromJSON(int type, const QJsonValue &value) const;
-    static Qt3D::QAbstractAttribute::DataType accessorTypeFromJSON(int componentType);
+    static Qt3DCore::QAbstractAttribute::DataType accessorTypeFromJSON(int componentType);
     static uint accessorDataSizeFromJson(const QString &type);
 
     static QRenderState *buildStateEnable(int state);
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
index 685b09ea1..8e654f395 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
@@ -54,29 +54,29 @@ QT_BEGIN_NAMESPACE
 
 void Qt3DQuick3DCorePlugin::registerTypes(const char *uri)
 {
-    Qt3D::Quick::Quick3D_initialize();
+    Qt3DCore::Quick::Quick3D_initialize();
 
-    qmlRegisterUncreatableType<Qt3D::QComponent>(uri, 2, 0, "Component3D", QStringLiteral(""));
-    qmlRegisterUncreatableType<Qt3D::QAbstractTransform>(uri, 2, 0, "QAbstractTransform", QStringLiteral("QAbstractTransform is abstract"));
+    qmlRegisterUncreatableType<Qt3DCore::QComponent>(uri, 2, 0, "Component3D", QStringLiteral(""));
+    qmlRegisterUncreatableType<Qt3DCore::QAbstractTransform>(uri, 2, 0, "QAbstractTransform", QStringLiteral("QAbstractTransform is abstract"));
 
-    qmlRegisterType<Qt3D::Quick::Quick3DConfiguration>(uri, 2, 0, "Configuration");
-    Qt3D::Quick::registerExtendedType<Qt3D::QEntity, Qt3D::Quick::Quick3DEntity>("QEntity", "Qt3D/Entity", uri, 2, 0, "Entity");
-    qmlRegisterType<Qt3D::Quick::Quick3DEntityLoader>(uri, 2, 0, "EntityLoader");
-    qmlRegisterType<Qt3D::Quick::Quick3DNodeInstantiator>(uri, 2, 0, "NodeInstantiator");
-    Qt3D::Quick::registerExtendedType<Qt3D::QTransform, Qt3D::Quick::Quick3DTransform>("QTransform", "Qt3D/Transform", uri, 2, 0, "Transform");
+    qmlRegisterType<Qt3DCore::Quick::Quick3DConfiguration>(uri, 2, 0, "Configuration");
+    Qt3DCore::Quick::registerExtendedType<Qt3DCore::QEntity, Qt3DCore::Quick::Quick3DEntity>("QEntity", "Qt3D/Entity", uri, 2, 0, "Entity");
+    qmlRegisterType<Qt3DCore::Quick::Quick3DEntityLoader>(uri, 2, 0, "EntityLoader");
+    qmlRegisterType<Qt3DCore::Quick::Quick3DNodeInstantiator>(uri, 2, 0, "NodeInstantiator");
+    Qt3DCore::Quick::registerExtendedType<Qt3DCore::QTransform, Qt3DCore::Quick::Quick3DTransform>("QTransform", "Qt3D/Transform", uri, 2, 0, "Transform");
     // Ideally we want to make Node an uncreatable type
     // We would need qmlRegisterUncreatableExtendedType for that
-    qmlRegisterExtendedUncreatableType<Qt3D::QNode, Qt3D::Quick::Quick3DNode>(uri, 2, 0, "Node", QStringLiteral("Node is a base class"));
-    Qt3D::Quick::registerExtendedType<Qt3D::QCamera, Qt3D::Quick::Quick3DNode>("QCamera", "Qt3D/Camera", uri, 2, 0, "Camera");
-    qmlRegisterType<Qt3D::QCameraLens>(uri, 2, 0, "CameraLens");
+    qmlRegisterExtendedUncreatableType<Qt3DCore::QNode, Qt3DCore::Quick::Quick3DNode>(uri, 2, 0, "Node", QStringLiteral("Node is a base class"));
+    Qt3DCore::Quick::registerExtendedType<Qt3DCore::QCamera, Qt3DCore::Quick::Quick3DNode>("QCamera", "Qt3D/Camera", uri, 2, 0, "Camera");
+    qmlRegisterType<Qt3DCore::QCameraLens>(uri, 2, 0, "CameraLens");
 
-    qmlRegisterType<Qt3D::QMatrixTransform>(uri, 2, 0, "MatrixTransform");
-    qmlRegisterType<Qt3D::QTranslateTransform>(uri, 2, 0, "Translate");
-    qmlRegisterType<Qt3D::QRotateTransform>(uri, 2, 0, "Rotate");
-    qmlRegisterType<Qt3D::QLookAtTransform>(uri, 2, 0, "LookAt");
-    qmlRegisterType<Qt3D::QScaleTransform>(uri, 2, 0, "Scale");
+    qmlRegisterType<Qt3DCore::QMatrixTransform>(uri, 2, 0, "MatrixTransform");
+    qmlRegisterType<Qt3DCore::QTranslateTransform>(uri, 2, 0, "Translate");
+    qmlRegisterType<Qt3DCore::QRotateTransform>(uri, 2, 0, "Rotate");
+    qmlRegisterType<Qt3DCore::QLookAtTransform>(uri, 2, 0, "LookAt");
+    qmlRegisterType<Qt3DCore::QScaleTransform>(uri, 2, 0, "Scale");
 
-    qmlRegisterUncreatableType<Qt3D::QAbstractAttribute>(uri, 2, 0, "AbstractAttribute", QStringLiteral("QAbstractAttribute is abstract"));
+    qmlRegisterUncreatableType<Qt3DCore::QAbstractAttribute>(uri, 2, 0, "AbstractAttribute", QStringLiteral("QAbstractAttribute is abstract"));
 }
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp b/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp
index bef34eec0..690d4f9fb 100644
--- a/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drendererplugin.cpp
@@ -197,8 +197,8 @@ void Qt3DQuick3DRendererPlugin::registerTypes(const char *uri)
     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"));
+    qmlRegisterUncreatableType<Qt3DCore::QAbstractAttribute>(uri, 2, 0, "QAbstractAttribute", QStringLiteral("QAbstractAttribute is abstract"));
+    qmlRegisterUncreatableType<Qt3DCore::QAbstractBuffer>(uri, 2, 0, "QAbstractBuffer", QStringLiteral("QAbstractBuffer is abstract"));
     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");
@@ -223,7 +223,7 @@ void Qt3DQuick3DRendererPlugin::registerTypes(const char *uri)
     qmlRegisterType<Qt3DRender::QSpotLight>(uri, 2, 0, "SpotLight");
 
     // FrameGraph
-    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QCameraSelector, Qt3D::Quick::Quick3DNode>("QCameraSelector", "Qt3D.Renderer/CameraSelector", uri, 2, 0, "CameraSelector");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QCameraSelector, Qt3DCore::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");
diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp
index 7daca94ad..840da7a0d 100644
--- a/src/quick3d/imports/scene3d/scene3ditem.cpp
+++ b/src/quick3d/imports/scene3d/scene3ditem.cpp
@@ -83,13 +83,13 @@ private:
 class Scene3DSGNode;
 
 /*!
-    \class Qt3D::Scene3DRenderer
+    \class Qt3DCore::Scene3DRenderer
     \internal
 
-    \brief The Qt3D::Scene3DRenderer class takes care of rendering a Qt3D scene
+    \brief The Qt3DCore::Scene3DRenderer class takes care of rendering a Qt3D scene
     within a Framebuffer object to be used by the QtQuick 2 renderer.
 
-    The Qt3D::Scene3DRenderer class renders a Qt3D scene as provided by a Qt3D::Scene3DItem.
+    The Qt3DCore::Scene3DRenderer class renders a Qt3D scene as provided by a Qt3DCore::Scene3DItem.
     It owns the aspectEngine even though it doesn't instantiate it.
 
     The shutdown procedure is a two steps process that goes as follow:
@@ -147,7 +147,7 @@ class Scene3DRenderer : public QObject
     Q_OBJECT
 public:
     Scene3DRenderer(Scene3DItem *item,
-                    Qt3D::QAspectEngine *aspectEngine,
+                    Qt3DCore::QAspectEngine *aspectEngine,
                     QRenderAspect *renderAspect)
         : QObject()
         , m_item(item)
@@ -248,7 +248,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
+    Qt3DCore::QAspectEngine *m_aspectEngine; // Will be released by the Scene3DRendererCleaner
     QRenderAspect *m_renderAspect; // Will be released by the aspectEngine
     QScopedPointer<QOpenGLFramebufferObject> m_multisampledFBO;
     QScopedPointer<QOpenGLFramebufferObject> m_finalFBO;
@@ -263,13 +263,13 @@ private:
 };
 
 /*!
-    \class Qt3D::SCene3DMaterialShader
+    \class Qt3DCore::SCene3DMaterialShader
     \internal
 
-    \brief The Qt3D::Scene3DSGMaterialShader class is a custom
-    QSGMaterialShader subclass instantiated by a Qt3D::Scene3DSGMateria1
+    \brief The Qt3DCore::Scene3DSGMaterialShader class is a custom
+    QSGMaterialShader subclass instantiated by a Qt3DCore::Scene3DSGMateria1
 
-    The Qt3D::Scene3DSGMaterialShader provides a shader that renders a texture
+    The Qt3DCore::Scene3DSGMaterialShader provides a shader that renders a texture
     using premultiplied alpha.
  */
 class Scene3DSGMaterialShader : public QSGMaterialShader
@@ -353,14 +353,14 @@ private:
 QSGMaterialType Scene3DSGMaterialShader::type;
 
 /*!
-    \class Qt3D::Scene3DSGMaterial
+    \class Qt3DCore::Scene3DSGMaterial
     \internal
     \inherit QSGMaterial
 
-    \brief The Qt3D::Scene3DSGMaterial class is a custom QSGMaterial subclass used to
-    render a Qt3D::Scene3DSGNode
+    \brief The Qt3DCore::Scene3DSGMaterial class is a custom QSGMaterial subclass used to
+    render a Qt3DCore::Scene3DSGNode
 
-    The Qt3D::Scene3DSGMaterial class renders a texture using premultiplied
+    The Qt3DCore::Scene3DSGMaterial class renders a texture using premultiplied
     alpha unlike the QSGSimpleTextureMaterial.
 
     This is needed to properly integrate alpha blending from a Qt3D scene
@@ -389,13 +389,13 @@ private:
 };
 
 /*!
-    \class Qt3D::Scene3DSGNode
+    \class Qt3DCore::Scene3DSGNode
     \internal
 
-    \brief The Qt3D::Scene3DSGNode class is a simple QSGeometryNode subclass that
-    uses a Qt3D::Scene3DMaterial
+    \brief The Qt3DCore::Scene3DSGNode class is a simple QSGeometryNode subclass that
+    uses a Qt3DCore::Scene3DMaterial
 
-    The Qt3D::Scene3DSGNode allows to render a simple rect texture with
+    The Qt3DCore::Scene3DSGNode allows to render a simple rect texture with
     premultiplied alpha.
  */
 class Scene3DSGNode : public QSGGeometryNode
@@ -448,22 +448,22 @@ private:
 };
 
 /*!
-    \class Qt3D::Scene3DItem
+    \class Qt3DCore::Scene3DItem
     \internal
 
-    \brief The Qt3D::Scene3DItem class is a QQuickItem subclass used to integrate
+    \brief The Qt3DCore::Scene3DItem class is a QQuickItem subclass used to integrate
     a Qt3D scene into a QtQuick 2 scene.
 
-    The Qt3D::Scene3DItem class renders a Qt3D scene, provided by a Qt3D::QEntity
+    The Qt3DCore::Scene3DItem class renders a Qt3D scene, provided by a Qt3DCore::QEntity
     into a multisampled Framebuffer object that is later blitted into a non
     multisampled Framebuffer object to be then renderer through the use of a
-    Qt3D::Scene3DSGNode with premultiplied alpha.
+    Qt3DCore::Scene3DSGNode with premultiplied alpha.
  */
 
 Scene3DItem::Scene3DItem(QQuickItem *parent)
     : QQuickItem(parent)
     , m_entity(Q_NULLPTR)
-    , m_aspectEngine(new Qt3D::QAspectEngine())
+    , m_aspectEngine(new Qt3DCore::QAspectEngine())
     , m_renderAspect(new QRenderAspect(QRenderAspect::Synchronous))
     , m_renderer(Q_NULLPTR)
     , m_rendererCleaner(new Scene3DCleaner())
@@ -489,7 +489,7 @@ QStringList Scene3DItem::aspects() const
     return m_aspects;
 }
 
-Qt3D::QEntity *Scene3DItem::entity() const
+Qt3DCore::QEntity *Scene3DItem::entity() const
 {
     return m_entity;
 }
@@ -518,7 +518,7 @@ void Scene3DItem::setAspects(const QStringList &aspects)
     emit aspectsChanged();
 }
 
-void Scene3DItem::setEntity(Qt3D::QEntity *entity)
+void Scene3DItem::setEntity(Qt3DCore::QEntity *entity)
 {
     if (entity == m_entity)
         return;
diff --git a/src/quick3d/imports/scene3d/scene3ditem_p.h b/src/quick3d/imports/scene3d/scene3ditem_p.h
index 1f0eaafc1..301af9022 100644
--- a/src/quick3d/imports/scene3d/scene3ditem_p.h
+++ b/src/quick3d/imports/scene3d/scene3ditem_p.h
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QAspectEngine;
 class QEntity;
 }
@@ -55,7 +55,7 @@ class Scene3DCleaner;
 class Scene3DItem : public QQuickItem
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QEntity* entity READ entity WRITE setEntity NOTIFY entityChanged)
+    Q_PROPERTY(Qt3DCore::QEntity* entity READ entity WRITE setEntity NOTIFY entityChanged)
     Q_PROPERTY(QStringList aspects READ aspects WRITE setAspects NOTIFY aspectsChanged)
     Q_PROPERTY(bool multisample READ multisample WRITE setMultisample NOTIFY multisampleChanged)
     Q_CLASSINFO("DefaultProperty", "entity")
@@ -64,14 +64,14 @@ public:
     ~Scene3DItem();
 
     QStringList aspects() const;
-    Qt3D::QEntity *entity() const;
+    Qt3DCore::QEntity *entity() const;
 
     bool multisample() const;
     void setMultisample(bool enable);
 
 public Q_SLOTS:
     void setAspects(const QStringList &aspects);
-    void setEntity(Qt3D::QEntity *entity);
+    void setEntity(Qt3DCore::QEntity *entity);
 
 Q_SIGNALS:
     void aspectsChanged();
@@ -85,9 +85,9 @@ private:
     QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *nodeData) Q_DECL_OVERRIDE;
 
     QStringList m_aspects;
-    Qt3D::QEntity *m_entity;
+    Qt3DCore::QEntity *m_entity;
 
-    Qt3D::QAspectEngine *m_aspectEngine;
+    Qt3DCore::QAspectEngine *m_aspectEngine;
     QRenderAspect *m_renderAspect;
     Scene3DRenderer *m_renderer;
     Scene3DCleaner *m_rendererCleaner;
diff --git a/src/quick3d/quick3d/items/quick3dconfiguration.cpp b/src/quick3d/quick3d/items/quick3dconfiguration.cpp
index 5efb7d0aa..433e5e0d2 100644
--- a/src/quick3d/quick3d/items/quick3dconfiguration.cpp
+++ b/src/quick3d/quick3d/items/quick3dconfiguration.cpp
@@ -46,8 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DCore {
 namespace Quick {
 
 /*!
@@ -71,7 +70,7 @@ void Quick3DConfiguration::setControlledCamera(QCamera *camera)
 }
 
 /*!
-    \qmlproperty Camera Qt3D::Configuration::controlledCamera
+    \qmlproperty Camera Qt3DCore::Configuration::controlledCamera
 */
 QCamera *Quick3DConfiguration::controlledCamera() const
 {
@@ -96,8 +95,7 @@ void Quick3DConfiguration::applyControlledCameraChange()
     }
 }
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3d/items/quick3dconfiguration.h b/src/quick3d/quick3d/items/quick3dconfiguration.h
index f65076ab0..99606698b 100644
--- a/src/quick3d/quick3d/items/quick3dconfiguration.h
+++ b/src/quick3d/quick3d/items/quick3dconfiguration.h
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QCamera;
 
@@ -51,7 +51,7 @@ namespace Quick {
 class QT3DQUICKSHARED_EXPORT Quick3DConfiguration : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QCamera *controlledCamera READ controlledCamera WRITE setControlledCamera NOTIFY controlledCameraChanged)
+    Q_PROPERTY(Qt3DCore::QCamera *controlledCamera READ controlledCamera WRITE setControlledCamera NOTIFY controlledCameraChanged)
 public:
     explicit Quick3DConfiguration(QObject *parent = 0);
 
@@ -68,9 +68,8 @@ private:
     QCamera *m_camera;
 };
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/items/quick3dentity.cpp b/src/quick3d/quick3d/items/quick3dentity.cpp
index c00eb0899..8b3b9ba4b 100644
--- a/src/quick3d/quick3d/items/quick3dentity.cpp
+++ b/src/quick3d/quick3d/items/quick3dentity.cpp
@@ -39,8 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DCore {
 namespace Quick {
 
 /*!
@@ -56,12 +55,12 @@ Quick3DEntity::Quick3DEntity(QObject *parent)
 }
 
 /*!
-    \qmlproperty list<Component3D> Qt3D::Entity::components
+    \qmlproperty list<Component3D> Qt3DCore::Entity::components
     \readonly
 */
 QQmlListProperty<QComponent> Quick3DEntity::componentList()
 {
-    return QQmlListProperty<Qt3D::QComponent>(this, 0,
+    return QQmlListProperty<Qt3DCore::QComponent>(this, 0,
                                              Quick3DEntity::qmlAppendComponent,
                                              Quick3DEntity::qmlComponentsCount,
                                              Quick3DEntity::qmlComponentAt,
@@ -97,8 +96,7 @@ void Quick3DEntity::qmlClearComponents(QQmlListProperty<QComponent> *list)
     }
 }
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3d/items/quick3dentity.h b/src/quick3d/quick3d/items/quick3dentity.h
index 1db358037..3a9adca06 100644
--- a/src/quick3d/quick3d/items/quick3dentity.h
+++ b/src/quick3d/quick3d/items/quick3dentity.h
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QEntity;
 class QComponent;
@@ -54,25 +54,24 @@ namespace Quick {
 class QT3DQUICKSHARED_EXPORT Quick3DEntity : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QComponent> components READ componentList)
+    Q_PROPERTY(QQmlListProperty<Qt3DCore::QComponent> components READ componentList)
 
 public:
     explicit Quick3DEntity(QObject *parent = 0);
-    QQmlListProperty<Qt3D::QComponent> componentList();
+    QQmlListProperty<Qt3DCore::QComponent> componentList();
 
     inline QEntity *parentEntity() const { return qobject_cast<QEntity*>(parent()); }
 
 private:
 
-    static void qmlAppendComponent(QQmlListProperty<Qt3D::QComponent> *list, Qt3D::QComponent *comp);
-    static QComponent *qmlComponentAt(QQmlListProperty<Qt3D::QComponent> *list, int index);
-    static int qmlComponentsCount(QQmlListProperty<Qt3D::QComponent> *list);
-    static void qmlClearComponents(QQmlListProperty<Qt3D::QComponent> *list);
+    static void qmlAppendComponent(QQmlListProperty<Qt3DCore::QComponent> *list, Qt3DCore::QComponent *comp);
+    static QComponent *qmlComponentAt(QQmlListProperty<Qt3DCore::QComponent> *list, int index);
+    static int qmlComponentsCount(QQmlListProperty<Qt3DCore::QComponent> *list);
+    static void qmlClearComponents(QQmlListProperty<Qt3DCore::QComponent> *list);
 };
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp
index 1fe8945e1..0b4d3d9a1 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader.cpp
+++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp
@@ -45,8 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DCore {
 namespace Quick {
 
 class Quick3DEntityLoaderIncubator : public QQmlIncubator
@@ -105,7 +104,7 @@ Quick3DEntityLoader::~Quick3DEntityLoader()
 }
 
 /*!
-    \qmlproperty QtQml::QtObject Qt3D::EntityLoader::entity
+    \qmlproperty QtQml::QtObject Qt3DCore::EntityLoader::entity
     \readonly
 */
 QObject *Quick3DEntityLoader::entity() const
@@ -115,7 +114,7 @@ QObject *Quick3DEntityLoader::entity() const
 }
 
 /*!
-    \qmlproperty url Qt3D::EntityLoader::source
+    \qmlproperty url Qt3DCore::EntityLoader::source
 */
 QUrl Quick3DEntityLoader::source() const
 {
@@ -146,7 +145,7 @@ void Quick3DEntityLoader::copy(const QNode *ref)
 }
 
 /*!
-    \class Qt3D::Quick::Quick3DEntityLoaderPrivate
+    \class Qt3DCore::Quick::Quick3DEntityLoaderPrivate
     \internal
 */
 Quick3DEntityLoaderPrivate::Quick3DEntityLoaderPrivate()
@@ -236,9 +235,8 @@ void Quick3DEntityLoaderPrivate::_q_componentStatusChanged(QQmlComponent::Status
     m_component->create(*m_incubator, m_context);
 }
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/items/quick3dentityloader.h b/src/quick3d/quick3d/items/quick3dentityloader.h
index 0280ca3aa..49d689e02 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader.h
+++ b/src/quick3d/quick3d/items/quick3dentityloader.h
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QEntity;
 
@@ -82,9 +82,8 @@ private:
     QT3D_CLONEABLE(Quick3DEntityLoader)
 };
 
-} // Quick;
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h
index 2cd0ffda4..21ec9ed55 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader_p.h
+++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 class QQmlIncubator;
 class QQmlContext;
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QEntity;
 
@@ -89,9 +89,8 @@ public:
     QEntity *m_entity;
 };
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/items/quick3dnode.cpp b/src/quick3d/quick3d/items/quick3dnode.cpp
index c230df447..2c4128bed 100644
--- a/src/quick3d/quick3d/items/quick3dnode.cpp
+++ b/src/quick3d/quick3d/items/quick3dnode.cpp
@@ -39,8 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DCore {
 namespace Quick {
 
 /*!
@@ -58,7 +57,7 @@ Quick3DNode::Quick3DNode(QObject *parent)
 }
 
 /*!
-    \qmlproperty list<QtQml::QtObject> Qt3D::Node::data
+    \qmlproperty list<QtQml::QtObject> Qt3DCore::Node::data
     \default
 */
 
@@ -72,7 +71,7 @@ QQmlListProperty<QObject> Quick3DNode::data()
 }
 
 /*!
-    \qmlproperty list<Node> Qt3D::Node::childNodes
+    \qmlproperty list<Node> Qt3DCore::Node::childNodes
     \readonly
 */
 
@@ -113,7 +112,7 @@ void Quick3DNode::clearData(QQmlListProperty<QObject> *list)
         self->childRemoved(0, child);
 }
 
-void Quick3DNode::appendChild(QQmlListProperty<Qt3D::QNode> *list, Qt3D::QNode *obj)
+void Quick3DNode::appendChild(QQmlListProperty<Qt3DCore::QNode> *list, Qt3DCore::QNode *obj)
 {
     if (!obj)
         return;
@@ -124,19 +123,19 @@ void Quick3DNode::appendChild(QQmlListProperty<Qt3D::QNode> *list, Qt3D::QNode *
     self->childAppended(0, obj);
 }
 
-Qt3D::QNode *Quick3DNode::childAt(QQmlListProperty<Qt3D::QNode> *list, int index)
+Qt3DCore::QNode *Quick3DNode::childAt(QQmlListProperty<Qt3DCore::QNode> *list, int index)
 {
     Quick3DNode *self = static_cast<Quick3DNode *>(list->object);
     return qobject_cast<QNode *>(self->parentNode()->children().at(index));
 }
 
-int Quick3DNode::childCount(QQmlListProperty<Qt3D::QNode> *list)
+int Quick3DNode::childCount(QQmlListProperty<Qt3DCore::QNode> *list)
 {
     Quick3DNode *self = static_cast<Quick3DNode *>(list->object);
     return self->parentNode()->children().count();
 }
 
-void Quick3DNode::clearChildren(QQmlListProperty<Qt3D::QNode> *list)
+void Quick3DNode::clearChildren(QQmlListProperty<Qt3DCore::QNode> *list)
 {
     Quick3DNode *self = static_cast<Quick3DNode *>(list->object);
     Q_FOREACH (QObject *const child, self->parentNode()->children())
@@ -163,8 +162,7 @@ void Quick3DNode::childRemoved(int, QObject *obj)
         obj->setParent(Q_NULLPTR);
 }
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3d/items/quick3dnode.h b/src/quick3d/quick3d/items/quick3dnode.h
index 008583ecc..96fcd78e4 100644
--- a/src/quick3d/quick3d/items/quick3dnode.h
+++ b/src/quick3d/quick3d/items/quick3dnode.h
@@ -43,21 +43,20 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DCore {
 namespace Quick {
 
 class QT3DQUICKSHARED_EXPORT Quick3DNode : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<QObject> data READ data)
-    Q_PROPERTY(QQmlListProperty<Qt3D::QNode> childNodes READ childNodes)
+    Q_PROPERTY(QQmlListProperty<Qt3DCore::QNode> childNodes READ childNodes)
     Q_CLASSINFO("DefaultProperty", "data")
 public:
     explicit Quick3DNode(QObject *parent = 0);
 
     QQmlListProperty<QObject> data();
-    QQmlListProperty<Qt3D::QNode> childNodes();
+    QQmlListProperty<Qt3DCore::QNode> childNodes();
 
     inline QNode *parentNode() const { return qobject_cast<QNode*>(parent()); }
 
@@ -67,19 +66,18 @@ private:
     static int dataCount(QQmlListProperty<QObject> *list);
     static void clearData(QQmlListProperty<QObject> *list);
 
-    static void appendChild(QQmlListProperty<Qt3D::QNode> *list, Qt3D::QNode *obj);
-    static QNode *childAt(QQmlListProperty<Qt3D::QNode> *list, int index);
-    static int childCount(QQmlListProperty<Qt3D::QNode> *list);
-    static void clearChildren(QQmlListProperty<Qt3D::QNode> *list);
+    static void appendChild(QQmlListProperty<Qt3DCore::QNode> *list, Qt3DCore::QNode *obj);
+    static QNode *childAt(QQmlListProperty<Qt3DCore::QNode> *list, int index);
+    static int childCount(QQmlListProperty<Qt3DCore::QNode> *list);
+    static void clearChildren(QQmlListProperty<Qt3DCore::QNode> *list);
 
 private Q_SLOTS:
     void childAppended(int idx, QObject *child);
     void childRemoved(int idx, QObject *child);
 };
 
-} // Quick;
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
index c6257ec58..fb49eef89 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
@@ -47,11 +47,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 namespace Quick {
 
 /*!
-    \class Qt3D::Quick::Quick3DNodeInstantiatorPrivate
+    \class Qt3DCore::Quick::Quick3DNodeInstantiatorPrivate
     \internal
 */
 Quick3DNodeInstantiatorPrivate::Quick3DNodeInstantiatorPrivate()
@@ -222,7 +222,7 @@ Quick3DNodeInstantiator::~Quick3DNodeInstantiator()
 }
 
 /*!
-    \qmlsignal Qt3D::NodeInstantiator::objectAdded(int index, QtObject node)
+    \qmlsignal Qt3DCore::NodeInstantiator::objectAdded(int index, QtObject node)
 
     This signal is emitted when a node is added to the NodeInstantiator. The \a index
     parameter holds the index which the node has been given, and the \a node
@@ -232,7 +232,7 @@ Quick3DNodeInstantiator::~Quick3DNodeInstantiator()
 */
 
 /*!
-    \qmlsignal Qt3D::NodeInstantiator::objectRemoved(int index, QtObject object)
+    \qmlsignal Qt3DCore::NodeInstantiator::objectRemoved(int index, QtObject object)
 
     This signal is emitted when an object is removed from the Instantiator. The \a index
     parameter holds the index which the object had been given, and the \a object
@@ -244,7 +244,7 @@ Quick3DNodeInstantiator::~Quick3DNodeInstantiator()
     The corresponding handler is \c onObjectRemoved.
 */
 /*!
-    \qmlproperty bool Qt3D::NodeInstantiator::active
+    \qmlproperty bool Qt3DCore::NodeInstantiator::active
 
     When active is \c true, and the delegate component is ready, the Instantiator will
     create objects according to the model. When active is \c false, no objects
@@ -269,7 +269,7 @@ void Quick3DNodeInstantiator::setActive(bool newVal)
 }
 
 /*!
-    \qmlproperty bool Qt3D::NodeInstantiator::asynchronous
+    \qmlproperty bool Qt3DCore::NodeInstantiator::asynchronous
 
     When asynchronous is true the Instantiator will attempt to create objects
     asynchronously. This means that objects may not be available immediately,
@@ -296,7 +296,7 @@ void Quick3DNodeInstantiator::setAsync(bool newVal)
 
 
 /*!
-    \qmlproperty int Qt3D::NodeInstantiator::count
+    \qmlproperty int Qt3DCore::NodeInstantiator::count
     \readonly
 
     The number of objects the Instantiator is currently managing.
@@ -309,7 +309,7 @@ int Quick3DNodeInstantiator::count() const
 }
 
 /*!
-    \qmlproperty QtQml::Component Qt3D::NodeInstantiator::delegate
+    \qmlproperty QtQml::Component Qt3DCore::NodeInstantiator::delegate
     \default
 
     The component used to create all objects.
@@ -346,7 +346,7 @@ void Quick3DNodeInstantiator::setDelegate(QQmlComponent *c)
 }
 
 /*!
-    \qmlproperty variant Qt3D::NodeInstantiator::model
+    \qmlproperty variant Qt3DCore::NodeInstantiator::model
 
     This property can be set to any of the supported \l {qml-data-models}{data models}:
 
@@ -421,7 +421,7 @@ void Quick3DNodeInstantiator::setModel(const QVariant &v)
 }
 
 /*!
-    \qmlproperty QtQml::QtObject Qt3D::NodeInstantiator::object
+    \qmlproperty QtQml::QtObject Qt3DCore::NodeInstantiator::object
     \readonly
 
     This is a reference to the first created object, intended as a convenience
@@ -436,7 +436,7 @@ QObject *Quick3DNodeInstantiator::object() const
 }
 
 /*!
-    \qmlmethod QtQml::QtObject Qt3D::NodeInstantiator::objectAt(int index)
+    \qmlmethod QtQml::QtObject Qt3DCore::NodeInstantiator::objectAt(int index)
 
     Returns a reference to the object with the given \a index.
 */
@@ -492,7 +492,7 @@ void Quick3DNodeInstantiator::copy(const QNode *ref)
 }
 
 } // namespace Quick
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
index a3f9b3dda..38a4d5a6f 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 namespace Quick {
 
 class Quick3DNodeInstantiatorPrivate;
@@ -122,7 +122,7 @@ private:
 };
 
 } // namespace Quick
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h
index 68a16b192..71bc44668 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 class QQmlComponent;
 
-namespace Qt3D {
+namespace Qt3DCore {
 namespace Quick {
 
 class Quick3DNodeInstantiatorPrivate : public QNodePrivate
@@ -86,7 +86,7 @@ public:
 };
 
 } // namespace Quick
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/items/quick3dtransform.cpp b/src/quick3d/quick3d/items/quick3dtransform.cpp
index 3386a2c8a..3f313850a 100644
--- a/src/quick3d/quick3d/items/quick3dtransform.cpp
+++ b/src/quick3d/quick3d/items/quick3dtransform.cpp
@@ -39,8 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DCore {
 namespace Quick {
 
 /*!
@@ -51,16 +50,16 @@ namespace Quick {
 Quick3DTransform::Quick3DTransform(QObject *parent)
     : QObject(parent)
 {
-    Q_ASSERT(qobject_cast<Qt3D::QTransform *>(parent) != Q_NULLPTR);
+    Q_ASSERT(qobject_cast<Qt3DCore::QTransform *>(parent) != Q_NULLPTR);
 }
 
 /*!
-    \qmlproperty matrix4x4 Qt3D::Transform::matrix
+    \qmlproperty matrix4x4 Qt3DCore::Transform::matrix
     \readonly
 */
 
 /*!
-    \qmlproperty list<QAbstractTransform> Qt3D::Transform::transforms
+    \qmlproperty list<QAbstractTransform> Qt3DCore::Transform::transforms
     \default
 */
 QQmlListProperty<QAbstractTransform> Quick3DTransform::transformList()
@@ -100,8 +99,7 @@ void Quick3DTransform::qmlClearTransforms(QQmlListProperty<QAbstractTransform> *
         self->parentTransform()->removeTransform(trans);
 }
 
-} //Quick
-
-} //Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3d/items/quick3dtransform.h b/src/quick3d/quick3d/items/quick3dtransform.h
index 2d7f9aa10..504b0fe61 100644
--- a/src/quick3d/quick3d/items/quick3dtransform.h
+++ b/src/quick3d/quick3d/items/quick3dtransform.h
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QTransform;
 
@@ -53,24 +53,23 @@ namespace Quick {
 class QT3DQUICKSHARED_EXPORT Quick3DTransform : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QAbstractTransform> transforms READ transformList)
+    Q_PROPERTY(QQmlListProperty<Qt3DCore::QAbstractTransform> transforms READ transformList)
     Q_CLASSINFO("DefaultProperty", "transforms")
 public:
     explicit Quick3DTransform(QObject *parent = 0);
-    QQmlListProperty<Qt3D::QAbstractTransform> transformList();
+    QQmlListProperty<Qt3DCore::QAbstractTransform> transformList();
 
-    inline QTransform *parentTransform() const { return qobject_cast<Qt3D::QTransform *>(parent()); }
+    inline QTransform *parentTransform() const { return qobject_cast<Qt3DCore::QTransform *>(parent()); }
 
 private:
-    static void qmlAppendTransform(QQmlListProperty<Qt3D::QAbstractTransform> *list, Qt3D::QAbstractTransform *bar);
-    static QAbstractTransform* transformAt(QQmlListProperty<Qt3D::QAbstractTransform> *list, int index);
-    static int transformCount(QQmlListProperty<Qt3D::QAbstractTransform> *list);
-    static void qmlClearTransforms(QQmlListProperty<Qt3D::QAbstractTransform> *list);
+    static void qmlAppendTransform(QQmlListProperty<Qt3DCore::QAbstractTransform> *list, Qt3DCore::QAbstractTransform *bar);
+    static QAbstractTransform* transformAt(QQmlListProperty<Qt3DCore::QAbstractTransform> *list, int index);
+    static int transformCount(QQmlListProperty<Qt3DCore::QAbstractTransform> *list);
+    static void qmlClearTransforms(QQmlListProperty<Qt3DCore::QAbstractTransform> *list);
 };
 
-} //Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/qqmlaspectengine.cpp b/src/quick3d/quick3d/qqmlaspectengine.cpp
index a05143f23..8cdee8674 100644
--- a/src/quick3d/quick3d/qqmlaspectengine.cpp
+++ b/src/quick3d/quick3d/qqmlaspectengine.cpp
@@ -43,12 +43,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DCore {
 namespace Quick {
 
 /*!
-    \class Qt3D::Quick::QQmlAspectEnginePrivate
+    \class Qt3DCore::Quick::QQmlAspectEnginePrivate
     \internal
 */
 QQmlAspectEnginePrivate::QQmlAspectEnginePrivate()
@@ -140,9 +139,8 @@ void QQmlAspectEnginePrivate::_q_continueExecute()
     emit q->statusChanged(q->status());
 }
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/qqmlaspectengine.h b/src/quick3d/quick3d/qqmlaspectengine.h
index 025908a97..7f742e83f 100644
--- a/src/quick3d/quick3d/qqmlaspectengine.h
+++ b/src/quick3d/quick3d/qqmlaspectengine.h
@@ -43,8 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DCore {
 namespace Quick {
 
 class QQmlAspectEnginePrivate;
@@ -71,9 +70,8 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_continueExecute())
 };
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/qqmlaspectengine_p.h b/src/quick3d/quick3d/qqmlaspectengine_p.h
index f864aadef..c53082a4a 100644
--- a/src/quick3d/quick3d/qqmlaspectengine_p.h
+++ b/src/quick3d/quick3d/qqmlaspectengine_p.h
@@ -55,8 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DCore {
 namespace Quick {
 
 class QQmlAspectEnginePrivate : public QObjectPrivate
@@ -74,9 +73,8 @@ private:
     void _q_continueExecute();
 };
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/qt3dquick_global.cpp b/src/quick3d/quick3d/qt3dquick_global.cpp
index afd0a2a0a..ce40df540 100644
--- a/src/quick3d/quick3d/qt3dquick_global.cpp
+++ b/src/quick3d/quick3d/qt3dquick_global.cpp
@@ -44,8 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DCore {
 namespace Quick {
 
 class Quick3DColorProvider : public QQmlColorProvider
@@ -665,7 +664,7 @@ static Quick3DColorProvider *getColorProvider()
 
 void Quick3D_initialize()
 {
-    Qt3D::Quick::Quick3DValueTypes::registerValueTypes();
+    Qt3DCore::Quick::Quick3DValueTypes::registerValueTypes();
     QQml_addValueTypeProvider(getValueTypeProvider());
     QQml_setColorProvider(getColorProvider());
     QAbstractNodeFactory::registerNodeFactory(QuickNodeFactory::instance());
@@ -676,8 +675,7 @@ void Quick3D_registerType(const char *className, const char *quickName, int majo
     QuickNodeFactory::instance()->registerType(className, quickName, major, minor);
 }
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3d/qt3dquick_global_p.h b/src/quick3d/quick3d/qt3dquick_global_p.h
index addb2d6cf..d15381dd6 100644
--- a/src/quick3d/quick3d/qt3dquick_global_p.h
+++ b/src/quick3d/quick3d/qt3dquick_global_p.h
@@ -55,8 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DCore {
 namespace Quick {
 
 QT3DQUICKSHARED_PRIVATE_EXPORT void Quick3D_initialize();
@@ -69,9 +68,8 @@ template<class T, class E> void registerExtendedType(const char *className, cons
     Quick3D_registerType(className, quickName, major, minor);
 }
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/qt3dquicknodefactory.cpp b/src/quick3d/quick3d/qt3dquicknodefactory.cpp
index 062e97bb7..4da5e9b25 100644
--- a/src/quick3d/quick3d/qt3dquicknodefactory.cpp
+++ b/src/quick3d/quick3d/qt3dquicknodefactory.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 Q_GLOBAL_STATIC(QuickNodeFactory, quick_node_factory)
 
@@ -68,6 +68,6 @@ QNode *QuickNodeFactory::createNode(const char *type)
     return typeInfo.t ? qobject_cast<QNode *>(typeInfo.t->create()) : Q_NULLPTR;
 }
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3d/qt3dquicknodefactory_p.h b/src/quick3d/quick3d/qt3dquicknodefactory_p.h
index 8d475dc95..fda891ed8 100644
--- a/src/quick3d/quick3d/qt3dquicknodefactory_p.h
+++ b/src/quick3d/quick3d/qt3dquicknodefactory_p.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 
 class QQmlType;
 
-namespace Qt3D {
+namespace Qt3DCore {
 
 class QuickNodeFactory : public QAbstractNodeFactory
 {
@@ -79,7 +79,7 @@ private:
     QHash<QByteArray, Type> m_types;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
index 1d3052fdb..2c19c67cc 100644
--- a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
+++ b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
@@ -39,8 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DCore {
 namespace Quick {
 
 namespace Quick3DValueTypes {
@@ -534,8 +533,7 @@ QString Quick3DMatrix4x4ValueType::toString() const
             .arg(v(3, 0)).arg(v(3, 1)).arg(v(3, 2)).arg(v(3, 3));
 }
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h
index c3013fbe7..1fec1f059 100644
--- a/src/quick3d/quick3d/qt3dquickvaluetypes_p.h
+++ b/src/quick3d/quick3d/qt3dquickvaluetypes_p.h
@@ -61,10 +61,8 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
-
+namespace Qt3DCore {
 namespace Quick {
-
 namespace Quick3DValueTypes {
 
 QT3DQUICKSHARED_PRIVATE_EXPORT void registerValueTypes();
@@ -281,9 +279,8 @@ public:
     Q_INVOKABLE bool fuzzyEquals(const QMatrix4x4 &m) const;
 };
 
-} // Quick
-
-} // Qt3D
+} // namespace Quick
+} // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp b/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp
index c0961ab6c..b2af9763b 100644
--- a/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dgeometry.cpp
@@ -47,45 +47,45 @@ Quick3DGeometry::Quick3DGeometry(QObject *parent)
 {
 }
 
-QQmlListProperty<Qt3D::QAbstractAttribute> Quick3DGeometry::attributeList()
+QQmlListProperty<Qt3DCore::QAbstractAttribute> Quick3DGeometry::attributeList()
 {
-    return QQmlListProperty<Qt3D::QAbstractAttribute>(this, 0,
+    return QQmlListProperty<Qt3DCore::QAbstractAttribute>(this, 0,
                                                       &Quick3DGeometry::appendAttribute,
                                                       &Quick3DGeometry::attributesCount,
                                                       &Quick3DGeometry::attributeAt,
                                                       &Quick3DGeometry::clearAttributes);
 }
 
-void Quick3DGeometry::appendAttribute(QQmlListProperty<Qt3D::QAbstractAttribute> *list, Qt3D::QAbstractAttribute *attribute)
+void Quick3DGeometry::appendAttribute(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, Qt3DCore::QAbstractAttribute *attribute)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
     geometry->m_managedAttributes.append(attribute);
     geometry->parentGeometry()->addAttribute(attribute);
 }
 
-Qt3D::QAbstractAttribute *Quick3DGeometry::attributeAt(QQmlListProperty<Qt3D::QAbstractAttribute> *list, int index)
+Qt3DCore::QAbstractAttribute *Quick3DGeometry::attributeAt(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, int index)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
     return geometry->parentGeometry()->attributes().at(index);
 }
 
-int Quick3DGeometry::attributesCount(QQmlListProperty<Qt3D::QAbstractAttribute> *list)
+int Quick3DGeometry::attributesCount(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
     return geometry->parentGeometry()->attributes().count();
 }
 
-void Quick3DGeometry::clearAttributes(QQmlListProperty<Qt3D::QAbstractAttribute> *list)
+void Quick3DGeometry::clearAttributes(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
-    QVector<Qt3D::QAbstractAttribute *> &managedAttributes = geometry->m_managedAttributes;
-    Q_FOREACH (Qt3D::QAbstractAttribute *attribute, managedAttributes)
+    QVector<Qt3DCore::QAbstractAttribute *> &managedAttributes = geometry->m_managedAttributes;
+    Q_FOREACH (Qt3DCore::QAbstractAttribute *attribute, managedAttributes)
         geometry->parentGeometry()->removeAttribute(attribute);
     managedAttributes.clear();
 }
 
 } // namespace Quick
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3dgeometry.h b/src/quick3d/quick3drenderer/items/quick3dgeometry.h
index 85b01554e..d9e996b95 100644
--- a/src/quick3d/quick3drenderer/items/quick3dgeometry.h
+++ b/src/quick3d/quick3drenderer/items/quick3dgeometry.h
@@ -50,27 +50,27 @@ namespace Quick {
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DGeometry : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QAbstractAttribute> attributes READ attributeList)
+    Q_PROPERTY(QQmlListProperty<Qt3DCore::QAbstractAttribute> attributes READ attributeList)
     Q_CLASSINFO("DefaultProperty", "attributeProviders")
 
 public:
     explicit Quick3DGeometry(QObject *parent = 0);
     inline QGeometry *parentGeometry() const { return qobject_cast<QGeometry *>(parent()); }
 
-    QQmlListProperty<Qt3D::QAbstractAttribute> attributeList();
+    QQmlListProperty<Qt3DCore::QAbstractAttribute> attributeList();
 
 private:
-    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);
+    static void appendAttribute(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, Qt3DCore::QAbstractAttribute *provider);
+    static Qt3DCore::QAbstractAttribute *attributeAt(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, int index);
+    static int attributesCount(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list);
+    static void clearAttributes(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list);
 
-    QVector<Qt3D::QAbstractAttribute *> m_managedAttributes;
+    QVector<Qt3DCore::QAbstractAttribute *> m_managedAttributes;
 };
 
 } // namespace Quick
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.h b/src/quick3d/quick3drenderer/items/quick3drenderpass.h
index a8354c27d..12f1e829c 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.h
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.h
@@ -89,7 +89,7 @@ private:
 
 } // namespace Quick
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp b/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp
index a84e71ac5..ebc99e93e 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp
@@ -81,7 +81,7 @@ public:
             }
             return innerValues;
         } else if (v.userType() == quick3DShaderDataTypeId) {
-            Qt3D::QNodeId id;
+            Qt3DCore::QNodeId id;
             QShaderData *shaderData = v.value<Quick3DShaderData *>();
             if (shaderData)
                 id = shaderData->id();
@@ -99,6 +99,6 @@ Quick3DShaderData::Quick3DShaderData(QNode *parent)
 
 } // namespace Quick
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h b/src/quick3d/quick3drenderer/items/quick3dshaderdata.h
index 31beee39d..4bc40ad98 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h
+++ b/src/quick3d/quick3drenderer/items/quick3dshaderdata.h
@@ -61,7 +61,7 @@ private:
 
 } // namespace Quick
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp
index c85f6d62e..3b863b35e 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp
@@ -43,7 +43,7 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class Quick3DShaderDataArrayPrivate : public Qt3D::QNodePrivate
+class Quick3DShaderDataArrayPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     Quick3DShaderDataArrayPrivate()
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h
index aa0a0da5c..dfe1a2cb0 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h
+++ b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h
@@ -54,20 +54,20 @@ namespace Quick {
 class Quick3DShaderDataArrayPrivate;
 class Quick3DShaderData;
 
-class QT3DQUICKRENDERERSHARED_EXPORT Quick3DShaderDataArray : public Qt3D::QNode
+class QT3DQUICKRENDERERSHARED_EXPORT Quick3DShaderDataArray : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QShaderData> values READ valuesList)
     Q_CLASSINFO("DefaultProperty", "values")
 
 public:
-    explicit Quick3DShaderDataArray(Qt3D::QNode *parent = 0);
+    explicit Quick3DShaderDataArray(Qt3DCore::QNode *parent = 0);
     ~Quick3DShaderDataArray();
     QQmlListProperty<QShaderData> valuesList();
     QList<QShaderData *> values() const;
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     static void appendValue(QQmlListProperty<QShaderData> *list, QShaderData *bar);
diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp b/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp
index 6fdbf4ea4..bc46386e2 100644
--- a/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp
+++ b/src/quick3d/quick3drenderer/qt3dquickrenderer_global.cpp
@@ -45,7 +45,7 @@ namespace Quick {
 
 void Quick3DRenderer_initialize()
 {
-    Qt3D::QAbstractNodeFactory::registerNodeFactory(QuickRendererNodeFactory::instance());
+    Qt3DCore::QAbstractNodeFactory::registerNodeFactory(QuickRendererNodeFactory::instance());
 }
 
 void Quick3DRenderer_registerType(const char *className, const char *quickName, int major, int minor)
diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp
index 0694882e2..1123062cc 100644
--- a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp
+++ b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory.cpp
@@ -53,7 +53,7 @@ void QuickRendererNodeFactory::registerType(const char *className, const char *q
     m_types.insert(className, Type(quickName, major, minor));
 }
 
-Qt3D::QNode *QuickRendererNodeFactory::createNode(const char *type)
+Qt3DCore::QNode *QuickRendererNodeFactory::createNode(const char *type)
 {
     if (!m_types.contains(type))
         return Q_NULLPTR;
@@ -65,7 +65,7 @@ Qt3D::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<Qt3D::QNode *>(typeInfo.t->create()) : Q_NULLPTR;
+    return typeInfo.t ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t->create()) : Q_NULLPTR;
 }
 
 } // namespace Qt3DRender
diff --git a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h
index 243019174..7d9f49c7e 100644
--- a/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h
+++ b/src/quick3d/quick3drenderer/qt3dquickrenderernodefactory_p.h
@@ -57,10 +57,10 @@ class QQmlType;
 
 namespace Qt3DRender {
 
-class QuickRendererNodeFactory : public Qt3D::QAbstractNodeFactory
+class QuickRendererNodeFactory : public Qt3DCore::QAbstractNodeFactory
 {
 public:
-    Qt3D::QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+    Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE;
 
     void registerType(const char *className, const char *quickName, int major, int minor);
 
@@ -79,7 +79,7 @@ private:
     QHash<QByteArray, Type> m_types;
 };
 
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/backend/attachmentpack_p.h b/src/render/backend/attachmentpack_p.h
index f08c12f1c..cbf96cc99 100644
--- a/src/render/backend/attachmentpack_p.h
+++ b/src/render/backend/attachmentpack_p.h
@@ -62,7 +62,7 @@ struct Attachment
     QString m_name;
     int m_mipLevel;
     int m_layer;
-    Qt3D::QNodeId m_textureUuid;
+    Qt3DCore::QNodeId m_textureUuid;
     QRenderAttachment::RenderAttachmentType m_type;
     QRenderAttachment::CubeMapFace m_face;
 };
diff --git a/src/render/backend/cameralens.cpp b/src/render/backend/cameralens.cpp
index faf4fee06..72a392277 100644
--- a/src/render/backend/cameralens.cpp
+++ b/src/render/backend/cameralens.cpp
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -67,7 +67,7 @@ void CameraLens::cleanup()
 
 }
 
-void CameraLens::updateFromPeer(Qt3D::QNode *peer)
+void CameraLens::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QCameraLens *lens = static_cast<QCameraLens *>(peer);
     setProjection(lens->projectionMatrix());
@@ -79,7 +79,7 @@ void CameraLens::setProjection(const QMatrix4x4 &projection)
     m_projection = projection;
 }
 
-void CameraLens::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void CameraLens::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     switch (e->type()) {
     case NodeUpdated: {
diff --git a/src/render/backend/cameralens_p.h b/src/render/backend/cameralens_p.h
index 0fcea9826..b997db679 100644
--- a/src/render/backend/cameralens_p.h
+++ b/src/render/backend/cameralens_p.h
@@ -60,14 +60,14 @@ namespace Render {
 
 class CameraManager;
 
-class CameraLens : public Qt3D::QBackendNode
+class CameraLens : public Qt3DCore::QBackendNode
 {
 public:
     CameraLens();
     ~CameraLens();
     void cleanup();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
     void setClearColor();
     QVector4D clearColor() const { return m_clearColor; }
@@ -77,7 +77,7 @@ public:
 
     inline bool isEnabled() const { return m_enabled; }
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
     QVector4D m_clearColor;
diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp
index 9aa0da946..e76eb2102 100644
--- a/src/render/backend/entity.cpp
+++ b/src/render/backend/entity.cpp
@@ -57,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -93,10 +93,10 @@ void Entity::cleanup()
         qCDebug(Render::RenderNodes) << Q_FUNC_INFO;
 
         // Clear components
-        m_transformComponent = Qt3D::QNodeId();
-        m_cameraComponent = Qt3D::QNodeId();
-        m_materialComponent = Qt3D::QNodeId();
-        m_geometryRendererComponent = Qt3D::QNodeId();
+        m_transformComponent = Qt3DCore::QNodeId();
+        m_cameraComponent = Qt3DCore::QNodeId();
+        m_materialComponent = Qt3DCore::QNodeId();
+        m_geometryRendererComponent = Qt3DCore::QNodeId();
         m_layerComponents.clear();
         m_shaderDataComponents.clear();
     }
@@ -131,7 +131,7 @@ void Entity::setHandle(HEntity handle)
     m_handle = handle;
 }
 
-void Entity::updateFromPeer(Qt3D::QNode *peer)
+void Entity::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QEntity *entity = static_cast<QEntity *>(peer);
     const QNodeId parentEntityId = entity->parentEntityId();
@@ -157,7 +157,7 @@ void Entity::updateFromPeer(Qt3D::QNode *peer)
     }
 }
 
-void Entity::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Entity::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     switch (e->type()) {
@@ -237,12 +237,12 @@ const QMatrix4x4 *Entity::worldTransform() const
     return m_renderer->worldMatrixManager()->data(m_worldTransform);
 }
 
-void Entity::addComponent(Qt3D::QComponent *component)
+void Entity::addComponent(Qt3DCore::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<Qt3D::QTransform*>(component) != Q_NULLPTR)
+    if (qobject_cast<Qt3DCore::QTransform*>(component) != Q_NULLPTR)
         m_transformComponent = component->id();
     else if (qobject_cast<QCameraLens *>(component) != Q_NULLPTR)
         m_cameraComponent = component->id();
@@ -256,7 +256,7 @@ void Entity::addComponent(Qt3D::QComponent *component)
         m_geometryRendererComponent = component->id();
 }
 
-void Entity::removeComponent(const Qt3D::QNodeId &nodeId)
+void Entity::removeComponent(const Qt3DCore::QNodeId &nodeId)
 {
     if (m_transformComponent == nodeId)
         m_transformComponent = QNodeId();
@@ -321,13 +321,13 @@ GeometryRenderer *Entity::renderComponent<GeometryRenderer>() const
 }
 
 template<>
-Qt3D::QNodeId Entity::componentUuid<Transform>() const { return m_transformComponent; }
+Qt3DCore::QNodeId Entity::componentUuid<Transform>() const { return m_transformComponent; }
 
 template<>
-Qt3D::QNodeId Entity::componentUuid<CameraLens>() const { return m_cameraComponent; }
+Qt3DCore::QNodeId Entity::componentUuid<CameraLens>() const { return m_cameraComponent; }
 
 template<>
-Qt3D::QNodeId Entity::componentUuid<Material>() const { return m_materialComponent; }
+Qt3DCore::QNodeId Entity::componentUuid<Material>() const { return m_materialComponent; }
 
 template<>
 QList<HLayer> Entity::componentsHandle<Layer>() const
@@ -348,7 +348,7 @@ QList<Layer *> Entity::renderComponents<Layer>() const
 }
 
 template<>
-QList<Qt3D::QNodeId> Entity::componentsUuid<Layer>() const { return m_layerComponents; }
+QList<Qt3DCore::QNodeId> Entity::componentsUuid<Layer>() const { return m_layerComponents; }
 
 template<>
 QList<HShaderData> Entity::componentsHandle<ShaderData>() const
@@ -369,10 +369,10 @@ QList<ShaderData *> Entity::renderComponents<ShaderData>() const
 }
 
 template<>
-QList<Qt3D::QNodeId> Entity::componentsUuid<ShaderData>() const { return m_shaderDataComponents; }
+QList<Qt3DCore::QNodeId> Entity::componentsUuid<ShaderData>() const { return m_shaderDataComponents; }
 
 template<>
-Qt3D::QNodeId Entity::componentUuid<GeometryRenderer>() const { return m_geometryRendererComponent; }
+Qt3DCore::QNodeId Entity::componentUuid<GeometryRenderer>() const { return m_geometryRendererComponent; }
 
 
 RenderEntityFunctor::RenderEntityFunctor(Renderer *renderer)
@@ -380,7 +380,7 @@ RenderEntityFunctor::RenderEntityFunctor(Renderer *renderer)
 {
 }
 
-Qt3D::QBackendNode *RenderEntityFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *RenderEntityFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
 {
     HEntity renderNodeHandle = m_renderer->renderNodesManager()->getOrAcquireHandle(frontend->id());
     Entity *entity = m_renderer->renderNodesManager()->data(renderNodeHandle);
@@ -391,12 +391,12 @@ Qt3D::QBackendNode *RenderEntityFunctor::create(Qt3D::QNode *frontend, const Qt3
     return entity;
 }
 
-Qt3D::QBackendNode *RenderEntityFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *RenderEntityFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     return m_renderer->renderNodesManager()->lookupResource(id);
 }
 
-void RenderEntityFunctor::destroy(const Qt3D::QNodeId &id) const
+void RenderEntityFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     m_renderer->renderNodesManager()->releaseResource(id);
 }
diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h
index 1091d3751..947dccef1 100644
--- a/src/render/backend/entity_p.h
+++ b/src/render/backend/entity_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 class QMatrix4x4;
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QNode;
 class QEntity;
 class QComponent;
@@ -75,7 +75,7 @@ namespace Render {
 
 class Renderer;
 
-class Q_AUTOTEST_EXPORT Entity : public Qt3D::QBackendNode
+class Q_AUTOTEST_EXPORT Entity : public Qt3DCore::QBackendNode
 {
 public:
     Entity();
@@ -84,8 +84,8 @@ public:
 
     void setParentHandle(HEntity parentHandle);
     void setRenderer(Renderer *renderer);
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
     void dump() const;
 
@@ -104,19 +104,19 @@ public:
     Sphere *localBoundingVolume() { return m_localBoundingVolume; }
     Sphere *worldBoundingVolume() { return m_worldBoundingVolume; }
 
-    void addComponent(Qt3D::QComponent *component);
-    void removeComponent(const Qt3D::QNodeId &nodeId);
+    void addComponent(Qt3DCore::QComponent *component);
+    void removeComponent(const Qt3DCore::QNodeId &nodeId);
 
     template<class Backend, uint INDEXBITS>
-    Qt3D::QHandle<Backend, INDEXBITS> componentHandle() const
+    Qt3DCore::QHandle<Backend, INDEXBITS> componentHandle() const
     {
-        return Qt3D::QHandle<Backend, INDEXBITS>();
+        return Qt3DCore::QHandle<Backend, INDEXBITS>();
     }
 
     template<class Backend, uint INDEXBITS>
-    QList<Qt3D::QHandle<Backend, INDEXBITS> > componentsHandle() const
+    QList<Qt3DCore::QHandle<Backend, INDEXBITS> > componentsHandle() const
     {
-        return QList<Qt3D::QHandle<Backend, INDEXBITS> >();
+        return QList<Qt3DCore::QHandle<Backend, INDEXBITS> >();
     }
 
     template<class Backend>
@@ -132,15 +132,15 @@ public:
     }
 
     template<class Backend>
-    Qt3D::QNodeId componentUuid() const
+    Qt3DCore::QNodeId componentUuid() const
     {
-        return Qt3D::QNodeId();
+        return Qt3DCore::QNodeId();
     }
 
     template<class Backend>
-    QList<Qt3D::QNodeId> componentsUuid() const
+    QList<Qt3DCore::QNodeId> componentsUuid() const
     {
-        return QList<Qt3D::QNodeId>();
+        return QList<Qt3DCore::QNodeId>();
     }
 
 private:
@@ -166,12 +166,12 @@ private:
     Sphere *m_worldBoundingVolume;
 
     // Handles to Components
-    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;
+    Qt3DCore::QNodeId m_transformComponent;
+    Qt3DCore::QNodeId m_materialComponent;
+    Qt3DCore::QNodeId m_cameraComponent;
+    QList<Qt3DCore::QNodeId> m_layerComponents;
+    QList<Qt3DCore::QNodeId> m_shaderDataComponents;
+    Qt3DCore::QNodeId m_geometryRendererComponent;
 
     QString m_objectName;
 };
@@ -201,13 +201,13 @@ template<>
 Q_AUTOTEST_EXPORT GeometryRenderer *Entity::renderComponent<GeometryRenderer>() const;
 
 template<>
-Q_AUTOTEST_EXPORT Qt3D::QNodeId Entity::componentUuid<Transform>() const;
+Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<Transform>() const;
 
 template<>
-Q_AUTOTEST_EXPORT Qt3D::QNodeId Entity::componentUuid<CameraLens>() const;
+Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<CameraLens>() const;
 
 template<>
-Q_AUTOTEST_EXPORT Qt3D::QNodeId Entity::componentUuid<Material>() const;
+Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<Material>() const;
 
 template<>
 QList<HLayer> Entity::componentsHandle<Layer>() const;
@@ -216,7 +216,7 @@ template<>
 QList<Layer *> Entity::renderComponents<Layer>() const;
 
 template<>
-Q_AUTOTEST_EXPORT QList<Qt3D::QNodeId> Entity::componentsUuid<Layer>() const;
+Q_AUTOTEST_EXPORT QList<Qt3DCore::QNodeId> Entity::componentsUuid<Layer>() const;
 
 template<>
 QList<HShaderData> Entity::componentsHandle<ShaderData>() const;
@@ -225,18 +225,18 @@ template<>
 QList<ShaderData *> Entity::renderComponents<ShaderData>() const;
 
 template<>
-Q_AUTOTEST_EXPORT QList<Qt3D::QNodeId> Entity::componentsUuid<ShaderData>() const;
+Q_AUTOTEST_EXPORT QList<Qt3DCore::QNodeId> Entity::componentsUuid<ShaderData>() const;
 
 template<>
-Q_AUTOTEST_EXPORT Qt3D::QNodeId Entity::componentUuid<GeometryRenderer>() const;
+Q_AUTOTEST_EXPORT Qt3DCore::QNodeId Entity::componentUuid<GeometryRenderer>() const;
 
-class RenderEntityFunctor : public Qt3D::QBackendNodeFunctor
+class RenderEntityFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit RenderEntityFunctor(Renderer *renderer);
-    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;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
 private:
     Renderer *m_renderer;
diff --git a/src/render/backend/handle_types_p.h b/src/render/backend/handle_types_p.h
index 4761ba4f7..27f8dafc4 100644
--- a/src/render/backend/handle_types_p.h
+++ b/src/render/backend/handle_types_p.h
@@ -85,32 +85,32 @@ class Attribute;
 class Geometry;
 class GeometryRenderer;
 
-typedef Qt3D::QHandle<RenderAttachment, 16> HAttachment;
-typedef Qt3D::QHandle<CameraLens, 8> HCamera;
-typedef Qt3D::QHandle<Annotation, 16> HCriterion;
-typedef Qt3D::QHandle<Effect, 16> HEffect;
-typedef Qt3D::QHandle<Entity, 16> HEntity;
-typedef Qt3D::QHandle<FrameGraphNode *, 8> HFrameGraphNode;
-typedef Qt3D::QHandle<Layer, 16> HLayer;
-typedef Qt3D::QHandle<Material, 16> HMaterial;
-typedef Qt3D::QHandle<QMatrix4x4, 16> HMatrix;
-typedef Qt3D::QHandle<Shader, 16> HShader;
-typedef Qt3D::QHandle<QOpenGLVertexArrayObject*, 16> HVao;
-typedef Qt3D::QHandle<Shader, 16> HShader;
-typedef Qt3D::QHandle<SortCriterion, 8> HSortCriterion;
-typedef Qt3D::QHandle<Technique, 16> HTechnique;
-typedef Qt3D::QHandle<Texture, 16> HTexture;
-typedef Qt3D::QHandle<Transform, 16> HTransform;
-typedef Qt3D::QHandle<RenderTarget, 8> HTarget;
-typedef Qt3D::QHandle<RenderPass, 16> HRenderPass;
-typedef Qt3D::QHandle<TexImageData, 16> HTextureData;
-typedef Qt3D::QHandle<Parameter, 16> HParameter;
-typedef Qt3D::QHandle<ShaderData, 16> HShaderData;
-typedef Qt3D::QHandle<TextureImage, 16> HTextureImage;
-typedef Qt3D::QHandle<Buffer, 16> HBuffer;
-typedef Qt3D::QHandle<Attribute, 16> HAttribute;
-typedef Qt3D::QHandle<Geometry, 16> HGeometry;
-typedef Qt3D::QHandle<GeometryRenderer, 16> HGeometryRenderer;
+typedef Qt3DCore::QHandle<RenderAttachment, 16> HAttachment;
+typedef Qt3DCore::QHandle<CameraLens, 8> HCamera;
+typedef Qt3DCore::QHandle<Annotation, 16> HCriterion;
+typedef Qt3DCore::QHandle<Effect, 16> HEffect;
+typedef Qt3DCore::QHandle<Entity, 16> HEntity;
+typedef Qt3DCore::QHandle<FrameGraphNode *, 8> HFrameGraphNode;
+typedef Qt3DCore::QHandle<Layer, 16> HLayer;
+typedef Qt3DCore::QHandle<Material, 16> HMaterial;
+typedef Qt3DCore::QHandle<QMatrix4x4, 16> HMatrix;
+typedef Qt3DCore::QHandle<Shader, 16> HShader;
+typedef Qt3DCore::QHandle<QOpenGLVertexArrayObject*, 16> HVao;
+typedef Qt3DCore::QHandle<Shader, 16> HShader;
+typedef Qt3DCore::QHandle<SortCriterion, 8> HSortCriterion;
+typedef Qt3DCore::QHandle<Technique, 16> HTechnique;
+typedef Qt3DCore::QHandle<Texture, 16> HTexture;
+typedef Qt3DCore::QHandle<Transform, 16> HTransform;
+typedef Qt3DCore::QHandle<RenderTarget, 8> HTarget;
+typedef Qt3DCore::QHandle<RenderPass, 16> HRenderPass;
+typedef Qt3DCore::QHandle<TexImageData, 16> HTextureData;
+typedef Qt3DCore::QHandle<Parameter, 16> HParameter;
+typedef Qt3DCore::QHandle<ShaderData, 16> HShaderData;
+typedef Qt3DCore::QHandle<TextureImage, 16> HTextureImage;
+typedef Qt3DCore::QHandle<Buffer, 16> HBuffer;
+typedef Qt3DCore::QHandle<Attribute, 16> HAttribute;
+typedef Qt3DCore::QHandle<Geometry, 16> HGeometry;
+typedef Qt3DCore::QHandle<GeometryRenderer, 16> HGeometryRenderer;
 
 } // namespace Render
 
diff --git a/src/render/backend/layer.cpp b/src/render/backend/layer.cpp
index fdd180d26..332882802 100644
--- a/src/render/backend/layer.cpp
+++ b/src/render/backend/layer.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -60,7 +60,7 @@ void Layer::cleanup()
 {
 }
 
-void Layer::updateFromPeer(Qt3D::QNode *peer)
+void Layer::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QLayer *layer = static_cast<QLayer *>(peer);
     m_layers = layer->names();
@@ -72,7 +72,7 @@ QStringList Layer::layers() const
     return m_layers;
 }
 
-void Layer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Layer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (e->type() == NodeUpdated && propertyChange->propertyName() == QByteArrayLiteral("names"))
diff --git a/src/render/backend/layer_p.h b/src/render/backend/layer_p.h
index 05ac73711..d75e7164c 100644
--- a/src/render/backend/layer_p.h
+++ b/src/render/backend/layer_p.h
@@ -62,17 +62,17 @@ namespace Render {
 
 class LayerManager;
 
-class Layer : public Qt3D::QBackendNode
+class Layer : public Qt3DCore::QBackendNode
 {
 public:
     Layer();
     ~Layer();
     void cleanup();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
     QStringList layers() const;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     inline bool isEnabled() const { return m_enabled; }
 
 private:
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index e59228e4b..1c4e9d86e 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -77,150 +77,150 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class AttachmentManager : public Qt3D::QResourceManager<
+class AttachmentManager : public Qt3DCore::QResourceManager<
         RenderAttachment,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     AttachmentManager() {}
 };
 
-class CameraManager : public Qt3D::QResourceManager<
+class CameraManager : public Qt3DCore::QResourceManager<
         CameraLens,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         8,
-        Qt3D::ArrayAllocatingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy>
 {
 public:
     CameraManager() {}
 };
 
-class CriterionManager : public Qt3D::QResourceManager<
+class CriterionManager : public Qt3DCore::QResourceManager<
         Annotation,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 
 {
 public:
     CriterionManager() {}
 };
 
-class EffectManager : public Qt3D::QResourceManager<
+class EffectManager : public Qt3DCore::QResourceManager<
         Effect,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     EffectManager() {}
 };
 
-class EntityManager : public Qt3D::QResourceManager<Entity, Qt3D::QNodeId, 16>
+class EntityManager : public Qt3DCore::QResourceManager<Entity, Qt3DCore::QNodeId, 16>
 {
 public:
     EntityManager() {}
 };
 
-class FrameGraphManager : public Qt3D::QResourceManager<
+class FrameGraphManager : public Qt3DCore::QResourceManager<
         FrameGraphNode *,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         8,
-        Qt3D::ArrayAllocatingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy>
 {
 public:
     FrameGraphManager() {}
 };
 
-class LayerManager : public Qt3D::QResourceManager<
+class LayerManager : public Qt3DCore::QResourceManager<
         Layer,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     LayerManager() {}
 };
 
-class MaterialManager : public Qt3D::QResourceManager<
+class MaterialManager : public Qt3DCore::QResourceManager<
         Material,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     MaterialManager() {}
 };
 
-class MatrixManager : public Qt3D::QResourceManager<QMatrix4x4, Qt3D::QNodeId, 16>
+class MatrixManager : public Qt3DCore::QResourceManager<QMatrix4x4, Qt3DCore::QNodeId, 16>
 {
 public:
     MatrixManager() {}
 };
 
-class ShaderManager : public Qt3D::QResourceManager<
+class ShaderManager : public Qt3DCore::QResourceManager<
         Shader,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     ShaderManager() {}
 };
 
-class SortCriterionManager : public Qt3D::QResourceManager<
+class SortCriterionManager : public Qt3DCore::QResourceManager<
         SortCriterion,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         8,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     SortCriterionManager() {}
 };
 
-class TechniqueManager : public Qt3D::QResourceManager<
+class TechniqueManager : public Qt3DCore::QResourceManager<
         Technique,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     TechniqueManager() {}
 };
 
-class TextureManager : public Qt3D::QResourceManager<
+class TextureManager : public Qt3DCore::QResourceManager<
         Texture,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     TextureManager() {}
 };
 
-class TransformManager : public Qt3D::QResourceManager<
+class TransformManager : public Qt3DCore::QResourceManager<
         Transform,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     TransformManager() {}
 };
 
-class VAOManager : public Qt3D::QResourceManager<
+class VAOManager : public Qt3DCore::QResourceManager<
         QOpenGLVertexArrayObject *,
         QPair<HGeometry, HShader>,
         16>
@@ -229,84 +229,84 @@ public:
     VAOManager() {}
 };
 
-class RenderTargetManager : public Qt3D::QResourceManager<
+class RenderTargetManager : public Qt3DCore::QResourceManager<
         RenderTarget,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         8,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     RenderTargetManager() {}
 };
 
-class RenderPassManager : public Qt3D::QResourceManager<
+class RenderPassManager : public Qt3DCore::QResourceManager<
         RenderPass,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     RenderPassManager() {}
 };
 
 
-class ParameterManager : public Qt3D::QResourceManager<
+class ParameterManager : public Qt3DCore::QResourceManager<
         Parameter,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     ParameterManager() {}
 };
 
-class ShaderDataManager : public Qt3D::QResourceManager<
+class ShaderDataManager : public Qt3DCore::QResourceManager<
         ShaderData,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     ShaderDataManager() {}
 };
 
-class UBOManager : public Qt3D::QResourceManager<
+class UBOManager : public Qt3DCore::QResourceManager<
         UniformBuffer,
         ShaderDataShaderUboKey,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 };
 
-class TextureImageManager : public Qt3D::QResourceManager<
+class TextureImageManager : public Qt3DCore::QResourceManager<
         TextureImage,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 };
 
-class AttributeManager : public Qt3D::QResourceManager<
+class AttributeManager : public Qt3DCore::QResourceManager<
         Attribute,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 };
 
-class GeometryManager : public Qt3D::QResourceManager<
+class GeometryManager : public Qt3DCore::QResourceManager<
         Geometry,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 };
 
diff --git a/src/render/backend/nodefunctor_p.h b/src/render/backend/nodefunctor_p.h
index 0067cba81..6a2a902b8 100644
--- a/src/render/backend/nodefunctor_p.h
+++ b/src/render/backend/nodefunctor_p.h
@@ -58,7 +58,7 @@ namespace Qt3DRender {
 namespace Render {
 
 template<class Backend, class Manager>
-class NodeFunctor : public Qt3D::QBackendNodeFunctor
+class NodeFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit NodeFunctor(Manager *manager)
@@ -66,7 +66,7 @@ public:
     {
     }
 
-    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL
     {
         Backend *backend = m_manager->getOrCreateResource(frontend->id());
         backend->setFactory(factory);
@@ -74,12 +74,12 @@ public:
         return backend;
     }
 
-    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL
     {
         return m_manager->lookupResource(id);
     }
 
-    void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL
     {
         m_manager->releaseResource(id);
     }
diff --git a/src/render/backend/parameterpack.cpp b/src/render/backend/parameterpack.cpp
index 3d6553363..17b1c3eef 100644
--- a/src/render/backend/parameterpack.cpp
+++ b/src/render/backend/parameterpack.cpp
@@ -55,19 +55,19 @@ void ParameterPack::clear()
     m_peers.clear();
 }
 
-void ParameterPack::appendParameter(const Qt3D::QNodeId &parameterId)
+void ParameterPack::appendParameter(const Qt3DCore::QNodeId &parameterId)
 {
     if (!m_peers.contains(parameterId)) {
         m_peers.append(parameterId);
     }
 }
 
-void ParameterPack::removeParameter(const Qt3D::QNodeId &parameterId)
+void ParameterPack::removeParameter(const Qt3DCore::QNodeId &parameterId)
 {
     m_peers.removeOne(parameterId);
 }
 
-QList<Qt3D::QNodeId> ParameterPack::parameters() const
+QList<Qt3DCore::QNodeId> ParameterPack::parameters() const
 {
     return m_peers;
 }
diff --git a/src/render/backend/parameterpack_p.h b/src/render/backend/parameterpack_p.h
index 74413548e..274797f0d 100644
--- a/src/render/backend/parameterpack_p.h
+++ b/src/render/backend/parameterpack_p.h
@@ -63,12 +63,12 @@ public:
     ParameterPack();
     ~ParameterPack();
     void clear();
-    void appendParameter(const Qt3D::QNodeId &parameterId);
-    void removeParameter(const Qt3D::QNodeId &parameterId);
-    QList<Qt3D::QNodeId> parameters() const;
+    void appendParameter(const Qt3DCore::QNodeId &parameterId);
+    void removeParameter(const Qt3DCore::QNodeId &parameterId);
+    QList<Qt3DCore::QNodeId> parameters() const;
 
 private:
-    QList<Qt3D::QNodeId> m_peers;
+    QList<Qt3DCore::QNodeId> m_peers;
 };
 
 } // namespace Render
diff --git a/src/render/backend/quniformvalue.cpp b/src/render/backend/quniformvalue.cpp
index 140035d80..df25fb466 100644
--- a/src/render/backend/quniformvalue.cpp
+++ b/src/render/backend/quniformvalue.cpp
@@ -56,7 +56,7 @@ QUniformValue::QUniformValue()
 {
 }
 
-QUniformValue *QUniformValue::fromVariant(const QVariant &v, Qt3D::QFrameAllocator *allocator)
+QUniformValue *QUniformValue::fromVariant(const QVariant &v, Qt3DCore::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 Qt3D::QNodeId &texId)
+void QUniformPack::setTexture(const QString &glslName, const Qt3DCore::QNodeId &texId)
 {
     for (int t=0; t<m_textures.size(); ++t) {
         if (m_textures[t].glslName != glslName) {
diff --git a/src/render/backend/quniformvalue_p.h b/src/render/backend/quniformvalue_p.h
index 9a57b9027..51bb2fc29 100644
--- a/src/render/backend/quniformvalue_p.h
+++ b/src/render/backend/quniformvalue_p.h
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
 class QOpenGLShaderProgram;
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QFrameAllocator;
 }
 
@@ -79,7 +79,7 @@ public:
     QUniformValue();
     virtual ~QUniformValue() {}
 
-    static QUniformValue *fromVariant(const QVariant &v, Qt3D::QFrameAllocator *allocator);
+    static QUniformValue *fromVariant(const QVariant &v, Qt3DCore::QFrameAllocator *allocator);
 
     virtual bool operator ==(const QUniformValue &other);
     bool operator !=(const QUniformValue &other);
@@ -109,12 +109,12 @@ public :
         return true;
     }
 
-    void setTextureId(const Qt3D::QNodeId &id)
+    void setTextureId(const Qt3DCore::QNodeId &id)
     {
         m_textureId = id;
     }
 
-    Qt3D::QNodeId textureId() const { return m_textureId; }
+    Qt3DCore::QNodeId textureId() const { return m_textureId; }
 
     bool operator ==(const QUniformValue &other) Q_DECL_OVERRIDE
     {
@@ -131,13 +131,13 @@ public :
     void apply(GraphicsContext *ctx, const ShaderUniform &description) const Q_DECL_OVERRIDE;
 
 private:
-    Qt3D::QNodeId m_textureId;
+    Qt3DCore::QNodeId m_textureId;
     int m_textureUnit;
 };
 
 struct BlockToUBO {
     int m_blockIndex;
-    Qt3D::QNodeId m_shaderDataID;
+    Qt3DCore::QNodeId m_shaderDataID;
     bool m_needsUpdate;
     QHash<QString, QVariant> m_updatedProperties;
 };
@@ -148,7 +148,7 @@ public:
     ~QUniformPack();
 
     void setUniform(const QString &glslName, const QUniformValue *val);
-    void setTexture(const QString &glslName, const Qt3D::QNodeId &id);
+    void setTexture(const QString &glslName, const Qt3DCore::QNodeId &id);
     void setUniformBuffer(const BlockToUBO &blockToUBO);
 
     inline const QHash<QString, const QUniformValue* > &uniforms() const { return m_uniforms; }
@@ -157,13 +157,13 @@ public:
     struct NamedTexture
     {
         NamedTexture() {}
-        NamedTexture(const QString &nm, const Qt3D::QNodeId &t)
+        NamedTexture(const QString &nm, const Qt3DCore::QNodeId &t)
             : glslName(nm)
             , texId(t)
         { }
 
         QString glslName;
-        Qt3D::QNodeId texId;
+        Qt3DCore::QNodeId texId;
     };
 
     inline QVector<NamedTexture> textures() const { return m_textures; }
diff --git a/src/render/backend/renderattachment.cpp b/src/render/backend/renderattachment.cpp
index a62ae76a5..92436a217 100644
--- a/src/render/backend/renderattachment.cpp
+++ b/src/render/backend/renderattachment.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -51,7 +51,7 @@ RenderAttachment::RenderAttachment()
 {
 }
 
-void RenderAttachment::updateFromPeer(Qt3D::QNode *peer)
+void RenderAttachment::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QRenderAttachment *attachment = static_cast<QRenderAttachment *>(peer);
 
@@ -64,7 +64,7 @@ void RenderAttachment::updateFromPeer(Qt3D::QNode *peer)
         m_attachmentData.m_textureUuid = attachment->texture()->id();
 }
 
-Qt3D::QNodeId RenderAttachment::textureUuid() const
+Qt3DCore::QNodeId RenderAttachment::textureUuid() const
 {
     return m_attachmentData.m_textureUuid;
 }
@@ -94,7 +94,7 @@ QRenderAttachment::RenderAttachmentType RenderAttachment::type() const
     return m_attachmentData.m_type;
 }
 
-void RenderAttachment::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void RenderAttachment::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (e->type() == NodeUpdated) {
diff --git a/src/render/backend/renderattachment_p.h b/src/render/backend/renderattachment_p.h
index e20ded8ef..d2c4487c0 100644
--- a/src/render/backend/renderattachment_p.h
+++ b/src/render/backend/renderattachment_p.h
@@ -63,24 +63,24 @@ namespace Render {
 
 class AttachmentManager;
 
-class RenderAttachment : public Qt3D::QBackendNode
+class RenderAttachment : public Qt3DCore::QBackendNode
 {
 public:
     RenderAttachment();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
-    Qt3D::QNodeId textureUuid() const;
+    Qt3DCore::QNodeId textureUuid() const;
     int mipLevel() const;
     int layer() const;
     QString name() const;
     QRenderAttachment::CubeMapFace face() const;
     QRenderAttachment::RenderAttachmentType type() const;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     Attachment attachment() const;
 
 private:
-    Qt3D::QNodeId m_attachmentUuid;
+    Qt3DCore::QNodeId m_attachmentUuid;
     Attachment m_attachmentData;
 };
 
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index 5d42e7c6a..a68ee1cc4 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -97,7 +97,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -326,7 +326,7 @@ void Renderer::createThreadLocalAllocator(void *renderer)
 /*!
  * Returns the a FrameAllocator for the caller thread.
  */
-Qt3D::QFrameAllocator *Renderer::currentFrameAllocator()
+Qt3DCore::QFrameAllocator *Renderer::currentFrameAllocator()
 {
     // return the QFrameAllocator for the current thread
     // It is never cleared as each renderview when it is destroyed
@@ -429,7 +429,7 @@ void Renderer::shutdown()
     }
 }
 
-void Renderer::setFrameGraphRoot(const Qt3D::QNodeId &frameGraphRootUuid)
+void Renderer::setFrameGraphRoot(const Qt3DCore::QNodeId &frameGraphRootUuid)
 {
     m_frameGraphRootUuid = frameGraphRootUuid;
     qCDebug(Backend) << Q_FUNC_INFO << m_frameGraphRootUuid;
@@ -550,7 +550,7 @@ void Renderer::render()
     // Matrice update, bounding volumes computation ...
     // Should be jobs
 
-    // namespace Qt3D has 2 distincts node trees
+    // namespace Qt3DCore has 2 distincts node trees
     // One scene description
     // One framegraph description
 
@@ -758,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<Qt3D::QAspectJobPtr> Renderer::createRenderBinJobs()
+QVector<Qt3DCore::QAspectJobPtr> Renderer::createRenderBinJobs()
 {
     // Traverse the current framegraph. For each leaf node create a
     // RenderView and set its configuration then create a job to
@@ -781,7 +781,7 @@ QVector<Qt3D::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<Qt3D::QAspectJobPtr> Renderer::createRenderBufferJobs()
+QVector<Qt3DCore::QAspectJobPtr> Renderer::createRenderBufferJobs()
 {
     const QVector<QNodeId> dirtyBuffers = m_bufferManager->dirtyBuffers();
     QVector<QAspectJobPtr> dirtyBuffersJobs;
@@ -799,7 +799,7 @@ QVector<Qt3D::QAspectJobPtr> Renderer::createRenderBufferJobs()
     return dirtyBuffersJobs;
 }
 
-QVector<Qt3D::QAspectJobPtr> Renderer::createGeometryRendererJobs()
+QVector<Qt3DCore::QAspectJobPtr> Renderer::createGeometryRendererJobs()
 {
     const QVector<QNodeId> dirtyGeometryRenderers = m_geometryRendererManager->dirtyGeometryRenderers();
     QVector<QAspectJobPtr> dirtyGeometryRendererJobs;
@@ -817,7 +817,7 @@ QVector<Qt3D::QAspectJobPtr> Renderer::createGeometryRendererJobs()
 }
 
 // Called during while traversing the FrameGraph for each leaf node context of QAspectThread
-Qt3D::QAspectJobPtr Renderer::createRenderViewJob(FrameGraphNode *node, int submitOrderIndex)
+Qt3DCore::QAspectJobPtr Renderer::createRenderViewJob(FrameGraphNode *node, int submitOrderIndex)
 {
     RenderViewJobPtr job(new RenderViewJob);
     job->setRenderer(this);
@@ -1053,7 +1053,7 @@ Attribute *Renderer::updateBuffersAndAttributes(Geometry *geometry, RenderComman
     return indexAttribute;
 }
 
-void Renderer::addAllocator(Qt3D::QFrameAllocator *allocator)
+void Renderer::addAllocator(Qt3DCore::QFrameAllocator *allocator)
 {
     QMutexLocker lock(&m_mutex);
     m_allocators.append(allocator);
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h
index a1eb09ce6..f272de2ed 100644
--- a/src/render/backend/renderer_p.h
+++ b/src/render/backend/renderer_p.h
@@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE
 class QSurface;
 class QOpenGLDebugLogger;
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QEntity;
 class QFrameAllocator;
 }
@@ -148,11 +148,11 @@ public:
     void createAllocators();
     void destroyAllocators();
 
-    Qt3D::QFrameAllocator *currentFrameAllocator();
+    Qt3DCore::QFrameAllocator *currentFrameAllocator();
 
-    QThreadStorage<Qt3D::QFrameAllocator *> *tlsAllocators();
+    QThreadStorage<Qt3DCore::QFrameAllocator *> *tlsAllocators();
 
-    void setFrameGraphRoot(const Qt3D::QNodeId &fgRoot);
+    void setFrameGraphRoot(const Qt3DCore::QNodeId &fgRoot);
     Render::FrameGraphNode *frameGraphRoot() const;
 
     void setSceneGraphRoot(Entity *sgRoot);
@@ -161,13 +161,13 @@ public:
     void render();
     void doRender();
 
-    QVector<Qt3D::QAspectJobPtr> createRenderBinJobs();
-    QVector<Qt3D::QAspectJobPtr> createRenderBufferJobs();
-    QVector<Qt3D::QAspectJobPtr> createGeometryRendererJobs();
-    Qt3D::QAspectJobPtr createRenderViewJob(FrameGraphNode *node, int submitOrderIndex);
+    QVector<Qt3DCore::QAspectJobPtr> createRenderBinJobs();
+    QVector<Qt3DCore::QAspectJobPtr> createRenderBufferJobs();
+    QVector<Qt3DCore::QAspectJobPtr> createGeometryRendererJobs();
+    Qt3DCore::QAspectJobPtr createRenderViewJob(FrameGraphNode *node, int submitOrderIndex);
     void executeCommands(const QVector<RenderCommand *> &commands);
     Attribute *updateBuffersAndAttributes(Geometry *geometry, RenderCommand *command, GLsizei &count, bool forceUpdate);
-    void addAllocator(Qt3D::QFrameAllocator *allocator);
+    void addAllocator(Qt3DCore::QFrameAllocator *allocator);
 
     inline CameraManager *cameraManager() const { return m_cameraManager; }
     inline EntityManager *renderNodesManager() const { return m_renderNodesManager; }
@@ -225,7 +225,7 @@ private:
     QRenderAspect *m_rendererAspect;
 
     // Frame graph root
-    Qt3D::QNodeId m_frameGraphRootUuid;
+    Qt3DCore::QNodeId m_frameGraphRootUuid;
 
     Entity *m_renderSceneRoot;
 
@@ -293,13 +293,13 @@ private:
 
     static void createThreadLocalAllocator(void *renderer);
     static void destroyThreadLocalAllocator(void *renderer);
-    QThreadStorage<Qt3D::QFrameAllocator *> m_tlsAllocators;
+    QThreadStorage<Qt3DCore::QFrameAllocator *> m_tlsAllocators;
 
     QAtomicInt m_running;
 
     QScopedPointer<QOpenGLDebugLogger> m_debugLogger;
     QList<AbstractSceneParser *> m_sceneParsers;
-    QVector<Qt3D::QFrameAllocator *> m_allocators;
+    QVector<Qt3DCore::QFrameAllocator *> m_allocators;
 
     QVector<Attribute *> m_dirtyAttributes;
     QVector<Geometry *> m_dirtyGeometry;
diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp
index e55284377..dc528349c 100644
--- a/src/render/backend/rendertarget.cpp
+++ b/src/render/backend/rendertarget.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -52,7 +52,7 @@ RenderTarget::RenderTarget()
 {
 }
 
-void RenderTarget::updateFromPeer(Qt3D::QNode *peer)
+void RenderTarget::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QRenderTarget *target = static_cast<QRenderTarget *>(peer);
     m_renderAttachments.clear();
@@ -75,12 +75,12 @@ void RenderTarget::removeRenderAttachment(const QNodeId &attachmentId)
     m_renderAttachments.removeOne(attachmentId);
 }
 
-QList<Qt3D::QNodeId> RenderTarget::renderAttachments() const
+QList<Qt3DCore::QNodeId> RenderTarget::renderAttachments() const
 {
     return m_renderAttachments;
 }
 
-void RenderTarget::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void RenderTarget::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (e->type() == NodeAdded && propertyChange->propertyName() == QByteArrayLiteral("attachment"))
diff --git a/src/render/backend/rendertarget_p.h b/src/render/backend/rendertarget_p.h
index 4692a014e..e369ba320 100644
--- a/src/render/backend/rendertarget_p.h
+++ b/src/render/backend/rendertarget_p.h
@@ -63,23 +63,23 @@ namespace Render {
 
 class RenderTargetManager;
 
-class RenderTarget : public Qt3D::QBackendNode
+class RenderTarget : public Qt3DCore::QBackendNode
 {
 public:
     RenderTarget();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void cleanup();
 
-    void appendRenderAttachment(const Qt3D::QNodeId &attachmentId);
-    void removeRenderAttachment(const Qt3D::QNodeId &attachmentId);
+    void appendRenderAttachment(const Qt3DCore::QNodeId &attachmentId);
+    void removeRenderAttachment(const Qt3DCore::QNodeId &attachmentId);
 
-    QList<Qt3D::QNodeId> renderAttachments() const;
+    QList<Qt3DCore::QNodeId> renderAttachments() const;
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
-    QList<Qt3D::QNodeId> m_renderAttachments;
+    QList<Qt3DCore::QNodeId> m_renderAttachments;
 };
 
 } // namespace Render
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index c730b7ce2..4e5a1d890 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -94,7 +94,7 @@ bool isEntityInLayers(const Entity *entity, const QStringList &layers)
     return false;
 }
 
-void destroyUniformValue(const QUniformValue *value, Qt3D::QFrameAllocator *allocator)
+void destroyUniformValue(const QUniformValue *value, Qt3DCore::QFrameAllocator *allocator)
 {
     QUniformValue *v = const_cast<QUniformValue *>(value);
     if (v->isTexture())
diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h
index ef7cc77ed..6cf7a308c 100644
--- a/src/render/backend/renderview_p.h
+++ b/src/render/backend/renderview_p.h
@@ -104,7 +104,7 @@ public:
     inline void setSurfaceSize(const QSize &size) { m_surfaceSize = size; }
     inline Renderer *renderer() const { return m_renderer; }
 
-    inline void setAllocator(Qt3D::QFrameAllocator *allocator)
+    inline void setAllocator(Qt3DCore::QFrameAllocator *allocator)
     {
         m_allocator = allocator;
         m_data = m_allocator->allocate<InnerData>();
@@ -116,7 +116,7 @@ public:
         // help cache performance during iteration
         m_data->m_viewMatrix = m_allocator->allocate<QMatrix4x4>();
     }
-    inline Qt3D::QFrameAllocator *allocator() const { return m_allocator; }
+    inline Qt3DCore::QFrameAllocator *allocator() const { return m_allocator; }
 
     inline void setRenderCamera(CameraLens *renderCamera) { m_data->m_renderCamera = renderCamera; }
     inline CameraLens *renderCamera() const { return m_data->m_renderCamera; }
@@ -196,7 +196,7 @@ public:
     void setRenderTargetHandle(HTarget renderTargetHandle) { m_renderTarget = renderTargetHandle; }
     HTarget renderTargetHandle() const { return m_renderTarget; }
 
-    void addSortCriteria(const QList<Qt3D::QNodeId> &sortMethodUid) { m_data->m_sortingCriteria.append(sortMethodUid); }
+    void addSortCriteria(const QList<Qt3DCore::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
@@ -214,7 +214,7 @@ public:
         const RenderPassFilter *m_passFilter;
         QMatrix4x4 *m_viewMatrix;
         QStringList m_layers;
-        QList<Qt3D::QNodeId> m_sortingCriteria;
+        QList<Qt3DCore::QNodeId> m_sortingCriteria;
         QVector3D m_eyePos;
         UniformBlockValueBuilder m_uniformBlockBuilder;
     };
@@ -224,7 +224,7 @@ private:
 
     Renderer *m_renderer;
     QSize m_surfaceSize;
-    Qt3D::QFrameAllocator *m_allocator;
+    Qt3DCore::QFrameAllocator *m_allocator;
 
     InnerData *m_data;
 
diff --git a/src/render/backend/transform.cpp b/src/render/backend/transform.cpp
index 91d9ee60e..cb633ace4 100644
--- a/src/render/backend/transform.cpp
+++ b/src/render/backend/transform.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -53,9 +53,9 @@ Transform::Transform()
 {
 }
 
-void Transform::updateFromPeer(Qt3D::QNode *peer)
+void Transform::updateFromPeer(Qt3DCore::QNode *peer)
 {
-    Qt3D::QTransform *transform = static_cast<Qt3D::QTransform *>(peer);
+    Qt3DCore::QTransform *transform = static_cast<Qt3DCore::QTransform *>(peer);
 
     m_transformMatrix = transform->matrix();
     m_enabled = transform->isEnabled();
@@ -66,7 +66,7 @@ QMatrix4x4 Transform::transformMatrix() const
     return m_transformMatrix;
 }
 
-void Transform::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Transform::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         const QScenePropertyChangePtr &propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
diff --git a/src/render/backend/transform_p.h b/src/render/backend/transform_p.h
index 195274e51..49d876424 100644
--- a/src/render/backend/transform_p.h
+++ b/src/render/backend/transform_p.h
@@ -60,14 +60,14 @@ namespace Render {
 class Renderer;
 class TransformManager;
 
-class Transform : public Qt3D::QBackendNode
+class Transform : public Qt3DCore::QBackendNode
 {
 public:
     Transform();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     QMatrix4x4 transformMatrix() const;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     inline bool isEnabled() const { return m_enabled; }
 
 private:
diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h
index dbbdb21f1..b1a6471aa 100644
--- a/src/render/defaults/qdiffusemapmaterial.h
+++ b/src/render/defaults/qdiffusemapmaterial.h
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
 public:
-    explicit QDiffuseMapMaterial(Qt3D::QNode *parent = 0);
+    explicit QDiffuseMapMaterial(Qt3DCore::QNode *parent = 0);
     ~QDiffuseMapMaterial();
 
     QColor ambient() const;
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.h b/src/render/defaults/qdiffusespecularmapmaterial.h
index d4568c4a0..f49341e9f 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial.h
+++ b/src/render/defaults/qdiffusespecularmapmaterial.h
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
 public:
-    explicit QDiffuseSpecularMapMaterial(Qt3D::QNode *parent = 0);
+    explicit QDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = 0);
     ~QDiffuseSpecularMapMaterial();
 
     QColor ambient() const;
diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/render/defaults/qforwardrenderer.cpp
index cd6307ec4..2ff2d6784 100644
--- a/src/render/defaults/qforwardrenderer.cpp
+++ b/src/render/defaults/qforwardrenderer.cpp
@@ -131,7 +131,7 @@ void QForwardRenderer::setClearColor(const QColor &clearColor)
 
     \note A camera is a QEntity having a QCameraLens as one of its components.
 */
-void QForwardRenderer::setCamera(Qt3D::QEntity *camera)
+void QForwardRenderer::setCamera(Qt3DCore::QEntity *camera)
 {
     Q_D(QForwardRenderer);
     d->m_cameraSelector->setCamera(camera);
@@ -166,7 +166,7 @@ QColor QForwardRenderer::clearColor() const
 
     \note A camera is a QEntity that has a QCameraLens as one of its components.
 */
-Qt3D::QEntity *QForwardRenderer::camera() const
+Qt3DCore::QEntity *QForwardRenderer::camera() const
 {
     Q_D(const QForwardRenderer);
     return d->m_cameraSelector->camera();
diff --git a/src/render/defaults/qforwardrenderer.h b/src/render/defaults/qforwardrenderer.h
index ff485f55f..44249c767 100644
--- a/src/render/defaults/qforwardrenderer.h
+++ b/src/render/defaults/qforwardrenderer.h
@@ -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(Qt3D::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged)
+    Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged)
 public:
-    explicit QForwardRenderer(Qt3D::QNode *parent = 0);
+    explicit QForwardRenderer(Qt3DCore::QNode *parent = 0);
     ~QForwardRenderer();
 
     void setViewportRect(const QRectF &viewportRect);
     void setClearColor(const QColor &clearColor);
-    void setCamera(Qt3D::QEntity *camera);
+    void setCamera(Qt3DCore::QEntity *camera);
 
     QRectF viewportRect() const;
     QColor clearColor() const;
-    Qt3D::QEntity *camera() const;
+    Qt3DCore::QEntity *camera() const;
 
 Q_SIGNALS:
     void viewportRectChanged();
diff --git a/src/render/defaults/qgoochmaterial.cpp b/src/render/defaults/qgoochmaterial.cpp
index e8363d6b1..c969df70b 100644
--- a/src/render/defaults/qgoochmaterial.cpp
+++ b/src/render/defaults/qgoochmaterial.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 /*!
-   \class Qt3D::QGoochMaterialPrivate
+   \class Qt3DCore::QGoochMaterialPrivate
    \internal
 */
 QGoochMaterialPrivate::QGoochMaterialPrivate()
@@ -129,7 +129,7 @@ void QGoochMaterialPrivate::init()
 }
 
 /*!
-    \class Qt3D::QGoochMaterial
+    \class Qt3DCore::QGoochMaterial
     \brief The QGoochMaterial provides a material that implements the Gooch
     shading model, popular in CAD and CAM applications.
     \inmodule Qt3DRenderer
@@ -157,7 +157,7 @@ void QGoochMaterialPrivate::init()
 */
 
 /*!
-    Constructs a new Qt3D::QGoochMaterial instance with parent object \a parent.
+    Constructs a new Qt3DCore::QGoochMaterial instance with parent object \a parent.
 */
 QGoochMaterial::QGoochMaterial(QNode *parent)
     : QMaterial(*new QGoochMaterialPrivate, parent)
@@ -174,7 +174,7 @@ QGoochMaterial::QGoochMaterial(QGoochMaterialPrivate &dd, QNode *parent)
 }
 
 /*!
-    \property Qt3D::QGoochMaterial::diffuse
+    \property Qt3DCore::QGoochMaterial::diffuse
 
     Holds the current diffuse color.
 */
@@ -185,7 +185,7 @@ QColor QGoochMaterial::diffuse() const
 }
 
 /*!
-    \property Qt3D::QGoochMaterial::specular
+    \property Qt3DCore::QGoochMaterial::specular
 
     Holds the current specular color.
 */
@@ -196,7 +196,7 @@ QColor QGoochMaterial::specular() const
 }
 
 /*!
-    \property Qt3D::QGoochMaterial::cool
+    \property Qt3DCore::QGoochMaterial::cool
 
     Holds the current cool color.
 */
@@ -207,7 +207,7 @@ QColor QGoochMaterial::cool() const
 }
 
 /*!
-    \property Qt3D::QGoochMaterial::warm
+    \property Qt3DCore::QGoochMaterial::warm
 
     Holds the current warm color.
 */
@@ -218,7 +218,7 @@ QColor QGoochMaterial::warm() const
 }
 
 /*!
-    \property Qt3D::QGoochMaterial::alpha
+    \property Qt3DCore::QGoochMaterial::alpha
 
     Holds the current alpha value. The start point of the color ramp
     used by the Gooch shader is calculated as {c = cool + alpha * diffuse}.
@@ -230,7 +230,7 @@ float QGoochMaterial::alpha() const
 }
 
 /*!
-    \property Qt3D::QGoochMaterial::beta
+    \property Qt3DCore::QGoochMaterial::beta
 
     Holds the current beta value. The start point of the color ramp
     used by the Gooch shader is calculated as {c = warm + beta * diffuse}.
@@ -242,7 +242,7 @@ float QGoochMaterial::beta() const
 }
 
 /*!
-    \property Qt3D::QGoochMaterial::shininess
+    \property Qt3DCore::QGoochMaterial::shininess
 
     Holds the current shininess value. Higher values of shininess result in
     a smaller and brighter highlight.
diff --git a/src/render/defaults/qgoochmaterial.h b/src/render/defaults/qgoochmaterial.h
index 88f868a8a..6135b9eb3 100644
--- a/src/render/defaults/qgoochmaterial.h
+++ b/src/render/defaults/qgoochmaterial.h
@@ -58,7 +58,7 @@ class QGoochMaterial : public QMaterial
     Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged)
 
 public:
-    explicit QGoochMaterial(Qt3D::QNode *parent = 0);
+    explicit QGoochMaterial(Qt3DCore::QNode *parent = 0);
     QColor diffuse() const;
     QColor specular() const;
     QColor cool() const;
@@ -86,7 +86,7 @@ Q_SIGNALS:
     void shininessChanged();
 
 protected:
-    QGoochMaterial(QGoochMaterialPrivate &dd, Qt3D::QNode *parent = 0);
+    QGoochMaterial(QGoochMaterialPrivate &dd, Qt3DCore::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QGoochMaterial)
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.h b/src/render/defaults/qnormaldiffusemapalphamaterial.h
index ae7c28b71..38188e04c 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial.h
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial.h
@@ -49,7 +49,7 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapAlphaMaterial : public QNormalD
 {
     Q_OBJECT
 public:
-    explicit QNormalDiffuseMapAlphaMaterial(Qt3D::QNode *parent = 0);
+    explicit QNormalDiffuseMapAlphaMaterial(Qt3DCore::QNode *parent = 0);
     ~QNormalDiffuseMapAlphaMaterial();
 
 private:
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.h b/src/render/defaults/qnormaldiffusemapmaterial.h
index 4eb6d662c..158cfca45 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial.h
+++ b/src/render/defaults/qnormaldiffusemapmaterial.h
@@ -58,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
 public:
-    explicit QNormalDiffuseMapMaterial(Qt3D::QNode *parent = 0);
+    explicit QNormalDiffuseMapMaterial(Qt3DCore::QNode *parent = 0);
     ~QNormalDiffuseMapMaterial();
 
     QColor ambient() const;
@@ -84,7 +84,7 @@ Q_SIGNALS:
     void textureScaleChanged();
 
 protected:
-    QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, Qt3D::QNode *parent = 0);
+    QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, Qt3DCore::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QNormalDiffuseMapMaterial)
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.h b/src/render/defaults/qnormaldiffusespecularmapmaterial.h
index 5d92ebbc2..668fed0f3 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial.h
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.h
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMate
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
 public:
-    explicit QNormalDiffuseSpecularMapMaterial(Qt3D::QNode *parent = 0);
+    explicit QNormalDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = 0);
     ~QNormalDiffuseSpecularMapMaterial();
 
     QColor ambient() const;
@@ -83,7 +83,7 @@ Q_SIGNALS:
     void textureScaleChanged();
 
 protected:
-    QNormalDiffuseSpecularMapMaterial(QNormalDiffuseSpecularMapMaterialPrivate &dd, Qt3D::QNode *parent = 0);
+    QNormalDiffuseSpecularMapMaterial(QNormalDiffuseSpecularMapMaterialPrivate &dd, Qt3DCore::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QNormalDiffuseSpecularMapMaterial)
diff --git a/src/render/defaults/qpervertexcolormaterial.h b/src/render/defaults/qpervertexcolormaterial.h
index a21649858..7ce8ece79 100644
--- a/src/render/defaults/qpervertexcolormaterial.h
+++ b/src/render/defaults/qpervertexcolormaterial.h
@@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QPerVertexColorMaterial : public QMaterial
     Q_OBJECT
 
 public:
-    explicit QPerVertexColorMaterial(Qt3D::QNode *parent = 0);
+    explicit QPerVertexColorMaterial(Qt3DCore::QNode *parent = 0);
     ~QPerVertexColorMaterial();
 
 private:
diff --git a/src/render/defaults/qphongmaterial.h b/src/render/defaults/qphongmaterial.h
index a37f0f75c..f9576058c 100644
--- a/src/render/defaults/qphongmaterial.h
+++ b/src/render/defaults/qphongmaterial.h
@@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QPhongMaterial : public QMaterial
     Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged)
 
 public:
-    explicit QPhongMaterial(Qt3D::QNode *parent = 0);
+    explicit QPhongMaterial(Qt3DCore::QNode *parent = 0);
     ~QPhongMaterial();
 
     QColor ambient() const;
diff --git a/src/render/defaults/qskyboxentity.cpp b/src/render/defaults/qskyboxentity.cpp
index c9a271d9e..1e9b9641e 100644
--- a/src/render/defaults/qskyboxentity.cpp
+++ b/src/render/defaults/qskyboxentity.cpp
@@ -53,12 +53,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
 /*!
- * \class Qt3D::QSkyboxEntityPrivate
+ * \class Qt3DCore::QSkyboxEntityPrivate
  * \internal
  */
 QSkyboxEntityPrivate::QSkyboxEntityPrivate()
@@ -75,7 +75,7 @@ QSkyboxEntityPrivate::QSkyboxEntityPrivate()
     , m_es2RenderPass(new QRenderPass())
     , m_gl3RenderPass(new QRenderPass())
     , m_mesh(new QCuboidMesh())
-    , m_transform(new Qt3D::QTransform())
+    , m_transform(new Qt3DCore::QTransform())
     , m_translate(new QTranslateTransform())
     , m_textureParameter(new QParameter(QStringLiteral("skyboxTexture"), m_skyboxTexture))
     , m_posXImage(new QTextureImage())
@@ -184,13 +184,13 @@ void QSkyboxEntityPrivate::reloadTexture()
 }
 
 /*!
- * \class Qt3D::QSkyboxEntity
+ * \class Qt3DCore::QSkyboxEntity
  * \inmodule Qt3DRenderer
  *
- * \brief Qt3D::QSkyboxEntity is a convenience Qt3D::QEntity subclass that can
+ * \brief Qt3DCore::QSkyboxEntity is a convenience Qt3DCore::QEntity subclass that can
  * be used to insert a skybox in a 3D scene.
  *
- * By specifying a base name and an extension, Qt3D::QSkyboxEntity
+ * By specifying a base name and an extension, Qt3DCore::QSkyboxEntity
  * will take care of building a TextureCubeMap to be rendered at runtime. The
  * images in the source directory should match the pattern:
  * \b base name + * "_posx|_posy|_posz|_negx|_negy|_negz" + extension
@@ -204,7 +204,7 @@ void QSkyboxEntityPrivate::reloadTexture()
  */
 
 /*!
- * Constructs a new Qt3D::QSkyboxEntity object with \a parent as parent.
+ * Constructs a new Qt3DCore::QSkyboxEntity object with \a parent as parent.
  */
 QSkyboxEntity::QSkyboxEntity(QNode *parent)
     : QEntity(*new QSkyboxEntityPrivate, parent)
diff --git a/src/render/defaults/qskyboxentity.h b/src/render/defaults/qskyboxentity.h
index 103f8004a..a3708a9f5 100644
--- a/src/render/defaults/qskyboxentity.h
+++ b/src/render/defaults/qskyboxentity.h
@@ -46,11 +46,11 @@ namespace Qt3DRender {
 
 class QSkyboxEntityPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QSkyboxEntity : public Qt3D::QEntity
+class QT3DRENDERERSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity
 {
     Q_OBJECT
 public:
-    explicit QSkyboxEntity(Qt3D::QNode *parent = 0);
+    explicit QSkyboxEntity(Qt3DCore::QNode *parent = 0);
     ~QSkyboxEntity();
 
     void setBaseName(const QString &path);
diff --git a/src/render/defaults/qskyboxentity_p.h b/src/render/defaults/qskyboxentity_p.h
index 0ccc1d3ef..f81bdc21d 100644
--- a/src/render/defaults/qskyboxentity_p.h
+++ b/src/render/defaults/qskyboxentity_p.h
@@ -53,7 +53,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QTransform;
 class QTranslateTransform;
 }
@@ -71,7 +71,7 @@ class QParameter;
 class QMaterial;
 class QEffect;
 
-class QSkyboxEntityPrivate : public Qt3D::QEntityPrivate
+class QSkyboxEntityPrivate : public Qt3DCore::QEntityPrivate
 {
     QSkyboxEntityPrivate();
 
@@ -92,8 +92,8 @@ class QSkyboxEntityPrivate : public Qt3D::QEntityPrivate
     QRenderPass *m_es2RenderPass;
     QRenderPass *m_gl3RenderPass;
     QCuboidMesh *m_mesh;
-    Qt3D::QTransform *m_transform;
-    Qt3D::QTranslateTransform *m_translate;
+    Qt3DCore::QTransform *m_transform;
+    Qt3DCore::QTranslateTransform *m_translate;
     QParameter *m_textureParameter;
     QTextureImage *m_posXImage;
     QTextureImage *m_posYImage;
diff --git a/src/render/framegraph/cameraselectornode.cpp b/src/render/framegraph/cameraselectornode.cpp
index 527147842..96377e9e7 100644
--- a/src/render/framegraph/cameraselectornode.cpp
+++ b/src/render/framegraph/cameraselectornode.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -55,7 +55,7 @@ CameraSelector::CameraSelector()
 {
 }
 
-void CameraSelector::updateFromPeer(Qt3D::QNode *peer)
+void CameraSelector::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QCameraSelector *selector = static_cast<QCameraSelector *>(peer);
     m_cameraUuid = QNodeId();
@@ -64,7 +64,7 @@ void CameraSelector::updateFromPeer(Qt3D::QNode *peer)
     setEnabled(selector->isEnabled());
 }
 
-void CameraSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void CameraSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     qCDebug(Render::Framegraph) << Q_FUNC_INFO;
     if (e->type() == NodeUpdated) {
diff --git a/src/render/framegraph/cameraselectornode_p.h b/src/render/framegraph/cameraselectornode_p.h
index 283c81be1..e7075334a 100644
--- a/src/render/framegraph/cameraselectornode_p.h
+++ b/src/render/framegraph/cameraselectornode_p.h
@@ -67,13 +67,13 @@ class CameraSelector : public FrameGraphNode
 public:
     CameraSelector();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    Qt3D::QNodeId cameraUuid() const;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeId cameraUuid() const;
 
 private:
-    Qt3D::QNodeId m_cameraUuid;
+    Qt3DCore::QNodeId m_cameraUuid;
 };
 
 } // namespace Render
diff --git a/src/render/framegraph/clearbuffer.cpp b/src/render/framegraph/clearbuffer.cpp
index 47982d5f0..c04da0fd0 100644
--- a/src/render/framegraph/clearbuffer.cpp
+++ b/src/render/framegraph/clearbuffer.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -50,14 +50,14 @@ ClearBuffer::ClearBuffer()
 {
 }
 
-void ClearBuffer::updateFromPeer(Qt3D::QNode *peer)
+void ClearBuffer::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QClearBuffer *clearBuffer = static_cast<QClearBuffer *>(peer);
     m_type = clearBuffer->buffers();
     setEnabled(clearBuffer->isEnabled());
 }
 
-void ClearBuffer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void ClearBuffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
diff --git a/src/render/framegraph/clearbuffer_p.h b/src/render/framegraph/clearbuffer_p.h
index c7a33e0ac..67c4542a2 100644
--- a/src/render/framegraph/clearbuffer_p.h
+++ b/src/render/framegraph/clearbuffer_p.h
@@ -64,8 +64,8 @@ class ClearBuffer : public FrameGraphNode
 public:
     ClearBuffer();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     QClearBuffer::BufferType type() const;
 
 private:
diff --git a/src/render/framegraph/framegraphnode.cpp b/src/render/framegraph/framegraphnode.cpp
index b001fd675..30859e34b 100644
--- a/src/render/framegraph/framegraphnode.cpp
+++ b/src/render/framegraph/framegraphnode.cpp
@@ -139,7 +139,7 @@ FrameGraphComponentFunctor::FrameGraphComponentFunctor(Renderer *renderer)
 {
 }
 
-Qt3D::QBackendNode *FrameGraphComponentFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *) const
+Qt3DCore::QBackendNode *FrameGraphComponentFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *) const
 {
     // TO DO: Ideally we should have a RenderFrameGraph component and use its setPeer method
     // to do that
@@ -149,13 +149,13 @@ Qt3D::QBackendNode *FrameGraphComponentFunctor::create(Qt3D::QNode *frontend, co
     return Q_NULLPTR;
 }
 
-Qt3D::QBackendNode *FrameGraphComponentFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *FrameGraphComponentFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     Q_UNUSED(id);
     return Q_NULLPTR;
 }
 
-void FrameGraphComponentFunctor::destroy(const Qt3D::QNodeId &id) const
+void FrameGraphComponentFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     Q_UNUSED(id);
 }
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h
index 35875bcab..b58cfdbff 100644
--- a/src/render/framegraph/framegraphnode_p.h
+++ b/src/render/framegraph/framegraphnode_p.h
@@ -62,7 +62,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class FrameGraphNode : public Qt3D::QBackendNode
+class FrameGraphNode : public Qt3DCore::QBackendNode
 {
 public:
     FrameGraphNode();
@@ -116,7 +116,7 @@ private:
 };
 
 template<typename Backend, typename Frontend>
-class FrameGraphNodeFunctor : public Qt3D::QBackendNodeFunctor
+class FrameGraphNodeFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit FrameGraphNodeFunctor(FrameGraphManager *manager)
@@ -124,12 +124,12 @@ public:
     {
     }
 
-    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE
     {
         return createBackendFrameGraphNode(frontend, factory);
     }
 
-    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE
     {
         FrameGraphNode **node = m_manager->lookupResource(id);
         if (node != Q_NULLPTR)
@@ -137,13 +137,13 @@ public:
         return Q_NULLPTR;
     }
 
-    void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE
     {
         m_manager->releaseResource(id);
     }
 
 protected:
-    Backend *createBackendFrameGraphNode(Qt3D::QNode *n, const Qt3D::QBackendNodeFactory *factory) const
+    Backend *createBackendFrameGraphNode(Qt3DCore::QNode *n, const Qt3DCore::QBackendNodeFactory *factory) const
     {
         Frontend *f = qobject_cast<Frontend *>(n);
         if (f != Q_NULLPTR) {
@@ -170,13 +170,13 @@ private:
     FrameGraphManager *m_manager;
 };
 
-class FrameGraphComponentFunctor : public Qt3D::QBackendNodeFunctor
+class FrameGraphComponentFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit FrameGraphComponentFunctor(Renderer *renderer);
-    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;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
 private:
     Renderer *m_renderer;
diff --git a/src/render/framegraph/framegraphsubtreeselector.cpp b/src/render/framegraph/framegraphsubtreeselector.cpp
index 5fa060d37..4ff874118 100644
--- a/src/render/framegraph/framegraphsubtreeselector.cpp
+++ b/src/render/framegraph/framegraphsubtreeselector.cpp
@@ -53,13 +53,13 @@ FrameGraphSubtreeSelector::~FrameGraphSubtreeSelector()
 {
 }
 
-void FrameGraphSubtreeSelector::updateFromPeer(Qt3D::QNode *peer)
+void FrameGraphSubtreeSelector::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QFrameGraphSelector *selector = static_cast<QFrameGraphSelector *>(peer);
     setEnabled(selector->isEnabled());
 }
 
-void FrameGraphSubtreeSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &)
+void FrameGraphSubtreeSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &)
 {
 }
 
diff --git a/src/render/framegraph/framegraphsubtreeselector_p.h b/src/render/framegraph/framegraphsubtreeselector_p.h
index f6b8aeb32..72e4ac4a4 100644
--- a/src/render/framegraph/framegraphsubtreeselector_p.h
+++ b/src/render/framegraph/framegraphsubtreeselector_p.h
@@ -63,8 +63,8 @@ public:
     FrameGraphSubtreeSelector();
     ~FrameGraphSubtreeSelector();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_FINAL;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
 };
 
 } // namespace Render
diff --git a/src/render/framegraph/framegraphvisitor.cpp b/src/render/framegraph/framegraphvisitor.cpp
index e9b825815..29de86e98 100644
--- a/src/render/framegraph/framegraphvisitor.cpp
+++ b/src/render/framegraph/framegraphvisitor.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -56,7 +56,7 @@ FrameGraphVisitor::FrameGraphVisitor()
 
 void FrameGraphVisitor::traverse(FrameGraphNode *root,
                                  Renderer *renderer,
-                                 QVector<Qt3D::QAspectJobPtr> *jobs)
+                                 QVector<Qt3DCore::QAspectJobPtr> *jobs)
 {
     m_renderer = renderer;
     m_jobs = jobs;
diff --git a/src/render/framegraph/framegraphvisitor_p.h b/src/render/framegraph/framegraphvisitor_p.h
index 3e3273b0f..66d3292b9 100644
--- a/src/render/framegraph/framegraphvisitor_p.h
+++ b/src/render/framegraph/framegraphvisitor_p.h
@@ -69,13 +69,13 @@ public:
 
     void traverse(FrameGraphNode *root,
                   Renderer *renderer,
-                  QVector<Qt3D::QAspectJobPtr> *jobs);
+                  QVector<Qt3DCore::QAspectJobPtr> *jobs);
 
 private:
     void visit(Render::FrameGraphNode *node);
 
     Renderer *m_renderer;
-    QVector<Qt3D::QAspectJobPtr> *m_jobs;
+    QVector<Qt3DCore::QAspectJobPtr> *m_jobs;
     int m_renderviewIndex;
 };
 
diff --git a/src/render/framegraph/layerfilternode.cpp b/src/render/framegraph/layerfilternode.cpp
index 4c9ee50ad..247d795b2 100644
--- a/src/render/framegraph/layerfilternode.cpp
+++ b/src/render/framegraph/layerfilternode.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -50,14 +50,14 @@ LayerFilterNode::LayerFilterNode()
 {
 }
 
-void LayerFilterNode::updateFromPeer(Qt3D::QNode *peer)
+void LayerFilterNode::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QLayerFilter *layerFilter = static_cast<QLayerFilter *>(peer);
     m_layers = layerFilter->layers();
     setEnabled(layerFilter->isEnabled());
 }
 
-void LayerFilterNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void LayerFilterNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
diff --git a/src/render/framegraph/layerfilternode_p.h b/src/render/framegraph/layerfilternode_p.h
index 1e6649b1d..7d5ba58b0 100644
--- a/src/render/framegraph/layerfilternode_p.h
+++ b/src/render/framegraph/layerfilternode_p.h
@@ -66,8 +66,8 @@ class LayerFilterNode : public FrameGraphNode
 public:
     LayerFilterNode();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     QStringList layers() const;
     void setLayers(const QStringList &list);
 
diff --git a/src/render/framegraph/nodraw.cpp b/src/render/framegraph/nodraw.cpp
index 0822779f8..55b0359c1 100644
--- a/src/render/framegraph/nodraw.cpp
+++ b/src/render/framegraph/nodraw.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -54,13 +54,13 @@ NoDraw::~NoDraw()
 {
 }
 
-void NoDraw::updateFromPeer(Qt3D::QNode *peer)
+void NoDraw::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QNoDraw *noDraw = static_cast<QNoDraw *>(peer);
     setEnabled(noDraw->isEnabled());
 }
 
-void NoDraw::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void NoDraw::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
 
diff --git a/src/render/framegraph/nodraw_p.h b/src/render/framegraph/nodraw_p.h
index 510327ff9..2289f79bd 100644
--- a/src/render/framegraph/nodraw_p.h
+++ b/src/render/framegraph/nodraw_p.h
@@ -62,10 +62,10 @@ public:
     NoDraw();
     ~NoDraw();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
 protected:
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 };
 
 } // namespace Render
diff --git a/src/render/framegraph/qcameraselector.cpp b/src/render/framegraph/qcameraselector.cpp
index d77c493e9..37df26beb 100644
--- a/src/render/framegraph/qcameraselector.cpp
+++ b/src/render/framegraph/qcameraselector.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 /*!
-    \class Qt3D::CameraSelector
+    \class Qt3DCore::CameraSelector
 */
 
 /*! \internal */
@@ -69,10 +69,10 @@ void QCameraSelector::copy(const QNode *ref)
     const QCameraSelector *other = static_cast<const QCameraSelector*>(ref);
 
     if (other->d_func()->m_camera)
-        setCamera(qobject_cast<Qt3D::QEntity *>(QNode::clone(other->d_func()->m_camera)));
+        setCamera(qobject_cast<Qt3DCore::QEntity *>(QNode::clone(other->d_func()->m_camera)));
 }
 
-QCameraSelector::QCameraSelector(Qt3D::QNode *parent)
+QCameraSelector::QCameraSelector(Qt3DCore::QNode *parent)
     :   QFrameGraphNode(*new QCameraSelectorPrivate, parent)
 {}
 
@@ -81,7 +81,7 @@ QCameraSelector::~QCameraSelector()
     QNode::cleanup();
 }
 
-void QCameraSelector::setCamera(Qt3D::QEntity *camera)
+void QCameraSelector::setCamera(Qt3DCore::QEntity *camera)
 {
     Q_D(QCameraSelector);
     if (d->m_camera != camera) {
@@ -97,7 +97,7 @@ void QCameraSelector::setCamera(Qt3D::QEntity *camera)
     }
 }
 
-Qt3D::QEntity *QCameraSelector::camera() const
+Qt3DCore::QEntity *QCameraSelector::camera() const
 {
     Q_D(const QCameraSelector);
     return d->m_camera;
diff --git a/src/render/framegraph/qcameraselector.h b/src/render/framegraph/qcameraselector.h
index 546d77a61..4088f6e8b 100644
--- a/src/render/framegraph/qcameraselector.h
+++ b/src/render/framegraph/qcameraselector.h
@@ -49,21 +49,21 @@ class QCameraSelectorPrivate;
 class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphNode
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged)
+    Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged)
 
 public:
-    explicit QCameraSelector(Qt3D::QNode *parent = 0);
+    explicit QCameraSelector(Qt3DCore::QNode *parent = 0);
     ~QCameraSelector();
 
-    void setCamera(Qt3D::QEntity *camera);
-    Qt3D::QEntity *camera() const;
+    void setCamera(Qt3DCore::QEntity *camera);
+    Qt3DCore::QEntity *camera() const;
 
 Q_SIGNALS:
     void cameraChanged();
 
 protected:
-    QCameraSelector(QCameraSelectorPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QCameraSelector(QCameraSelectorPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     QT3D_CLONEABLE(QCameraSelector)
diff --git a/src/render/framegraph/qcameraselector_p.h b/src/render/framegraph/qcameraselector_p.h
index d387b9d86..aec10ae94 100644
--- a/src/render/framegraph/qcameraselector_p.h
+++ b/src/render/framegraph/qcameraselector_p.h
@@ -63,7 +63,7 @@ public:
     QCameraSelectorPrivate();
 
     Q_DECLARE_PUBLIC(QCameraSelector)
-    Qt3D::QEntity *m_camera;
+    Qt3DCore::QEntity *m_camera;
 };
 
 
diff --git a/src/render/framegraph/qclearbuffer.h b/src/render/framegraph/qclearbuffer.h
index 9b42cb46c..62b645a06 100644
--- a/src/render/framegraph/qclearbuffer.h
+++ b/src/render/framegraph/qclearbuffer.h
@@ -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(Qt3D::QNode *parent = 0);
+    explicit QClearBuffer(Qt3DCore::QNode *parent = 0);
     ~QClearBuffer();
 
     enum BufferType {
@@ -72,8 +72,8 @@ Q_SIGNALS:
     void buffersChanged();
 
 protected:
-    QClearBuffer(QClearBufferPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QClearBuffer(QClearBufferPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QClearBuffer)
diff --git a/src/render/framegraph/qframegraph.h b/src/render/framegraph/qframegraph.h
index 2a32a95f6..0b720ea72 100644
--- a/src/render/framegraph/qframegraph.h
+++ b/src/render/framegraph/qframegraph.h
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 class QFrameGraphPrivate;
 class QFrameGraphNode;
 
-class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3D::QComponent
+class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3DCore::QComponent
 {
     Q_OBJECT
     // Note : The full namespace has to be used to define the property
@@ -56,7 +56,7 @@ class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3D::QComponent
     Q_CLASSINFO("DefaultProperty", "activeFrameGraph")
 
 public:
-    explicit QFrameGraph(Qt3D::QNode *parent = 0);
+    explicit QFrameGraph(Qt3DCore::QNode *parent = 0);
     ~QFrameGraph();
 
     QFrameGraphNode *activeFrameGraph() const;
@@ -66,8 +66,8 @@ Q_SIGNALS:
     void activeFrameGraphChanged();
 
 protected:
-    QFrameGraph(QFrameGraphPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QFrameGraph(QFrameGraphPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QFrameGraph)
diff --git a/src/render/framegraph/qframegraph_p.h b/src/render/framegraph/qframegraph_p.h
index ea502c11f..d340c04f7 100644
--- a/src/render/framegraph/qframegraph_p.h
+++ b/src/render/framegraph/qframegraph_p.h
@@ -58,7 +58,7 @@ namespace Qt3DRender {
 class QFrameGraph;
 class QFrameGraphNode;
 
-class QFrameGraphPrivate : public Qt3D::QComponentPrivate
+class QFrameGraphPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QFrameGraphPrivate();
diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp
index 1c28d72a0..519843fa7 100644
--- a/src/render/framegraph/qframegraphnode.cpp
+++ b/src/render/framegraph/qframegraphnode.cpp
@@ -82,7 +82,7 @@ QFrameGraphNode::QFrameGraphNode(QNode *parent)
 
 QFrameGraphNode::~QFrameGraphNode()
 {
-    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");
+    Q_ASSERT_X(Qt3DCore::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");
 }
 
 /*!
diff --git a/src/render/framegraph/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h
index ce14b9bed..826edd36f 100644
--- a/src/render/framegraph/qframegraphnode.h
+++ b/src/render/framegraph/qframegraphnode.h
@@ -47,12 +47,12 @@ namespace Qt3DRender {
 
 class QFrameGraphNodePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QFrameGraphNode : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QFrameGraphNode : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
 public:
-    explicit QFrameGraphNode(Qt3D::QNode *parent = 0);
+    explicit QFrameGraphNode(Qt3DCore::QNode *parent = 0);
     ~QFrameGraphNode();
 
     QFrameGraphNode *parentFrameGraphNode() const;
@@ -61,7 +61,7 @@ public:
     void setEnabled(bool enabled);
 
 protected:
-    QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3D::QNode *parent = 0);
+    QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3DCore::QNode *parent = 0);
 
 Q_SIGNALS:
     void enabledChanged();
diff --git a/src/render/framegraph/qframegraphnode_p.h b/src/render/framegraph/qframegraphnode_p.h
index 3d1c99a7c..1bcab0c29 100644
--- a/src/render/framegraph/qframegraphnode_p.h
+++ b/src/render/framegraph/qframegraphnode_p.h
@@ -58,7 +58,7 @@ namespace Qt3DRender {
 
 class QFrameGraphNode;
 
-class QFrameGraphNodePrivate : public Qt3D::QNodePrivate
+class QFrameGraphNodePrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QFrameGraphNodePrivate();
diff --git a/src/render/framegraph/qframegraphselector.h b/src/render/framegraph/qframegraphselector.h
index 8300be080..64f8bf9fb 100644
--- a/src/render/framegraph/qframegraphselector.h
+++ b/src/render/framegraph/qframegraphselector.h
@@ -59,14 +59,14 @@ class QT3DRENDERERSHARED_EXPORT QFrameGraphSelector : public QFrameGraphNode
 {
     Q_OBJECT
 public:
-    explicit QFrameGraphSelector(Qt3D::QNode *parent = 0);
+    explicit QFrameGraphSelector(Qt3DCore::QNode *parent = 0);
     ~QFrameGraphSelector();
 
     QFrameGraphSelectorFunctorPtr selectionFunctor() const;
     void setSelectionFunctor(QFrameGraphSelectorFunctorPtr functor);
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     QT3D_CLONEABLE(QFrameGraphSelector)
diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h
index 7e177e322..5d20ca30e 100644
--- a/src/render/framegraph/qlayerfilter.h
+++ b/src/render/framegraph/qlayerfilter.h
@@ -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(Qt3D::QNode *parent = 0);
+    explicit QLayerFilter(Qt3DCore::QNode *parent = 0);
     ~QLayerFilter();
 
     void setLayers(const QStringList &layers);
@@ -61,8 +61,8 @@ Q_SIGNALS:
     void layersChanged();
 
 protected:
-    QLayerFilter(QLayerFilterPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QLayerFilter(QLayerFilterPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QLayerFilter)
diff --git a/src/render/framegraph/qnodraw.cpp b/src/render/framegraph/qnodraw.cpp
index 294bdba5f..e24b2ca83 100644
--- a/src/render/framegraph/qnodraw.cpp
+++ b/src/render/framegraph/qnodraw.cpp
@@ -41,12 +41,12 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 /*!
- * \class Qt3D::QNoDraw::QNoDraw
+ * \class Qt3DCore::QNoDraw::QNoDraw
  *
- * \brief When a Qt3D::QNoDraw node is present in a FrameGraph branch, this
+ * \brief When a Qt3DCore::QNoDraw node is present in a FrameGraph branch, this
  * prevents the renderer from rendering any primitive.
  *
- * Qt3D::QNoDraw should be used when the FrameGraph needs to set up some render
+ * Qt3DCore::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 Qt3DRender::QRenderPassFilter that matches none of
  * available Qt3DRender::QRenderPass instances of the scene without the overhead cost
diff --git a/src/render/framegraph/qnodraw.h b/src/render/framegraph/qnodraw.h
index 361bbfdc4..3daee3212 100644
--- a/src/render/framegraph/qnodraw.h
+++ b/src/render/framegraph/qnodraw.h
@@ -47,7 +47,7 @@ class QT3DRENDERERSHARED_EXPORT QNoDraw : public QFrameGraphNode
 {
     Q_OBJECT
 public:
-    explicit QNoDraw(Qt3D::QNode *parent = 0);
+    explicit QNoDraw(Qt3DCore::QNode *parent = 0);
     ~QNoDraw();
 
 private:
diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp
index bc72ed652..eb3fec7a1 100644
--- a/src/render/framegraph/qrenderpassfilter.cpp
+++ b/src/render/framegraph/qrenderpassfilter.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h
index edab54406..15ff9738b 100644
--- a/src/render/framegraph/qrenderpassfilter.h
+++ b/src/render/framegraph/qrenderpassfilter.h
@@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode
     Q_OBJECT
 
 public:
-    explicit QRenderPassFilter(Qt3D::QNode *parent = 0);
+    explicit QRenderPassFilter(Qt3DCore::QNode *parent = 0);
     ~QRenderPassFilter();
 
     QList<QAnnotation *> includes() const;
@@ -67,8 +67,8 @@ public:
     QList<QParameter *> parameters() const;
 
 protected:
-    QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QRenderPassFilter)
diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp
index fc87cadc9..58529ae09 100644
--- a/src/render/framegraph/qrendertargetselector.cpp
+++ b/src/render/framegraph/qrendertargetselector.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h
index c05f4584f..a83029f3b 100644
--- a/src/render/framegraph/qrendertargetselector.h
+++ b/src/render/framegraph/qrendertargetselector.h
@@ -54,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged)
 public:
-    explicit QRenderTargetSelector(Qt3D::QNode *parent = 0);
+    explicit QRenderTargetSelector(Qt3DCore::QNode *parent = 0);
     ~QRenderTargetSelector();
 
     void setTarget(QRenderTarget *target);
@@ -67,8 +67,8 @@ Q_SIGNALS:
     void targetChanged();
 
 protected:
-    QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QRenderTargetSelector)
diff --git a/src/render/framegraph/qsortcriterion.cpp b/src/render/framegraph/qsortcriterion.cpp
index 2c09a552c..f4a5fdf9d 100644
--- a/src/render/framegraph/qsortcriterion.cpp
+++ b/src/render/framegraph/qsortcriterion.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QSortCriterionPrivate
+    \class Qt3DCore::QSortCriterionPrivate
     \internal
 */
 QSortCriterionPrivate::QSortCriterionPrivate()
diff --git a/src/render/framegraph/qsortcriterion.h b/src/render/framegraph/qsortcriterion.h
index d4e12a7a8..41ec43393 100644
--- a/src/render/framegraph/qsortcriterion.h
+++ b/src/render/framegraph/qsortcriterion.h
@@ -46,12 +46,12 @@ namespace Qt3DRender {
 
 class QSortCriterionPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QSortCriterion : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QSortCriterion : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged)
 public:
-    explicit QSortCriterion(Qt3D::QNode *parent = 0);
+    explicit QSortCriterion(Qt3DCore::QNode *parent = 0);
     ~QSortCriterion();
 
     enum SortType {
@@ -68,8 +68,8 @@ Q_SIGNALS:
     void sortChanged();
 
 protected:
-    QSortCriterion(QSortCriterionPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QSortCriterion(QSortCriterionPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     QT3D_CLONEABLE(QSortCriterion)
diff --git a/src/render/framegraph/qsortcriterion_p.h b/src/render/framegraph/qsortcriterion_p.h
index 34d51238d..f9f39f747 100644
--- a/src/render/framegraph/qsortcriterion_p.h
+++ b/src/render/framegraph/qsortcriterion_p.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QSortCriterionPrivate : public Qt3D::QNodePrivate
+class QSortCriterionPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QSortCriterionPrivate();
diff --git a/src/render/framegraph/qsortmethod.cpp b/src/render/framegraph/qsortmethod.cpp
index c103fbe47..9253326f2 100644
--- a/src/render/framegraph/qsortmethod.cpp
+++ b/src/render/framegraph/qsortmethod.cpp
@@ -42,12 +42,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QSortMethodPrivate
+    \class Qt3DCore::QSortMethodPrivate
     \internal
 */
 QSortMethodPrivate::QSortMethodPrivate()
diff --git a/src/render/framegraph/qsortmethod.h b/src/render/framegraph/qsortmethod.h
index 5eb5ee85e..337eaebf6 100644
--- a/src/render/framegraph/qsortmethod.h
+++ b/src/render/framegraph/qsortmethod.h
@@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QSortMethod : public QFrameGraphNode
     Q_OBJECT
 
 public:
-    explicit QSortMethod(Qt3D::QNode *parent = 0);
+    explicit QSortMethod(Qt3DCore::QNode *parent = 0);
     ~QSortMethod();
 
     void addCriterion(QSortCriterion *criterion);
@@ -59,8 +59,8 @@ public:
     QList<QSortCriterion *> criteria() const;
 
 protected:
-    QSortMethod(QSortMethodPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QSortMethod(QSortMethodPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QSortMethod)
diff --git a/src/render/framegraph/qstateset.cpp b/src/render/framegraph/qstateset.cpp
index cd7646d7b..f67f15b8e 100644
--- a/src/render/framegraph/qstateset.cpp
+++ b/src/render/framegraph/qstateset.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
@@ -52,22 +52,22 @@ QStateSetPrivate::QStateSetPrivate()
 }
 
 /*!
- * \class Qt3D::QStateSet
+ * \class Qt3DCore::QStateSet
  * \inmodule Qt3DRender
  *
- * \brief The Qt3D::QStateSet FrameGraph node offers a way of specifying a set
- * of Qt3D::QRenderState to be applied during the execution of a FrameGraph
+ * \brief The Qt3DCore::QStateSet FrameGraph node offers a way of specifying a set
+ * of Qt3DCore::QRenderState to be applied during the execution of a FrameGraph
  * branch.
  *
- * States set on a Qt3D::QStateSet are set globally, contrary to the per
+ * States set on a Qt3DCore::QStateSet are set globally, contrary to the per
  * 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
+ * Qt3DCore::QStateSet will result in all render states being disabled when
+ * executed. Adding a Qt3DCore::QRenderState state explicitly enables that render
  * state at runtime.
  *
  * \since 5.5
  *
- * \sa Qt3D::QRenderState, Qt3DRender::QRenderPass
+ * \sa Qt3DCore::QRenderState, Qt3DRender::QRenderPass
  */
 
 QStateSet::QStateSet(QNode *parent)
@@ -95,9 +95,9 @@ void QStateSet::copy(const QNode *ref)
 }
 
 /*!
- * Adds a new Qt3D::QRenderState \a state to the Qt3D::QStateSet instance.
+ * Adds a new Qt3DCore::QRenderState \a state to the Qt3DCore::QStateSet instance.
  *
- * \note Not setting any Qt3D::QRenderState state on a Qt3D::QStateSet instance
+ * \note Not setting any Qt3DCore::QRenderState state on a Qt3DCore::QStateSet instance
  * implies all the render states will be disabled at render time.
  */
 void QStateSet::addRenderState(QRenderState *state)
@@ -120,7 +120,7 @@ void QStateSet::addRenderState(QRenderState *state)
 }
 
 /*!
- * Removes the Qt3D::QRenderState \a state from the Qt3D::QStateSet instance.
+ * Removes the Qt3DCore::QRenderState \a state from the Qt3DCore::QStateSet instance.
  */
 void QStateSet::removeRenderState(QRenderState *state)
 {
@@ -135,7 +135,7 @@ void QStateSet::removeRenderState(QRenderState *state)
 }
 
 /*!
- * Returns the list of Qt3D::QRenderState that compose the Qt3D::QStateSet instance.
+ * Returns the list of Qt3DCore::QRenderState that compose the Qt3DCore::QStateSet instance.
  */
 QList<QRenderState *> QStateSet::renderStates() const
 {
diff --git a/src/render/framegraph/qstateset.h b/src/render/framegraph/qstateset.h
index c9d6eb68d..7e4ff1257 100644
--- a/src/render/framegraph/qstateset.h
+++ b/src/render/framegraph/qstateset.h
@@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QStateSet : public QFrameGraphNode
     Q_OBJECT
 
 public:
-    explicit QStateSet(Qt3D::QNode *parent = 0);
+    explicit QStateSet(Qt3DCore::QNode *parent = 0);
     ~QStateSet();
 
     void addRenderState(QRenderState *state);
@@ -59,8 +59,8 @@ public:
     QList<QRenderState *> renderStates() const;
 
 protected:
-    QStateSet(QStateSetPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QStateSet(QStateSetPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QStateSet)
diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp
index 6092fb870..e2dd7c081 100644
--- a/src/render/framegraph/qtechniquefilter.cpp
+++ b/src/render/framegraph/qtechniquefilter.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h
index 8b8a115f8..b0798a04a 100644
--- a/src/render/framegraph/qtechniquefilter.h
+++ b/src/render/framegraph/qtechniquefilter.h
@@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode
 {
     Q_OBJECT
 public:
-    explicit QTechniqueFilter(Qt3D::QNode *parent = 0);
+    explicit QTechniqueFilter(Qt3DCore::QNode *parent = 0);
     ~QTechniqueFilter();
 
     QList<QAnnotation *> criteria() const;
@@ -64,8 +64,8 @@ public:
     QList<QParameter *> parameters() const;
 
 protected:
-    QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QTechniqueFilter)
diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h
index 3f427d044..baa6aeb1a 100644
--- a/src/render/framegraph/qviewport.h
+++ b/src/render/framegraph/qviewport.h
@@ -54,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QViewport : public QFrameGraphNode
     Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged)
 
 public:
-    explicit QViewport(Qt3D::QNode *parent = 0);
+    explicit QViewport(Qt3DCore::QNode *parent = 0);
     ~QViewport();
 
     QRectF rect() const;
@@ -68,8 +68,8 @@ Q_SIGNALS:
     void clearColorChanged();
 
 protected:
-    QViewport(QViewportPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QViewport(QViewportPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QViewport)
diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp
index 10c0352d8..920460121 100644
--- a/src/render/framegraph/renderpassfilternode.cpp
+++ b/src/render/framegraph/renderpassfilternode.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -52,7 +52,7 @@ RenderPassFilter::RenderPassFilter()
 {
 }
 
-void RenderPassFilter::updateFromPeer(Qt3D::QNode *peer)
+void RenderPassFilter::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QRenderPassFilter *filter = static_cast<QRenderPassFilter *>(peer);
     m_filters.clear();
@@ -64,7 +64,7 @@ void RenderPassFilter::updateFromPeer(Qt3D::QNode *peer)
         m_parameterPack.appendParameter(p->id());
 }
 
-QList<Qt3D::QNodeId> RenderPassFilter::filters() const
+QList<Qt3DCore::QNodeId> RenderPassFilter::filters() const
 {
     return m_filters;
 }
@@ -75,17 +75,17 @@ void RenderPassFilter::appendFilter(QAnnotation *criterion)
         m_filters.append(criterion->id());
 }
 
-void RenderPassFilter::removeFilter(const Qt3D::QNodeId &criterionId)
+void RenderPassFilter::removeFilter(const Qt3DCore::QNodeId &criterionId)
 {
     m_filters.removeOne(criterionId);
 }
 
-QList<Qt3D::QNodeId> RenderPassFilter::parameters() const
+QList<Qt3DCore::QNodeId> RenderPassFilter::parameters() const
 {
     return m_parameterPack.parameters();
 }
 
-void RenderPassFilter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void RenderPassFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
 
diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h
index 849631394..a413f10bc 100644
--- a/src/render/framegraph/renderpassfilternode_p.h
+++ b/src/render/framegraph/renderpassfilternode_p.h
@@ -70,15 +70,15 @@ class RenderPassFilter
 public:
     RenderPassFilter();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    QList<Qt3D::QNodeId> filters() const;
-    QList<Qt3D::QNodeId> parameters() const;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    QList<Qt3DCore::QNodeId> filters() const;
+    QList<Qt3DCore::QNodeId> parameters() const;
     void appendFilter(QAnnotation *criterion);
-    void removeFilter(const Qt3D::QNodeId &criterionId);
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void removeFilter(const Qt3DCore::QNodeId &criterionId);
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
-    QList<Qt3D::QNodeId> m_filters;
+    QList<Qt3DCore::QNodeId> m_filters;
     ParameterPack m_parameterPack;
 };
 
diff --git a/src/render/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp
index ddd565d57..50171e700 100644
--- a/src/render/framegraph/rendertargetselectornode.cpp
+++ b/src/render/framegraph/rendertargetselectornode.cpp
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -56,7 +56,7 @@ RenderTargetSelector::RenderTargetSelector() :
 {
 }
 
-void RenderTargetSelector::updateFromPeer(Qt3D::QNode *peer)
+void RenderTargetSelector::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QRenderTargetSelector *selector = static_cast<QRenderTargetSelector *>(peer);
     m_renderTargetUuid = QNodeId();
@@ -66,7 +66,7 @@ void RenderTargetSelector::updateFromPeer(Qt3D::QNode *peer)
     m_drawBuffers = selector->drawBuffers();
 }
 
-void RenderTargetSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void RenderTargetSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     qCDebug(Render::Framegraph) << Q_FUNC_INFO;
     if (e->type() == NodeUpdated) {
@@ -80,7 +80,7 @@ void RenderTargetSelector::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
     }
 }
 
-Qt3D::QNodeId RenderTargetSelector::renderTargetUuid() const
+Qt3DCore::QNodeId RenderTargetSelector::renderTargetUuid() const
 {
     return m_renderTargetUuid;
 }
diff --git a/src/render/framegraph/rendertargetselectornode_p.h b/src/render/framegraph/rendertargetselectornode_p.h
index 33d21d0f5..f6e1605a2 100644
--- a/src/render/framegraph/rendertargetselectornode_p.h
+++ b/src/render/framegraph/rendertargetselectornode_p.h
@@ -63,13 +63,13 @@ class RenderTargetSelector : public FrameGraphNode
 public:
     RenderTargetSelector();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    Qt3D::QNodeId renderTargetUuid() const;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeId renderTargetUuid() const;
     QList<QRenderAttachment::RenderAttachmentType> drawBuffers() const;
 
 private:
-    Qt3D::QNodeId m_renderTargetUuid;
+    Qt3DCore::QNodeId m_renderTargetUuid;
     QList<QRenderAttachment::RenderAttachmentType> m_drawBuffers;
 };
 
diff --git a/src/render/framegraph/sortcriterion.cpp b/src/render/framegraph/sortcriterion.cpp
index 97db75c9f..650d6f80a 100644
--- a/src/render/framegraph/sortcriterion.cpp
+++ b/src/render/framegraph/sortcriterion.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -55,7 +55,7 @@ void SortCriterion::cleanup()
 {
 }
 
-void SortCriterion::updateFromPeer(Qt3D::QNode *peer)
+void SortCriterion::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QSortCriterion *criterion = static_cast<QSortCriterion *>(peer);
     m_type = criterion->sort();
@@ -66,7 +66,7 @@ QSortCriterion::SortType SortCriterion::sortType() const
     return m_type;
 }
 
-void SortCriterion::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void SortCriterion::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (e->type() == NodeUpdated && propertyChange->propertyName() == QByteArrayLiteral("sort")) {
diff --git a/src/render/framegraph/sortcriterion_p.h b/src/render/framegraph/sortcriterion_p.h
index 14d749bd2..d0e20b603 100644
--- a/src/render/framegraph/sortcriterion_p.h
+++ b/src/render/framegraph/sortcriterion_p.h
@@ -59,17 +59,17 @@ namespace Render {
 
 class SortCriterionManager;
 
-class SortCriterion : public Qt3D::QBackendNode
+class SortCriterion : public Qt3DCore::QBackendNode
 {
 public:
     SortCriterion();
 
     void cleanup();
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
     QSortCriterion::SortType sortType() const;
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
     QSortCriterion::SortType m_type;
diff --git a/src/render/framegraph/sortmethod.cpp b/src/render/framegraph/sortmethod.cpp
index 4f67eb08f..d7bcb177b 100644
--- a/src/render/framegraph/sortmethod.cpp
+++ b/src/render/framegraph/sortmethod.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -50,7 +50,7 @@ SortMethod::SortMethod()
 {
 }
 
-void SortMethod::updateFromPeer(Qt3D::QNode *peer)
+void SortMethod::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QSortMethod *sortMethod = static_cast<QSortMethod *>(peer);
     m_criteria.clear();
@@ -59,7 +59,7 @@ void SortMethod::updateFromPeer(Qt3D::QNode *peer)
     setEnabled(sortMethod->isEnabled());
 }
 
-void SortMethod::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void SortMethod::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (propertyChange->propertyName() == QByteArrayLiteral("sortCriterion")) {
diff --git a/src/render/framegraph/sortmethod_p.h b/src/render/framegraph/sortmethod_p.h
index 69f73cf17..2222a76ea 100644
--- a/src/render/framegraph/sortmethod_p.h
+++ b/src/render/framegraph/sortmethod_p.h
@@ -62,13 +62,13 @@ class SortMethod : public FrameGraphNode
 public:
     SortMethod();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
-    QList<Qt3D::QNodeId> criteria() const;
+    QList<Qt3DCore::QNodeId> criteria() const;
 
 private:
-    QList<Qt3D::QNodeId> m_criteria;
+    QList<Qt3DCore::QNodeId> m_criteria;
 };
 
 } // namespace Render
diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp
index cd0d82371..d7832c256 100644
--- a/src/render/framegraph/statesetnode.cpp
+++ b/src/render/framegraph/statesetnode.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -57,7 +57,7 @@ StateSetNode::~StateSetNode()
 {
 }
 
-void StateSetNode::updateFromPeer(Qt3D::QNode *peer)
+void StateSetNode::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QStateSet *stateSet = static_cast<QStateSet*>(peer);
 
@@ -71,7 +71,7 @@ QList<RenderState *> StateSetNode::renderStates() const
     return m_renderStates.values();
 }
 
-void StateSetNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void StateSetNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     switch (e->type()) {
@@ -95,13 +95,13 @@ void StateSetNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
     }
 }
 
-void StateSetNode::appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState)
+void StateSetNode::appendRenderState(const Qt3DCore::QNodeId &id, RenderState *renderState)
 {
     if (!m_renderStates.contains(id))
         m_renderStates[id] = renderState;
 }
 
-void StateSetNode::removeRenderState(const Qt3D::QNodeId &renderStateId)
+void StateSetNode::removeRenderState(const Qt3DCore::QNodeId &renderStateId)
 {
     m_renderStates.remove(renderStateId);
 }
diff --git a/src/render/framegraph/statesetnode_p.h b/src/render/framegraph/statesetnode_p.h
index 859d67c21..7a9563cc0 100644
--- a/src/render/framegraph/statesetnode_p.h
+++ b/src/render/framegraph/statesetnode_p.h
@@ -62,17 +62,17 @@ public:
     StateSetNode();
     ~StateSetNode();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
     QList<RenderState *> renderStates() const;
 
 protected:
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
-    void appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState);
-    void removeRenderState(const Qt3D::QNodeId &renderStateId);
+    void appendRenderState(const Qt3DCore::QNodeId &id, RenderState *renderState);
+    void removeRenderState(const Qt3DCore::QNodeId &renderStateId);
 
-    QHash<Qt3D::QNodeId, RenderState *> m_renderStates;
+    QHash<Qt3DCore::QNodeId, RenderState *> m_renderStates;
 };
 
 } // namespace Render
diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp
index 547ed077b..9ec764415 100644
--- a/src/render/framegraph/techniquefilternode.cpp
+++ b/src/render/framegraph/techniquefilternode.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -53,7 +53,7 @@ TechniqueFilter::TechniqueFilter()
 {
 }
 
-void TechniqueFilter::updateFromPeer(Qt3D::QNode *peer)
+void TechniqueFilter::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QTechniqueFilter *filter = static_cast<QTechniqueFilter *>(peer);
     m_filters.clear();
@@ -65,12 +65,12 @@ void TechniqueFilter::updateFromPeer(Qt3D::QNode *peer)
     setEnabled(filter->isEnabled());
 }
 
-QList<Qt3D::QNodeId> TechniqueFilter::parameters() const
+QList<Qt3DCore::QNodeId> TechniqueFilter::parameters() const
 {
     return m_parameterPack.parameters();
 }
 
-QList<Qt3D::QNodeId> TechniqueFilter::filters() const
+QList<Qt3DCore::QNodeId> TechniqueFilter::filters() const
 {
     return m_filters;
 }
@@ -81,12 +81,12 @@ void TechniqueFilter::appendFilter(QAnnotation *criterion)
         m_filters.append(criterion->id());
 }
 
-void TechniqueFilter::removeFilter(const Qt3D::QNodeId &criterionId)
+void TechniqueFilter::removeFilter(const Qt3DCore::QNodeId &criterionId)
 {
     m_filters.removeOne(criterionId);
 }
 
-void TechniqueFilter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void TechniqueFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
 
diff --git a/src/render/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h
index 4dd8fc0b3..59ffb9572 100644
--- a/src/render/framegraph/techniquefilternode_p.h
+++ b/src/render/framegraph/techniquefilternode_p.h
@@ -72,18 +72,18 @@ class TechniqueFilter
 {
 public:
     TechniqueFilter();
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
-    QList<Qt3D::QNodeId> parameters() const;
+    QList<Qt3DCore::QNodeId> parameters() const;
 
-    QList<Qt3D::QNodeId> filters() const;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    QList<Qt3DCore::QNodeId> filters() const;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
     void appendFilter(QAnnotation *criterion);
-    void removeFilter(const Qt3D::QNodeId &criterionId);
+    void removeFilter(const Qt3DCore::QNodeId &criterionId);
 
-    QList<Qt3D::QNodeId> m_filters;
+    QList<Qt3DCore::QNodeId> m_filters;
     ParameterPack m_parameterPack;
 };
 
diff --git a/src/render/framegraph/viewportnode.cpp b/src/render/framegraph/viewportnode.cpp
index 29751068c..a016d9686 100644
--- a/src/render/framegraph/viewportnode.cpp
+++ b/src/render/framegraph/viewportnode.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -54,7 +54,7 @@ ViewportNode::ViewportNode()
 {
 }
 
-void ViewportNode::updateFromPeer(Qt3D::QNode *peer)
+void ViewportNode::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QViewport *viewport = static_cast<QViewport *>(peer);
     setXMin(viewport->rect().x());
@@ -107,7 +107,7 @@ QColor ViewportNode::clearColor() const
     return m_clearColor;
 }
 
-void ViewportNode::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void ViewportNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
diff --git a/src/render/framegraph/viewportnode_p.h b/src/render/framegraph/viewportnode_p.h
index e7af0604e..50ac79efa 100644
--- a/src/render/framegraph/viewportnode_p.h
+++ b/src/render/framegraph/viewportnode_p.h
@@ -66,7 +66,7 @@ class ViewportNode : public FrameGraphNode
 public:
     ViewportNode();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
     float xMin() const;
     void setXMin(float xMin);
@@ -82,7 +82,7 @@ public:
 
     QColor clearColor() const;
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
     float m_xMin;
diff --git a/src/render/frontend/qitemmodelbuffer.cpp b/src/render/frontend/qitemmodelbuffer.cpp
index c8e5cfc69..8de31a818 100644
--- a/src/render/frontend/qitemmodelbuffer.cpp
+++ b/src/render/frontend/qitemmodelbuffer.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
@@ -111,7 +111,7 @@ void variantToBytes(void* dest, const QVariant& v, GLint type)
 
 namespace {
 
-Qt3D::QAbstractAttribute::DataType typeFromGLType(GLint dataType, uint &dataCount)
+Qt3DCore::QAbstractAttribute::DataType typeFromGLType(GLint dataType, uint &dataCount)
 {
     switch (dataType) {
 
diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h
index 10499d7ba..e877aa108 100644
--- a/src/render/frontend/qlayer.h
+++ b/src/render/frontend/qlayer.h
@@ -47,12 +47,12 @@ namespace Qt3DRender {
 
 class QLayerPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QLayer : public Qt3D::QComponent
+class QT3DRENDERERSHARED_EXPORT QLayer : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(QStringList names READ names WRITE setNames NOTIFY namesChanged)
 public:
-    explicit QLayer(Qt3D::QNode *parent = 0);
+    explicit QLayer(Qt3DCore::QNode *parent = 0);
     ~QLayer();
 
     QStringList names() const;
@@ -62,8 +62,8 @@ Q_SIGNALS:
     void namesChanged();
 
 protected:
-    QLayer(QLayerPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QLayer(QLayerPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QLayer)
diff --git a/src/render/frontend/qlayer_p.h b/src/render/frontend/qlayer_p.h
index 8efa4b4ce..1efed58ba 100644
--- a/src/render/frontend/qlayer_p.h
+++ b/src/render/frontend/qlayer_p.h
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QLayerPrivate : public Qt3D::QComponentPrivate
+class QT3DRENDERERSHARED_EXPORT QLayerPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QLayerPrivate();
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index 444b54839..3e9dffdcd 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -121,12 +121,12 @@ static void initResources()
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QRenderAspectPrivate
+    \class Qt3DCore::QRenderAspectPrivate
     \internal
 */
 QRenderAspectPrivate::QRenderAspectPrivate(QRenderAspect::RenderType type)
@@ -138,7 +138,7 @@ QRenderAspectPrivate::QRenderAspectPrivate(QRenderAspect::RenderType type)
     , m_initialized(false)
 {
     initResources();
-    m_aspectType = Qt3D::QAbstractAspect::AspectRenderer;
+    m_aspectType = Qt3DCore::QAbstractAspect::AspectRenderer;
 }
 
 void QRenderAspectPrivate::setSurface(QSurface *surface)
@@ -201,15 +201,15 @@ QRenderAspect::QRenderAspect(QRenderAspectPrivate &dd, QObject *parent)
 void QRenderAspect::registerBackendTypes()
 {
     Q_D(QRenderAspect);
-    registerBackendType<Qt3D::QEntity>(QBackendNodeFunctorPtr(new Render::RenderEntityFunctor(d->m_renderer)));
-    registerBackendType<Qt3D::QTransform>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Transform, Render::TransformManager>(d->m_renderer->transformManager())));
+    registerBackendType<Qt3DCore::QEntity>(QBackendNodeFunctorPtr(new Render::RenderEntityFunctor(d->m_renderer)));
+    registerBackendType<Qt3DCore::QTransform>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Transform, Render::TransformManager>(d->m_renderer->transformManager())));
     registerBackendType<QMaterial>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Material, Render::MaterialManager>(d->m_renderer->materialManager())));
     registerBackendType<QTechnique>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Technique, Render::TechniqueManager>(d->m_renderer->techniqueManager())));
     registerBackendType<QAbstractTextureProvider>(QBackendNodeFunctorPtr(new Render::TextureFunctor(d->m_renderer->textureManager(), d->m_renderer->textureImageManager(), d->m_renderer->textureDataManager())));
     registerBackendType<QShaderProgram>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Shader, Render::ShaderManager>(d->m_renderer->shaderManager())));
     registerBackendType<QEffect>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Effect, Render::EffectManager>(d->m_renderer->effectManager())));
     registerBackendType<QAnnotation>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Annotation, Render::CriterionManager>(d->m_renderer->criterionManager())));
-    registerBackendType<Qt3D::QCameraLens>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::CameraLens, Render::CameraManager>(d->m_renderer->cameraManager())));
+    registerBackendType<Qt3DCore::QCameraLens>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::CameraLens, Render::CameraManager>(d->m_renderer->cameraManager())));
     registerBackendType<QLayer>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Layer, Render::LayerManager>(d->m_renderer->layerManager())));
     registerBackendType<QRenderPass>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::RenderPass, Render::RenderPassManager>(d->m_renderer->renderPassManager())));
     registerBackendType<QAbstractSceneLoader>(QBackendNodeFunctorPtr(new Render::RenderSceneFunctor(d->m_renderer->sceneManager())));
@@ -258,7 +258,7 @@ void QRenderAspect::renderShutdown()
     d->m_renderer->shutdown();
 }
 
-QVector<Qt3D::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time)
+QVector<Qt3DCore::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time)
 {
     Q_D(QRenderAspect);
     d->m_time = time;
@@ -321,7 +321,7 @@ QVector<Qt3D::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time)
     return jobs;
 }
 
-void QRenderAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e)
+void QRenderAspect::sceneNodeAdded(Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
@@ -330,7 +330,7 @@ void QRenderAspect::sceneNodeAdded(Qt3D::QSceneChangePtr &e)
     visitor.traverse(n, this, &QRenderAspect::visitNode);
 }
 
-void QRenderAspect::sceneNodeRemoved(Qt3D::QSceneChangePtr &e)
+void QRenderAspect::sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
@@ -344,7 +344,7 @@ qint64 QRenderAspect::time() const
     return d->m_time;
 }
 
-void QRenderAspect::setRootEntity(Qt3D::QEntity *rootObject)
+void QRenderAspect::setRootEntity(Qt3DCore::QEntity *rootObject)
 {
     // setSceneGraphRoot is synchronized using the Renderer's mutex
     Q_D(QRenderAspect);
@@ -362,7 +362,7 @@ void QRenderAspect::onInitialize(const QVariantMap &data)
 
         // Register the VSyncFrameAdvanceService to drive the aspect manager loop
         // depending on the vsync
-        services()->registerServiceProvider(Qt3D::QServiceLocator::FrameAdvanceService,
+        services()->registerServiceProvider(Qt3DCore::QServiceLocator::FrameAdvanceService,
                                             d->m_renderer->vsyncFrameAdvanceService());
 
         d->m_renderer->setQRenderAspect(this);
@@ -394,7 +394,7 @@ void QRenderAspect::onCleanup()
     d->m_renderer = Q_NULLPTR;
 }
 
-void QRenderAspect::visitNode(Qt3D::QNode *node)
+void QRenderAspect::visitNode(Qt3DCore::QNode *node)
 {
     QAbstractAspect::createBackendNode(node);
 }
diff --git a/src/render/frontend/qrenderaspect.h b/src/render/frontend/qrenderaspect.h
index 180424565..43242fb13 100644
--- a/src/render/frontend/qrenderaspect.h
+++ b/src/render/frontend/qrenderaspect.h
@@ -52,7 +52,7 @@ class Renderer;
 
 class QRenderAspectPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QRenderAspect : public Qt3D::QAbstractAspect
+class QT3DRENDERERSHARED_EXPORT QRenderAspect : public Qt3DCore::QAbstractAspect
 {
     Q_OBJECT
 public:
@@ -68,10 +68,10 @@ public:
     void renderSynchronous();
     void renderShutdown();
 
-    QVector<Qt3D::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64 time) Q_DECL_OVERRIDE;
 
-    void sceneNodeAdded(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void sceneNodeRemoved(Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     qint64 time() const;
 
@@ -79,13 +79,13 @@ protected:
     void registerBackendTypes();
 
 private:
-    void setRootEntity(Qt3D::QEntity *rootObject) Q_DECL_OVERRIDE;
+    void setRootEntity(Qt3DCore::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(Qt3D::QNode *node);
+    void visitNode(Qt3DCore::QNode *node);
 
     Q_DECLARE_PRIVATE(QRenderAspect)
     QRenderAspect(QRenderAspectPrivate &dd, QObject *parent);
diff --git a/src/render/frontend/qrenderaspect_p.h b/src/render/frontend/qrenderaspect_p.h
index e51e14117..18b1ce91a 100644
--- a/src/render/frontend/qrenderaspect_p.h
+++ b/src/render/frontend/qrenderaspect_p.h
@@ -66,7 +66,7 @@ namespace Render {
 class Renderer;
 }
 
-class QRenderAspectPrivate : public Qt3D::QAbstractAspectPrivate
+class QRenderAspectPrivate : public Qt3DCore::QAbstractAspectPrivate
 {
     QRenderAspectPrivate(QRenderAspect::RenderType type);
 
diff --git a/src/render/frontend/qrenderattachment.h b/src/render/frontend/qrenderattachment.h
index 49c14b146..b19979c5c 100644
--- a/src/render/frontend/qrenderattachment.h
+++ b/src/render/frontend/qrenderattachment.h
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 class QAbstractTextureProvider;
 class QRenderAttachmentPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QRenderAttachment : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QRenderAttachment : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(RenderAttachmentType type READ type WRITE setType NOTIFY typeChanged)
@@ -91,7 +91,7 @@ public:
     };
     Q_ENUM(CubeMapFace)
 
-    explicit QRenderAttachment(Qt3D::QNode *parent = 0);
+    explicit QRenderAttachment(Qt3DCore::QNode *parent = 0);
     ~QRenderAttachment();
 
     void setType(RenderAttachmentType type);
@@ -121,8 +121,8 @@ Q_SIGNALS:
     void nameChanged();
 
 protected:
-    QRenderAttachment(QRenderAttachmentPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QRenderAttachment(QRenderAttachmentPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QRenderAttachment)
diff --git a/src/render/frontend/qrenderattachment_p.h b/src/render/frontend/qrenderattachment_p.h
index 3b0d82b55..6624b4694 100644
--- a/src/render/frontend/qrenderattachment_p.h
+++ b/src/render/frontend/qrenderattachment_p.h
@@ -57,7 +57,7 @@ namespace Qt3DRender {
 
 class QAbstractTextureProvider;
 
-class QRenderAttachmentPrivate : public Qt3D::QNodePrivate
+class QRenderAttachmentPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QRenderAttachmentPrivate();
diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp
index ed7354871..2cf2115f3 100644
--- a/src/render/frontend/qrendertarget.cpp
+++ b/src/render/frontend/qrendertarget.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h
index a7b192b85..9c0fd9858 100644
--- a/src/render/frontend/qrendertarget.h
+++ b/src/render/frontend/qrendertarget.h
@@ -47,11 +47,11 @@ namespace Qt3DRender {
 class QRenderTargetPrivate;
 class QRenderAttachment;
 
-class QT3DRENDERERSHARED_EXPORT QRenderTarget : public Qt3D::QComponent
+class QT3DRENDERERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent
 {
     Q_OBJECT
 public:
-    explicit QRenderTarget(Qt3D::QNode *parent = 0);
+    explicit QRenderTarget(Qt3DCore::QNode *parent = 0);
     ~QRenderTarget();
 
     void addAttachment(QRenderAttachment *attachment);
@@ -59,8 +59,8 @@ public:
     QList<QRenderAttachment *> attachments() const;
 
 protected:
-    QRenderTarget(QRenderTargetPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QRenderTarget(QRenderTargetPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QRenderTarget)
diff --git a/src/render/frontend/qrendertarget_p.h b/src/render/frontend/qrendertarget_p.h
index 85d7991f7..8b300faed 100644
--- a/src/render/frontend/qrendertarget_p.h
+++ b/src/render/frontend/qrendertarget_p.h
@@ -57,7 +57,7 @@ namespace Qt3DRender {
 class QRenderAttachment;
 class QRenderTarget;
 
-class QRenderTargetPrivate : public Qt3D::QComponentPrivate
+class QRenderTargetPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QRenderTargetPrivate();
diff --git a/src/render/frontend/qwindow.cpp b/src/render/frontend/qwindow.cpp
index 3b6c3786e..da7ee8f8c 100644
--- a/src/render/frontend/qwindow.cpp
+++ b/src/render/frontend/qwindow.cpp
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
@@ -127,13 +127,13 @@ QFrameGraph *QWindow::frameGraph() const
     return d->m_frameGraph;
 }
 
-Qt3D::QCamera *QWindow::defaultCamera()
+Qt3DCore::QCamera *QWindow::defaultCamera()
 {
     Q_D(const QWindow);
     return d->m_defaultCamera;
 }
 
-void QWindow::registerAspect(Qt3D::QAbstractAspect *aspect)
+void QWindow::registerAspect(Qt3DCore::QAbstractAspect *aspect)
 {
     Q_ASSERT(!isVisible());
     Q_D(QWindow);
@@ -147,7 +147,7 @@ void QWindow::registerAspect(const QString &name)
     d->m_engine->registerAspect(name);
 }
 
-void QWindow::setRootEntity(Qt3D::QEntity *root)
+void QWindow::setRootEntity(Qt3DCore::QEntity *root)
 {
     Q_ASSERT(!isVisible());
     Q_D(QWindow);
diff --git a/src/render/frontend/qwindow.h b/src/render/frontend/qwindow.h
index b1acb2ba1..5ca4686f2 100644
--- a/src/render/frontend/qwindow.h
+++ b/src/render/frontend/qwindow.h
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QAbstractAspect;
 class QCamera;
 class QEntity;
@@ -61,12 +61,12 @@ public:
 
     void setFrameGraph(QFrameGraph *frameGraph);
     QFrameGraph *frameGraph() const;
-    Qt3D::QCamera *defaultCamera();
+    Qt3DCore::QCamera *defaultCamera();
 
-    void registerAspect(Qt3D::QAbstractAspect *aspect);
+    void registerAspect(Qt3DCore::QAbstractAspect *aspect);
     void registerAspect(const QString &name);
 
-    void setRootEntity(Qt3D::QEntity *root);
+    void setRootEntity(Qt3DCore::QEntity *root);
     void show();
 
 protected:
diff --git a/src/render/frontend/qwindow_p.h b/src/render/frontend/qwindow_p.h
index 40356eb8f..25f4376a7 100644
--- a/src/render/frontend/qwindow_p.h
+++ b/src/render/frontend/qwindow_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QAspectEngine;
 class QCamera;
 class QEntity;
@@ -70,11 +70,11 @@ public:
     QWindowPrivate();
 
     Q_DECLARE_PUBLIC(QWindow)
-    Qt3D::QEntity *m_root;
-    Qt3D::QEntity *   m_userRoot;
-    Qt3D::QCamera *m_defaultCamera;
+    Qt3DCore::QEntity *m_root;
+    Qt3DCore::QEntity *   m_userRoot;
+    Qt3DCore::QCamera *m_defaultCamera;
     QFrameGraph *m_frameGraph;
-    QScopedPointer<Qt3D::QAspectEngine> m_engine;
+    QScopedPointer<Qt3DCore::QAspectEngine> m_engine;
     QRenderAspect *m_renderAspect;
 };
 
diff --git a/src/render/frontend/sphere.cpp b/src/render/frontend/sphere.cpp
index a8b9cd6de..7cdfafeec 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 Qt3DRender::Sphere &s, QVector3D *q = Q_NULLPTR)
+bool intersectRaySphere(const Qt3DCore::QRay3D &ray, const Qt3DRender::Sphere &s, QVector3D *q = Q_NULLPTR)
 {
     const QVector3D p = ray.origin();
     const QVector3D d = ray.direction();
@@ -211,17 +211,17 @@ Sphere Sphere::transformed(const QMatrix4x4 &mat)
     return Sphere(c, sqrt(rSquared));
 }
 
-Qt3D::QNodeId Sphere::id() const
+Qt3DCore::QNodeId Sphere::id() const
 {
     return m_id;
 }
 
-bool Sphere::intersects(const Qt3D::QRay3D &ray, QVector3D *q) const
+bool Sphere::intersects(const Qt3DCore::QRay3D &ray, QVector3D *q) const
 {
     return intersectRaySphere(ray, *this, q);
 }
 
-Qt3D::QBoundingVolume::Type Sphere::type() const
+Qt3DCore::QBoundingVolume::Type Sphere::type() const
 {
     return QBoundingVolume::Sphere;
 }
diff --git a/src/render/frontend/sphere.h b/src/render/frontend/sphere.h
index e14ecc38b..faa07c433 100644
--- a/src/render/frontend/sphere.h
+++ b/src/render/frontend/sphere.h
@@ -48,16 +48,16 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT Sphere : public Qt3D::QBoundingSphere
+class QT3DRENDERERSHARED_EXPORT Sphere : public Qt3DCore::QBoundingSphere
 {
 public:
-    inline Sphere(const Qt3D::QNodeId &i = Qt3D::QNodeId())
+    inline Sphere(const Qt3DCore::QNodeId &i = Qt3DCore::QNodeId())
         : m_center()
         , m_radius(0.0f)
         , m_id(i)
     {}
 
-    inline Sphere(const QVector3D &c, float r, const Qt3D::QNodeId &i = Qt3D::QNodeId())
+    inline Sphere(const QVector3D &c, float r, const Qt3DCore::QNodeId &i = Qt3DCore::QNodeId())
         : m_center(c)
         , m_radius(r)
         , m_id(i)
@@ -89,8 +89,8 @@ public:
         return *this;
     }
 
-    Qt3D::QNodeId id() const Q_DECL_FINAL;
-    bool intersects(const Qt3D::QRay3D &ray, QVector3D *q) const Q_DECL_FINAL;
+    Qt3DCore::QNodeId id() const Q_DECL_FINAL;
+    bool intersects(const Qt3DCore::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;
-    Qt3D::QNodeId m_id;
+    Qt3DCore::QNodeId m_id;
 
     static const float ms_epsilon;
 };
diff --git a/src/render/geometry/attribute.cpp b/src/render/geometry/attribute.cpp
index 00e1e577a..606df44a0 100644
--- a/src/render/geometry/attribute.cpp
+++ b/src/render/geometry/attribute.cpp
@@ -40,20 +40,20 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
 
 Attribute::Attribute()
     : QBackendNode(ReadOnly)
-    , m_dataType(Qt3D::QAbstractAttribute::Float)
+    , m_dataType(Qt3DCore::QAbstractAttribute::Float)
     , m_dataSize(1)
     , m_count(0)
     , m_byteStride(0)
     , m_byteOffset(0)
     , m_divisor(0)
-    , m_attributeType(Qt3D::QAbstractAttribute::VertexAttribute)
+    , m_attributeType(Qt3DCore::QAbstractAttribute::VertexAttribute)
     , m_attributeDirty(false)
 {
 }
@@ -64,19 +64,19 @@ Attribute::~Attribute()
 
 void Attribute::cleanup()
 {
-    m_dataType = Qt3D::QAbstractAttribute::Float;
+    m_dataType = Qt3DCore::QAbstractAttribute::Float;
     m_dataSize = 1;
     m_count = 0;
     m_byteStride = 0;
     m_byteOffset = 0;
     m_divisor = 0;
-    m_attributeType = Qt3D::QAbstractAttribute::VertexAttribute;
-    m_bufferId = Qt3D::QNodeId();
+    m_attributeType = Qt3DCore::QAbstractAttribute::VertexAttribute;
+    m_bufferId = Qt3DCore::QNodeId();
     m_name.clear();
     m_attributeDirty = false;
 }
 
-void Attribute::updateFromPeer(Qt3D::QNode *peer)
+void Attribute::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QAttribute *attribute = static_cast<QAttribute *>(peer);
     if (attribute) {
@@ -94,7 +94,7 @@ void Attribute::updateFromPeer(Qt3D::QNode *peer)
     }
 }
 
-void Attribute::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Attribute::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     QByteArray propertyName = propertyChange->propertyName();
diff --git a/src/render/geometry/attribute_p.h b/src/render/geometry/attribute_p.h
index cb952bcf7..83a5dfacf 100644
--- a/src/render/geometry/attribute_p.h
+++ b/src/render/geometry/attribute_p.h
@@ -57,7 +57,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class Q_AUTOTEST_EXPORT Attribute : public Qt3D::QBackendNode
+class Q_AUTOTEST_EXPORT Attribute : public Qt3DCore::QBackendNode
 {
 public:
     Attribute();
@@ -65,31 +65,31 @@ public:
 
     void cleanup();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
-    inline Qt3D::QNodeId bufferId() const { return m_bufferId; }
+    inline Qt3DCore::QNodeId bufferId() const { return m_bufferId; }
     inline QString name() const { return m_name; }
-    inline Qt3D::QAbstractAttribute::DataType dataType() const { return m_dataType; }
+    inline Qt3DCore::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 Qt3D::QAbstractAttribute::AttributeType attributeType() const { return m_attributeType; }
+    inline Qt3DCore::QAbstractAttribute::AttributeType attributeType() const { return m_attributeType; }
     inline bool isDirty() const { return m_attributeDirty; }
     void unsetDirty();
 
 private:
-    Qt3D::QNodeId m_bufferId;
+    Qt3DCore::QNodeId m_bufferId;
     QString m_name;
-    Qt3D::QAbstractAttribute::DataType m_dataType;
+    Qt3DCore::QAbstractAttribute::DataType m_dataType;
     uint m_dataSize;
     uint m_count;
     uint m_byteStride;
     uint m_byteOffset;
     uint m_divisor;
-    Qt3D::QAbstractAttribute::AttributeType m_attributeType;
+    Qt3DCore::QAbstractAttribute::AttributeType m_attributeType;
     bool m_attributeDirty;
 };
 
diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp
index 16ba51602..762148182 100644
--- a/src/render/geometry/buffer.cpp
+++ b/src/render/geometry/buffer.cpp
@@ -40,7 +40,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -81,7 +81,7 @@ void Buffer::executeFunctor()
     m_data = (*m_functor)();
 }
 
-void Buffer::updateFromPeer(Qt3D::QNode *peer)
+void Buffer::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QBuffer *buffer = static_cast<QBuffer *>(peer);
     if (buffer != Q_NULLPTR) {
@@ -96,7 +96,7 @@ void Buffer::updateFromPeer(Qt3D::QNode *peer)
     }
 }
 
-void Buffer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Buffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
@@ -131,7 +131,7 @@ BufferFunctor::BufferFunctor(BufferManager *manager)
 {
 }
 
-Qt3D::QBackendNode *BufferFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *BufferFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
 {
     Buffer *buffer = m_manager->getOrCreateResource(frontend->id());
     buffer->setFactory(factory);
@@ -140,12 +140,12 @@ Qt3D::QBackendNode *BufferFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBa
     return buffer;
 }
 
-Qt3D::QBackendNode *BufferFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *BufferFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     return m_manager->lookupResource(id);
 }
 
-void BufferFunctor::destroy(const Qt3D::QNodeId &id) const
+void BufferFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     return m_manager->releaseResource(id);
 }
diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h
index 141abc46d..1d5d02dae 100644
--- a/src/render/geometry/buffer_p.h
+++ b/src/render/geometry/buffer_p.h
@@ -60,15 +60,15 @@ namespace Render {
 
 class BufferManager;
 
-class Q_AUTOTEST_EXPORT Buffer : public Qt3D::QBackendNode
+class Q_AUTOTEST_EXPORT Buffer : public Qt3DCore::QBackendNode
 {
 public:
     Buffer();
     ~Buffer();
     void cleanup();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     void setManager(BufferManager *manager);
     void executeFunctor();
@@ -89,13 +89,13 @@ private:
     BufferManager *m_manager;
 };
 
-class BufferFunctor : public Qt3D::QBackendNodeFunctor
+class BufferFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit BufferFunctor(BufferManager *manager);
-    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;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 private:
     BufferManager *m_manager;
 };
diff --git a/src/render/geometry/buffermanager.cpp b/src/render/geometry/buffermanager.cpp
index e8411fe02..fbbee4b23 100644
--- a/src/render/geometry/buffermanager.cpp
+++ b/src/render/geometry/buffermanager.cpp
@@ -49,15 +49,15 @@ BufferManager::~BufferManager()
 {
 }
 
-void BufferManager::addDirtyBuffer(const Qt3D::QNodeId &bufferId)
+void BufferManager::addDirtyBuffer(const Qt3DCore::QNodeId &bufferId)
 {
     if (!m_dirtyBuffers.contains(bufferId))
         m_dirtyBuffers.push_back(bufferId);
 }
 
-QVector<Qt3D::QNodeId> BufferManager::dirtyBuffers()
+QVector<Qt3DCore::QNodeId> BufferManager::dirtyBuffers()
 {
-    QVector<Qt3D::QNodeId> vector(m_dirtyBuffers);
+    QVector<Qt3DCore::QNodeId> vector(m_dirtyBuffers);
     m_dirtyBuffers.clear();
     return vector;
 }
diff --git a/src/render/geometry/buffermanager_p.h b/src/render/geometry/buffermanager_p.h
index f93bff11b..50bfc2a94 100644
--- a/src/render/geometry/buffermanager_p.h
+++ b/src/render/geometry/buffermanager_p.h
@@ -57,23 +57,23 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class BufferManager : public Qt3D::QResourceManager<
+class BufferManager : public Qt3DCore::QResourceManager<
         Buffer,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     BufferManager();
     ~BufferManager();
 
     // Aspect Thread
-    void addDirtyBuffer(const Qt3D::QNodeId &bufferId);
-    QVector<Qt3D::QNodeId> dirtyBuffers();
+    void addDirtyBuffer(const Qt3DCore::QNodeId &bufferId);
+    QVector<Qt3DCore::QNodeId> dirtyBuffers();
 
 private:
-    QVector<Qt3D::QNodeId> m_dirtyBuffers;
+    QVector<Qt3DCore::QNodeId> m_dirtyBuffers;
 };
 
 } // namespace Render
diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp
index 320d357e0..0be114fa7 100644
--- a/src/render/geometry/geometry.cpp
+++ b/src/render/geometry/geometry.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -64,7 +64,7 @@ void Geometry::cleanup()
     m_geometryDirty = false;
 }
 
-void Geometry::updateFromPeer(Qt3D::QNode *peer)
+void Geometry::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QGeometry *geometry = static_cast<QGeometry *>(peer);
     if (geometry != Q_NULLPTR) {
@@ -76,7 +76,7 @@ void Geometry::updateFromPeer(Qt3D::QNode *peer)
     }
 }
 
-void Geometry::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     QByteArray propertyName = propertyChange->propertyName();
diff --git a/src/render/geometry/geometry_p.h b/src/render/geometry/geometry_p.h
index e2469cf84..c43e7f5bd 100644
--- a/src/render/geometry/geometry_p.h
+++ b/src/render/geometry/geometry_p.h
@@ -57,7 +57,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class Q_AUTOTEST_EXPORT Geometry : public Qt3D::QBackendNode
+class Q_AUTOTEST_EXPORT Geometry : public Qt3DCore::QBackendNode
 {
 public:
     Geometry();
@@ -65,16 +65,16 @@ public:
 
     void cleanup();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
-    inline QVector<Qt3D::QNodeId> attributes() const { return m_attributes; }
+    inline QVector<Qt3DCore::QNodeId> attributes() const { return m_attributes; }
     inline bool isDirty() const { return m_geometryDirty; }
     inline int verticesPerPatch() const { return m_verticesPerPatch; }
     void unsetDirty();
 
 private:
-    QVector<Qt3D::QNodeId> m_attributes;
+    QVector<Qt3DCore::QNodeId> m_attributes;
     int m_verticesPerPatch;
     bool m_geometryDirty;
 };
diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp
index 583a23d34..a70405ea8 100644
--- a/src/render/geometry/geometryrenderer.cpp
+++ b/src/render/geometry/geometryrenderer.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -73,7 +73,7 @@ void GeometryRenderer::cleanup()
     m_restartIndex = -1;
     m_primitiveRestart = false;
     m_primitiveType = QGeometryRenderer::Triangles;
-    m_geometryId = Qt3D::QNodeId();
+    m_geometryId = Qt3DCore::QNodeId();
     m_dirty = false;
     m_functor.reset();
 }
@@ -83,7 +83,7 @@ void GeometryRenderer::setManager(GeometryRendererManager *manager)
     m_manager = manager;
 }
 
-void GeometryRenderer::updateFromPeer(Qt3D::QNode *peer)
+void GeometryRenderer::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QGeometryRenderer *geometryRenderer = static_cast<QGeometryRenderer *>(peer);
     if (geometryRenderer) {
@@ -103,7 +103,7 @@ void GeometryRenderer::updateFromPeer(Qt3D::QNode *peer)
     }
 }
 
-void GeometryRenderer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     QByteArray propertyName = propertyChange->propertyName();
@@ -190,7 +190,7 @@ GeometryRendererFunctor::GeometryRendererFunctor(GeometryRendererManager *manage
 {
 }
 
-Qt3D::QBackendNode *GeometryRendererFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *GeometryRendererFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
 {
     GeometryRenderer *geometryRenderer = m_manager->getOrCreateResource(frontend->id());
     geometryRenderer->setFactory(factory);
@@ -199,12 +199,12 @@ Qt3D::QBackendNode *GeometryRendererFunctor::create(Qt3D::QNode *frontend, const
     return geometryRenderer;
 }
 
-Qt3D::QBackendNode *GeometryRendererFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *GeometryRendererFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     return m_manager->lookupResource(id);
 }
 
-void GeometryRendererFunctor::destroy(const Qt3D::QNodeId &id) const
+void GeometryRendererFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     return m_manager->releaseResource(id);
 }
diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h
index d32afb00b..f03b8daa4 100644
--- a/src/render/geometry/geometryrenderer_p.h
+++ b/src/render/geometry/geometryrenderer_p.h
@@ -60,7 +60,7 @@ namespace Render {
 
 class GeometryRendererManager;
 
-class Q_AUTOTEST_EXPORT GeometryRenderer : public Qt3D::QBackendNode
+class Q_AUTOTEST_EXPORT GeometryRenderer : public Qt3DCore::QBackendNode
 {
 public:
     GeometryRenderer();
@@ -68,11 +68,11 @@ public:
 
     void cleanup();
     void setManager(GeometryRendererManager *manager);
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     void executeFunctor();
 
-    inline Qt3D::QNodeId geometryId() const { return m_geometryId; }
+    inline Qt3DCore::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; }
@@ -85,7 +85,7 @@ public:
     void unsetDirty();
 
 private:
-    Qt3D::QNodeId m_geometryId;
+    Qt3DCore::QNodeId m_geometryId;
     int m_instanceCount;
     int m_primitiveCount;
     int m_baseVertex;
@@ -98,13 +98,13 @@ private:
     GeometryRendererManager *m_manager;
 };
 
-class GeometryRendererFunctor : public Qt3D::QBackendNodeFunctor
+class GeometryRendererFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit GeometryRendererFunctor(GeometryRendererManager *manager);
-    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;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 private:
     GeometryRendererManager *m_manager;
 };
diff --git a/src/render/geometry/geometryrenderermanager.cpp b/src/render/geometry/geometryrenderermanager.cpp
index 9acbfcd8f..8592ee75c 100644
--- a/src/render/geometry/geometryrenderermanager.cpp
+++ b/src/render/geometry/geometryrenderermanager.cpp
@@ -49,15 +49,15 @@ GeometryRendererManager::~GeometryRendererManager()
 {
 }
 
-void GeometryRendererManager::addDirtyGeometryRenderer(const Qt3D::QNodeId &bufferId)
+void GeometryRendererManager::addDirtyGeometryRenderer(const Qt3DCore::QNodeId &bufferId)
 {
     if (!m_dirtyGeometryRenderers.contains(bufferId))
         m_dirtyGeometryRenderers.push_back(bufferId);
 }
 
-QVector<Qt3D::QNodeId> GeometryRendererManager::dirtyGeometryRenderers()
+QVector<Qt3DCore::QNodeId> GeometryRendererManager::dirtyGeometryRenderers()
 {
-    QVector<Qt3D::QNodeId> vector(m_dirtyGeometryRenderers);
+    QVector<Qt3DCore::QNodeId> vector(m_dirtyGeometryRenderers);
     m_dirtyGeometryRenderers.clear();
     return vector;
 }
diff --git a/src/render/geometry/geometryrenderermanager_p.h b/src/render/geometry/geometryrenderermanager_p.h
index dc79755b0..69066b7a0 100644
--- a/src/render/geometry/geometryrenderermanager_p.h
+++ b/src/render/geometry/geometryrenderermanager_p.h
@@ -57,23 +57,23 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class GeometryRendererManager : public Qt3D::QResourceManager<
+class GeometryRendererManager : public Qt3DCore::QResourceManager<
         GeometryRenderer,
-        Qt3D::QNodeId,
+        Qt3DCore::QNodeId,
         16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     GeometryRendererManager();
     ~GeometryRendererManager();
 
     // Aspect Thread
-    void addDirtyGeometryRenderer(const Qt3D::QNodeId &bufferId);
-    QVector<Qt3D::QNodeId> dirtyGeometryRenderers();
+    void addDirtyGeometryRenderer(const Qt3DCore::QNodeId &bufferId);
+    QVector<Qt3DCore::QNodeId> dirtyGeometryRenderers();
 
 private:
-    QVector<Qt3D::QNodeId> m_dirtyGeometryRenderers;
+    QVector<Qt3DCore::QNodeId> m_dirtyGeometryRenderers;
 };
 
 } // namespace Render
diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp
index 09b858128..8c3bb2aad 100644
--- a/src/render/geometry/qattribute.cpp
+++ b/src/render/geometry/qattribute.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 /*!
-    class Qt3D::AttributePrivate
+    class Qt3DCore::AttributePrivate
     \internal
 */
 QAttributePrivate::QAttributePrivate()
diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h
index 9106cbda9..772272e20 100644
--- a/src/render/geometry/qattribute.h
+++ b/src/render/geometry/qattribute.h
@@ -48,12 +48,12 @@ namespace Qt3DRender {
 class QAttributePrivate;
 class QBuffer;
 
-class QT3DRENDERERSHARED_EXPORT QAttribute : public Qt3D::QAbstractAttribute
+class QT3DRENDERERSHARED_EXPORT QAttribute : public Qt3DCore::QAbstractAttribute
 {
     Q_OBJECT
 
 public:
-    explicit QAttribute(Qt3D::QNode *parent = 0);
+    explicit QAttribute(Qt3DCore::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,7 +73,7 @@ public:
     static QString defaultTangentAttributeName();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     QT3D_CLONEABLE(QAttribute)
diff --git a/src/render/geometry/qattribute_p.h b/src/render/geometry/qattribute_p.h
index 806febabc..7968266e1 100644
--- a/src/render/geometry/qattribute_p.h
+++ b/src/render/geometry/qattribute_p.h
@@ -57,7 +57,7 @@ namespace Qt3DRender {
 
 class QAttribute;
 
-class QT3DRENDERERSHARED_EXPORT QAttributePrivate : public Qt3D::QAbstractAttributePrivate
+class QT3DRENDERERSHARED_EXPORT QAttributePrivate : public Qt3DCore::QAbstractAttributePrivate
 {
 public:
     QAttributePrivate();
diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp
index 6a86f74f7..f31badc2d 100644
--- a/src/render/geometry/qbuffer.cpp
+++ b/src/render/geometry/qbuffer.cpp
@@ -41,12 +41,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
 /*!
-    \class Qt3D::BufferPrivate
+    \class Qt3DCore::BufferPrivate
     \internal
 */
 QBufferPrivate::QBufferPrivate()
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h
index d1d9f9929..2bf6700ee 100644
--- a/src/render/geometry/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
@@ -54,7 +54,7 @@ class QBufferPrivate;
 class QBufferFunctor;
 typedef QSharedPointer<QBufferFunctor> QBufferFunctorPtr;
 
-class QT3DRENDERERSHARED_EXPORT QBuffer : public Qt3D::QAbstractBuffer
+class QT3DRENDERERSHARED_EXPORT QBuffer : public Qt3DCore::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, Qt3D::QNode *parent = 0);
+    QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3DCore::QNode *parent = 0);
     ~QBuffer();
 
     void setUsage(UsageType usage);
@@ -97,8 +97,8 @@ public:
     QBufferFunctorPtr bufferFunctor() const;
 
 protected:
-    QBuffer(QBufferPrivate &dd, QBuffer::BufferType ty, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QBuffer(QBufferPrivate &dd, QBuffer::BufferType ty, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
     void typeChanged();
diff --git a/src/render/geometry/qbuffer_p.h b/src/render/geometry/qbuffer_p.h
index 8f35ad77f..50ddbc9f3 100644
--- a/src/render/geometry/qbuffer_p.h
+++ b/src/render/geometry/qbuffer_p.h
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QBufferPrivate : public Qt3D::QAbstractBufferPrivate
+class QT3DRENDERERSHARED_EXPORT QBufferPrivate : public Qt3DCore::QAbstractBufferPrivate
 {
 public:
     QBufferPrivate();
diff --git a/src/render/geometry/qbufferfunctor.h b/src/render/geometry/qbufferfunctor.h
index 4a508b975..36c4b3a12 100644
--- a/src/render/geometry/qbufferfunctor.h
+++ b/src/render/geometry/qbufferfunctor.h
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QBufferFunctor : public Qt3D::QAbstractFunctor
+class QT3DRENDERERSHARED_EXPORT QBufferFunctor : public Qt3DCore::QAbstractFunctor
 {
 public:
     virtual ~QBufferFunctor() {}
diff --git a/src/render/geometry/qcuboidmesh.h b/src/render/geometry/qcuboidmesh.h
index 293c948d0..1bb9c6157 100644
--- a/src/render/geometry/qcuboidmesh.h
+++ b/src/render/geometry/qcuboidmesh.h
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QCuboidMesh : public QGeometryRenderer
     Q_PROPERTY(QSize xyMeshResolution READ xyMeshResolution WRITE setXYMeshResolution NOTIFY xyMeshResolutionChanged)
 
 public:
-    explicit QCuboidMesh(Qt3D::QNode *parent = 0);
+    explicit QCuboidMesh(Qt3DCore::QNode *parent = 0);
     ~QCuboidMesh();
 
     void setXExtent(float xExtent);
diff --git a/src/render/geometry/qcylindermesh.h b/src/render/geometry/qcylindermesh.h
index 648ebf2de..3c4294d07 100644
--- a/src/render/geometry/qcylindermesh.h
+++ b/src/render/geometry/qcylindermesh.h
@@ -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(Qt3D::QNode *parent = 0);
+    explicit QCylinderMesh(Qt3DCore::QNode *parent = 0);
     ~QCylinderMesh();
 
     void setRings(int rings);
diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp
index e59e195a1..64df80990 100644
--- a/src/render/geometry/qgeometry.cpp
+++ b/src/render/geometry/qgeometry.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
@@ -61,7 +61,7 @@ QGeometry::~QGeometry()
     QNode::cleanup();
 }
 
-void QGeometry::addAttribute(Qt3D::QAbstractAttribute *attribute)
+void QGeometry::addAttribute(Qt3DCore::QAbstractAttribute *attribute)
 {
     Q_D(QGeometry);
     if (!d->m_attributes.contains(attribute)) {
@@ -83,7 +83,7 @@ void QGeometry::addAttribute(Qt3D::QAbstractAttribute *attribute)
     }
 }
 
-void QGeometry::removeAttribute(Qt3D::QAbstractAttribute *attribute)
+void QGeometry::removeAttribute(Qt3DCore::QAbstractAttribute *attribute)
 {
     Q_D(QGeometry);
     if (d->m_changeArbiter != Q_NULLPTR) {
diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h
index f8774aba6..37e2dede0 100644
--- a/src/render/geometry/qgeometry.h
+++ b/src/render/geometry/qgeometry.h
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QAbstractAttribute;
 }
 
@@ -50,20 +50,20 @@ namespace Qt3DRender {
 
 class QGeometryPrivate;
 
-typedef QVector<Qt3D::QAbstractAttribute *> QAttributeList;
+typedef QVector<Qt3DCore::QAbstractAttribute *> QAttributeList;
 
-class QT3DRENDERERSHARED_EXPORT QGeometry : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QGeometry : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(int verticesPerPatch READ verticesPerPatch WRITE setVerticesPerPatch NOTIFY verticesPerPatchChanged)
 
 public:
-    explicit QGeometry(Qt3D::QNode *parent = 0);
+    explicit QGeometry(Qt3DCore::QNode *parent = 0);
     ~QGeometry();
 
     QAttributeList attributes() const;
-    void addAttribute(Qt3D::QAbstractAttribute *attribute);
-    void removeAttribute(Qt3D::QAbstractAttribute *attribute);
+    void addAttribute(Qt3DCore::QAbstractAttribute *attribute);
+    void removeAttribute(Qt3DCore::QAbstractAttribute *attribute);
 
     void setVerticesPerPatch(int verticesPerPatch);
     int verticesPerPatch() const;
@@ -72,8 +72,8 @@ Q_SIGNALS:
     void verticesPerPatchChanged();
 
 protected:
-    QGeometry(QGeometryPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QGeometry(QGeometryPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QGeometry)
diff --git a/src/render/geometry/qgeometry_p.h b/src/render/geometry/qgeometry_p.h
index 8a9c6ded8..52d35ceaa 100644
--- a/src/render/geometry/qgeometry_p.h
+++ b/src/render/geometry/qgeometry_p.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QGeometryPrivate : public Qt3D::QNodePrivate
+class QGeometryPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     Q_DECLARE_PUBLIC(QGeometry)
diff --git a/src/render/geometry/qgeometryfunctor.h b/src/render/geometry/qgeometryfunctor.h
index 4290fbe7b..e7075d614 100644
--- a/src/render/geometry/qgeometryfunctor.h
+++ b/src/render/geometry/qgeometryfunctor.h
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 
 class QGeometry;
 
-class QT3DRENDERERSHARED_EXPORT QGeometryFunctor : public Qt3D::QAbstractFunctor
+class QT3DRENDERERSHARED_EXPORT QGeometryFunctor : public Qt3DCore::QAbstractFunctor
 {
 public:
     virtual ~QGeometryFunctor() {}
diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp
index 8ba50b1b1..9688b26f1 100644
--- a/src/render/geometry/qgeometryrenderer.cpp
+++ b/src/render/geometry/qgeometryrenderer.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
@@ -256,7 +256,7 @@ void QGeometryRenderer::copy(const QNode *ref)
     d_func()->m_functor = other->d_func()->m_functor;
 }
 
-void QGeometryRenderer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void QGeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     Q_D(QGeometryRenderer);
     QScenePropertyChangePtr change = qSharedPointerCast<QScenePropertyChange>(e);
diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h
index 5bf581111..31e42e2db 100644
--- a/src/render/geometry/qgeometryrenderer.h
+++ b/src/render/geometry/qgeometryrenderer.h
@@ -50,7 +50,7 @@ class QGeometryFunctor;
 
 typedef QSharedPointer<QGeometryFunctor> QGeometryFunctorPtr;
 
-class QT3DRENDERERSHARED_EXPORT QGeometryRenderer : public Qt3D::QComponent
+class QT3DRENDERERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(int instanceCount READ instanceCount WRITE setInstanceCount NOTIFY instanceCountChanged)
@@ -63,7 +63,7 @@ class QT3DRENDERERSHARED_EXPORT QGeometryRenderer : public Qt3D::QComponent
     Q_PROPERTY(PrimitiveType primitiveType READ primitiveType WRITE setPrimitiveType NOTIFY primitiveTypeChanged)
 
 public:
-    explicit QGeometryRenderer(Qt3D::QNode *parent = 0);
+    explicit QGeometryRenderer(Qt3DCore::QNode *parent = 0);
     ~QGeometryRenderer();
 
     enum PrimitiveType {
@@ -116,9 +116,9 @@ Q_SIGNALS:
     void primitiveTypeChanged();
 
 protected:
-    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;
+    QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QGeometryRenderer)
diff --git a/src/render/geometry/qgeometryrenderer_p.h b/src/render/geometry/qgeometryrenderer_p.h
index d56fc0456..b0b4f62ef 100644
--- a/src/render/geometry/qgeometryrenderer_p.h
+++ b/src/render/geometry/qgeometryrenderer_p.h
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QGeometryRendererPrivate : public Qt3D::QComponentPrivate
+class QGeometryRendererPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QGeometryRendererPrivate();
diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp
index e35ee1dd0..953dbe8c0 100644
--- a/src/render/geometry/qmesh.cpp
+++ b/src/render/geometry/qmesh.cpp
@@ -125,7 +125,7 @@ QGeometry *MeshFunctor::operator()()
 
 
     // TO DO: Handle file download if remote url
-    QString filePath = Qt3D::QUrlHelper::urlToLocalFileOrQrc(m_sourcePath);
+    QString filePath = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(m_sourcePath);
     if (loader.load(filePath))
         return loader.geometry();
 
diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h
index fd5b686f6..ae4877b11 100644
--- a/src/render/geometry/qmesh.h
+++ b/src/render/geometry/qmesh.h
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QMesh : public QGeometryRenderer
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
 
 public:
-    explicit QMesh(Qt3D::QNode *parent = 0);
+    explicit QMesh(Qt3DCore::QNode *parent = 0);
     ~QMesh();
 
     void setSource(const QUrl &source);
@@ -67,7 +67,7 @@ Q_SIGNALS:
     void sourceChanged();
 
 protected:
-    QMesh(QMeshPrivate &dd, Qt3D::QNode *parent = 0);
+    QMesh(QMeshPrivate &dd, Qt3DCore::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QMesh)
diff --git a/src/render/geometry/qplanemesh.h b/src/render/geometry/qplanemesh.h
index 70d9c8518..f9867b4de 100644
--- a/src/render/geometry/qplanemesh.h
+++ b/src/render/geometry/qplanemesh.h
@@ -53,7 +53,7 @@ class QT3DRENDERERSHARED_EXPORT QPlaneMesh : public QGeometryRenderer
     Q_PROPERTY(QSize meshResolution READ meshResolution WRITE setMeshResolution NOTIFY meshResolutionChanged)
 
 public:
-    explicit QPlaneMesh(Qt3D::QNode *parent = 0);
+    explicit QPlaneMesh(Qt3DCore::QNode *parent = 0);
     ~QPlaneMesh();
 
     void setWidth(float width);
diff --git a/src/render/geometry/qspheremesh.h b/src/render/geometry/qspheremesh.h
index e96ad94e8..57f810092 100644
--- a/src/render/geometry/qspheremesh.h
+++ b/src/render/geometry/qspheremesh.h
@@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QSphereMesh : public QGeometryRenderer
     Q_PROPERTY(bool generateTangents READ generateTangents WRITE setGenerateTangents NOTIFY generateTangentsChanged)
 
 public:
-    explicit QSphereMesh(Qt3D::QNode *parent = 0);
+    explicit QSphereMesh(Qt3DCore::QNode *parent = 0);
     ~QSphereMesh();
 
     void setRings(int rings);
diff --git a/src/render/geometry/qtorusmesh.h b/src/render/geometry/qtorusmesh.h
index b1cca55f9..1f8778bbd 100644
--- a/src/render/geometry/qtorusmesh.h
+++ b/src/render/geometry/qtorusmesh.h
@@ -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(Qt3D::QNode *parent = 0);
+    explicit QTorusMesh(Qt3DCore::QNode *parent = 0);
     ~QTorusMesh();
 
     void setRings(int rings);
diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h
index b8ac3e00e..065032172 100644
--- a/src/render/graphicshelpers/graphicscontext_p.h
+++ b/src/render/graphicshelpers/graphicscontext_p.h
@@ -227,7 +227,7 @@ private:
     Shader *m_activeShader;
     QHash<ProgramDNA, Shader *> m_renderShaderHash;
     QHash<Buffer *, QOpenGLBuffer> m_renderBufferHash;
-    QHash<Qt3D::QNodeId, GLuint> m_renderTargets;
+    QHash<Qt3DCore::QNodeId, GLuint> m_renderTargets;
     QHash<GLuint, QSize> m_renderTargetsSize;
 
     // active textures, indexed by texture unit
diff --git a/src/render/graphicshelpers/graphicshelperes2.cpp b/src/render/graphicshelpers/graphicshelperes2.cpp
index 7f5530624..4e6d36c10 100644
--- a/src/render/graphicshelpers/graphicshelperes2.cpp
+++ b/src/render/graphicshelpers/graphicshelperes2.cpp
@@ -555,6 +555,6 @@ QSize GraphicsHelperES2::getTextureDimensions(GLuint textureId, GLenum target, u
 }
 
 } // namespace Render
-} // namespace Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/io/abstractsceneparser_p.h b/src/render/io/abstractsceneparser_p.h
index f3cb5fd5a..a4b5ab92d 100644
--- a/src/render/io/abstractsceneparser_p.h
+++ b/src/render/io/abstractsceneparser_p.h
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QEntity;
 }
 
@@ -84,8 +84,8 @@ public:
 
     virtual void setSource(const QUrl &source) = 0;
     virtual bool isExtensionSupported(const QUrl &source) const = 0;
-    virtual Qt3D::QEntity *scene(const QString &id = QString()) = 0;
-    virtual Qt3D::QEntity *node(const QString &id) = 0;
+    virtual Qt3DCore::QEntity *scene(const QString &id = QString()) = 0;
+    virtual Qt3DCore::QEntity *node(const QString &id) = 0;
 
     ParserStatus parserStatus() const;
     QStringList errors() const;
diff --git a/src/render/io/objloader.cpp b/src/render/io/objloader.cpp
index 89c5ee672..09ab6985c 100644
--- a/src/render/io/objloader.cpp
+++ b/src/render/io/objloader.cpp
@@ -429,7 +429,7 @@ void ObjLoader::center( QVector<QVector3D>& points )
     if ( points.isEmpty() )
         return;
 
-    Qt3D::QAxisAlignedBoundingBox bb(points);
+    Qt3DCore::QAxisAlignedBoundingBox bb(points);
     QVector3D center = bb.center();
 
     // Translate center of the AABB to the origin
diff --git a/src/render/io/qabstractsceneloader.cpp b/src/render/io/qabstractsceneloader.cpp
index d0e9a8838..110da9fa9 100644
--- a/src/render/io/qabstractsceneloader.cpp
+++ b/src/render/io/qabstractsceneloader.cpp
@@ -68,7 +68,7 @@ QAbstractSceneLoader::QAbstractSceneLoader(QNode *parent)
 
 QAbstractSceneLoader::~QAbstractSceneLoader()
 {
-    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");
+    Q_ASSERT_X(Qt3DCore::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)
diff --git a/src/render/io/qabstractsceneloader.h b/src/render/io/qabstractsceneloader.h
index 88af95577..66b41d265 100644
--- a/src/render/io/qabstractsceneloader.h
+++ b/src/render/io/qabstractsceneloader.h
@@ -49,13 +49,13 @@ namespace Qt3DRender {
 class QAbstractSceneLoader;
 class QAbstractSceneLoaderPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoader : public Qt3D::QComponent
+class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoader : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
 public:
-    explicit QAbstractSceneLoader(Qt3D::QNode *parent = 0);
+    explicit QAbstractSceneLoader(Qt3DCore::QNode *parent = 0);
     ~QAbstractSceneLoader();
 
     enum Status {
@@ -76,8 +76,8 @@ Q_SIGNALS:
     void statusChanged();
 
 protected:
-    QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QAbstractSceneLoader)
diff --git a/src/render/io/qabstractsceneloader_p.h b/src/render/io/qabstractsceneloader_p.h
index cc7dbd61b..e62a588fb 100644
--- a/src/render/io/qabstractsceneloader_p.h
+++ b/src/render/io/qabstractsceneloader_p.h
@@ -58,7 +58,7 @@ namespace Qt3DRender {
 
 class AbstractSceneParser;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoaderPrivate : public Qt3D::QComponentPrivate
+class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoaderPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QAbstractSceneLoaderPrivate();
diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp
index b5b4975e7..70eb15533 100644
--- a/src/render/io/qsceneloader.cpp
+++ b/src/render/io/qsceneloader.cpp
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
@@ -59,7 +59,7 @@ QSceneLoader::~QSceneLoader()
 }
 
 // Called in main thread
-void QSceneLoader::sceneChangeEvent(const Qt3D::QSceneChangePtr &change)
+void QSceneLoader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
 {
     QAbstractSceneLoaderPrivate *d = static_cast<QAbstractSceneLoaderPrivate*>(QNodePrivate::get(this));
     QScenePropertyChangePtr e = qSharedPointerCast<QScenePropertyChange>(change);
diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h
index adbed1dda..5ca560fdd 100644
--- a/src/render/io/qsceneloader.h
+++ b/src/render/io/qsceneloader.h
@@ -47,9 +47,9 @@ class QT3DRENDERERSHARED_EXPORT QSceneLoader : public QAbstractSceneLoader
 {
     Q_OBJECT
 public:
-    explicit QSceneLoader(Qt3D::QNode *parent = 0);
+    explicit QSceneLoader(Qt3DCore::QNode *parent = 0);
     ~QSceneLoader();
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
 
 protected:
     QT3D_CLONEABLE(QSceneLoader)
diff --git a/src/render/io/scene.cpp b/src/render/io/scene.cpp
index a92dc1fd8..8874db279 100644
--- a/src/render/io/scene.cpp
+++ b/src/render/io/scene.cpp
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -55,7 +55,7 @@ Scene::Scene()
 {
 }
 
-void Scene::updateFromPeer(Qt3D::QNode *peer)
+void Scene::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QAbstractSceneLoader *loader = static_cast<QAbstractSceneLoader *>(peer);
 
@@ -63,7 +63,7 @@ void Scene::updateFromPeer(Qt3D::QNode *peer)
     m_sceneManager->addSceneData(m_source, peerUuid());
 }
 
-void Scene::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Scene::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (propertyChange->propertyName() == QByteArrayLiteral("source")) {
@@ -77,7 +77,7 @@ QUrl Scene::source() const
     return m_source;
 }
 
-void Scene::setSceneSubtree(Qt3D::QEntity *subTree)
+void Scene::setSceneSubtree(Qt3DCore::QEntity *subTree)
 {
     QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerUuid()));
     e->setPropertyName("scene");
@@ -104,7 +104,7 @@ RenderSceneFunctor::RenderSceneFunctor(SceneManager *sceneManager)
 {
 }
 
-Qt3D::QBackendNode *RenderSceneFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *RenderSceneFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
 {
     Scene *scene = m_sceneManager->getOrCreateResource(frontend->id());
     scene->setFactory(factory);
@@ -113,12 +113,12 @@ Qt3D::QBackendNode *RenderSceneFunctor::create(Qt3D::QNode *frontend, const Qt3D
     return scene;
 }
 
-Qt3D::QBackendNode *RenderSceneFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *RenderSceneFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     return m_sceneManager->lookupResource(id);
 }
 
-void RenderSceneFunctor::destroy(const Qt3D::QNodeId &id) const
+void RenderSceneFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     m_sceneManager->releaseResource(id);
 }
diff --git a/src/render/io/scene_p.h b/src/render/io/scene_p.h
index 090bc64d4..cd9e5d50e 100644
--- a/src/render/io/scene_p.h
+++ b/src/render/io/scene_p.h
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QEntity;
 }
 
@@ -63,17 +63,17 @@ namespace Render {
 
 class SceneManager;
 
-class Scene : public Qt3D::QBackendNode
+class Scene : public Qt3DCore::QBackendNode
 {
 public:
     Scene();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
     // QObserverInterface interface
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     QUrl source() const;
-    void setSceneSubtree(Qt3D::QEntity *subTree);
+    void setSceneSubtree(Qt3DCore::QEntity *subTree);
     void setSceneManager(SceneManager *manager);
 
 private:
@@ -81,13 +81,13 @@ private:
     QUrl m_source;
 };
 
-class RenderSceneFunctor : public Qt3D::QBackendNodeFunctor
+class RenderSceneFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit RenderSceneFunctor(SceneManager *sceneManager);
-    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;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE;
 
 private:
     SceneManager *m_sceneManager;
diff --git a/src/render/io/scenemanager.cpp b/src/render/io/scenemanager.cpp
index 52fd2a627..f7223cd46 100644
--- a/src/render/io/scenemanager.cpp
+++ b/src/render/io/scenemanager.cpp
@@ -42,14 +42,14 @@ namespace Qt3DRender {
 namespace Render {
 
 SceneManager::SceneManager() : QResourceManager<Scene,
-                                                Qt3D::QNodeId,
+                                                Qt3DCore::QNodeId,
                                                 8,
-                                                Qt3D::ArrayAllocatingPolicy,
-                                                Qt3D::ObjectLevelLockingPolicy>()
+                                                Qt3DCore::ArrayAllocatingPolicy,
+                                                Qt3DCore::ObjectLevelLockingPolicy>()
 {
 }
 
-void SceneManager::addSceneData(const QUrl &source, const Qt3D::QNodeId &sceneUuid)
+void SceneManager::addSceneData(const QUrl &source, const Qt3DCore::QNodeId &sceneUuid)
 {
     LoadSceneJobPtr newJob(new LoadSceneJob(source, sceneUuid));
 
@@ -68,13 +68,13 @@ QVector<LoadSceneJobPtr> SceneManager::pendingSceneLoaderJobs()
     return copy;
 }
 
-void SceneManager::addLoadedSceneTree(const QUrl &source, Qt3D::QEntity *tree)
+void SceneManager::addLoadedSceneTree(const QUrl &source, Qt3DCore::QEntity *tree)
 {
     SceneManager::Locker lock(this);
     m_loadedSceneTrees.insert(source, tree);
 }
 
-Qt3D::QEntity *SceneManager::sceneTreeFromSource(const QUrl &source)
+Qt3DCore::QEntity *SceneManager::sceneTreeFromSource(const QUrl &source)
 {
     SceneManager::Locker lock(this);
     return m_loadedSceneTrees.value(source);
diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h
index 7bb845998..7baccd006 100644
--- a/src/render/io/scenemanager_p.h
+++ b/src/render/io/scenemanager_p.h
@@ -55,30 +55,30 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QEntity;
 }
 
 namespace Qt3DRender {
 namespace Render {
 
-class SceneManager : public Qt3D::QResourceManager<Scene,
-                                             Qt3D::QNodeId,
+class SceneManager : public Qt3DCore::QResourceManager<Scene,
+                                             Qt3DCore::QNodeId,
                                              8,
-                                             Qt3D::ArrayAllocatingPolicy,
-                                             Qt3D::ObjectLevelLockingPolicy>
+                                             Qt3DCore::ArrayAllocatingPolicy,
+                                             Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     SceneManager();
 
-    void addSceneData(const QUrl &source, const Qt3D::QNodeId &sceneUuid);
+    void addSceneData(const QUrl &source, const Qt3DCore::QNodeId &sceneUuid);
     QVector<LoadSceneJobPtr> pendingSceneLoaderJobs();
 
-    void addLoadedSceneTree(const QUrl &source, Qt3D::QEntity *tree);
-    Qt3D::QEntity *sceneTreeFromSource(const QUrl &source);
+    void addLoadedSceneTree(const QUrl &source, Qt3DCore::QEntity *tree);
+    Qt3DCore::QEntity *sceneTreeFromSource(const QUrl &source);
 
 private:
-    QHash<QUrl, Qt3D::QEntity *> m_loadedSceneTrees;
+    QHash<QUrl, Qt3DCore::QEntity *> m_loadedSceneTrees;
     QVector<LoadSceneJobPtr> m_pendingJobs;
 };
 
diff --git a/src/render/io/uniformbuffer_p.h b/src/render/io/uniformbuffer_p.h
index 5859a9078..49db79f51 100644
--- a/src/render/io/uniformbuffer_p.h
+++ b/src/render/io/uniformbuffer_p.h
@@ -59,7 +59,7 @@ namespace Render {
 
 class GraphicsContext;
 
-typedef QPair<Qt3D::QNodeId, Qt3D::QNodeId> ShaderDataShaderUboKey;
+typedef QPair<Qt3DCore::QNodeId, Qt3DCore::QNodeId> ShaderDataShaderUboKey;
 
 class UniformBuffer
 {
diff --git a/src/render/jobs/framecleanupjob.cpp b/src/render/jobs/framecleanupjob.cpp
index 7d6df11b4..7fdbb1290 100644
--- a/src/render/jobs/framecleanupjob.cpp
+++ b/src/render/jobs/framecleanupjob.cpp
@@ -58,7 +58,7 @@ FrameCleanupJob::~FrameCleanupJob()
 void FrameCleanupJob::run()
 {
     // set each ShaderData to not need an update
-    Q_FOREACH (const Qt3D::QNodeId &id, ShaderData::updatedShaderDataList()) {
+    Q_FOREACH (const Qt3DCore::QNodeId &id, ShaderData::updatedShaderDataList()) {
         ShaderData *shaderData = m_renderer->shaderDataManager()->lookupResource(id);
         if (shaderData != Q_NULLPTR)
             shaderData->clearUpdate();
diff --git a/src/render/jobs/framecleanupjob_p.h b/src/render/jobs/framecleanupjob_p.h
index 9af01b6bd..9dddc925e 100644
--- a/src/render/jobs/framecleanupjob_p.h
+++ b/src/render/jobs/framecleanupjob_p.h
@@ -60,7 +60,7 @@ namespace Render {
 class Renderer;
 class Entity;
 
-class FrameCleanupJob : public Qt3D::QAspectJob
+class FrameCleanupJob : public Qt3DCore::QAspectJob
 {
 public:
     explicit FrameCleanupJob(Renderer *renderer);
diff --git a/src/render/jobs/framepreparationjob_p.h b/src/render/jobs/framepreparationjob_p.h
index 3609c223f..d23969cd0 100644
--- a/src/render/jobs/framepreparationjob_p.h
+++ b/src/render/jobs/framepreparationjob_p.h
@@ -59,7 +59,7 @@ namespace Render {
 class Renderer;
 class Entity;
 
-class FramePreparationJob : public Qt3D::QAspectJob
+class FramePreparationJob : public Qt3DCore::QAspectJob
 {
 public:
     FramePreparationJob(Entity *root);
diff --git a/src/render/jobs/loadbufferjob_p.h b/src/render/jobs/loadbufferjob_p.h
index 89d2a8d18..d6b0d2ca6 100644
--- a/src/render/jobs/loadbufferjob_p.h
+++ b/src/render/jobs/loadbufferjob_p.h
@@ -60,7 +60,7 @@ namespace Render {
 
 class Renderer;
 
-class LoadBufferJob : public Qt3D::QAspectJob
+class LoadBufferJob : public Qt3DCore::QAspectJob
 {
 public:
     explicit LoadBufferJob(const HBuffer &handle);
diff --git a/src/render/jobs/loadgeometryjob_p.h b/src/render/jobs/loadgeometryjob_p.h
index 58fb419ca..9ed4a8269 100644
--- a/src/render/jobs/loadgeometryjob_p.h
+++ b/src/render/jobs/loadgeometryjob_p.h
@@ -60,7 +60,7 @@ namespace Render {
 
 class Renderer;
 
-class LoadGeometryJob : public Qt3D::QAspectJob
+class LoadGeometryJob : public Qt3DCore::QAspectJob
 {
 public:
     explicit LoadGeometryJob(const HGeometryRenderer &handle);
diff --git a/src/render/jobs/loadscenejob.cpp b/src/render/jobs/loadscenejob.cpp
index 6ceda73da..a7dbc3dae 100644
--- a/src/render/jobs/loadscenejob.cpp
+++ b/src/render/jobs/loadscenejob.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 namespace Render {
 
-LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &m_sceneComponent)
+LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3DCore::QNodeId &m_sceneComponent)
     : QAspectJob()
     , m_renderer(Q_NULLPTR)
     , m_source(source)
@@ -55,7 +55,7 @@ LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &m_sceneCompo
 
 void LoadSceneJob::run()
 {
-    Qt3D::QEntity *sceneTree = m_renderer->sceneManager()->sceneTreeFromSource(m_source);
+    Qt3DCore::QEntity *sceneTree = m_renderer->sceneManager()->sceneTreeFromSource(m_source);
     if (sceneTree == Q_NULLPTR) {
         Q_FOREACH (AbstractSceneParser *parser, m_renderer->sceneParsers()) {
             if (parser->isExtensionSupported(m_source)) {
diff --git a/src/render/jobs/loadscenejob_p.h b/src/render/jobs/loadscenejob_p.h
index 5385b9cfc..b8c4b18ed 100644
--- a/src/render/jobs/loadscenejob_p.h
+++ b/src/render/jobs/loadscenejob_p.h
@@ -61,10 +61,10 @@ namespace Render {
 
 class Renderer;
 
-class LoadSceneJob : public Qt3D::QAspectJob
+class LoadSceneJob : public Qt3DCore::QAspectJob
 {
 public:
-    explicit LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &sceneComponent);
+    explicit LoadSceneJob(const QUrl &source, const Qt3DCore::QNodeId &sceneComponent);
     void setRenderer(Renderer *renderer) { m_renderer = renderer; }
 
 protected:
@@ -73,7 +73,7 @@ protected:
 private:
     Renderer *m_renderer;
     QUrl m_source;
-    Qt3D::QNodeId m_sceneComponent;
+    Qt3DCore::QNodeId m_sceneComponent;
 };
 
 typedef QSharedPointer<LoadSceneJob> LoadSceneJobPtr;
diff --git a/src/render/jobs/loadtexturedatajob.cpp b/src/render/jobs/loadtexturedatajob.cpp
index 2dadcd69e..35ddf6cc5 100644
--- a/src/render/jobs/loadtexturedatajob.cpp
+++ b/src/render/jobs/loadtexturedatajob.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 namespace Render {
 
-LoadTextureDataJob::LoadTextureDataJob(const Qt3D::QNodeId &textureId)
+LoadTextureDataJob::LoadTextureDataJob(const Qt3DCore::QNodeId &textureId)
     : m_textureId(textureId)
 {
 }
diff --git a/src/render/jobs/loadtexturedatajob_p.h b/src/render/jobs/loadtexturedatajob_p.h
index abe476000..09d5e3b5d 100644
--- a/src/render/jobs/loadtexturedatajob_p.h
+++ b/src/render/jobs/loadtexturedatajob_p.h
@@ -60,10 +60,10 @@ namespace Render {
 
 class Renderer;
 
-class LoadTextureDataJob : public Qt3D::QAspectJob
+class LoadTextureDataJob : public Qt3DCore::QAspectJob
 {
 public:
-    LoadTextureDataJob(const Qt3D::QNodeId &textureId);
+    LoadTextureDataJob(const Qt3DCore::QNodeId &textureId);
     ~LoadTextureDataJob();
     inline void setRenderer(Renderer *renderer) { m_renderer = renderer; }
 
@@ -71,7 +71,7 @@ protected:
     void run() Q_DECL_FINAL;
 
 private:
-    Qt3D::QNodeId m_textureId;
+    Qt3DCore::QNodeId m_textureId;
     Renderer *m_renderer;
 };
 
diff --git a/src/render/jobs/renderviewjob.cpp b/src/render/jobs/renderviewjob.cpp
index 962bcaaa7..750a2e8b7 100644
--- a/src/render/jobs/renderviewjob.cpp
+++ b/src/render/jobs/renderviewjob.cpp
@@ -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
 
-    Qt3D::QFrameAllocator *currentFrameAllocator = m_renderer->currentFrameAllocator();
+    Qt3DCore::QFrameAllocator *currentFrameAllocator = m_renderer->currentFrameAllocator();
     RenderView *renderView = currentFrameAllocator->allocate<RenderView>();
 
     // RenderView should allocate heap resources using only the currentFrameAllocator
diff --git a/src/render/jobs/renderviewjob_p.h b/src/render/jobs/renderviewjob_p.h
index 670edb371..c5fecb3d8 100644
--- a/src/render/jobs/renderviewjob_p.h
+++ b/src/render/jobs/renderviewjob_p.h
@@ -62,7 +62,7 @@ namespace Render {
 class Renderer;
 class FrameGraphNode;
 
-class RenderViewJob : public Qt3D::QAspectJob
+class RenderViewJob : public Qt3DCore::QAspectJob
 {
 public:
     RenderViewJob()
diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp
index 9cf472549..7de8e4726 100644
--- a/src/render/jobs/renderviewjobutils.cpp
+++ b/src/render/jobs/renderviewjobutils.cpp
@@ -60,7 +60,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -324,7 +324,7 @@ ParameterInfoList::iterator findParamInfo(ParameterInfoList *params, const QStri
 }
 
 void addParametersForIds(ParameterInfoList *params, ParameterManager *manager,
-                                const QList<Qt3D::QNodeId> &parameterIds)
+                                const QList<Qt3DCore::QNodeId> &parameterIds)
 {
     Q_FOREACH (const QNodeId &paramId, parameterIds) {
         Parameter *param = manager->lookupResource(paramId);
diff --git a/src/render/jobs/renderviewjobutils_p.h b/src/render/jobs/renderviewjobutils_p.h
index ff6baab33..76b37a1bf 100644
--- a/src/render/jobs/renderviewjobutils_p.h
+++ b/src/render/jobs/renderviewjobutils_p.h
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QFrameAllocator;
 }
 
@@ -114,7 +114,7 @@ Q_AUTOTEST_EXPORT void parametersFromMaterialEffectTechnique(ParameterInfoList *
                                                              Technique *technique);
 
 Q_AUTOTEST_EXPORT void addParametersForIds(ParameterInfoList *params, ParameterManager *manager,
-                                           const QList<Qt3D::QNodeId> &parameterIds);
+                                           const QList<Qt3DCore::QNodeId> &parameterIds);
 
 template<class T>
 void parametersFromParametersProvider(ParameterInfoList *infoList,
@@ -129,7 +129,7 @@ Q_AUTOTEST_EXPORT ParameterInfoList::iterator findParamInfo(ParameterInfoList *i
                                                             const QString &name);
 
 Q_AUTOTEST_EXPORT RenderStateSet *buildRenderStateSet(const QList<RenderState*> &states,
-                                                      Qt3D::QFrameAllocator *allocator);
+                                                      Qt3DCore::QFrameAllocator *allocator);
 
 
 struct Q_AUTOTEST_EXPORT UniformBlockValueBuilder
diff --git a/src/render/jobs/updateboundingvolumejob_p.h b/src/render/jobs/updateboundingvolumejob_p.h
index e14f71e36..27dc82486 100644
--- a/src/render/jobs/updateboundingvolumejob_p.h
+++ b/src/render/jobs/updateboundingvolumejob_p.h
@@ -59,7 +59,7 @@ namespace Render {
 
 class Entity;
 
-class UpdateBoundingVolumeJob : public Qt3D::QAspectJob
+class UpdateBoundingVolumeJob : public Qt3DCore::QAspectJob
 {
 public:
     explicit UpdateBoundingVolumeJob(Entity *m_node);
diff --git a/src/render/jobs/updateworldtransformjob.cpp b/src/render/jobs/updateworldtransformjob.cpp
index 20c58511c..736325560 100644
--- a/src/render/jobs/updateworldtransformjob.cpp
+++ b/src/render/jobs/updateworldtransformjob.cpp
@@ -67,7 +67,7 @@ void updateWorldTransformAndBounds(Qt3DRender::Render::Entity *node, const QMatr
 }
 
 UpdateWorldTransformJob::UpdateWorldTransformJob(Entity *node)
-    : Qt3D::QAspectJob()
+    : Qt3DCore::QAspectJob()
     , m_node(node)
 {
 }
diff --git a/src/render/jobs/updateworldtransformjob_p.h b/src/render/jobs/updateworldtransformjob_p.h
index d379cf5a3..896a02c05 100644
--- a/src/render/jobs/updateworldtransformjob_p.h
+++ b/src/render/jobs/updateworldtransformjob_p.h
@@ -59,7 +59,7 @@ namespace Render {
 
 class Entity;
 
-class UpdateWorldTransformJob : public Qt3D::QAspectJob
+class UpdateWorldTransformJob : public Qt3DCore::QAspectJob
 {
 public:
     explicit UpdateWorldTransformJob(Entity *node);
diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp
index 82e1826be..a4272bcba 100644
--- a/src/render/lights/qabstractlight.cpp
+++ b/src/render/lights/qabstractlight.cpp
@@ -51,7 +51,7 @@ namespace Qt3DRender
 
 
 /*!
-    \class Qt3D::QAbstractLightPrivate
+    \class Qt3DCore::QAbstractLightPrivate
     \internal
 */
 QAbstractLightPrivate::QAbstractLightPrivate()
@@ -71,14 +71,14 @@ void QAbstractLight::copy(const QNode *ref)
 }
 
 /*!
-    \class Qt3D::QAbstractLight
+    \class Qt3DCore::QAbstractLight
     \inmodule Qt3DRender
 */
 
 /*!
  * Constructs a new QAbstractLight with the given \a parent.
  */
-QAbstractLight::QAbstractLight(Qt3D::QNode *parent) :
+QAbstractLight::QAbstractLight(Qt3DCore::QNode *parent) :
     QShaderData(*new QAbstractLightPrivate, parent)
 {
 }
@@ -91,7 +91,7 @@ QAbstractLight::QAbstractLight(QAbstractLightPrivate &dd, QNode *parent)
 
 
 /*!
- *  \property Qt3D::QAbstractLight::color
+ *  \property Qt3DCore::QAbstractLight::color
  *
  * Holds the current QAbstractLight color.
  */
@@ -111,7 +111,7 @@ void QAbstractLight::setColor(const QColor &color)
 }
 
 /*!
-    \property Qt3D::QAbstractLight::intensity
+    \property Qt3DCore::QAbstractLight::intensity
 
     Holds the current QAbstractLight intensity.
 */
@@ -131,7 +131,7 @@ void QAbstractLight::setIntensity(float intensity)
 }
 
 /*!
-    \property Qt3D::QAbstractLight::position
+    \property Qt3DCore::QAbstractLight::position
 
     Holds the current QAbstractLight position.
 */
diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h
index 6f30fe955..15eac8b04 100644
--- a/src/render/lights/qabstractlight.h
+++ b/src/render/lights/qabstractlight.h
@@ -58,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QAbstractLight : public QShaderData
     Q_PROPERTY(TransformType positionTransformed READ positionTransformed CONSTANT)
 
 public :
-    explicit QAbstractLight(Qt3D::QNode *parent = 0);
+    explicit QAbstractLight(Qt3DCore::QNode *parent = 0);
 
     QColor color() const;
     void setColor(const QColor &color);
@@ -72,8 +72,8 @@ public :
     TransformType positionTransformed() const;
 
 protected :
-    QAbstractLight(QAbstractLightPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QAbstractLight(QAbstractLightPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
     void colorChanged();
diff --git a/src/render/lights/qdirectionallight.cpp b/src/render/lights/qdirectionallight.cpp
index ebdc1e170..e6bbb7541 100644
--- a/src/render/lights/qdirectionallight.cpp
+++ b/src/render/lights/qdirectionallight.cpp
@@ -62,7 +62,7 @@ namespace Qt3DRender {
  */
 
 /*!
-    \class Qt3D::QDirectionalLightPrivate
+    \class Qt3DCore::QDirectionalLightPrivate
     \internal
 */
 QDirectionalLightPrivate::QDirectionalLightPrivate()
diff --git a/src/render/lights/qdirectionallight.h b/src/render/lights/qdirectionallight.h
index f626d4f6a..c0fe1dfe7 100644
--- a/src/render/lights/qdirectionallight.h
+++ b/src/render/lights/qdirectionallight.h
@@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QDirectionalLight : public QAbstractLight
     Q_PROPERTY(QVector3D direction READ direction WRITE setDirection NOTIFY directionChanged)
 
 public:
-    explicit QDirectionalLight(Qt3D::QNode *parent = 0);
+    explicit QDirectionalLight(Qt3DCore::QNode *parent = 0);
 
     void setDirection(const QVector3D &direction);
     QVector3D direction() const;
@@ -60,8 +60,8 @@ Q_SIGNALS:
     void directionChanged();
 
 protected:
-    QDirectionalLight(QDirectionalLightPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QDirectionalLight(QDirectionalLightPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QDirectionalLight)
diff --git a/src/render/lights/qpointlight.h b/src/render/lights/qpointlight.h
index 076f8b3cd..881c85f3e 100644
--- a/src/render/lights/qpointlight.h
+++ b/src/render/lights/qpointlight.h
@@ -50,11 +50,11 @@ class QT3DRENDERERSHARED_EXPORT QPointLight : public QAbstractLight
     Q_OBJECT
 
 public:
-    explicit QPointLight(Qt3D::QNode *parent = 0);
+    explicit QPointLight(Qt3DCore::QNode *parent = 0);
 
 protected:
     Q_DECLARE_PRIVATE(QPointLight)
-    QPointLight(QPointLightPrivate &dd, Qt3D::QNode *parent);
+    QPointLight(QPointLightPrivate &dd, Qt3DCore::QNode *parent);
     QT3D_CLONEABLE(QPointLight)
 };
 
diff --git a/src/render/lights/qspotlight.cpp b/src/render/lights/qspotlight.cpp
index 191be0e62..1e9244c91 100644
--- a/src/render/lights/qspotlight.cpp
+++ b/src/render/lights/qspotlight.cpp
@@ -63,7 +63,7 @@ namespace Qt3DRender {
  */
 
 /*!
-    \class Qt3D::QSpotLightPrivate
+    \class Qt3DCore::QSpotLightPrivate
     \internal
 */
 QSpotLightPrivate::QSpotLightPrivate()
@@ -81,14 +81,14 @@ QSpotLightPrivate::QSpotLightPrivate()
 
 /*!
     \qmltype SpotLight
-    \instantiates Qt3D::QSpotLight
+    \instantiates Qt3DCore::QSpotLight
     \inherits AbstractLight
     \inqmlmodule Qt3D.Renderer
     \since 5.5
     \brief For OpenGL ...
 */
 
-/*! \fn void Qt3D::QSpotLight::copy(const QNode *ref)
+/*! \fn void Qt3DCore::QSpotLight::copy(const QNode *ref)
   Copies the \a ref instance into this one.
  */
 
@@ -104,7 +104,7 @@ void QSpotLight::copy(const QNode *ref)
 
 
 /*!
-  \fn Qt3D::QSpotLight::QSpotLight(QNode *parent)
+  \fn Qt3DCore::QSpotLight::QSpotLight(QNode *parent)
   Constructs a new QSpotLight with the specified \a parent.
  */
 QSpotLight::QSpotLight(QNode *parent)
@@ -124,7 +124,7 @@ QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent)
 */
 
 /*!
-  \property Qt3D::QSpotLight::direction
+  \property Qt3DCore::QSpotLight::direction
 
  */
 
@@ -141,7 +141,7 @@ QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent)
 */
 
 /*!
-  \property Qt3D::QSpotLight::cutOffAngle
+  \property Qt3DCore::QSpotLight::cutOffAngle
 
  */
 float QSpotLight::cutOffAngle() const
diff --git a/src/render/lights/qspotlight.h b/src/render/lights/qspotlight.h
index c22ef62e5..d262b3d97 100644
--- a/src/render/lights/qspotlight.h
+++ b/src/render/lights/qspotlight.h
@@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QSpotLight : public QAbstractLight
     Q_PROPERTY(float cutOffAngle READ cutOffAngle WRITE setCutOffAngle NOTIFY cutOffAngleChanged)
 
 public:
-    explicit QSpotLight(Qt3D::QNode *parent = 0);
+    explicit QSpotLight(Qt3DCore::QNode *parent = 0);
 
     QVector3D direction() const;
     float cutOffAngle() const;
@@ -65,8 +65,8 @@ Q_SIGNALS:
     void cutOffAngleChanged();
 
 protected:
-    QSpotLight(QSpotLightPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QSpotLight(QSpotLightPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QSpotLight)
diff --git a/src/render/materialsystem/annotation.cpp b/src/render/materialsystem/annotation.cpp
index 2d725316a..ed0c6cea2 100644
--- a/src/render/materialsystem/annotation.cpp
+++ b/src/render/materialsystem/annotation.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -58,7 +58,7 @@ void Annotation::cleanup()
 {
 }
 
-void Annotation::updateFromPeer(Qt3D::QNode *peer)
+void Annotation::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QAnnotation *criterion = static_cast<QAnnotation *>(peer);
 
@@ -76,7 +76,7 @@ QString Annotation::criterionName() const
     return m_name;
 }
 
-void Annotation::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Annotation::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (propertyChange->propertyName() == QByteArrayLiteral("value"))
diff --git a/src/render/materialsystem/annotation_p.h b/src/render/materialsystem/annotation_p.h
index b864d02d5..564fe1671 100644
--- a/src/render/materialsystem/annotation_p.h
+++ b/src/render/materialsystem/annotation_p.h
@@ -61,17 +61,17 @@ namespace Render {
 
 class CriterionManager;
 
-class Annotation : public Qt3D::QBackendNode
+class Annotation : public Qt3DCore::QBackendNode
 {
 public:
     Annotation();
     ~Annotation();
     void cleanup();
-    void updateFromPeer(Qt3D::QNode *criterion) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *criterion) Q_DECL_OVERRIDE;
 
     QVariant criterionValue() const;
     QString criterionName() const;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     bool operator ==(const Annotation &other);
     bool operator !=(const Annotation &other);
 
diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp
index 37b73ffa6..bf0e64a58 100644
--- a/src/render/materialsystem/effect.cpp
+++ b/src/render/materialsystem/effect.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -64,7 +64,7 @@ void Effect::cleanup()
 {
 }
 
-void Effect::updateFromPeer(Qt3D::QNode *peer)
+void Effect::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QEffect *effect = static_cast<QEffect *>(peer);
 
@@ -78,7 +78,7 @@ void Effect::updateFromPeer(Qt3D::QNode *peer)
         m_parameterPack.appendParameter(p->id());
 }
 
-void Effect::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Effect::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     QVariant propertyValue = propertyChange->value();
@@ -103,18 +103,18 @@ void Effect::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
     }
 }
 
-void Effect::appendRenderTechnique(const Qt3D::QNodeId &technique)
+void Effect::appendRenderTechnique(const Qt3DCore::QNodeId &technique)
 {
     if (!m_techniques.contains(technique))
         m_techniques.append(technique);
 }
 
-QList<Qt3D::QNodeId> Effect::techniques() const
+QList<Qt3DCore::QNodeId> Effect::techniques() const
 {
     return m_techniques;
 }
 
-QList<Qt3D::QNodeId> Effect::parameters() const
+QList<Qt3DCore::QNodeId> Effect::parameters() const
 {
     return m_parameterPack.parameters();
 }
diff --git a/src/render/materialsystem/effect_p.h b/src/render/materialsystem/effect_p.h
index 841f2996a..0d307d0c5 100644
--- a/src/render/materialsystem/effect_p.h
+++ b/src/render/materialsystem/effect_p.h
@@ -62,22 +62,22 @@ class QTechnique;
 
 namespace Render {
 
-class Effect : public Qt3D::QBackendNode
+class Effect : public Qt3DCore::QBackendNode
 {
 public:
     Effect();
     ~Effect();
     void cleanup();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void appendRenderTechnique(const Qt3D::QNodeId &t);
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void appendRenderTechnique(const Qt3DCore::QNodeId &t);
 
-    QList<Qt3D::QNodeId> techniques() const;
-    QList<Qt3D::QNodeId> parameters() const;
+    QList<Qt3DCore::QNodeId> techniques() const;
+    QList<Qt3DCore::QNodeId> parameters() const;
 
 private:
-    QList<Qt3D::QNodeId> m_techniques;
+    QList<Qt3DCore::QNodeId> m_techniques;
     ParameterPack m_parameterPack;
 };
 
diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp
index c096c1a98..faf934d3e 100644
--- a/src/render/materialsystem/material.cpp
+++ b/src/render/materialsystem/material.cpp
@@ -46,7 +46,7 @@
 #include <Qt3DCore/qscenepropertychange.h>
 #include <QOpenGLShaderProgram>
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 QT_BEGIN_NAMESPACE
 
@@ -69,7 +69,7 @@ void Material::cleanup()
     m_parameterPack.clear();
 }
 
-void Material::updateFromPeer(Qt3D::QNode *node)
+void Material::updateFromPeer(Qt3DCore::QNode *node)
 {
     QMaterial *mat = static_cast<QMaterial *>(node);
     m_parameterPack.clear();
@@ -80,7 +80,7 @@ void Material::updateFromPeer(Qt3D::QNode *node)
         m_parameterPack.appendParameter(p->id());
 }
 
-void Material::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Material::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
 
@@ -111,12 +111,12 @@ void Material::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
     }
 }
 
-QList<Qt3D::QNodeId> Material::parameters() const
+QList<Qt3DCore::QNodeId> Material::parameters() const
 {
     return m_parameterPack.parameters();
 }
 
-Qt3D::QNodeId Material::effect() const
+Qt3DCore::QNodeId Material::effect() const
 {
     return m_effectUuid;
 }
diff --git a/src/render/materialsystem/material_p.h b/src/render/materialsystem/material_p.h
index 06cd4f285..f45912ab6 100644
--- a/src/render/materialsystem/material_p.h
+++ b/src/render/materialsystem/material_p.h
@@ -69,23 +69,23 @@ class Technique;
 class Effect;
 class MaterialManager;
 
-class Q_AUTOTEST_EXPORT Material : public Qt3D::QBackendNode
+class Q_AUTOTEST_EXPORT Material : public Qt3DCore::QBackendNode
 {
 public:
     Material();
     ~Material();
     void cleanup();
 
-    void updateFromPeer(Qt3D::QNode* mat) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode* mat) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     inline bool isEnabled() const { return m_enabled; }
 
-    QList<Qt3D::QNodeId> parameters() const;
-    Qt3D::QNodeId effect() const;
+    QList<Qt3DCore::QNodeId> parameters() const;
+    Qt3DCore::QNodeId effect() const;
 
 private:
     ParameterPack m_parameterPack;
-    Qt3D::QNodeId m_effectUuid;
+    Qt3DCore::QNodeId m_effectUuid;
     bool m_enabled;
 };
 
diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp
index afc44ed58..34eb395f7 100644
--- a/src/render/materialsystem/parameter.cpp
+++ b/src/render/materialsystem/parameter.cpp
@@ -44,7 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -56,14 +56,14 @@ Parameter::Parameter()
 {
 }
 
-void Parameter::updateFromPeer(Qt3D::QNode *mat)
+void Parameter::updateFromPeer(Qt3DCore::QNode *mat)
 {
     QParameter *param = static_cast<QParameter *>(mat);
     m_name = param->name();
     m_value = toBackendValue(param->value());
 }
 
-void Parameter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Parameter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
 
diff --git a/src/render/materialsystem/parameter_p.h b/src/render/materialsystem/parameter_p.h
index f8728c04b..a40af65ee 100644
--- a/src/render/materialsystem/parameter_p.h
+++ b/src/render/materialsystem/parameter_p.h
@@ -61,13 +61,13 @@ class ParameterManager;
 class ShaderDataManager;
 class TextureManager;
 
-class Parameter : public Qt3D::QBackendNode
+class Parameter : public Qt3DCore::QBackendNode
 {
 public:
     Parameter();
 
-    void updateFromPeer(Qt3D::QNode* mat) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode* mat) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     QString name() const;
     QVariant value() const;
diff --git a/src/render/materialsystem/parametermapping.cpp b/src/render/materialsystem/parametermapping.cpp
index a05d11b66..bc6ea8baf 100644
--- a/src/render/materialsystem/parametermapping.cpp
+++ b/src/render/materialsystem/parametermapping.cpp
@@ -47,7 +47,7 @@ ParameterMapping::ParameterMapping()
 }
 
 ParameterMapping::ParameterMapping(QParameterMapping *mapping)
-    : m_id(mapping ? mapping->id() : Qt3D::QNodeId())
+    : m_id(mapping ? mapping->id() : Qt3DCore::QNodeId())
     , m_parameterName(mapping ? mapping->parameterName() : QString())
     , m_shaderVariableName(mapping ? mapping->shaderVariableName() : QString())
     , m_bindingType(mapping ? mapping->bindingType() : QParameterMapping::Uniform)
@@ -59,7 +59,7 @@ bool ParameterMapping::isValid() const
     return !m_id.isNull();
 }
 
-Qt3D::QNodeId ParameterMapping::id() const
+Qt3DCore::QNodeId ParameterMapping::id() const
 {
     return m_id;
 }
diff --git a/src/render/materialsystem/parametermapping_p.h b/src/render/materialsystem/parametermapping_p.h
index 21e9fb7ec..7c5df3c31 100644
--- a/src/render/materialsystem/parametermapping_p.h
+++ b/src/render/materialsystem/parametermapping_p.h
@@ -64,13 +64,13 @@ public:
 
     bool isValid() const;
 
-    Qt3D::QNodeId id() const;
+    Qt3DCore::QNodeId id() const;
     QString parameterName() const;
     QString shaderVariableName() const;
     QParameterMapping::Binding bindingType() const;
 
 private:
-    Qt3D::QNodeId m_id;
+    Qt3DCore::QNodeId m_id;
     QString m_parameterName;
     QString m_shaderVariableName;
     QParameterMapping::Binding m_bindingType;
diff --git a/src/render/materialsystem/qannotation.h b/src/render/materialsystem/qannotation.h
index 158ebdc77..e36bfe46e 100644
--- a/src/render/materialsystem/qannotation.h
+++ b/src/render/materialsystem/qannotation.h
@@ -47,13 +47,13 @@ namespace Qt3DRender {
 
 class QAnnotationPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QAnnotation : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QAnnotation : public Qt3DCore::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(Qt3D::QNode *parent = 0);
+    explicit QAnnotation(Qt3DCore::QNode *parent = 0);
     ~QAnnotation();
 
     void setValue(const QVariant &value);
@@ -67,7 +67,7 @@ Q_SIGNALS:
     void valueChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QAnnotation)
diff --git a/src/render/materialsystem/qannotation_p.h b/src/render/materialsystem/qannotation_p.h
index 0763e59a4..f37004b0c 100644
--- a/src/render/materialsystem/qannotation_p.h
+++ b/src/render/materialsystem/qannotation_p.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QAnnotationPrivate : public Qt3D::QNodePrivate
+class QAnnotationPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QAnnotationPrivate();
diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp
index 443571872..d50e71f82 100644
--- a/src/render/materialsystem/qeffect.cpp
+++ b/src/render/materialsystem/qeffect.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h
index 164a6392a..be1d4a21b 100644
--- a/src/render/materialsystem/qeffect.h
+++ b/src/render/materialsystem/qeffect.h
@@ -49,11 +49,11 @@ class QTechnique;
 class QEffectPrivate;
 
 class QT3DRENDERERSHARED_EXPORT QEffect
-        : public Qt3D::QNode
+        : public Qt3DCore::QNode
 {
     Q_OBJECT
 public:
-    explicit QEffect(Qt3D::QNode *parent = 0);
+    explicit QEffect(Qt3DCore::QNode *parent = 0);
     ~QEffect();
 
     void addParameter(QParameter *parameter);
@@ -65,8 +65,8 @@ public:
     QList<QTechnique *> techniques() const;
 
 protected:
-    QEffect(QEffectPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QEffect(QEffectPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QEffect)
diff --git a/src/render/materialsystem/qeffect_p.h b/src/render/materialsystem/qeffect_p.h
index abb81994c..844016022 100644
--- a/src/render/materialsystem/qeffect_p.h
+++ b/src/render/materialsystem/qeffect_p.h
@@ -59,7 +59,7 @@ class QEffect;
 class QParameter;
 class QTechnique;
 
-class QT3DRENDERERSHARED_EXPORT QEffectPrivate : public Qt3D::QNodePrivate
+class QT3DRENDERERSHARED_EXPORT QEffectPrivate : public Qt3DCore::QNodePrivate
 {
 public :
     QEffectPrivate();
diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp
index b3c833556..c220b1841 100644
--- a/src/render/materialsystem/qmaterial.cpp
+++ b/src/render/materialsystem/qmaterial.cpp
@@ -57,12 +57,12 @@
  * sound should reflect off an element, the temperature of a surface,
  * and so on.
  *
- * \sa QEffect, QMesh, {Qt3D::}{QComponent}
+ * \sa QEffect, QMesh, {Qt3DCore::}{QComponent}
  */
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h
index ca44901c1..cfc3c0d99 100644
--- a/src/render/materialsystem/qmaterial.h
+++ b/src/render/materialsystem/qmaterial.h
@@ -52,13 +52,13 @@ class QMaterialPrivate;
 class QEffect;
 typedef QMap<QString, QAbstractTextureProvider*> TextureDict;
 
-class QT3DRENDERERSHARED_EXPORT QMaterial : public Qt3D::QComponent
+class QT3DRENDERERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged)
 
 public:
-    explicit QMaterial(Qt3D::QNode *parent = 0);
+    explicit QMaterial(Qt3DCore::QNode *parent = 0);
     ~QMaterial();
 
     void setEffect(QEffect *effect);
@@ -76,8 +76,8 @@ Q_SIGNALS:
     void effectChanged();
 
 protected:
-    QMaterial(QMaterialPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QMaterial(QMaterialPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QMaterial)
diff --git a/src/render/materialsystem/qmaterial_p.h b/src/render/materialsystem/qmaterial_p.h
index 9be59c488..c84aeb6c1 100644
--- a/src/render/materialsystem/qmaterial_p.h
+++ b/src/render/materialsystem/qmaterial_p.h
@@ -58,7 +58,7 @@ namespace Qt3DRender {
 class QParameter;
 class QEffect;
 
-class QT3DRENDERERSHARED_EXPORT QMaterialPrivate : public Qt3D::QComponentPrivate
+class QT3DRENDERERSHARED_EXPORT QMaterialPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QMaterialPrivate();
diff --git a/src/render/materialsystem/qopenglfilter.cpp b/src/render/materialsystem/qopenglfilter.cpp
index 3bc20a84d..fa9437e4a 100644
--- a/src/render/materialsystem/qopenglfilter.cpp
+++ b/src/render/materialsystem/qopenglfilter.cpp
@@ -280,7 +280,7 @@ void QOpenGLFilter::setVendor(const QString &vendor)
     }
 }
 
-/*! \fn bool Qt3D::operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
+/*! \fn bool Qt3DCore::operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
   \relates Qt3DRender::QOpenGLFilter
   Returns true if \a reference and \a sample are equivalent.
  */
@@ -302,7 +302,7 @@ bool operator ==(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
     return false;
 }
 
-/*! \fn bool Qt3D::operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
+/*! \fn bool Qt3DCore::operator !=(const QOpenGLFilter &reference, const QOpenGLFilter &sample)
   \relates Qt3DRender::QOpenGLFilter
   Returns true if \a reference and \a sample are different.
  */
diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp
index 96d1205df..fd14603a8 100644
--- a/src/render/materialsystem/qparameter.cpp
+++ b/src/render/materialsystem/qparameter.cpp
@@ -42,7 +42,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h
index 03883f5f1..b0a9c9b2e 100644
--- a/src/render/materialsystem/qparameter.h
+++ b/src/render/materialsystem/qparameter.h
@@ -48,17 +48,17 @@ namespace Qt3DRender {
 class QParameterPrivate;
 class QAbstractTextureProvider;
 
-class QT3DRENDERERSHARED_EXPORT QParameter : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QParameter : public Qt3DCore::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(Qt3D::QNode *parent = 0);
+    explicit QParameter(Qt3DCore::QNode *parent = 0);
     ~QParameter();
-    QParameter(const QString& name, const QVariant& value, Qt3D::QNode* parent = 0);
-    QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3D::QNode *parent = 0);
+    QParameter(const QString& name, const QVariant& value, Qt3DCore::QNode* parent = 0);
+    QParameter(const QString &name, QAbstractTextureProvider *texture, Qt3DCore::QNode *parent = 0);
 
     void setName(const QString &name);
     QString name() const;
@@ -75,8 +75,8 @@ Q_SIGNALS:
     void nameChanged();
 
 protected:
-    QParameter(QParameterPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QParameter(QParameterPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QParameter)
diff --git a/src/render/materialsystem/qparameter_p.h b/src/render/materialsystem/qparameter_p.h
index 40143edc8..01bdf63c2 100644
--- a/src/render/materialsystem/qparameter_p.h
+++ b/src/render/materialsystem/qparameter_p.h
@@ -57,7 +57,7 @@ namespace Qt3DRender {
 
 class QParameter;
 
-class QT3DRENDERERSHARED_PRIVATE_EXPORT QParameterPrivate : public Qt3D::QNodePrivate
+class QT3DRENDERERSHARED_PRIVATE_EXPORT QParameterPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QParameterPrivate();
diff --git a/src/render/materialsystem/qparametermapping.h b/src/render/materialsystem/qparametermapping.h
index f4e209abd..e104f4001 100644
--- a/src/render/materialsystem/qparametermapping.h
+++ b/src/render/materialsystem/qparametermapping.h
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QParameterMappingPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QParameterMapping : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QParameterMapping : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(QString parameterName READ parameterName WRITE setParameterName NOTIFY parameterNameChanged)
@@ -62,8 +62,8 @@ public:
     };
     Q_ENUM(Binding)
 
-    explicit QParameterMapping(Qt3D::QNode *parent = 0);
-    QParameterMapping(const QString &parameterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, Qt3D::QNode *parent = 0);
+    explicit QParameterMapping(Qt3DCore::QNode *parent = 0);
+    QParameterMapping(const QString &parameterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, Qt3DCore::QNode *parent = 0);
     ~QParameterMapping();
 
     void setParameterName(const QString &name);
@@ -80,8 +80,8 @@ Q_SIGNALS:
     void bindingTypeChanged();
 
 protected:
-    QParameterMapping(QParameterMappingPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QParameterMapping(QParameterMappingPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QParameterMapping)
diff --git a/src/render/materialsystem/qparametermapping_p.h b/src/render/materialsystem/qparametermapping_p.h
index 9539ba0fc..940f3983e 100644
--- a/src/render/materialsystem/qparametermapping_p.h
+++ b/src/render/materialsystem/qparametermapping_p.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QParameterMappingPrivate : public Qt3D::QNodePrivate
+class QParameterMappingPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QParameterMappingPrivate();
diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp
index efb315177..13cee24d0 100644
--- a/src/render/materialsystem/qrenderpass.cpp
+++ b/src/render/materialsystem/qrenderpass.cpp
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
@@ -221,11 +221,11 @@ QList<QParameterMapping *> QRenderPass::bindings() const
 }
 
 /*!
- * Adds a Qt3D::QRenderState \a state to the rendering pass. That implies that
+ * Adds a Qt3DCore::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 Qt3DRender::QRenderPass.
  *
- * \note not defining any Qt3D::QRenderState in a pass will result in the pass using
+ * \note not defining any Qt3DCore::QRenderState in a pass will result in the pass using
  * the globally set render state for a given FrameGraph branch execution path.
  */
 void QRenderPass::addRenderState(QRenderState *state)
@@ -263,7 +263,7 @@ void QRenderPass::removeRenderState(QRenderState *state)
 }
 
 /*!
- * Returns the list of Qt3D::QRenderState state objects making up the render
+ * Returns the list of Qt3DCore::QRenderState state objects making up the render
  * state of the Qt3DRender::QRenderPass.
  */
 QList<QRenderState *> QRenderPass::renderStates() const
diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h
index ed733ba12..b7018e7a1 100644
--- a/src/render/materialsystem/qrenderpass.h
+++ b/src/render/materialsystem/qrenderpass.h
@@ -58,13 +58,13 @@ typedef QList<QParameter*> ParameterList;
 
 class QRenderPassPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QRenderPass : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QRenderPass : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QShaderProgram *shaderProgram READ shaderProgram WRITE setShaderProgram NOTIFY shaderProgramChanged)
 
 public:
-    explicit QRenderPass(Qt3D::QNode *parent = 0);
+    explicit QRenderPass(Qt3DCore::QNode *parent = 0);
     ~QRenderPass();
 
     QString glslNameForParameter(QString paramName) const;
@@ -95,8 +95,8 @@ Q_SIGNALS:
     void shaderProgramChanged();
 
 protected:
-    QRenderPass(QRenderPassPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QRenderPass(QRenderPassPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QRenderPass)
diff --git a/src/render/materialsystem/qrenderpass_p.h b/src/render/materialsystem/qrenderpass_p.h
index 9be787a62..b587b7708 100644
--- a/src/render/materialsystem/qrenderpass_p.h
+++ b/src/render/materialsystem/qrenderpass_p.h
@@ -68,7 +68,7 @@ namespace Render
 class RenderStateSet;
 }
 
-class QT3DRENDERERSHARED_EXPORT QRenderPassPrivate : public Qt3D::QNodePrivate
+class QT3DRENDERERSHARED_EXPORT QRenderPassPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QRenderPassPrivate();
diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h
index 4353581af..35f195f88 100644
--- a/src/render/materialsystem/qshaderdata.h
+++ b/src/render/materialsystem/qshaderdata.h
@@ -55,11 +55,11 @@ public:
 
 typedef QSharedPointer<PropertyReaderInterface> PropertyReaderInterfacePtr;
 
-class QT3DRENDERERSHARED_EXPORT QShaderData : public Qt3D::QComponent
+class QT3DRENDERERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent
 {
     Q_OBJECT
 public:
-    explicit QShaderData(Qt3D::QNode *parent = 0);
+    explicit QShaderData(Qt3DCore::QNode *parent = 0);
     ~QShaderData();
 
     enum TransformType {
@@ -71,8 +71,8 @@ public:
     PropertyReaderInterfacePtr propertyReader() const;
 
 protected:
-    QShaderData(QShaderDataPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QShaderData(QShaderDataPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 
 private:
diff --git a/src/render/materialsystem/qshaderdata_p.h b/src/render/materialsystem/qshaderdata_p.h
index bb7c677d1..8a0c78e05 100644
--- a/src/render/materialsystem/qshaderdata_p.h
+++ b/src/render/materialsystem/qshaderdata_p.h
@@ -83,7 +83,7 @@ class QShaderDataPropertyReader: public PropertyReaderInterface
     }
 };
 
-class QT3DRENDERERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public Qt3D::QComponentPrivate
+class QT3DRENDERERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QShaderDataPrivate();
diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp
index 6c44ee0ce..e92a77d90 100644
--- a/src/render/materialsystem/qshaderprogram.cpp
+++ b/src/render/materialsystem/qshaderprogram.cpp
@@ -230,7 +230,7 @@ QByteArray QShaderProgram::shaderCode(ShaderType type) const
 QByteArray QShaderProgram::loadSource(const QUrl &sourceUrl)
 {
     // TO DO: Handle remote path
-    QString filePath = Qt3D::QUrlHelper::urlToLocalFileOrQrc(sourceUrl);
+    QString filePath = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(sourceUrl);
 
     QFile f(filePath);
     if (!f.exists())
diff --git a/src/render/materialsystem/qshaderprogram.h b/src/render/materialsystem/qshaderprogram.h
index 6695316ee..c229ad704 100644
--- a/src/render/materialsystem/qshaderprogram.h
+++ b/src/render/materialsystem/qshaderprogram.h
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QShaderProgramPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QShaderProgram : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QShaderProgram : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(QByteArray vertexShaderCode READ vertexShaderCode WRITE setVertexShaderCode NOTIFY vertexShaderCodeChanged)
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QShaderProgram : public Qt3D::QNode
     Q_PROPERTY(QByteArray computeShaderCode READ computeShaderCode WRITE setComputeShaderCode NOTIFY computeShaderCodeChanged)
 
 public:
-    explicit QShaderProgram(Qt3D::QNode *parent = 0);
+    explicit QShaderProgram(Qt3DCore::QNode *parent = 0);
     ~QShaderProgram();
 
     enum ShaderType {
@@ -103,8 +103,8 @@ Q_SIGNALS:
     void computeShaderCodeChanged();
 
 protected:
-    QShaderProgram(QShaderProgramPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QShaderProgram(QShaderProgramPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QShaderProgram)
diff --git a/src/render/materialsystem/qshaderprogram_p.h b/src/render/materialsystem/qshaderprogram_p.h
index 00936f0f2..078091b35 100644
--- a/src/render/materialsystem/qshaderprogram_p.h
+++ b/src/render/materialsystem/qshaderprogram_p.h
@@ -56,7 +56,7 @@ namespace Qt3DRender {
 
 class QShaderProgram;
 
-class QShaderProgramPrivate : public Qt3D::QNodePrivate
+class QShaderProgramPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QShaderProgramPrivate();
diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp
index 52578e267..e80811603 100644
--- a/src/render/materialsystem/qtechnique.cpp
+++ b/src/render/materialsystem/qtechnique.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h
index d45892991..4a8863d73 100644
--- a/src/render/materialsystem/qtechnique.h
+++ b/src/render/materialsystem/qtechnique.h
@@ -52,13 +52,13 @@ class QParameter;
 class QTechniquePrivate;
 class QOpenGLFilter;
 
-class QT3DRENDERERSHARED_EXPORT QTechnique : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QTechnique : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QOpenGLFilter *openGLFilter READ openGLFilter)
 
 public:
-    explicit QTechnique(Qt3D::QNode *parent = 0);
+    explicit QTechnique(Qt3DCore::QNode *parent = 0);
     ~QTechnique();
 
     void addAnnotation(QAnnotation *criterion);
@@ -76,8 +76,8 @@ public:
     QOpenGLFilter *openGLFilter();
 
 protected:
-    QTechnique(QTechniquePrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    QTechnique(QTechniquePrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QTechnique)
diff --git a/src/render/materialsystem/qtechnique_p.h b/src/render/materialsystem/qtechnique_p.h
index 794ce76df..669a75a56 100644
--- a/src/render/materialsystem/qtechnique_p.h
+++ b/src/render/materialsystem/qtechnique_p.h
@@ -61,7 +61,7 @@ class QAnnotation;
 class QParameter;
 class QRenderPass;
 
-class QT3DRENDERERSHARED_EXPORT QTechniquePrivate : public Qt3D::QNodePrivate
+class QT3DRENDERERSHARED_EXPORT QTechniquePrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QTechniquePrivate();
diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp
index b64b8682d..cdbf92126 100644
--- a/src/render/materialsystem/renderpass.cpp
+++ b/src/render/materialsystem/renderpass.cpp
@@ -49,7 +49,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -68,7 +68,7 @@ void RenderPass::cleanup()
 {
 }
 
-void RenderPass::updateFromPeer(Qt3D::QNode *peer)
+void RenderPass::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QRenderPass *pass = static_cast<QRenderPass *>(peer);
 
@@ -88,7 +88,7 @@ void RenderPass::updateFromPeer(Qt3D::QNode *peer)
         m_parameterPack.appendParameter(p->id());
 }
 
-void RenderPass::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void RenderPass::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     switch (e->type()) {
@@ -130,7 +130,7 @@ void RenderPass::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
     }
 }
 
-Qt3D::QNodeId RenderPass::shaderProgram() const
+Qt3DCore::QNodeId RenderPass::shaderProgram() const
 {
     return m_shaderUuid;
 }
@@ -140,7 +140,7 @@ QList<ParameterMapping> RenderPass::bindings() const
     return m_bindings.values();
 }
 
-QList<Qt3D::QNodeId> RenderPass::annotations() const
+QList<Qt3DCore::QNodeId> RenderPass::annotations() const
 {
     return m_annotationList;
 }
@@ -150,18 +150,18 @@ QList<RenderState *> RenderPass::renderStates() const
     return m_renderStates.values();
 }
 
-QList<Qt3D::QNodeId> RenderPass::parameters() const
+QList<Qt3DCore::QNodeId> RenderPass::parameters() const
 {
     return m_parameterPack.parameters();
 }
 
-void RenderPass::appendAnnotation(const Qt3D::QNodeId &annotationId)
+void RenderPass::appendAnnotation(const Qt3DCore::QNodeId &annotationId)
 {
     if (!m_annotationList.contains(annotationId))
         m_annotationList.append(annotationId);
 }
 
-void RenderPass::removeAnnotation(const Qt3D::QNodeId &annotationId)
+void RenderPass::removeAnnotation(const Qt3DCore::QNodeId &annotationId)
 {
     m_annotationList.removeOne(annotationId);
 }
@@ -172,18 +172,18 @@ void RenderPass::appendBinding(const ParameterMapping &binding)
         m_bindings[binding.id()] = binding;
 }
 
-void RenderPass::removeBinding(const Qt3D::QNodeId &bindingId)
+void RenderPass::removeBinding(const Qt3DCore::QNodeId &bindingId)
 {
     m_bindings.remove(bindingId);
 }
 
-void RenderPass::appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState)
+void RenderPass::appendRenderState(const Qt3DCore::QNodeId &id, RenderState *renderState)
 {
     if (!m_renderStates.contains(id))
         m_renderStates[id] = renderState;
 }
 
-void RenderPass::removeRenderState(const Qt3D::QNodeId &renderStateId)
+void RenderPass::removeRenderState(const Qt3DCore::QNodeId &renderStateId)
 {
     m_renderStates.remove(renderStateId);
 }
diff --git a/src/render/materialsystem/renderpass_p.h b/src/render/materialsystem/renderpass_p.h
index 70f3fdf25..2d5a2a6d8 100644
--- a/src/render/materialsystem/renderpass_p.h
+++ b/src/render/materialsystem/renderpass_p.h
@@ -71,7 +71,7 @@ namespace Render {
 class RenderPassManager;
 class RenderState;
 
-class Q_AUTOTEST_EXPORT RenderPass : public Qt3D::QBackendNode
+class Q_AUTOTEST_EXPORT RenderPass : public Qt3DCore::QBackendNode
 {
 public:
     RenderPass();
@@ -79,29 +79,29 @@ public:
 
     void cleanup();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
-    Qt3D::QNodeId shaderProgram() const;
+    Qt3DCore::QNodeId shaderProgram() const;
     QList<ParameterMapping> bindings() const;
-    QList<Qt3D::QNodeId> annotations() const;
+    QList<Qt3DCore::QNodeId> annotations() const;
     QList<RenderState *> renderStates() const;
-    QList<Qt3D::QNodeId> parameters() const;
+    QList<Qt3DCore::QNodeId> parameters() const;
 
 private:
-    void appendAnnotation(const Qt3D::QNodeId &criterionId);
-    void removeAnnotation(const Qt3D::QNodeId &criterionId);
+    void appendAnnotation(const Qt3DCore::QNodeId &criterionId);
+    void removeAnnotation(const Qt3DCore::QNodeId &criterionId);
 
     void appendBinding(const ParameterMapping &binding);
-    void removeBinding(const Qt3D::QNodeId &bindingId);
+    void removeBinding(const Qt3DCore::QNodeId &bindingId);
 
-    void appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState);
-    void removeRenderState(const Qt3D::QNodeId &renderStateId);
+    void appendRenderState(const Qt3DCore::QNodeId &id, RenderState *renderState);
+    void removeRenderState(const Qt3DCore::QNodeId &renderStateId);
 
-    Qt3D::QNodeId m_shaderUuid;
-    QHash<Qt3D::QNodeId, ParameterMapping> m_bindings;
-    QHash<Qt3D::QNodeId, RenderState *> m_renderStates;
-    QList<Qt3D::QNodeId> m_annotationList;
+    Qt3DCore::QNodeId m_shaderUuid;
+    QHash<Qt3DCore::QNodeId, ParameterMapping> m_bindings;
+    QHash<Qt3DCore::QNodeId, RenderState *> m_renderStates;
+    QList<Qt3DCore::QNodeId> m_annotationList;
     ParameterPack m_parameterPack;
 };
 
diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp
index 1a600bfbe..f52d01543 100644
--- a/src/render/materialsystem/shader.cpp
+++ b/src/render/materialsystem/shader.cpp
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -85,7 +85,7 @@ void Shader::cleanup()
     m_uniformBlocks.clear();
 }
 
-void Shader::updateFromPeer(Qt3D::QNode *peer)
+void Shader::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QShaderProgram *shader = static_cast<QShaderProgram *>(peer);
 
@@ -122,7 +122,7 @@ QVector<QByteArray> Shader::shaderCode() const
     return m_shaderCode;
 }
 
-void Shader::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Shader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h
index fccef6ccd..3dd9570ac 100644
--- a/src/render/materialsystem/shader_p.h
+++ b/src/render/materialsystem/shader_p.h
@@ -69,7 +69,7 @@ class AttachmentPack;
 
 typedef uint ProgramDNA;
 
-class Q_AUTOTEST_EXPORT Shader : public Qt3D::QBackendNode
+class Q_AUTOTEST_EXPORT Shader : public Qt3DCore::QBackendNode
 {
 public:
     Shader();
@@ -77,7 +77,7 @@ public:
 
     void cleanup();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void updateUniforms(GraphicsContext *ctx, const QUniformPack &pack);
     void setFragOutputs(const QHash<QString, int> &fragOutputs);
 
@@ -86,7 +86,7 @@ public:
     QVector<QString> uniformBlockNames() const;
     QVector<QByteArray> shaderCode() const;
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     bool isLoaded() const;
     ProgramDNA dna() const;
 
diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp
index 743ea1c60..6338df96b 100644
--- a/src/render/materialsystem/shaderdata.cpp
+++ b/src/render/materialsystem/shaderdata.cpp
@@ -47,12 +47,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
 
-QList<Qt3D::QNodeId> ShaderData::m_updatedShaderData;
+QList<Qt3DCore::QNodeId> ShaderData::m_updatedShaderData;
 
 ShaderData::ShaderData()
     : QBackendNode()
@@ -66,7 +66,7 @@ ShaderData::~ShaderData()
     delete m_mutex;
 }
 
-void ShaderData::updateFromPeer(Qt3D::QNode *peer)
+void ShaderData::updateFromPeer(Qt3DCore::QNode *peer)
 {
     m_properties.clear();
     const QShaderData *shaderData = static_cast<const QShaderData *>(peer);
@@ -190,7 +190,7 @@ void ShaderData::addToClearUpdateList()
         ShaderData::m_updatedShaderData.append(peerUuid());
 }
 
-const int qNodeIdTypeId = qMetaTypeId<Qt3D::QNodeId>();
+const int qNodeIdTypeId = qMetaTypeId<Qt3DCore::QNodeId>();
 
 void ShaderData::readPeerProperties(QShaderData *shaderData)
 {
@@ -240,7 +240,7 @@ void ShaderData::setManager(ShaderDataManager *manager)
     m_manager = manager;
 }
 
-void ShaderData::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void ShaderData::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     if (!m_propertyReader.isNull()) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
@@ -290,7 +290,7 @@ RenderShaderDataFunctor::RenderShaderDataFunctor(ShaderDataManager *manager)
 {
 }
 
-Qt3D::QBackendNode *RenderShaderDataFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *RenderShaderDataFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
 {
     ShaderData *backend = m_manager->getOrCreateResource(frontend->id());
     backend->setFactory(factory);
@@ -299,12 +299,12 @@ Qt3D::QBackendNode *RenderShaderDataFunctor::create(Qt3D::QNode *frontend, const
     return backend;
 }
 
-Qt3D::QBackendNode *RenderShaderDataFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *RenderShaderDataFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     return m_manager->lookupResource(id);
 }
 
-void RenderShaderDataFunctor::destroy(const Qt3D::QNodeId &id) const
+void RenderShaderDataFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     m_manager->releaseResource(id);
 }
diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h
index ebc6cec4b..c87196776 100644
--- a/src/render/materialsystem/shaderdata_p.h
+++ b/src/render/materialsystem/shaderdata_p.h
@@ -64,18 +64,18 @@ class GraphicsContext;
 class UniformBuffer;
 class ShaderDataManager;
 
-class Q_AUTOTEST_EXPORT ShaderData : public Qt3D::QBackendNode
+class Q_AUTOTEST_EXPORT ShaderData : public Qt3DCore::QBackendNode
 {
 public:
     ShaderData();
     ~ShaderData();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::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<Qt3D::QNodeId> updatedShaderDataList() { return m_updatedShaderData; }
+    inline static QList<Qt3DCore::QNodeId> updatedShaderDataList() { return m_updatedShaderData; }
     inline static void clearShaderDataList() { return m_updatedShaderData.clear(); }
     void clearUpdate();
 
@@ -86,7 +86,7 @@ public:
     void updateTransformedProperties(const QMatrix4x4 &nodeWordlTransform);
 
 protected:
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
     // 1 to 1 match with frontend properties, modified only by sceneChangeEvent
@@ -102,7 +102,7 @@ private:
     QHash<QString, QShaderData::TransformType> m_transformedProperties;
     ShaderDataManager *m_manager;
     QMutex *m_mutex;
-    static QList<Qt3D::QNodeId> m_updatedShaderData;
+    static QList<Qt3DCore::QNodeId> m_updatedShaderData;
     QMatrix4x4 m_worldMatrix;
     QMatrix4x4 m_viewMatrix;
 
@@ -112,14 +112,14 @@ private:
     friend class RenderShaderDataFunctor;
 };
 
-class RenderShaderDataFunctor : public Qt3D::QBackendNodeFunctor
+class RenderShaderDataFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit RenderShaderDataFunctor(ShaderDataManager *manager);
 
-    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;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
 
 private:
     ShaderDataManager *m_manager;
diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp
index a3315f30e..ac2e4554c 100644
--- a/src/render/materialsystem/technique.cpp
+++ b/src/render/materialsystem/technique.cpp
@@ -51,7 +51,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -72,7 +72,7 @@ void Technique::cleanup()
 {
 }
 
-void Technique::updateFromPeer(Qt3D::QNode *peer)
+void Technique::updateFromPeer(Qt3DCore::QNode *peer)
 {
     m_parameterPack.clear();
     m_renderPasses.clear();
@@ -94,7 +94,7 @@ void Technique::updateFromPeer(Qt3D::QNode *peer)
     }
 }
 
-void Technique::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Technique::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     switch (e->type()) {
@@ -141,28 +141,28 @@ void Technique::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
     }
 }
 
-QList<Qt3D::QNodeId> Technique::parameters() const
+QList<Qt3DCore::QNodeId> Technique::parameters() const
 {
     return m_parameterPack.parameters();
 }
 
-void Technique::appendRenderPass(const Qt3D::QNodeId &renderPassId)
+void Technique::appendRenderPass(const Qt3DCore::QNodeId &renderPassId)
 {
     if (!m_renderPasses.contains(renderPassId))
         m_renderPasses.append(renderPassId);
 }
 
-void Technique::removeRenderPass(const Qt3D::QNodeId &renderPassId)
+void Technique::removeRenderPass(const Qt3DCore::QNodeId &renderPassId)
 {
     m_renderPasses.removeOne(renderPassId);
 }
 
-QList<Qt3D::QNodeId> Technique::annotations() const
+QList<Qt3DCore::QNodeId> Technique::annotations() const
 {
     return m_annotationList;
 }
 
-QList<Qt3D::QNodeId> Technique::renderPasses() const
+QList<Qt3DCore::QNodeId> Technique::renderPasses() const
 {
     return m_renderPasses;
 }
@@ -172,13 +172,13 @@ QOpenGLFilter *Technique::openGLFilter() const
     return m_openglFilter;
 }
 
-void Technique::appendAnnotation(const Qt3D::QNodeId &criterionId)
+void Technique::appendAnnotation(const Qt3DCore::QNodeId &criterionId)
 {
     if (!m_annotationList.contains(criterionId))
         m_annotationList.append(criterionId);
 }
 
-void Technique::removeAnnotation(const Qt3D::QNodeId &criterionId)
+void Technique::removeAnnotation(const Qt3DCore::QNodeId &criterionId)
 {
     m_annotationList.removeOne(criterionId);
 }
diff --git a/src/render/materialsystem/technique_p.h b/src/render/materialsystem/technique_p.h
index d4c8303ab..77c96d4f0 100644
--- a/src/render/materialsystem/technique_p.h
+++ b/src/render/materialsystem/technique_p.h
@@ -69,34 +69,34 @@ namespace Render {
 
 class TechniqueManager;
 
-class Technique : public Qt3D::QBackendNode
+class Technique : public Qt3DCore::QBackendNode
 {
 public:
     Technique();
     ~Technique();
     void cleanup();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    QList<Qt3D::QNodeId> parameters() const;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    QList<Qt3DCore::QNodeId> parameters() const;
 
-    void appendRenderPass(const Qt3D::QNodeId &renderPassId);
-    void removeRenderPass(const Qt3D::QNodeId &renderPassId);
+    void appendRenderPass(const Qt3DCore::QNodeId &renderPassId);
+    void removeRenderPass(const Qt3DCore::QNodeId &renderPassId);
 
-    void appendAnnotation(const Qt3D::QNodeId &criterionId);
-    void removeAnnotation(const Qt3D::QNodeId &criterionId);
+    void appendAnnotation(const Qt3DCore::QNodeId &criterionId);
+    void removeAnnotation(const Qt3DCore::QNodeId &criterionId);
 
-    QList<Qt3D::QNodeId> annotations() const;
-    QList<Qt3D::QNodeId> renderPasses() const;
+    QList<Qt3DCore::QNodeId> annotations() const;
+    QList<Qt3DCore::QNodeId> renderPasses() const;
     QOpenGLFilter *openGLFilter() const;
 
 private:
     QOpenGLFilter *m_openglFilter;
 
     ParameterPack m_parameterPack;
-    QList<Qt3D::QNodeId> m_annotationList;
-    QList<Qt3D::QNodeId> m_renderPasses;
+    QList<Qt3DCore::QNodeId> m_annotationList;
+    QList<Qt3DCore::QNodeId> m_renderPasses;
 };
 
 } // namespace Render
diff --git a/src/render/renderstates/qalphacoverage.h b/src/render/renderstates/qalphacoverage.h
index 753b28919..5ba0a5506 100644
--- a/src/render/renderstates/qalphacoverage.h
+++ b/src/render/renderstates/qalphacoverage.h
@@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QAlphaCoverage : public QRenderState
 {
     Q_OBJECT
 public:
-    explicit QAlphaCoverage(Qt3D::QNode *parent = 0);
+    explicit QAlphaCoverage(Qt3DCore::QNode *parent = 0);
     ~QAlphaCoverage();
 
 private:
diff --git a/src/render/renderstates/qalphatest.h b/src/render/renderstates/qalphatest.h
index d59340ec7..44d107529 100644
--- a/src/render/renderstates/qalphatest.h
+++ b/src/render/renderstates/qalphatest.h
@@ -65,7 +65,7 @@ public:
     };
     Q_ENUM(AlphaFunc)
 
-    explicit QAlphaTest(Qt3D::QNode *parent = 0);
+    explicit QAlphaTest(Qt3DCore::QNode *parent = 0);
     ~QAlphaTest();
 
     AlphaFunc func() const;
@@ -79,7 +79,7 @@ Q_SIGNALS:
     void clampChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QAlphaTest)
diff --git a/src/render/renderstates/qblendequation.h b/src/render/renderstates/qblendequation.h
index 94735fdb6..e6ca15fb7 100644
--- a/src/render/renderstates/qblendequation.h
+++ b/src/render/renderstates/qblendequation.h
@@ -62,7 +62,7 @@ public:
     };
     Q_ENUM(BlendMode)
 
-    explicit QBlendEquation(Qt3D::QNode *parent = 0);
+    explicit QBlendEquation(Qt3DCore::QNode *parent = 0);
     ~QBlendEquation();
 
     BlendMode mode() const;
@@ -72,7 +72,7 @@ Q_SIGNALS:
     void modeChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QBlendEquation)
diff --git a/src/render/renderstates/qblendstate.cpp b/src/render/renderstates/qblendstate.cpp
index 7f7a8d680..76e945372 100644
--- a/src/render/renderstates/qblendstate.cpp
+++ b/src/render/renderstates/qblendstate.cpp
@@ -65,7 +65,7 @@ public:
 };
 
 /*!
-    \class Qt3D::QBlendState
+    \class Qt3DCore::QBlendState
     \inmodule Qt3DRenderer
     \since 5.5
     \brief Encapsulates blending information.
@@ -73,7 +73,7 @@ public:
 
 /*!
     \qmltype BlendState
-    \instantiates Qt3D::QBlendState
+    \instantiates Qt3DCore::QBlendState
     \inherits RenderState
     \inqmlmodule Qt3D.Renderer
     \since 5.5
@@ -116,7 +116,7 @@ QBlendState::QBlendState(QRenderState::Type type, QNode *parent)
 }
 
 /*!
-  \enum Qt3D::QBlendState::Blending
+  \enum Qt3DCore::QBlendState::Blending
 
   \value Zero 0
   \value One 1
@@ -145,7 +145,7 @@ QBlendState::QBlendState(QRenderState::Type type, QNode *parent)
  */
 
 /*!
-    \property Qt3D::QBlendState::srcRGB
+    \property Qt3DCore::QBlendState::srcRGB
 
  */
 QBlendState::Blending QBlendState::srcRGB() const
@@ -169,7 +169,7 @@ void QBlendState::setSrcRGB(QBlendState::Blending srcRGB)
  */
 
 /*!
-    \property Qt3D::QBlendState::dstRGB
+    \property Qt3DCore::QBlendState::dstRGB
 
  */
 QBlendState::Blending QBlendState::dstRGB() const
@@ -193,7 +193,7 @@ void QBlendState::setDstRGB(QBlendState::Blending dstRGB)
  */
 
 /*!
-    \property Qt3D::QBlendState::srcAlpha
+    \property Qt3DCore::QBlendState::srcAlpha
 
  */
 QBlendState::Blending QBlendState::srcAlpha() const
@@ -217,7 +217,7 @@ void QBlendState::setSrcAlpha(QBlendState::Blending srcAlpha)
  */
 
 /*!
-    \property Qt3D::QBlendState::dstAlpha
+    \property Qt3DCore::QBlendState::dstAlpha
 
  */
 QBlendState::Blending QBlendState::dstAlpha() const
@@ -244,7 +244,7 @@ void QBlendState::setDstAlpha(QBlendState::Blending dstAlpha)
 
 /*!
     \qmltype BlendStateSeparate
-    \instantiates Qt3D::QBlendStateSeparate
+    \instantiates Qt3DCore::QBlendStateSeparate
     \inherits RenderState
     \inqmlmodule Qt3D.Renderer
     \since 5.5
diff --git a/src/render/renderstates/qblendstate.h b/src/render/renderstates/qblendstate.h
index 25072f449..2ae8b06bc 100644
--- a/src/render/renderstates/qblendstate.h
+++ b/src/render/renderstates/qblendstate.h
@@ -80,7 +80,7 @@ public:
     };
     Q_ENUM(Blending)
 
-    explicit QBlendState(Qt3D::QNode *parent = 0);
+    explicit QBlendState(Qt3DCore::QNode *parent = 0);
     ~QBlendState();
 
     Blending srcRGB() const;
@@ -102,8 +102,8 @@ Q_SIGNALS:
     void dstAlphaChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
-    QBlendState(QRenderState::Type type, Qt3D::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
+    QBlendState(QRenderState::Type type, Qt3DCore::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QBlendState)
@@ -114,7 +114,7 @@ class QT3DRENDERERSHARED_EXPORT QBlendStateSeparate : public QBlendState
 {
     Q_OBJECT
 public:
-    explicit QBlendStateSeparate(Qt3D::QNode *parent = 0);
+    explicit QBlendStateSeparate(Qt3DCore::QNode *parent = 0);
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/renderstates/qclipplane.cpp b/src/render/renderstates/qclipplane.cpp
index d3f2fadb3..eb327c0e4 100644
--- a/src/render/renderstates/qclipplane.cpp
+++ b/src/render/renderstates/qclipplane.cpp
@@ -53,21 +53,21 @@ public:
 };
 
 /*!
-    \class Qt3D::QClipPlane
+    \class Qt3DCore::QClipPlane
     \inmodule Qt3DRenderer
     \since 5.5
     \brief Enables an additional OpenGL clipping plane that can be in shaders
     using gl_ClipDistance
 
     By default, OpenGL supports up to 8 additional clipping planes.
-    Qt3D::QClipPlane allows to enable one of these additional planes. These
+    Qt3DCore::QClipPlane allows to enable one of these additional planes. These
     planes can then be manipulated in the shaders using gl_ClipDistance[i]
     where i varies between 0 and 8.
  */
 
 /*!
     \qmltype ClipPlane
-    \instantiates Qt3D::QClipPlane
+    \instantiates Qt3DCore::QClipPlane
     \inherits RenderState
     \inqmlmodule Qt3D.Renderer
     \since 5.5
diff --git a/src/render/renderstates/qclipplane.h b/src/render/renderstates/qclipplane.h
index 7afa6c5e7..40ebfd9a5 100644
--- a/src/render/renderstates/qclipplane.h
+++ b/src/render/renderstates/qclipplane.h
@@ -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(Qt3D::QNode *parent = 0);
+    explicit QClipPlane(Qt3DCore::QNode *parent = 0);
     ~QClipPlane();
 
     int plane() const;
     void setPlane(int);
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_FINAL;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_FINAL;
 
 Q_SIGNALS:
     void planeChanged();
diff --git a/src/render/renderstates/qcolormask.cpp b/src/render/renderstates/qcolormask.cpp
index 9f61825ea..e52a5d067 100644
--- a/src/render/renderstates/qcolormask.cpp
+++ b/src/render/renderstates/qcolormask.cpp
@@ -61,7 +61,7 @@ public:
 };
 
 /*!
-    \class Qt3D::QColorMask
+    \class Qt3DCore::QColorMask
     \inmodule Qt3DRenderer
 
     \brief Allows specifying which color components should be written to the
@@ -75,7 +75,7 @@ public:
 
 
 /*!
-    Constructs a new Qt3D::QColorMask instance with \a parent as parent.
+    Constructs a new Qt3DCore::QColorMask instance with \a parent as parent.
  */
 QColorMask::QColorMask(QNode *parent)
     : QRenderState(*new QColorMaskPrivate, parent)
@@ -112,7 +112,7 @@ bool QColorMask::isAlpha() const
 }
 
 /*!
-    \property Qt3D::QColorMask::red
+    \property Qt3DCore::QColorMask::red
     Holds whether the red color component should be written to the frame buffer.
  */
 void QColorMask::setRed(bool red)
@@ -125,7 +125,7 @@ void QColorMask::setRed(bool red)
 }
 
 /*!
-    \property Qt3D::QColorMask::green
+    \property Qt3DCore::QColorMask::green
     Holds whether the green color component should be written to the frame buffer.
  */
 void QColorMask::setGreen(bool green)
@@ -138,7 +138,7 @@ void QColorMask::setGreen(bool green)
 }
 
 /*!
-    \property Qt3D::QColorMask::blue
+    \property Qt3DCore::QColorMask::blue
     Holds whether the blue color component should be written to the frame buffer.
  */
 void QColorMask::setBlue(bool blue)
@@ -151,7 +151,7 @@ void QColorMask::setBlue(bool blue)
 }
 
 /*!
-    \property Qt3D::QColorMask::alpha
+    \property Qt3DCore::QColorMask::alpha
     Holds whether the alpha component should be written to the frame buffer.
  */
 void QColorMask::setAlpha(bool alpha)
diff --git a/src/render/renderstates/qcolormask.h b/src/render/renderstates/qcolormask.h
index 886feebbb..fcbfac88b 100644
--- a/src/render/renderstates/qcolormask.h
+++ b/src/render/renderstates/qcolormask.h
@@ -54,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QColorMask : public QRenderState
     Q_PROPERTY(bool alpha READ isAlpha WRITE setAlpha NOTIFY alphaChanged)
 
 public:
-    explicit QColorMask(Qt3D::QNode *parent = Q_NULLPTR);
+    explicit QColorMask(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QColorMask();
 
     bool isRed() const;
@@ -74,7 +74,7 @@ Q_SIGNALS:
     void alphaChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_FINAL;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_FINAL;
 
 private:
     Q_DECLARE_PRIVATE(QColorMask)
diff --git a/src/render/renderstates/qcullface.h b/src/render/renderstates/qcullface.h
index d8832bcd6..d6329d205 100644
--- a/src/render/renderstates/qcullface.h
+++ b/src/render/renderstates/qcullface.h
@@ -62,7 +62,7 @@ public:
     };
     Q_ENUM(CullingMode)
 
-    explicit QCullFace(Qt3D::QNode *parent = 0);
+    explicit QCullFace(Qt3DCore::QNode *parent = 0);
     ~QCullFace();
 
     CullingMode mode() const;
@@ -72,7 +72,7 @@ Q_SIGNALS:
     void modeChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QCullFace)
diff --git a/src/render/renderstates/qdepthmask.h b/src/render/renderstates/qdepthmask.h
index fdd02b4d3..8d0ea920a 100644
--- a/src/render/renderstates/qdepthmask.h
+++ b/src/render/renderstates/qdepthmask.h
@@ -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(Qt3D::QNode *parent = 0);
+    explicit QDepthMask(Qt3DCore::QNode *parent = 0);
     ~QDepthMask();
 
     bool mask() const;
@@ -61,7 +61,7 @@ Q_SIGNALS:
     void maskChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QDepthMask)
diff --git a/src/render/renderstates/qdepthtest.h b/src/render/renderstates/qdepthtest.h
index e9b4275b6..bedec55e3 100644
--- a/src/render/renderstates/qdepthtest.h
+++ b/src/render/renderstates/qdepthtest.h
@@ -64,7 +64,7 @@ public:
     };
     Q_ENUM(DepthFunc)
 
-    explicit QDepthTest(Qt3D::QNode *parent = 0);
+    explicit QDepthTest(Qt3DCore::QNode *parent = 0);
     ~QDepthTest();
 
     DepthFunc func() const;
@@ -74,7 +74,7 @@ Q_SIGNALS:
     void funcChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QDepthTest)
diff --git a/src/render/renderstates/qdithering.h b/src/render/renderstates/qdithering.h
index 37794e372..6fcf83786 100644
--- a/src/render/renderstates/qdithering.h
+++ b/src/render/renderstates/qdithering.h
@@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QDithering : public QRenderState
 {
     Q_OBJECT
 public:
-    explicit QDithering(Qt3D::QNode *parent = 0);
+    explicit QDithering(Qt3DCore::QNode *parent = 0);
     ~QDithering();
 
 private:
diff --git a/src/render/renderstates/qfrontface.h b/src/render/renderstates/qfrontface.h
index 0a2c8cac9..95fe3f0c5 100644
--- a/src/render/renderstates/qfrontface.h
+++ b/src/render/renderstates/qfrontface.h
@@ -59,7 +59,7 @@ public:
     };
     Q_ENUM(FaceDir)
 
-    explicit QFrontFace(Qt3D::QNode *parent = 0);
+    explicit QFrontFace(Qt3DCore::QNode *parent = 0);
     ~QFrontFace();
 
     FaceDir direction() const;
@@ -69,7 +69,7 @@ Q_SIGNALS:
     void directionChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QFrontFace)
diff --git a/src/render/renderstates/qpolygonoffset.h b/src/render/renderstates/qpolygonoffset.h
index 9aff94a1f..dde7dca43 100644
--- a/src/render/renderstates/qpolygonoffset.h
+++ b/src/render/renderstates/qpolygonoffset.h
@@ -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(Qt3D::QNode *parent = Q_NULLPTR);
+    explicit QPolygonOffset(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QPolygonOffset();
 
     float factor() const;
@@ -66,7 +66,7 @@ Q_SIGNALS:
     void unitsChanged(float newUnits);
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QPolygonOffset)
diff --git a/src/render/renderstates/qrenderstate.cpp b/src/render/renderstates/qrenderstate.cpp
index 831962ca4..821ec7e9e 100644
--- a/src/render/renderstates/qrenderstate.cpp
+++ b/src/render/renderstates/qrenderstate.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QRenderStatePrivate
+    \class Qt3DCore::QRenderStatePrivate
     \internal
 */
 QRenderStatePrivate::QRenderStatePrivate(QRenderState::Type type)
@@ -54,7 +54,7 @@ QRenderStatePrivate::QRenderStatePrivate(QRenderState::Type type)
 
 QRenderState::~QRenderState()
 {
-    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");
+    Q_ASSERT_X(Qt3DCore::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
diff --git a/src/render/renderstates/qrenderstate.h b/src/render/renderstates/qrenderstate.h
index 6f730a432..790c89e83 100644
--- a/src/render/renderstates/qrenderstate.h
+++ b/src/render/renderstates/qrenderstate.h
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 
 class QRenderStatePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QRenderState : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QRenderState : public Qt3DCore::QNode
 {
     Q_OBJECT
 
@@ -78,7 +78,7 @@ public:
     Type type() const;
 
 protected:
-    QRenderState(QRenderStatePrivate &dd, Qt3D::QNode *parent = Q_NULLPTR);
+    QRenderState(QRenderStatePrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR);
 
 private:
     Q_DECLARE_PRIVATE(QRenderState)
diff --git a/src/render/renderstates/qrenderstate_p.h b/src/render/renderstates/qrenderstate_p.h
index 261629e8b..ed22d5d92 100644
--- a/src/render/renderstates/qrenderstate_p.h
+++ b/src/render/renderstates/qrenderstate_p.h
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QRenderStatePrivate : public Qt3D::QNodePrivate
+class QRenderStatePrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QRenderStatePrivate(QRenderState::Type type);
diff --git a/src/render/renderstates/qscissortest.h b/src/render/renderstates/qscissortest.h
index a607bcd72..2e09fff64 100644
--- a/src/render/renderstates/qscissortest.h
+++ b/src/render/renderstates/qscissortest.h
@@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QScissorTest  : public QRenderState
     Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged)
 
 public:
-    explicit QScissorTest(Qt3D::QNode *parent = 0);
+    explicit QScissorTest(Qt3DCore::QNode *parent = 0);
     ~QScissorTest();
 
     int left() const;
@@ -77,7 +77,7 @@ Q_SIGNALS:
     void heightChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QScissorTest)
diff --git a/src/render/renderstates/qstencilmask.h b/src/render/renderstates/qstencilmask.h
index 6e11cff68..b4414e148 100644
--- a/src/render/renderstates/qstencilmask.h
+++ b/src/render/renderstates/qstencilmask.h
@@ -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(Qt3D::QNode *parent = 0);
+    explicit QStencilMask(Qt3DCore::QNode *parent = 0);
     ~QStencilMask();
 
     void setFrontMask(uint mask);
@@ -64,7 +64,7 @@ Q_SIGNALS:
     void backMaskChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_FINAL;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_FINAL;
 
 private:
     Q_DECLARE_PRIVATE(QStencilMask)
diff --git a/src/render/renderstates/qstencilop.h b/src/render/renderstates/qstencilop.h
index bc212af48..881ea1354 100644
--- a/src/render/renderstates/qstencilop.h
+++ b/src/render/renderstates/qstencilop.h
@@ -53,14 +53,14 @@ class QT3DRENDERERSHARED_EXPORT QStencilOp : public QRenderState
     Q_PROPERTY(Qt3DRender::QStencilOpSeparate *back READ back CONSTANT)
 
 public:
-    explicit QStencilOp(Qt3D::QNode *parent = 0);
+    explicit QStencilOp(Qt3DCore::QNode *parent = 0);
     ~QStencilOp();
 
     QStencilOpSeparate *front() const;
     QStencilOpSeparate *back() const;
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_FINAL;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_FINAL;
 
 private:
     Q_DECLARE_PRIVATE(QStencilOp)
diff --git a/src/render/renderstates/qstenciltest.h b/src/render/renderstates/qstenciltest.h
index 51469f69c..2c538d186 100644
--- a/src/render/renderstates/qstenciltest.h
+++ b/src/render/renderstates/qstenciltest.h
@@ -54,14 +54,14 @@ class QT3DRENDERERSHARED_EXPORT QStencilTest : public QRenderState
     Q_PROPERTY(Qt3DRender::QStencilTestSeparate *back READ back CONSTANT)
 public:
 
-    explicit QStencilTest(Qt3D::QNode *parent = 0);
+    explicit QStencilTest(Qt3DCore::QNode *parent = 0);
     ~QStencilTest();
 
     QStencilTestSeparate *front() const;
     QStencilTestSeparate *back() const;
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QStencilTest)
diff --git a/src/render/services/qraycastingservice.cpp b/src/render/services/qraycastingservice.cpp
index ccfbb34a6..68907b8b5 100644
--- a/src/render/services/qraycastingservice.cpp
+++ b/src/render/services/qraycastingservice.cpp
@@ -48,12 +48,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
-QCollisionQueryResult QRayCastingServicePrivate::collides(const Qt3D::QRay3D &ray, Qt3D::QBoundingVolumeProvider *provider,
-                                                          Qt3D::QAbstractCollisionQueryService::QueryMode mode, const Qt3D::QQueryHandle &handle)
+QCollisionQueryResult QRayCastingServicePrivate::collides(const Qt3DCore::QRay3D &ray, Qt3DCore::QBoundingVolumeProvider *provider,
+                                                          Qt3DCore::QAbstractCollisionQueryService::QueryMode mode, const Qt3DCore::QQueryHandle &handle)
 {
     Q_Q(QRayCastingService);
 
@@ -97,13 +97,13 @@ QRayCastingServicePrivate::QRayCastingServicePrivate(const QString &description,
 {
 }
 
-QRayCastingService::QRayCastingService(Qt3D::QBoundingVolumeProvider *provider)
+QRayCastingService::QRayCastingService(Qt3DCore::QBoundingVolumeProvider *provider)
     : QAbstractCollisionQueryService(*new QRayCastingServicePrivate(QStringLiteral("Collision detection service using Ray Casting"),
                                                                     provider))
 {
 }
 
-Qt3D::QQueryHandle QRayCastingService::query(const Qt3D::QRay3D &ray, QAbstractCollisionQueryService::QueryMode mode)
+Qt3DCore::QQueryHandle QRayCastingService::query(const Qt3DCore::QRay3D &ray, QAbstractCollisionQueryService::QueryMode mode)
 {
     Q_D(QRayCastingService);
 
@@ -117,14 +117,14 @@ Qt3D::QQueryHandle QRayCastingService::query(const Qt3D::QRay3D &ray, QAbstractC
     return handle;
 }
 
-Qt3D::QCollisionQueryResult QRayCastingService::fetchResult(const Qt3D::QQueryHandle &handle)
+Qt3DCore::QCollisionQueryResult QRayCastingService::fetchResult(const Qt3DCore::QQueryHandle &handle)
 {
     Q_D(QRayCastingService);
 
     return d->m_results.value(handle).result();
 }
 
-QVector<Qt3D::QCollisionQueryResult> QRayCastingService::fetchAllResults() const
+QVector<Qt3DCore::QCollisionQueryResult> QRayCastingService::fetchAllResults() const
 {
     Q_D(const QRayCastingService);
 
diff --git a/src/render/services/qraycastingservice.h b/src/render/services/qraycastingservice.h
index 0dbb93863..387b77592 100644
--- a/src/render/services/qraycastingservice.h
+++ b/src/render/services/qraycastingservice.h
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QBoundingVolumeProvider;
 }
 
@@ -51,15 +51,15 @@ namespace Qt3DRender {
 
 class QRayCastingServicePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QRayCastingService : public Qt3D::QAbstractCollisionQueryService
+class QT3DRENDERERSHARED_EXPORT QRayCastingService : public Qt3DCore::QAbstractCollisionQueryService
 {
 public:
-    explicit QRayCastingService(Qt3D::QBoundingVolumeProvider *provider);
+    explicit QRayCastingService(Qt3DCore::QBoundingVolumeProvider *provider);
 
-    Qt3D::QQueryHandle query(const Qt3D::QRay3D &ray, QueryMode mode) Q_DECL_OVERRIDE;
+    Qt3DCore::QQueryHandle query(const Qt3DCore::QRay3D &ray, QueryMode mode) Q_DECL_OVERRIDE;
 
-    Qt3D::QCollisionQueryResult fetchResult(const Qt3D::QQueryHandle &handle) Q_DECL_OVERRIDE;
-    QVector<Qt3D::QCollisionQueryResult> fetchAllResults() const Q_DECL_OVERRIDE;
+    Qt3DCore::QCollisionQueryResult fetchResult(const Qt3DCore::QQueryHandle &handle) Q_DECL_OVERRIDE;
+    QVector<Qt3DCore::QCollisionQueryResult> fetchAllResults() const Q_DECL_OVERRIDE;
 
 protected:
     QRayCastingService(QRayCastingServicePrivate &dd);
diff --git a/src/render/services/qraycastingservice_p.h b/src/render/services/qraycastingservice_p.h
index 1de070b72..95b455ee1 100644
--- a/src/render/services/qraycastingservice_p.h
+++ b/src/render/services/qraycastingservice_p.h
@@ -59,38 +59,38 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DCore {
 class QBoundingVolume;
 class QBoundingVolumeProvider;
 }
 
 namespace Qt3DRender {
 
-typedef QFuture<Qt3D::QCollisionQueryResult> FutureQueryResult;
+typedef QFuture<Qt3DCore::QCollisionQueryResult> FutureQueryResult;
 
-class QRayCastingServicePrivate : public Qt3D::QAbstractCollisionQueryServicePrivate
+class QRayCastingServicePrivate : public Qt3DCore::QAbstractCollisionQueryServicePrivate
 {
 public:
-    QRayCastingServicePrivate(const QString &description, Qt3D::QBoundingVolumeProvider *provider);
+    QRayCastingServicePrivate(const QString &description, Qt3DCore::QBoundingVolumeProvider *provider);
 
-    Qt3D::QCollisionQueryResult collides(const Qt3D::QRay3D &ray,
-                                         Qt3D::QBoundingVolumeProvider *provider,
-                                         Qt3D::QAbstractCollisionQueryService::QueryMode mode,
-                                         const Qt3D::QQueryHandle &handle);
+    Qt3DCore::QCollisionQueryResult collides(const Qt3DCore::QRay3D &ray,
+                                         Qt3DCore::QBoundingVolumeProvider *provider,
+                                         Qt3DCore::QAbstractCollisionQueryService::QueryMode mode,
+                                         const Qt3DCore::QQueryHandle &handle);
 
     Q_DECLARE_PUBLIC(QRayCastingService)
 
     struct Query
     {
-        Qt3D::QQueryHandle handle;
-        Qt3D::QRay3D ray;
+        Qt3DCore::QQueryHandle handle;
+        Qt3DCore::QRay3D ray;
         QRayCastingService::QueryMode mode;
     };
 
-    QHash<Qt3D::QQueryHandle, FutureQueryResult> m_results;
+    QHash<Qt3DCore::QQueryHandle, FutureQueryResult> m_results;
     QAtomicInt m_handlesCount;
 
-    Qt3D::QBoundingVolumeProvider *m_boundingProvider;
+    Qt3DCore::QBoundingVolumeProvider *m_boundingProvider;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/services/vsyncframeadvanceservice.cpp b/src/render/services/vsyncframeadvanceservice.cpp
index 5c937e6ed..19d7e70d1 100644
--- a/src/render/services/vsyncframeadvanceservice.cpp
+++ b/src/render/services/vsyncframeadvanceservice.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 namespace Render {
 
-class VSyncFrameAdvanceServicePrivate Q_DECL_FINAL : public Qt3D::QAbstractFrameAdvanceServicePrivate
+class VSyncFrameAdvanceServicePrivate Q_DECL_FINAL : public Qt3DCore::QAbstractFrameAdvanceServicePrivate
 {
 public:
     VSyncFrameAdvanceServicePrivate()
diff --git a/src/render/services/vsyncframeadvanceservice_p.h b/src/render/services/vsyncframeadvanceservice_p.h
index fa0d308ec..d09f74efd 100644
--- a/src/render/services/vsyncframeadvanceservice_p.h
+++ b/src/render/services/vsyncframeadvanceservice_p.h
@@ -58,7 +58,7 @@ namespace Render {
 
 class VSyncFrameAdvanceServicePrivate;
 
-class Q_AUTOTEST_EXPORT VSyncFrameAdvanceService Q_DECL_FINAL : public Qt3D::QAbstractFrameAdvanceService
+class Q_AUTOTEST_EXPORT VSyncFrameAdvanceService Q_DECL_FINAL : public Qt3DCore::QAbstractFrameAdvanceService
 {
 public:
     VSyncFrameAdvanceService();
diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp
index 5f44090d4..e19c2fe8d 100644
--- a/src/render/texture/qabstracttextureimage.cpp
+++ b/src/render/texture/qabstracttextureimage.cpp
@@ -40,18 +40,18 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QAbstractTextureImagePrivate
+    \class Qt3DCore::QAbstractTextureImagePrivate
     \internal
 */
 
 /*!
     \qmltype AbstractTextureImage
-    \instantiates Qt3D::QAbstractTextureImage
+    \instantiates Qt3DCore::QAbstractTextureImage
     \inherits Node
     \inqmlmodule Qt3D.Renderer
     \qmlabstract
@@ -79,7 +79,7 @@ namespace Qt3DRender {
  */
 
 /*!
-    Constructs a new Qt3D::QAbstractTextureImage instance with \a parent as parent.
+    Constructs a new Qt3DCore::QAbstractTextureImage instance with \a parent as parent.
  */
 QAbstractTextureImage::QAbstractTextureImage(QNode *parent)
     : QNode(*new QAbstractTextureImagePrivate, parent)
@@ -91,7 +91,7 @@ QAbstractTextureImage::QAbstractTextureImage(QNode *parent)
  */
 QAbstractTextureImage::~QAbstractTextureImage()
 {
-    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");
+    Q_ASSERT_X(Qt3DCore::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");
 }
 
 
@@ -102,7 +102,7 @@ QAbstractTextureImage::~QAbstractTextureImage()
  */
 
 /*!
-    \property Qt3D::QAbstractTextureImage::mipmapLevel
+    \property Qt3DCore::QAbstractTextureImage::mipmapLevel
 
     Holds the mipmap level of the texture image.
  */
@@ -119,7 +119,7 @@ int QAbstractTextureImage::mipmapLevel() const
  */
 
 /*!
-    \property Qt3D::QAbstractTextureImage::layer
+    \property Qt3DCore::QAbstractTextureImage::layer
 
     Holds the layer of the texture image.
  */
@@ -147,7 +147,7 @@ int QAbstractTextureImage::layer() const
  */
 
 /*!
-    \property Qt3D::QAbstractTextureImage::cubeMapFace
+    \property Qt3DCore::QAbstractTextureImage::cubeMapFace
 
     Holds the cube map face of the texture image.
 
diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h
index 24efd2508..a7eed7d91 100644
--- a/src/render/texture/qabstracttextureimage.h
+++ b/src/render/texture/qabstracttextureimage.h
@@ -48,7 +48,7 @@ namespace Qt3DRender {
 // 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 Qt3D::QAbstractFunctor
+class QT3DRENDERERSHARED_EXPORT QTextureDataFunctor : public Qt3DCore::QAbstractFunctor
 {
 public:
     virtual ~QTextureDataFunctor() {}
@@ -60,14 +60,14 @@ typedef QSharedPointer<QTextureDataFunctor> QTextureDataFunctorPtr;
 
 class QAbstractTextureImagePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractTextureImage : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::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(Qt3DRender::QAbstractTextureProvider::CubeMapFace cubeMapFace READ cubeMapFace WRITE setCubeMapFace NOTIFY cubeMapFaceChanged)
 public:
-    explicit QAbstractTextureImage(Qt3D::QNode *parent = 0);
+    explicit QAbstractTextureImage(Qt3DCore::QNode *parent = 0);
     virtual ~QAbstractTextureImage();
 
     int mipmapLevel() const;
@@ -87,8 +87,8 @@ Q_SIGNALS:
     void cubeMapFaceChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
-    QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
+    QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Qt3DCore::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QAbstractTextureImage)
diff --git a/src/render/texture/qabstracttextureimage_p.h b/src/render/texture/qabstracttextureimage_p.h
index 02c762e9e..abd95e302 100644
--- a/src/render/texture/qabstracttextureimage_p.h
+++ b/src/render/texture/qabstracttextureimage_p.h
@@ -58,7 +58,7 @@ namespace Qt3DRender {
 
 class QAbstractTextureImage;
 
-class QT3DRENDERERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3D::QNodePrivate
+class QT3DRENDERERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QAbstractTextureImagePrivate()
diff --git a/src/render/texture/qabstracttextureprovider.cpp b/src/render/texture/qabstracttextureprovider.cpp
index 34259b511..bed56a14b 100644
--- a/src/render/texture/qabstracttextureprovider.cpp
+++ b/src/render/texture/qabstracttextureprovider.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
@@ -237,7 +237,7 @@ int QAbstractTextureProvider::maximumLayers() const
     By default the renderer based on the attributes of texture providers is
     able to compare them and detect duplicates (same size, format and image
     sources) and smartly avoid unnecessary computations. In some cases however
-    (texture providers used as Qt3D::RenderTarget attachments) you don't want
+    (texture providers used as Qt3DCore::RenderTarget attachments) you don't want
     the renderer to perform these comparison, in which case you can set is
     unique to true.
  */
@@ -318,9 +318,9 @@ QAbstractTextureProvider::Target QAbstractTextureProvider::target() const
 }
 
 /*!
-    Adds a new Qt3D::QAbstractTextureImage \a textureImage to the texture provider.
+    Adds a new Qt3DCore::QAbstractTextureImage \a textureImage to the texture provider.
 
-    \note Qt3D::QAbstractTextureImage should never be shared between multiple
+    \note Qt3DCore::QAbstractTextureImage should never be shared between multiple
     Qt3DRender::QAbstractTextureProvider instances.
  */
 void QAbstractTextureProvider::addTextureImage(QAbstractTextureImage *textureImage)
@@ -349,7 +349,7 @@ void QAbstractTextureProvider::addTextureImage(QAbstractTextureImage *textureIma
 }
 
 /*!
-    Removes a Qt3D::QAbstractTextureImage \a textureImage from the texture provider.
+    Removes a Qt3DCore::QAbstractTextureImage \a textureImage from the texture provider.
  */
 void QAbstractTextureProvider::removeTextureImage(QAbstractTextureImage *textureImage)
 {
diff --git a/src/render/texture/qabstracttextureprovider.h b/src/render/texture/qabstracttextureprovider.h
index 4a8e3adde..96d4f403c 100644
--- a/src/render/texture/qabstracttextureprovider.h
+++ b/src/render/texture/qabstracttextureprovider.h
@@ -49,7 +49,7 @@ class QAbstractTextureProviderPrivate;
 class QTextureWrapMode;
 class QAbstractTextureImage;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractTextureProvider : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QAbstractTextureProvider : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(Target target READ target CONSTANT)
@@ -326,10 +326,10 @@ Q_SIGNALS:
     void uniqueChanged();
 
 protected:
-    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;
+    explicit QAbstractTextureProvider(Qt3DCore::QNode *parent = 0);
+    explicit QAbstractTextureProvider(Target target, Qt3DCore::QNode *parent = 0);
+    QAbstractTextureProvider(QAbstractTextureProviderPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
     void setStatus(Status status);
 
 private:
diff --git a/src/render/texture/qabstracttextureprovider_p.h b/src/render/texture/qabstracttextureprovider_p.h
index c7bfe078c..c1df87de9 100644
--- a/src/render/texture/qabstracttextureprovider_p.h
+++ b/src/render/texture/qabstracttextureprovider_p.h
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QAbstractTextureProviderPrivate : public Qt3D::QNodePrivate
+class QAbstractTextureProviderPrivate : public Qt3DCore::QNodePrivate
 {
 public :
     QAbstractTextureProviderPrivate();
diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp
index 3d8a58b3e..fd2f6524c 100644
--- a/src/render/texture/qtextureimage.cpp
+++ b/src/render/texture/qtextureimage.cpp
@@ -67,7 +67,7 @@ public:
     {
         TexImageDataPtr dataPtr;
         if (m_url.isLocalFile() || m_url.scheme() == QStringLiteral("qrc")) {
-            QString source = Qt3D::QUrlHelper::urlToLocalFileOrQrc(m_url);
+            QString source = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(m_url);
             dataPtr.reset(new TexImageData());
             if (dataPtr->setCompressedFile(source))
                 return dataPtr;
diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h
index f77c2d47e..51a612f37 100644
--- a/src/render/texture/qtextureimage.h
+++ b/src/render/texture/qtextureimage.h
@@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureImage : public QAbstractTextureImage
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
 
 public:
-    explicit QTextureImage(Qt3D::QNode *parent = 0);
+    explicit QTextureImage(Qt3DCore::QNode *parent = 0);
     ~QTextureImage();
 
     QUrl source() const;
@@ -64,7 +64,7 @@ Q_SIGNALS:
     void sourceChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QTextureImage)
diff --git a/src/render/texture/qtextureproviders.h b/src/render/texture/qtextureproviders.h
index dc54b7999..4cf2f7289 100644
--- a/src/render/texture/qtextureproviders.h
+++ b/src/render/texture/qtextureproviders.h
@@ -47,7 +47,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture1D : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
-    explicit QTexture1D(Qt3D::QNode *parent = 0);
+    explicit QTexture1D(Qt3DCore::QNode *parent = 0);
     ~QTexture1D();
 };
 
@@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture1DArray : public QAbstractTextureProvide
 {
     Q_OBJECT
 public:
-    explicit QTexture1DArray(Qt3D::QNode *parent = 0);
+    explicit QTexture1DArray(Qt3DCore::QNode *parent = 0);
     ~QTexture1DArray();
 };
 
@@ -63,7 +63,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture2D : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
-    explicit QTexture2D(Qt3D::QNode *parent = 0);
+    explicit QTexture2D(Qt3DCore::QNode *parent = 0);
     ~QTexture2D();
 };
 
@@ -71,7 +71,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture2DArray : public QAbstractTextureProvide
 {
     Q_OBJECT
 public:
-    explicit QTexture2DArray(Qt3D::QNode *parent = 0);
+    explicit QTexture2DArray(Qt3DCore::QNode *parent = 0);
     ~QTexture2DArray();
 };
 
@@ -79,7 +79,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture3D : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
-    explicit QTexture3D(Qt3D::QNode *parent = 0);
+    explicit QTexture3D(Qt3DCore::QNode *parent = 0);
     ~QTexture3D();
 };
 
@@ -87,7 +87,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureCubeMap : public QAbstractTextureProvide
 {
     Q_OBJECT
 public:
-    explicit QTextureCubeMap(Qt3D::QNode *parent = 0);
+    explicit QTextureCubeMap(Qt3DCore::QNode *parent = 0);
     ~QTextureCubeMap();
 };
 
@@ -95,7 +95,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTexturePr
 {
     Q_OBJECT
 public:
-    explicit QTextureCubeMapArray(Qt3D::QNode *parent = 0);
+    explicit QTextureCubeMapArray(Qt3DCore::QNode *parent = 0);
     ~QTextureCubeMapArray();
 };
 
@@ -103,7 +103,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture2DMultisample : public QAbstractTextureP
 {
     Q_OBJECT
 public:
-    explicit QTexture2DMultisample(Qt3D::QNode *parent = 0);
+    explicit QTexture2DMultisample(Qt3DCore::QNode *parent = 0);
     ~QTexture2DMultisample();
 };
 
@@ -111,7 +111,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTex
 {
     Q_OBJECT
 public:
-    explicit QTexture2DMultisampleArray(Qt3D::QNode *parent = 0);
+    explicit QTexture2DMultisampleArray(Qt3DCore::QNode *parent = 0);
     ~QTexture2DMultisampleArray();
 };
 
@@ -119,7 +119,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureRectangle : public QAbstractTextureProvi
 {
     Q_OBJECT
 public:
-    explicit QTextureRectangle(Qt3D::QNode *parent = 0);
+    explicit QTextureRectangle(Qt3DCore::QNode *parent = 0);
     ~QTextureRectangle();
 };
 
@@ -127,7 +127,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureBuffer : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
-    explicit QTextureBuffer(Qt3D::QNode *parent = 0);
+    explicit QTextureBuffer(Qt3DCore::QNode *parent = 0);
     ~QTextureBuffer();
 };
 
diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp
index 9ac0966ce..edbf26b68 100644
--- a/src/render/texture/texture.cpp
+++ b/src/render/texture/texture.cpp
@@ -50,7 +50,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -123,7 +123,7 @@ void Texture::cleanup()
 }
 
 // AspectThread
-void Texture::updateFromPeer(Qt3D::QNode *peer)
+void Texture::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QAbstractTextureProvider *texture = static_cast<QAbstractTextureProvider *>(peer);
 
@@ -412,7 +412,7 @@ void Texture::setFormat(QAbstractTextureProvider::TextureFormat format)
 }
 
 // ChangeArbiter/Aspect Thread
-void Texture::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Texture::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     // The QOpenGLTexture has to be manipulated from the RenderThread only
     QMutexLocker lock(m_lock);
@@ -579,7 +579,7 @@ TextureFunctor::TextureFunctor(TextureManager *textureManager,
 {
 }
 
-Qt3D::QBackendNode *TextureFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *TextureFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
 {
     Texture *backend = m_textureManager->getOrCreateResource(frontend->id());
     backend->setFactory(factory);
@@ -590,12 +590,12 @@ Qt3D::QBackendNode *TextureFunctor::create(Qt3D::QNode *frontend, const Qt3D::QB
     return backend;
 }
 
-Qt3D::QBackendNode *TextureFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *TextureFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     return m_textureManager->lookupResource(id);
 }
 
-void TextureFunctor::destroy(const Qt3D::QNodeId &id) const
+void TextureFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     m_textureManager->releaseResource(id);
 }
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h
index d520afae7..313dc40b0 100644
--- a/src/render/texture/texture_p.h
+++ b/src/render/texture/texture_p.h
@@ -71,14 +71,14 @@ class TextureDataManager;
 
 typedef uint TextureDNA;
 
-class Texture : public Qt3D::QBackendNode
+class Texture : public Qt3DCore::QBackendNode
 {
 public:
     Texture();
     ~Texture();
     void cleanup();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
     QOpenGLTexture* getOrCreateGLTexture() ;
 
@@ -86,7 +86,7 @@ public:
 
     bool isTextureReset() const;
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     TextureDNA dna() const;
 
     void setTextureManager(TextureManager *manager);
@@ -145,16 +145,16 @@ private:
     void updateDNA();
 };
 
-class TextureFunctor : public Qt3D::QBackendNodeFunctor
+class TextureFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit TextureFunctor(TextureManager *textureManager,
                                   TextureImageManager *textureImageManager,
                                   TextureDataManager *textureDataManager);
 
-    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;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
 
 private:
     TextureManager *m_textureManager;
diff --git a/src/render/texture/texturedatamanager.cpp b/src/render/texture/texturedatamanager.cpp
index 3e77179f6..313a2fe0a 100644
--- a/src/render/texture/texturedatamanager.cpp
+++ b/src/render/texture/texturedatamanager.cpp
@@ -48,7 +48,7 @@ TextureDataManager::TextureDataManager()
 {}
 
 // Called from AspectThread sync
-void TextureDataManager::addToPendingTextures(const Qt3D::QNodeId &textureId)
+void TextureDataManager::addToPendingTextures(const Qt3DCore::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 Qt3D::QNodeId &textureId)
 }
 
 // Called from AspectThread prepare jobs
-QVector<Qt3D::QNodeId> TextureDataManager::texturesPending()
+QVector<Qt3DCore::QNodeId> TextureDataManager::texturesPending()
 {
-    QVector<Qt3D::QNodeId> textureIds = m_texturesPending;
+    QVector<Qt3DCore::QNodeId> textureIds = m_texturesPending;
     m_texturesPending.clear();
     return textureIds;
 }
diff --git a/src/render/texture/texturedatamanager_p.h b/src/render/texture/texturedatamanager_p.h
index f15c5be98..fcdabebce 100644
--- a/src/render/texture/texturedatamanager_p.h
+++ b/src/render/texture/texturedatamanager_p.h
@@ -65,17 +65,17 @@ namespace Render {
 typedef QPair<QTextureDataFunctorPtr, QVector<HTextureImage> > FunctorImageHandlesPair;
 typedef QPair<QTextureDataFunctorPtr, HTextureData> FunctorTextureDataPair;
 
-class TextureDataManager : public Qt3D::QResourceManager<TexImageData,
-                                                         Qt3D::QNodeId,
+class TextureDataManager : public Qt3DCore::QResourceManager<TexImageData,
+                                                         Qt3DCore::QNodeId,
                                                          16,
-                                                         Qt3D::ArrayAllocatingPolicy,
-                                                         Qt3D::ObjectLevelLockingPolicy>
+                                                         Qt3DCore::ArrayAllocatingPolicy,
+                                                         Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     TextureDataManager();
-    void addToPendingTextures(const Qt3D::QNodeId &textureId);
+    void addToPendingTextures(const Qt3DCore::QNodeId &textureId);
 
-    QVector<Qt3D::QNodeId> texturesPending();
+    QVector<Qt3DCore::QNodeId> texturesPending();
 
     HTextureData textureDataFromFunctor(const QTextureDataFunctorPtr &functor) const;
     void addTextureDataForFunctor(HTextureData textureDataHandle, const QTextureDataFunctorPtr &functor);
@@ -87,7 +87,7 @@ public:
     void cleanup();
 
 private:
-    QVector<Qt3D::QNodeId> m_texturesPending;
+    QVector<Qt3DCore::QNodeId> m_texturesPending;
     QVector<FunctorTextureDataPair > m_textureDataFunctors;
     QVector<FunctorImageHandlesPair > m_texturesImagesPerFunctor;
     mutable QMutex m_mutex;
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp
index 4625586bf..96c6cbd3e 100644
--- a/src/render/texture/textureimage.cpp
+++ b/src/render/texture/textureimage.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -73,7 +73,7 @@ void TextureImage::cleanup()
     m_dna = 0;
 }
 
-void TextureImage::updateFromPeer(Qt3D::QNode *peer)
+void TextureImage::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QAbstractTextureImage *textureImage = static_cast<QAbstractTextureImage *>(peer);
     m_layer = textureImage->layer();
@@ -94,7 +94,7 @@ void TextureImage::updateFromPeer(Qt3D::QNode *peer)
     }
 }
 
-void TextureImage::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void TextureImage::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
 
@@ -161,7 +161,7 @@ TextureImageFunctor::TextureImageFunctor(TextureManager *textureManager,
 {
 }
 
-Qt3D::QBackendNode *TextureImageFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *TextureImageFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
 {
     TextureImage *backend = m_textureImageManager->getOrCreateResource(frontend->id());
     backend->setFactory(factory);
@@ -172,12 +172,12 @@ Qt3D::QBackendNode *TextureImageFunctor::create(Qt3D::QNode *frontend, const Qt3
     return backend;
 }
 
-Qt3D::QBackendNode *TextureImageFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *TextureImageFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     return m_textureImageManager->lookupResource(id);
 }
 
-void TextureImageFunctor::destroy(const Qt3D::QNodeId &id) const
+void TextureImageFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     m_textureImageManager->releaseResource(id);
 }
diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h
index 8b81a6756..bde1e58ca 100644
--- a/src/render/texture/textureimage_p.h
+++ b/src/render/texture/textureimage_p.h
@@ -66,13 +66,13 @@ class TextureDataManager;
 
 typedef uint TextureImageDNA;
 
-class TextureImage : public Qt3D::QBackendNode
+class TextureImage : public Qt3DCore::QBackendNode
 {
 public:
     TextureImage();
     void cleanup();
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     int m_layer;
     int m_mipmapLevel;
@@ -105,22 +105,22 @@ private:
     TextureManager *m_textureManager;
     TextureImageManager *m_textureImageManager;
     TextureDataManager *m_textureDataManager;
-    QList<Qt3D::QNodeId> m_referencedTextures;
+    QList<Qt3DCore::QNodeId> m_referencedTextures;
     HTexture m_textureProvider;
-    Qt3D::QNodeId m_textureProviderId;
+    Qt3DCore::QNodeId m_textureProviderId;
     TextureImageDNA m_dna;
 };
 
-class TextureImageFunctor : public Qt3D::QBackendNodeFunctor
+class TextureImageFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit TextureImageFunctor(TextureManager *textureManager,
                                   TextureImageManager *textureImageManager,
                                   TextureDataManager *textureDataManager);
 
-    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;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
 
 private:
     TextureManager *m_textureManager;
diff --git a/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp b/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp
index cc2889eb6..5515fa6ad 100644
--- a/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp
+++ b/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp
@@ -69,16 +69,16 @@ public:
     QAtomicInt m_value;
 };
 
-typedef Qt3D::QHandle<tst_ArrayResource> tHandle;
-typedef Qt3D::QHandle<tst_ArrayResource, 4> tHandle4;
-typedef Qt3D::QHandle<tst_ArrayResource, 8> tHandle8;
-typedef Qt3D::QHandle<tst_ArrayResource, 16> tHandle16;
+typedef Qt3DCore::QHandle<tst_ArrayResource> tHandle;
+typedef Qt3DCore::QHandle<tst_ArrayResource, 4> tHandle4;
+typedef Qt3DCore::QHandle<tst_ArrayResource, 8> tHandle8;
+typedef Qt3DCore::QHandle<tst_ArrayResource, 16> tHandle16;
 
 void tst_DynamicArrayPolicy::createResourcesManager()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, int, 16> manager16;
-    Qt3D::QResourceManager<tst_ArrayResource, int, 4> manager4;
-    Qt3D::QResourceManager<tst_ArrayResource, int, 8> manager8;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int, 16> manager16;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int, 4> manager4;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int, 8> manager8;
     QVERIFY(manager16.maxResourcesEntries() == 65535);
     QVERIFY(manager8.maxResourcesEntries() == 255);
     QVERIFY(manager4.maxResourcesEntries() == 15);
@@ -90,7 +90,7 @@ void tst_DynamicArrayPolicy::createResourcesManager()
  */
 void tst_DynamicArrayPolicy::acquireResources()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint, 4> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint, 4> manager;
 
     QList<tHandle4> handles;
 
@@ -110,7 +110,7 @@ void tst_DynamicArrayPolicy::acquireResources()
 void tst_DynamicArrayPolicy::getResources()
 {
 
-    Qt3D::QResourceManager<tst_ArrayResource, int, 8> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int, 8> manager;
     QList<tst_ArrayResource *> resources;
     QList<tHandle8> handles;
 
@@ -141,7 +141,7 @@ void tst_DynamicArrayPolicy::getResources()
  */
 void tst_DynamicArrayPolicy::registerResourcesResize()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint, 16> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint, 16> manager;
     QList<tHandle16> handles;
 
     for (uint i = 0; i < 2; i++) {
@@ -169,7 +169,7 @@ void tst_DynamicArrayPolicy::registerResourcesResize()
  */
 void tst_DynamicArrayPolicy::removeResource()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, int> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle> handles;
@@ -193,7 +193,7 @@ void tst_DynamicArrayPolicy::removeResource()
  */
 void tst_DynamicArrayPolicy::resetResource()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle16> handles;
@@ -220,7 +220,7 @@ void tst_DynamicArrayPolicy::resetResource()
 
 void tst_DynamicArrayPolicy::lookupResource()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle16> handles;
@@ -245,7 +245,7 @@ void tst_DynamicArrayPolicy::lookupResource()
 
 void tst_DynamicArrayPolicy::releaseResource()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint> manager;
     QList<tst_ArrayResource *> resources;
 
     for (int i = 0; i < 5; i++) {
@@ -267,11 +267,11 @@ class tst_Thread : public QThread
     Q_OBJECT
 public:
 
-    typedef Qt3D::QResourceManager<tst_ArrayResource,
+    typedef Qt3DCore::QResourceManager<tst_ArrayResource,
     int,
     16,
-    Qt3D::ArrayAllocatingPolicy,
-    Qt3D::ObjectLevelLockingPolicy> Manager;
+    Qt3DCore::ArrayAllocatingPolicy,
+    Qt3DCore::ObjectLevelLockingPolicy> Manager;
 
     tst_Thread()
         : QThread()
@@ -338,11 +338,11 @@ class tst_Thread2 : public QThread
     Q_OBJECT
 public:
 
-    typedef Qt3D::QResourceManager<tst_ArrayResource,
+    typedef Qt3DCore::QResourceManager<tst_ArrayResource,
     int,
     16,
-    Qt3D::ArrayAllocatingPolicy,
-    Qt3D::ObjectLevelLockingPolicy> Manager;
+    Qt3DCore::ArrayAllocatingPolicy,
+    Qt3DCore::ObjectLevelLockingPolicy> Manager;
 
     tst_Thread2(int releaseAbove = 7)
         : QThread()
@@ -414,7 +414,7 @@ void tst_DynamicArrayPolicy::heavyDutyMultiThreadedAccessRelease()
 
 void tst_DynamicArrayPolicy::maximumNumberOfResources()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle16> handles;
diff --git a/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp b/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp
index c3fa5aea5..d56196d00 100644
--- a/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp
+++ b/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp
@@ -69,16 +69,16 @@ public:
     QAtomicInt m_value;
 };
 
-typedef Qt3D::QHandle<tst_ArrayResource> tHandle;
-typedef Qt3D::QHandle<tst_ArrayResource, 4> tHandle4;
-typedef Qt3D::QHandle<tst_ArrayResource, 8> tHandle8;
-typedef Qt3D::QHandle<tst_ArrayResource, 16> tHandle16;
+typedef Qt3DCore::QHandle<tst_ArrayResource> tHandle;
+typedef Qt3DCore::QHandle<tst_ArrayResource, 4> tHandle4;
+typedef Qt3DCore::QHandle<tst_ArrayResource, 8> tHandle8;
+typedef Qt3DCore::QHandle<tst_ArrayResource, 16> tHandle16;
 
 void tst_PreallocatedArrayPolicy::createResourcesManager()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, int, 16, Qt3D::ArrayPreallocationPolicy> manager16;
-    Qt3D::QResourceManager<tst_ArrayResource, int, 4, Qt3D::ArrayPreallocationPolicy> manager4;
-    Qt3D::QResourceManager<tst_ArrayResource, int, 8, Qt3D::ArrayPreallocationPolicy> manager8;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int, 16, Qt3DCore::ArrayPreallocationPolicy> manager16;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int, 4, Qt3DCore::ArrayPreallocationPolicy> manager4;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int, 8, Qt3DCore::ArrayPreallocationPolicy> manager8;
     QVERIFY(manager16.maxResourcesEntries() == 65535);
     QVERIFY(manager8.maxResourcesEntries() == 255);
     QVERIFY(manager4.maxResourcesEntries() == 15);
@@ -90,7 +90,7 @@ void tst_PreallocatedArrayPolicy::createResourcesManager()
  */
 void tst_PreallocatedArrayPolicy::acquireResources()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint, 4, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint, 4, Qt3DCore::ArrayPreallocationPolicy> manager;
 
     QList<tHandle4> handles;
 
@@ -110,7 +110,7 @@ void tst_PreallocatedArrayPolicy::acquireResources()
 void tst_PreallocatedArrayPolicy::getResources()
 {
 
-    Qt3D::QResourceManager<tst_ArrayResource, int, 8, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int, 8, Qt3DCore::ArrayPreallocationPolicy> manager;
     QList<tst_ArrayResource *> resources;
     QList<tHandle8> handles;
 
@@ -141,7 +141,7 @@ void tst_PreallocatedArrayPolicy::getResources()
  */
 void tst_PreallocatedArrayPolicy::registerResourcesResize()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint, 16, Qt3DCore::ArrayPreallocationPolicy> manager;
     QList<tHandle16> handles;
 
     for (uint i = 0; i < 2; i++) {
@@ -169,7 +169,7 @@ void tst_PreallocatedArrayPolicy::registerResourcesResize()
  */
 void tst_PreallocatedArrayPolicy::removeResource()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, int, 16, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, int, 16, Qt3DCore::ArrayPreallocationPolicy> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle> handles;
@@ -193,7 +193,7 @@ void tst_PreallocatedArrayPolicy::removeResource()
  */
 void tst_PreallocatedArrayPolicy::resetResource()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint, 16, Qt3DCore::ArrayPreallocationPolicy> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle16> handles;
@@ -220,7 +220,7 @@ void tst_PreallocatedArrayPolicy::resetResource()
 
 void tst_PreallocatedArrayPolicy::lookupResource()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint, 16, Qt3DCore::ArrayPreallocationPolicy> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle16> handles;
@@ -245,7 +245,7 @@ void tst_PreallocatedArrayPolicy::lookupResource()
 
 void tst_PreallocatedArrayPolicy::releaseResource()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint, 16, Qt3DCore::ArrayPreallocationPolicy> manager;
     QList<tst_ArrayResource *> resources;
 
     for (int i = 0; i < 5; i++) {
@@ -267,11 +267,11 @@ class tst_Thread : public QThread
     Q_OBJECT
 public:
 
-    typedef Qt3D::QResourceManager<tst_ArrayResource,
+    typedef Qt3DCore::QResourceManager<tst_ArrayResource,
     int,
     16,
-    Qt3D::ArrayPreallocationPolicy,
-    Qt3D::ObjectLevelLockingPolicy> Manager;
+    Qt3DCore::ArrayPreallocationPolicy,
+    Qt3DCore::ObjectLevelLockingPolicy> Manager;
 
     tst_Thread()
         : QThread()
@@ -339,11 +339,11 @@ class tst_Thread2 : public QThread
     Q_OBJECT
 public:
 
-    typedef Qt3D::QResourceManager<tst_ArrayResource,
+    typedef Qt3DCore::QResourceManager<tst_ArrayResource,
     int,
     16,
-    Qt3D::ArrayPreallocationPolicy,
-    Qt3D::ObjectLevelLockingPolicy> Manager;
+    Qt3DCore::ArrayPreallocationPolicy,
+    Qt3DCore::ObjectLevelLockingPolicy> Manager;
 
     tst_Thread2(int releaseAbove = 7)
         : QThread()
@@ -415,7 +415,7 @@ void tst_PreallocatedArrayPolicy::heavyDutyMultiThreadedAccessRelease()
 
 void tst_PreallocatedArrayPolicy::maximumNumberOfResources()
 {
-    Qt3D::QResourceManager<tst_ArrayResource, uint, 16, Qt3D::ArrayPreallocationPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ArrayResource, uint, 16, Qt3DCore::ArrayPreallocationPolicy> manager;
 
     QList<tst_ArrayResource *> resources;
     QList<tHandle16> handles;
diff --git a/tests/auto/core/cloning/tst_cloning.cpp b/tests/auto/core/cloning/tst_cloning.cpp
index 1ea911698..1ddada245 100644
--- a/tests/auto/core/cloning/tst_cloning.cpp
+++ b/tests/auto/core/cloning/tst_cloning.cpp
@@ -51,11 +51,11 @@ private slots:
     void checkEntityCloning();
 };
 
-class MyQNode : public Qt3D::QNode
+class MyQNode : public Qt3DCore::QNode
 {
     Q_OBJECT
 public:
-    explicit MyQNode(Qt3D::QNode *parent = 0) : QNode(parent)
+    explicit MyQNode(Qt3DCore::QNode *parent = 0) : QNode(parent)
     {}
 
     ~MyQNode()
@@ -75,19 +75,19 @@ public:
     }
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE
     {
-        Qt3D::QNode::copy(ref);
+        Qt3DCore::QNode::copy(ref);
         const MyQNode *refNode = qobject_cast<const MyQNode *>(ref);
         setCustomProperty(refNode->customProperty());
     }
 };
 
-class MyQComponent : public Qt3D::QComponent
+class MyQComponent : public Qt3DCore::QComponent
 {
     Q_OBJECT
 public:
-    explicit MyQComponent(Qt3D::QNode *parent = 0) : QComponent(parent)
+    explicit MyQComponent(Qt3DCore::QNode *parent = 0) : QComponent(parent)
     {}
 
     ~MyQComponent()
@@ -101,11 +101,11 @@ public:
 void tst_Cloning::checkEntityCloning()
 {
     // GIVEN
-    Qt3D::QScene *scene = new Qt3D::QScene();
+    Qt3DCore::QScene *scene = new Qt3DCore::QScene();
     MyQNode *root = new MyQNode();
-    Qt3D::QNodePrivate::get(root)->setScene(scene);
+    Qt3DCore::QNodePrivate::get(root)->setScene(scene);
 
-    Qt3D::QEntity *entity = new Qt3D::QEntity(root);
+    Qt3DCore::QEntity *entity = new Qt3DCore::QEntity(root);
 
     // WHEN
     MyQComponent *comp1 = new MyQComponent();
@@ -133,16 +133,16 @@ void tst_Cloning::checkEntityCloning()
     QCOMPARE(cloneRoot->id(), root->id());
     QVERIFY(cloneRoot->customProperty() == root->customProperty());
 
-    Qt3D::QEntity *cloneEntity = qobject_cast<Qt3D::QEntity *>(cloneRoot->children().first());
+    Qt3DCore::QEntity *cloneEntity = qobject_cast<Qt3DCore::QEntity *>(cloneRoot->children().first());
     QVERIFY(cloneEntity != Q_NULLPTR);
     QCOMPARE(cloneEntity->id(), entity->id());
     QCOMPARE(cloneEntity->children().count(), 4);
     QCOMPARE(cloneEntity->components().count(), 3);
 
-    QList<Qt3D::QNodeId> ids = QList<Qt3D::QNodeId>() << comp1->id() << comp2->id() << comp3->id() << childNode->id();
+    QList<Qt3DCore::QNodeId> ids = QList<Qt3DCore::QNodeId>() << comp1->id() << comp2->id() << comp3->id() << childNode->id();
 
     Q_FOREACH (QObject *c, cloneEntity->children()) {
-        Qt3D::QNode *n = qobject_cast<Qt3D::QNode *>(c);
+        Qt3DCore::QNode *n = qobject_cast<Qt3DCore::QNode *>(c);
         QVERIFY(ids.contains(n->id()));
         ids.removeAll(n->id());
     }
diff --git a/tests/auto/core/handle/tst_handle.cpp b/tests/auto/core/handle/tst_handle.cpp
index 7f2c01903..d993056a1 100644
--- a/tests/auto/core/handle/tst_handle.cpp
+++ b/tests/auto/core/handle/tst_handle.cpp
@@ -69,8 +69,8 @@ public:
     int m_value;
 };
 
-typedef Qt3D::QHandle<SimpleResource> Handle;
-typedef Qt3D::QHandle<SimpleResource, 22> BigHandle;
+typedef Qt3DCore::QHandle<SimpleResource> Handle;
+typedef Qt3DCore::QHandle<SimpleResource, 22> BigHandle;
 
 void tst_Handle::defaultConstruction()
 {
diff --git a/tests/auto/core/handlemanager/tst_handlemanager.cpp b/tests/auto/core/handlemanager/tst_handlemanager.cpp
index bdbc6252a..66911f2c9 100644
--- a/tests/auto/core/handlemanager/tst_handlemanager.cpp
+++ b/tests/auto/core/handlemanager/tst_handlemanager.cpp
@@ -67,17 +67,17 @@ public:
     int m_value;
 };
 
-typedef Qt3D::QHandle<SimpleResource> Handle;
+typedef Qt3DCore::QHandle<SimpleResource> Handle;
 
 void tst_HandleManager::construction()
 {
-    Qt3D::QHandleManager<SimpleResource> manager;
+    Qt3DCore::QHandleManager<SimpleResource> manager;
     QVERIFY(manager.activeEntries() == 0);
 }
 
 void tst_HandleManager::correctPointer()
 {
-    Qt3D::QHandleManager<SimpleResource> manager;
+    Qt3DCore::QHandleManager<SimpleResource> manager;
     SimpleResource *p1 = (SimpleResource *)0xdeadbeef;
     const Handle h = manager.acquire(p1);
 
@@ -89,7 +89,7 @@ void tst_HandleManager::correctPointer()
 
 void tst_HandleManager::correctPointers()
 {
-    Qt3D::QHandleManager<SimpleResource> manager;
+    Qt3DCore::QHandleManager<SimpleResource> manager;
     SimpleResource *p[3];
     p[0] = (SimpleResource *)0xdeadbeef;
     p[1] = (SimpleResource *)0x11111111;
@@ -109,7 +109,7 @@ void tst_HandleManager::correctPointers()
 
 void tst_HandleManager::correctConstPointer()
 {
-    Qt3D::QHandleManager<SimpleResource> manager;
+    Qt3DCore::QHandleManager<SimpleResource> manager;
     QSharedPointer<SimpleResource> p1(new SimpleResource);
     const Handle h = manager.acquire(p1.data());
 
@@ -121,7 +121,7 @@ void tst_HandleManager::correctConstPointer()
 
 void tst_HandleManager::nullForRemovedEntry()
 {
-    Qt3D::QHandleManager<SimpleResource> manager;
+    Qt3DCore::QHandleManager<SimpleResource> manager;
     QSharedPointer<SimpleResource> p1(new SimpleResource);
     const Handle h = manager.acquire(p1.data());
     manager.release(h);
@@ -134,7 +134,7 @@ void tst_HandleManager::nullForRemovedEntry()
 
 void tst_HandleManager::validHandleForReplacementEntry()
 {
-    Qt3D::QHandleManager<SimpleResource> manager;
+    Qt3DCore::QHandleManager<SimpleResource> manager;
     QSharedPointer<SimpleResource> p1(new SimpleResource);
     const Handle h = manager.acquire(p1.data());
     QVERIFY(manager.activeEntries() == 1);
@@ -155,7 +155,7 @@ void tst_HandleManager::validHandleForReplacementEntry()
 
 void tst_HandleManager::updateChangesValue()
 {
-    Qt3D::QHandleManager<SimpleResource> manager;
+    Qt3DCore::QHandleManager<SimpleResource> manager;
     QSharedPointer<SimpleResource> p1(new SimpleResource);
     const Handle h = manager.acquire(p1.data());
 
@@ -171,7 +171,7 @@ void tst_HandleManager::updateChangesValue()
 
 void tst_HandleManager::resetRemovesAllEntries()
 {
-    Qt3D::QHandleManager<SimpleResource> manager;
+    Qt3DCore::QHandleManager<SimpleResource> manager;
     for (int i = 0; i < 100; ++i) {
         SimpleResource *p = (SimpleResource *) 0xdead0000 + i;
         const Handle h = manager.acquire(p);
@@ -190,7 +190,7 @@ void tst_HandleManager::resetRemovesAllEntries()
 
 void tst_HandleManager::maximumEntries()
 {
-    Qt3D::QHandleManager<SimpleResource> manager;
+    Qt3DCore::QHandleManager<SimpleResource> manager;
 
     QCOMPARE(Handle::maxIndex(), (uint)((1 << 16) - 1));
 
diff --git a/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp b/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp
index 3f18fee4b..a3dbb3ea1 100644
--- a/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp
+++ b/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp
@@ -69,16 +69,16 @@ public:
     QAtomicInt m_value;
 };
 
-typedef Qt3D::QHandle<tst_ListResource> tHandle;
-typedef Qt3D::QHandle<tst_ListResource, 4> tHandle4;
-typedef Qt3D::QHandle<tst_ListResource, 8> tHandle8;
-typedef Qt3D::QHandle<tst_ListResource, 16> tHandle16;
+typedef Qt3DCore::QHandle<tst_ListResource> tHandle;
+typedef Qt3DCore::QHandle<tst_ListResource, 4> tHandle4;
+typedef Qt3DCore::QHandle<tst_ListResource, 8> tHandle8;
+typedef Qt3DCore::QHandle<tst_ListResource, 16> tHandle16;
 
 void tst_ListResourcesManager::createResourcesManager()
 {
-    Qt3D::QResourceManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager16;
-    Qt3D::QResourceManager<tst_ListResource, int, 4, Qt3D::ListAllocatingPolicy> manager4;
-    Qt3D::QResourceManager<tst_ListResource, int, 8, Qt3D::ListAllocatingPolicy> manager8;
+    Qt3DCore::QResourceManager<tst_ListResource, int, 16, Qt3DCore::ListAllocatingPolicy> manager16;
+    Qt3DCore::QResourceManager<tst_ListResource, int, 4, Qt3DCore::ListAllocatingPolicy> manager4;
+    Qt3DCore::QResourceManager<tst_ListResource, int, 8, Qt3DCore::ListAllocatingPolicy> manager8;
 
     QVERIFY(manager16.maxResourcesEntries() == 65535);
     QVERIFY(manager8.maxResourcesEntries() == 255);
@@ -91,7 +91,7 @@ void tst_ListResourcesManager::createResourcesManager()
  */
 void tst_ListResourcesManager::acquireResources()
 {
-    Qt3D::QResourceManager<tst_ListResource, int, 4, Qt3D::ListAllocatingPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ListResource, int, 4, Qt3DCore::ListAllocatingPolicy> manager;
 
     QList<tHandle4> handles;
 
@@ -111,7 +111,7 @@ void tst_ListResourcesManager::acquireResources()
 void tst_ListResourcesManager::getResources()
 {
 
-    Qt3D::QResourceManager<tst_ListResource, int, 8, Qt3D::ListAllocatingPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ListResource, int, 8, Qt3DCore::ListAllocatingPolicy> manager;
     QList<tst_ListResource *> resources;
     QList<tHandle8> handles;
 
@@ -142,7 +142,7 @@ void tst_ListResourcesManager::getResources()
  */
 void tst_ListResourcesManager::registerResourcesResize()
 {
-    Qt3D::QResourceManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ListResource, int, 16, Qt3DCore::ListAllocatingPolicy> manager;
     QList<tHandle16> handles;
 
     for (uint i = 0; i < 2; i++) {
@@ -170,7 +170,7 @@ void tst_ListResourcesManager::registerResourcesResize()
  */
 void tst_ListResourcesManager::removeResource()
 {
-    Qt3D::QResourceManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ListResource, int, 16, Qt3DCore::ListAllocatingPolicy> manager;
 
     QList<tst_ListResource *> resources;
     QList<tHandle> handles;
@@ -194,7 +194,7 @@ void tst_ListResourcesManager::removeResource()
  */
 void tst_ListResourcesManager::resetResource()
 {
-    Qt3D::QResourceManager<tst_ListResource, int, 16, Qt3D::ListAllocatingPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ListResource, int, 16, Qt3DCore::ListAllocatingPolicy> manager;
 
     QList<tst_ListResource *> resources;
     QList<tHandle16> handles;
@@ -221,7 +221,7 @@ void tst_ListResourcesManager::resetResource()
 
 void tst_ListResourcesManager::lookupResource()
 {
-    Qt3D::QResourceManager<tst_ListResource, uint, 16, Qt3D::ListAllocatingPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ListResource, uint, 16, Qt3DCore::ListAllocatingPolicy> manager;
 
     QList<tst_ListResource *> resources;
     QList<tHandle16> handles;
@@ -246,7 +246,7 @@ void tst_ListResourcesManager::lookupResource()
 
 void tst_ListResourcesManager::releaseResource()
 {
-    Qt3D::QResourceManager<tst_ListResource, uint, 16, Qt3D::ListAllocatingPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ListResource, uint, 16, Qt3DCore::ListAllocatingPolicy> manager;
     QList<tst_ListResource *> resources;
 
     for (int i = 0; i < 5; i++) {
@@ -268,11 +268,11 @@ class tst_Thread : public QThread
     Q_OBJECT
 public:
 
-    typedef Qt3D::QResourceManager<tst_ListResource,
+    typedef Qt3DCore::QResourceManager<tst_ListResource,
                             int,
                             16,
-                            Qt3D::ListAllocatingPolicy,
-                            Qt3D::ObjectLevelLockingPolicy> Manager;
+                            Qt3DCore::ListAllocatingPolicy,
+                            Qt3DCore::ObjectLevelLockingPolicy> Manager;
 
     tst_Thread() : QThread()
     {
@@ -339,11 +339,11 @@ class tst_Thread2 : public QThread
     Q_OBJECT
 public:
 
-    typedef Qt3D::QResourceManager<tst_ListResource,
+    typedef Qt3DCore::QResourceManager<tst_ListResource,
                             int,
                             16,
-                            Qt3D::ListAllocatingPolicy,
-                            Qt3D::ObjectLevelLockingPolicy> Manager;
+                            Qt3DCore::ListAllocatingPolicy,
+                            Qt3DCore::ObjectLevelLockingPolicy> Manager;
 
     tst_Thread2(int releaseAbove = 7)
         : QThread()
@@ -415,7 +415,7 @@ void tst_ListResourcesManager::heavyDutyMultiThreadedAccessRelease()
 
 void tst_ListResourcesManager::maximumNumberOfResources()
 {
-    Qt3D::QResourceManager<tst_ListResource, uint, 16, Qt3D::ListAllocatingPolicy> manager;
+    Qt3DCore::QResourceManager<tst_ListResource, uint, 16, Qt3DCore::ListAllocatingPolicy> manager;
 
     QList<tst_ListResource *> resources;
     QList<tHandle16> handles;
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index 41ddcad43..629c03365 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -84,87 +84,87 @@ private slots:
 };
 
 class ObserverSpy;
-class SimplePostman : public Qt3D::QAbstractPostman
+class SimplePostman : public Qt3DCore::QAbstractPostman
 {
 public:
     SimplePostman(ObserverSpy *spy)
         : m_spy(spy)
     {}
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &) Q_DECL_FINAL {};
-    void setScene(Qt3D::QScene *) Q_DECL_FINAL {};
-    void notifyBackend(const Qt3D::QSceneChangePtr &change) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_FINAL {};
+    void setScene(Qt3DCore::QScene *) Q_DECL_FINAL {};
+    void notifyBackend(const Qt3DCore::QSceneChangePtr &change) Q_DECL_FINAL;
 
 private:
     ObserverSpy *m_spy;
 };
 
-class ObserverSpy : public Qt3D::QAbstractArbiter
+class ObserverSpy : public Qt3DCore::QAbstractArbiter
 {
 public:
-    class ChangeRecord : public QPair<Qt3D::QSceneChangePtr, bool>
+    class ChangeRecord : public QPair<Qt3DCore::QSceneChangePtr, bool>
     {
     public:
-        ChangeRecord(const Qt3D::QSceneChangePtr &event, bool locked)
-            : QPair<Qt3D::QSceneChangePtr, bool>(event, locked)
+        ChangeRecord(const Qt3DCore::QSceneChangePtr &event, bool locked)
+            : QPair<Qt3DCore::QSceneChangePtr, bool>(event, locked)
         {}
 
-        Qt3D::QSceneChangePtr change() const { return first; }
+        Qt3DCore::QSceneChangePtr change() const { return first; }
 
         bool wasLocked() const { return second; }
     };
 
-    ObserverSpy(Qt3D::QNode *node)
-        : Qt3D::QAbstractArbiter()
+    ObserverSpy(Qt3DCore::QNode *node)
+        : Qt3DCore::QAbstractArbiter()
         , m_node(node)
         , m_postman(new SimplePostman(this))
     {
-        Qt3D::QNodePrivate::get(node)->setArbiter(this);
+        Qt3DCore::QNodePrivate::get(node)->setArbiter(this);
     }
 
     ~ObserverSpy()
     {
-        Qt3D::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
+        Qt3DCore::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
     }
 
-    void sceneChangeEventWithLock(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE
     {
         events << ChangeRecord(e, true);
     }
 
-    void sceneChangeEventWithLock(const Qt3D::QSceneChangeList &e) Q_DECL_OVERRIDE
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_OVERRIDE
     {
         for (uint i = 0, m = e.size(); i < m; ++i) {
             events << ChangeRecord(e.at(i), false);
         }
     }
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE
     {
         events << ChangeRecord(e, false);
     }
 
-    Qt3D::QAbstractPostman *postman() const Q_DECL_FINAL
+    Qt3DCore::QAbstractPostman *postman() const Q_DECL_FINAL
     {
         return m_postman.data();
     }
 
     QList<ChangeRecord> events;
-    Qt3D::QNode *m_node;
+    Qt3DCore::QNode *m_node;
     QScopedPointer<SimplePostman> m_postman;
 };
 
-void SimplePostman::notifyBackend(const Qt3D::QSceneChangePtr &change)
+void SimplePostman::notifyBackend(const Qt3DCore::QSceneChangePtr &change)
 {
     m_spy->sceneChangeEventWithLock(change);
 }
 
-class MyQNode : public Qt3D::QNode
+class MyQNode : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(QString customProperty READ customProperty WRITE setCustomProperty NOTIFY customPropertyChanged)
 public:
-    explicit MyQNode(Qt3D::QNode *parent = 0)
+    explicit MyQNode(Qt3DCore::QNode *parent = 0)
         : QNode(parent)
         , m_scene(Q_NULLPTR)
     {}
@@ -192,8 +192,8 @@ public:
     void assignScene()
     {
         if (!m_scene)
-            m_scene = new Qt3D::QScene();
-        Qt3D::QNodePrivate::get(this)->setScene(m_scene);
+            m_scene = new Qt3DCore::QScene();
+        Qt3DCore::QNodePrivate::get(this)->setScene(m_scene);
     }
 
     void makeCopyOf(QNode *other)
@@ -208,14 +208,14 @@ protected:
     QT3D_CLONEABLE(MyQNode)
 
     QString m_customProperty;
-    Qt3D::QScene *m_scene;
+    Qt3DCore::QScene *m_scene;
 };
 
-class MyQComponent : public Qt3D::QComponent
+class MyQComponent : public Qt3DCore::QComponent
 {
     Q_OBJECT
 public:
-    explicit MyQComponent(Qt3D::QNode *parent = 0) : QComponent(parent)
+    explicit MyQComponent(Qt3DCore::QNode *parent = 0) : QComponent(parent)
     {}
 
     ~MyQComponent()
@@ -261,8 +261,8 @@ void tst_Nodes::defaultComponentConstruction()
 void tst_Nodes::defaultEntityConstrution()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> entity(new Qt3D::QEntity());
-    Qt3D::QEntity *entity2 = new Qt3D::QEntity(entity.data());
+    QScopedPointer<Qt3DCore::QEntity> entity(new Qt3DCore::QEntity());
+    Qt3DCore::QEntity *entity2 = new Qt3DCore::QEntity(entity.data());
 
     // THEN
     QVERIFY(entity->components().isEmpty());
@@ -278,7 +278,7 @@ void tst_Nodes::appendSingleChildNodeToNodeNoSceneExplicitParenting()
     ObserverSpy spy(node.data());
 
     // THEN
-    QVERIFY(Qt3D::QNodePrivate::get(node.data())->scene() == Q_NULLPTR);
+    QVERIFY(Qt3DCore::QNodePrivate::get(node.data())->scene() == Q_NULLPTR);
     // WHEN
     QScopedPointer<MyQNode> child(new MyQNode());
 
@@ -305,7 +305,7 @@ void tst_Nodes::appendSingleChildNodeToNodeNoSceneImplicitParenting()
     ObserverSpy spy(node.data());
 
     // THEN
-    QVERIFY(Qt3D::QNodePrivate::get(node.data())->scene() == Q_NULLPTR);
+    QVERIFY(Qt3DCore::QNodePrivate::get(node.data())->scene() == Q_NULLPTR);
     // WHEN
     QScopedPointer<MyQNode> child(new MyQNode(node.data()));
 
@@ -326,11 +326,11 @@ void tst_Nodes::appendMultipleChildNodesToNodeNoScene()
     ObserverSpy spy(node.data());
 
     // THEN
-    QVERIFY(Qt3D::QNodePrivate::get(node.data())->scene() == Q_NULLPTR);
+    QVERIFY(Qt3DCore::QNodePrivate::get(node.data())->scene() == Q_NULLPTR);
     // WHEN
     for (int i = 0; i < 10; i++) {
         // WHEN
-        Qt3D::QNode *child = Q_NULLPTR;
+        Qt3DCore::QNode *child = Q_NULLPTR;
         if (i % 2 == 0) {
             child = new MyQNode(node.data());
         } else {
@@ -357,7 +357,7 @@ void tst_Nodes::appendSingleChildNodeToNodeSceneExplicitParenting()
     // WHEN
     node->assignScene();
     // THEN
-    QVERIFY(Qt3D::QNodePrivate::get(node.data())->scene() != Q_NULLPTR);
+    QVERIFY(Qt3DCore::QNodePrivate::get(node.data())->scene() != Q_NULLPTR);
 
     // WHEN
     QScopedPointer<MyQNode> child(new MyQNode());
@@ -376,10 +376,10 @@ void tst_Nodes::appendSingleChildNodeToNodeSceneExplicitParenting()
     QVERIFY(spy.events.first().wasLocked());
     QCOMPARE(node->children().count(), 1);
 
-    Qt3D::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3D::QScenePropertyChange>();
-    QCOMPARE(event->type(), Qt3D::NodeCreated);
+    Qt3DCore::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>();
+    QCOMPARE(event->type(), Qt3DCore::NodeCreated);
     QCOMPARE(event->propertyName(), "node");
-    Qt3D::QNodePtr clone = event->value().value<Qt3D::QNodePtr>();
+    Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>();
     QCOMPARE(clone->id(), child->id());
     QCOMPARE(clone->parentNode()->id(), node->id());
 }
@@ -393,7 +393,7 @@ void tst_Nodes::appendSingleChildNodeToNodeSceneImplicitParenting()
     // WHEN
     node->assignScene();
     // THEN
-    QVERIFY(Qt3D::QNodePrivate::get(node.data())->scene() != Q_NULLPTR);
+    QVERIFY(Qt3DCore::QNodePrivate::get(node.data())->scene() != Q_NULLPTR);
 
     // WHEN
     QScopedPointer<MyQNode> child(new MyQNode(node.data()));
@@ -402,16 +402,16 @@ void tst_Nodes::appendSingleChildNodeToNodeSceneImplicitParenting()
     // THEN
     QVERIFY(child->parent() == node.data());
     QVERIFY(child->parentNode() == node.data());
-    QVERIFY(Qt3D::QNodePrivate::get(child.data())->scene() != Q_NULLPTR);
+    QVERIFY(Qt3DCore::QNodePrivate::get(child.data())->scene() != Q_NULLPTR);
 
     QCOMPARE(spy.events.size(), 1);
     QVERIFY(spy.events.first().wasLocked());
     QCOMPARE(node->children().count(), 1);
 
-    Qt3D::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3D::QScenePropertyChange>();
-    QCOMPARE(event->type(), Qt3D::NodeCreated);
+    Qt3DCore::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>();
+    QCOMPARE(event->type(), Qt3DCore::NodeCreated);
     QCOMPARE(event->propertyName(), "node");
-    Qt3D::QNodePtr clone = event->value().value<Qt3D::QNodePtr>();
+    Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>();
     QCOMPARE(clone->id(), child->id());
     QCOMPARE(clone->parentNode()->id(), node->id());
 }
@@ -426,12 +426,12 @@ void tst_Nodes::appendMultipleChildNodesToNodeScene()
     node->assignScene();
     ObserverSpy spy(node.data());
     // THEN
-    QVERIFY(Qt3D::QNodePrivate::get(node.data())->scene() != Q_NULLPTR);
+    QVERIFY(Qt3DCore::QNodePrivate::get(node.data())->scene() != Q_NULLPTR);
 
     // WHEN
     for (int i = 0; i < 10; i++) {
         // WHEN
-        Qt3D::QNode *child = Q_NULLPTR;
+        Qt3DCore::QNode *child = Q_NULLPTR;
         if (i % 2 == 0) {
             child = new MyQNode(node.data());
             QCoreApplication::processEvents();
@@ -442,7 +442,7 @@ void tst_Nodes::appendMultipleChildNodesToNodeScene()
         }
         // THEN
         QVERIFY(child->parent() == node.data());
-        QVERIFY(Qt3D::QNodePrivate::get(child)->scene() != Q_NULLPTR);
+        QVERIFY(Qt3DCore::QNodePrivate::get(child)->scene() != Q_NULLPTR);
     }
     // THEN
     QCOMPARE(node->children().count(), 10);
@@ -452,14 +452,14 @@ void tst_Nodes::appendMultipleChildNodesToNodeScene()
     Q_FOREACH (const ObserverSpy::ChangeRecord &r, spy.events) {
 
         QVERIFY(r.wasLocked());
-        Qt3D::QScenePropertyChangePtr event = r.change().dynamicCast<Qt3D::QScenePropertyChange>();
-        QCOMPARE(event->type(), Qt3D::NodeCreated);
+        Qt3DCore::QScenePropertyChangePtr event = r.change().dynamicCast<Qt3DCore::QScenePropertyChange>();
+        QCOMPARE(event->type(), Qt3DCore::NodeCreated);
         QCOMPARE(event->propertyName(), "node");
-        Qt3D::QNodePtr clone = event->value().value<Qt3D::QNodePtr>();
+        Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>();
 
         bool found = false;
         Q_FOREACH (QObject *c, node->children()) {
-            if (clone->id() == qobject_cast<Qt3D::QNode *>(c)->id()) {
+            if (clone->id() == qobject_cast<Qt3DCore::QNode *>(c)->id()) {
                 found = true;
                 QCOMPARE(clone->parentNode()->id(), node->id());
                 break;
@@ -477,7 +477,7 @@ void tst_Nodes::checkParentChangeToNull()
 
     // WHEN
     root->assignScene();
-    QScopedPointer<Qt3D::QNode> child(new MyQNode(root.data()));
+    QScopedPointer<Qt3DCore::QNode> child(new MyQNode(root.data()));
     QCoreApplication::processEvents();
 
     // THEN
@@ -495,10 +495,10 @@ void tst_Nodes::checkParentChangeToNull()
     QCOMPARE(spy.events.size(), 1);
 
     QVERIFY(spy.events.first().wasLocked());
-    Qt3D::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3D::QScenePropertyChange>();
-    QCOMPARE(event->type(), Qt3D::NodeAboutToBeDeleted);
+    Qt3DCore::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>();
+    QCOMPARE(event->type(), Qt3DCore::NodeAboutToBeDeleted);
     QCOMPARE(event->propertyName(), "node");
-    Qt3D::QNodePtr clone = event->value().value<Qt3D::QNodePtr>();
+    Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>();
     QCOMPARE(clone->id(), child->id());
     QVERIFY(!clone->parentNode());
 }
@@ -519,14 +519,14 @@ void tst_Nodes::checkParentChangeToOtherParent()
     // WHEN
     ObserverSpy spyParent1(parent1.data());
     ObserverSpy spyParent2(parent2.data());
-    QScopedPointer<Qt3D::QNode> child(new MyQNode(parent1.data()));
+    QScopedPointer<Qt3DCore::QNode> child(new MyQNode(parent1.data()));
     QCoreApplication::processEvents();
 
     // THEN
     QVERIFY(child->parent() == parent1.data());
     QCOMPARE(parent1->children().size(), 1);
     QCOMPARE(parent2->children().size(), 0);
-    QVERIFY(Qt3D::QNodePrivate::get(child.data())->scene() != Q_NULLPTR);
+    QVERIFY(Qt3DCore::QNodePrivate::get(child.data())->scene() != Q_NULLPTR);
     QCOMPARE(spyParent1.events.size(), 1);
 
     // WHEN
@@ -542,19 +542,19 @@ void tst_Nodes::checkParentChangeToOtherParent()
 
     // CHECK event 1 is  a Node Deleted event
     QVERIFY(spyParent1.events.first().wasLocked());
-    Qt3D::QScenePropertyChangePtr event = spyParent1.events.takeFirst().change().dynamicCast<Qt3D::QScenePropertyChange>();
-    QCOMPARE(event->type(), Qt3D::NodeAboutToBeDeleted);
+    Qt3DCore::QScenePropertyChangePtr event = spyParent1.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>();
+    QCOMPARE(event->type(), Qt3DCore::NodeAboutToBeDeleted);
     QCOMPARE(event->propertyName(), "node");
-    Qt3D::QNodePtr clone = event->value().value<Qt3D::QNodePtr>();
+    Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>();
     QCOMPARE(clone->id(), child->id());
     QVERIFY(!clone->parentNode());
 
     // CHECK event 2 is a Node Added event
     QVERIFY(spyParent2.events.last().wasLocked());
-    event = spyParent2.events.last().change().dynamicCast<Qt3D::QScenePropertyChange>();
-    QCOMPARE(event->type(), Qt3D::NodeCreated);
+    event = spyParent2.events.last().change().dynamicCast<Qt3DCore::QScenePropertyChange>();
+    QCOMPARE(event->type(), Qt3DCore::NodeCreated);
     QCOMPARE(event->propertyName(), "node");
-    clone = event->value().value<Qt3D::QNodePtr>();
+    clone = event->value().value<Qt3DCore::QNodePtr>();
     QCOMPARE(clone->id(), child->id());
     QVERIFY(clone->parentNode());
 }
@@ -564,7 +564,7 @@ void tst_Nodes::removingSingleChildNodeFromNode()
 {
     // GIVEN
     QScopedPointer<MyQNode> root(new MyQNode());
-    QScopedPointer<Qt3D::QNode> child(new MyQNode());
+    QScopedPointer<Qt3DCore::QNode> child(new MyQNode());
 
     // WHEN
     child->setParent(root.data());
@@ -583,10 +583,10 @@ void tst_Nodes::removingSingleChildNodeFromNode()
 
     QCOMPARE(spy.events.size(), 1);
     QVERIFY(spy.events.first().wasLocked());
-    Qt3D::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3D::QScenePropertyChange>();
-    QCOMPARE(event->type(), Qt3D::NodeAboutToBeDeleted);
+    Qt3DCore::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>();
+    QCOMPARE(event->type(), Qt3DCore::NodeAboutToBeDeleted);
     QCOMPARE(event->propertyName(), "node");
-    Qt3D::QNodePtr clone = event->value().value<Qt3D::QNodePtr>();
+    Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>();
     QCOMPARE(clone->id(), child->id());
     QVERIFY(!clone->parentNode());
 }
@@ -601,7 +601,7 @@ void tst_Nodes::removingMultipleChildNodesFromNode()
     ObserverSpy spy(root.data());
 
     // THEN
-    QVERIFY(Qt3D::QNodePrivate::get(root.data())->scene() != Q_NULLPTR);
+    QVERIFY(Qt3DCore::QNodePrivate::get(root.data())->scene() != Q_NULLPTR);
 
     // WHEN
     for (int i = 0; i < 10; i++)
@@ -623,10 +623,10 @@ void tst_Nodes::removingMultipleChildNodesFromNode()
     QCOMPARE(spy.events.size(), 10);
     Q_FOREACH (const ObserverSpy::ChangeRecord &r, spy.events) {
         QVERIFY(r.wasLocked());
-        Qt3D::QScenePropertyChangePtr event = r.change().dynamicCast<Qt3D::QScenePropertyChange>();
-        QCOMPARE(event->type(), Qt3D::NodeAboutToBeDeleted);
+        Qt3DCore::QScenePropertyChangePtr event = r.change().dynamicCast<Qt3DCore::QScenePropertyChange>();
+        QCOMPARE(event->type(), Qt3DCore::NodeAboutToBeDeleted);
         QCOMPARE(event->propertyName(), "node");
-        Qt3D::QNodePtr clone = event->value().value<Qt3D::QNodePtr>();
+        Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>();
         QVERIFY(!clone->parentNode());
     }
 }
@@ -637,7 +637,7 @@ void tst_Nodes::appendingChildEntitiesToNode()
     QScopedPointer<MyQNode> root(new MyQNode());
 
     // WHEN
-    Qt3D::QEntity *childEntity = new Qt3D::QEntity(root.data());
+    Qt3DCore::QEntity *childEntity = new Qt3DCore::QEntity(root.data());
 
     // THEN
     QVERIFY(root->children().first() == childEntity);
@@ -651,7 +651,7 @@ void tst_Nodes::removingChildEntitiesFromNode()
     QScopedPointer<MyQNode> root(new MyQNode());
 
     // WHEN
-    Qt3D::QEntity *childEntity = new Qt3D::QEntity(root.data());
+    Qt3DCore::QEntity *childEntity = new Qt3DCore::QEntity(root.data());
 
     // THEN
     QVERIFY(root->children().first() == childEntity);
@@ -670,7 +670,7 @@ void tst_Nodes::removingChildEntitiesFromNode()
 void tst_Nodes::appendingParentlessComponentToEntity()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> entity(new Qt3D::QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity(new Qt3DCore::QEntity());
     MyQComponent *comp = new MyQComponent();
 
     // THEN
@@ -697,10 +697,10 @@ void tst_Nodes::appendingParentlessComponentToEntity()
     // return early in such a case.
 
     // Check that we received ComponentAdded
-    Qt3D::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3D::QScenePropertyChange>();
-    QCOMPARE(event->type(), Qt3D::ComponentAdded);
+    Qt3DCore::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>();
+    QCOMPARE(event->type(), Qt3DCore::ComponentAdded);
     QCOMPARE(event->propertyName(), "component");
-    Qt3D::QNodePtr clone = event->value().value<Qt3D::QNodePtr>();
+    Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>();
     QCOMPARE(clone->id(), comp->id());
     QVERIFY(!clone->parentNode());
 }
@@ -708,7 +708,7 @@ void tst_Nodes::appendingParentlessComponentToEntity()
 void tst_Nodes::appendingComponentToEntity()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> entity(new Qt3D::QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity(new Qt3DCore::QEntity());
     MyQComponent *comp = new MyQComponent(entity.data());
     QCoreApplication::processEvents();
 
@@ -728,10 +728,10 @@ void tst_Nodes::appendingComponentToEntity()
     QVERIFY(comp->parentNode() == entity.data());
     QCOMPARE(spy.events.size(), 1);
     QVERIFY(spy.events.first().wasLocked());
-    Qt3D::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3D::QScenePropertyChange>();
-    QCOMPARE(event->type(), Qt3D::ComponentAdded);
+    Qt3DCore::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>();
+    QCOMPARE(event->type(), Qt3DCore::ComponentAdded);
     QCOMPARE(event->propertyName(), "component");
-    Qt3D::QNodePtr clone = event->value().value<Qt3D::QNodePtr>();
+    Qt3DCore::QNodePtr clone = event->value().value<Qt3DCore::QNodePtr>();
     QCOMPARE(clone->id(), comp->id());
     QVERIFY(!clone->parentNode());
 }
@@ -739,7 +739,7 @@ void tst_Nodes::appendingComponentToEntity()
 void tst_Nodes::removingComponentFromEntity()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> entity(new Qt3D::QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity(new Qt3DCore::QEntity());
     MyQComponent *comp = new MyQComponent();
 
     // WHEN
@@ -760,10 +760,10 @@ void tst_Nodes::removingComponentFromEntity()
     QVERIFY(entity->children().count() == 1);
     QCOMPARE(spy.events.size(), 1);
     QVERIFY(spy.events.first().wasLocked());
-    Qt3D::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3D::QScenePropertyChange>();
-    QCOMPARE(event->type(), Qt3D::ComponentRemoved);
+    Qt3DCore::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>();
+    QCOMPARE(event->type(), Qt3DCore::ComponentRemoved);
     QCOMPARE(event->propertyName(), "componentId");
-    Qt3D::QNodeId nodeId = event->value().value<Qt3D::QNodeId>();
+    Qt3DCore::QNodeId nodeId = event->value().value<Qt3DCore::QNodeId>();
     QCOMPARE(nodeId, comp->id());
 }
 
@@ -777,8 +777,8 @@ void tst_Nodes::changeCustomProperty()
     // THEN
     QCOMPARE(spy.events.size(), 1);
     QVERIFY(spy.events.first().wasLocked());
-    Qt3D::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3D::QScenePropertyChange>();
-    QCOMPARE(event->type(), Qt3D::NodeUpdated);
+    Qt3DCore::QScenePropertyChangePtr event = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QScenePropertyChange>();
+    QCOMPARE(event->type(), Qt3DCore::NodeUpdated);
     QCOMPARE(event->propertyName(), "customProperty");
     QCOMPARE(event->value().toString(), QString("foo"));
 }
@@ -787,7 +787,7 @@ void tst_Nodes::checkDestruction()
 {
     // GIVEN
     QScopedPointer<MyQNode> root(new MyQNode());
-    Qt3D::QEntity *entity = new Qt3D::QEntity(root.data());
+    Qt3DCore::QEntity *entity = new Qt3DCore::QEntity(root.data());
 
     MyQComponent *comp1 = new MyQComponent();
     MyQComponent *comp2 = new MyQComponent();
diff --git a/tests/auto/core/qaspectengine/tst_qaspectengine.cpp b/tests/auto/core/qaspectengine/tst_qaspectengine.cpp
index 0f6a30c8e..69b7a916e 100644
--- a/tests/auto/core/qaspectengine/tst_qaspectengine.cpp
+++ b/tests/auto/core/qaspectengine/tst_qaspectengine.cpp
@@ -39,7 +39,7 @@
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qtransform.h>
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 class tst_QAspectEngine : public QObject
 {
@@ -85,7 +85,7 @@ void tst_QAspectEngine::shouldNotCrashOnShutdownWhenComponentIsCreatedWithParent
     // GIVEN
     QEntity *root = new QEntity;
     // A component parented to an entity...
-    QComponent *component = new Qt3D::QTransform(root);
+    QComponent *component = new Qt3DCore::QTransform(root);
     // ... created *before* the entity it will be added to.
     QEntity *entity = new QEntity(root);
     entity->addComponent(component);
diff --git a/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp b/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp
index d52821d42..6da0489e3 100644
--- a/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp
+++ b/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp
@@ -38,7 +38,7 @@
 #include <Qt3DCore/QAspectFactory>
 #include <Qt3DCore/QAbstractAspect>
 
-using namespace QT_PREPEND_NAMESPACE(Qt3D);
+using namespace QT_PREPEND_NAMESPACE(Qt3DCore);
 
 #define FAKE_ASPECT(ClassName) \
 class ClassName : public QAbstractAspect \
diff --git a/tests/auto/core/qboundedcircularbuffer/tst_qboundedcircularbuffer.cpp b/tests/auto/core/qboundedcircularbuffer/tst_qboundedcircularbuffer.cpp
index 2a61cee97..ce4489f4b 100644
--- a/tests/auto/core/qboundedcircularbuffer/tst_qboundedcircularbuffer.cpp
+++ b/tests/auto/core/qboundedcircularbuffer/tst_qboundedcircularbuffer.cpp
@@ -39,7 +39,7 @@
 
 #include <Qt3DCore/private/qboundedcircularbuffer_p.h>
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 class tst_QBoundedCircularBuffer : public QObject
 {
diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
index fd3d622cd..0382ecae6 100644
--- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
+++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
@@ -64,75 +64,75 @@ private slots:
     void distributeBackendChanges();
 };
 
-class tst_Node : public Qt3D::QNode
+class tst_Node : public Qt3DCore::QNode
 {
 public:
-    explicit tst_Node(Qt3D::QNode *parent = 0) : Qt3D::QNode(parent)
+    explicit tst_Node(Qt3DCore::QNode *parent = 0) : Qt3DCore::QNode(parent)
     {}
 
     void sendNodeAddedNotification()
     {
-        Qt3D::QScenePropertyChangePtr e(new Qt3D::QScenePropertyChange(Qt3D::NodeAdded, Qt3D::QSceneChange::Node, id()));
+        Qt3DCore::QScenePropertyChangePtr e(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, id()));
         e->setPropertyName("NodeAdded");
-        Qt3D::QNodePrivate::get(this)->notifyObservers(e);
+        Qt3DCore::QNodePrivate::get(this)->notifyObservers(e);
     }
 
     void sendNodeRemovedNotification()
     {
-        Qt3D::QScenePropertyChangePtr e(new Qt3D::QScenePropertyChange(Qt3D::NodeRemoved, Qt3D::QSceneChange::Node, id()));
+        Qt3DCore::QScenePropertyChangePtr e(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, id()));
         e->setPropertyName("NodeRemoved");
-        Qt3D::QNodePrivate::get(this)->notifyObservers(e);
+        Qt3DCore::QNodePrivate::get(this)->notifyObservers(e);
     }
 
     void sendNodeUpdatedNotification()
     {
-        Qt3D::QScenePropertyChangePtr e(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, id()));
+        Qt3DCore::QScenePropertyChangePtr e(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, id()));
         e->setPropertyName("NodeUpdated");
-        Qt3D::QNodePrivate::get(this)->notifyObservers(e);
+        Qt3DCore::QNodePrivate::get(this)->notifyObservers(e);
     }
 
     void sendComponentAddedNotification()
     {
-        Qt3D::QScenePropertyChangePtr e(new Qt3D::QScenePropertyChange(Qt3D::ComponentAdded, Qt3D::QSceneChange::Node, id()));
+        Qt3DCore::QScenePropertyChangePtr e(new Qt3DCore::QScenePropertyChange(Qt3DCore::ComponentAdded, Qt3DCore::QSceneChange::Node, id()));
         e->setPropertyName("ComponentAdded");
-        Qt3D::QNodePrivate::get(this)->notifyObservers(e);
+        Qt3DCore::QNodePrivate::get(this)->notifyObservers(e);
     }
 
     void sendComponentRemovedNotification()
     {
-        Qt3D::QScenePropertyChangePtr e(new Qt3D::QScenePropertyChange(Qt3D::ComponentRemoved, Qt3D::QSceneChange::Node, id()));
+        Qt3DCore::QScenePropertyChangePtr e(new Qt3DCore::QScenePropertyChange(Qt3DCore::ComponentRemoved, Qt3DCore::QSceneChange::Node, id()));
         e->setPropertyName("ComponentRemoved");
-        Qt3D::QNodePrivate::get(this)->notifyObservers(e);
+        Qt3DCore::QNodePrivate::get(this)->notifyObservers(e);
     }
 
     void sendAllChangesNotification()
     {
-        Qt3D::QScenePropertyChangePtr e(new Qt3D::QScenePropertyChange(Qt3D::AllChanges, Qt3D::QSceneChange::Node, id()));
+        Qt3DCore::QScenePropertyChangePtr e(new Qt3DCore::QScenePropertyChange(Qt3DCore::AllChanges, Qt3DCore::QSceneChange::Node, id()));
         e->setPropertyName("AllChanges");
-        Qt3D::QNodePrivate::get(this)->notifyObservers(e);
+        Qt3DCore::QNodePrivate::get(this)->notifyObservers(e);
     }
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &change) Q_DECL_OVERRIDE
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE
     {
         QVERIFY(!change.isNull());
         m_lastChanges << change;
     }
 
-    Qt3D::QSceneChangePtr lastChange() const
+    Qt3DCore::QSceneChangePtr lastChange() const
     {
         if (m_lastChanges.isEmpty())
-            return Qt3D::QSceneChangePtr();
+            return Qt3DCore::QSceneChangePtr();
         return m_lastChanges.last();
     }
 
-    QList<Qt3D::QSceneChangePtr> lastChanges() const
+    QList<Qt3DCore::QSceneChangePtr> lastChanges() const
     {
         return m_lastChanges;
     }
 
     // QNode interface
 protected:
-    Qt3D::QNode *doClone() const
+    Qt3DCore::QNode *doClone() const
     {
         tst_Node *clone = new tst_Node();
         clone->copy(this);
@@ -140,54 +140,54 @@ protected:
     }
 
 private:
-    QList<Qt3D::QSceneChangePtr> m_lastChanges;
+    QList<Qt3DCore::QSceneChangePtr> m_lastChanges;
 };
 
-class tst_SimpleObserver : public Qt3D::QObserverInterface
+class tst_SimpleObserver : public Qt3DCore::QObserverInterface
 {
 public:
 
     // QObserverInterface interface
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE
     {
         QVERIFY(!e.isNull());
         m_lastChanges.append(e);
     }
 
-    Qt3D::QSceneChangePtr lastChange() const
+    Qt3DCore::QSceneChangePtr lastChange() const
     {
         if (m_lastChanges.isEmpty())
-            return Qt3D::QSceneChangePtr();
+            return Qt3DCore::QSceneChangePtr();
         return m_lastChanges.last();
     }
 
-    QList<Qt3D::QSceneChangePtr> lastChanges() const
+    QList<Qt3DCore::QSceneChangePtr> lastChanges() const
     {
         return m_lastChanges;
     }
 
 private:
-    QList<Qt3D::QSceneChangePtr> m_lastChanges;
+    QList<Qt3DCore::QSceneChangePtr> m_lastChanges;
 };
 
-class tst_BackendObserverObservable : public Qt3D::QBackendNode
+class tst_BackendObserverObservable : public Qt3DCore::QBackendNode
 {
 public:
 
     tst_BackendObserverObservable()
-        : Qt3D::QBackendNode(ReadWrite)
+        : Qt3DCore::QBackendNode(ReadWrite)
     {}
 
-    void updateFromPeer(Qt3D::QNode *) Q_DECL_OVERRIDE
+    void updateFromPeer(Qt3DCore::QNode *) Q_DECL_OVERRIDE
     {}
 
     // QObserverInterface interface
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE
     {
         QVERIFY(!e.isNull());
         m_lastChanges << e;
         // Save reply to be sent to the frontend
-        m_reply.reset(new Qt3D::QBackendScenePropertyChange(Qt3D::NodeUpdated, e->subjectId()));
+        m_reply.reset(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, e->subjectId()));
         m_reply->setTargetNode(e->subjectId());
         m_reply->setPropertyName("Reply");
     }
@@ -200,21 +200,21 @@ public:
         qDebug() << Q_FUNC_INFO;
     }
 
-    Qt3D::QSceneChangePtr lastChange() const
+    Qt3DCore::QSceneChangePtr lastChange() const
     {
         if (m_lastChanges.isEmpty())
-            return Qt3D::QSceneChangePtr();
+            return Qt3DCore::QSceneChangePtr();
         return m_lastChanges.last();
     }
 
-    QList<Qt3D::QSceneChangePtr> lastChanges() const
+    QList<Qt3DCore::QSceneChangePtr> lastChanges() const
     {
         return m_lastChanges;
     }
 
 private:
-    QList<Qt3D::QSceneChangePtr> m_lastChanges;
-    Qt3D::QBackendScenePropertyChangePtr m_reply;
+    QList<Qt3DCore::QSceneChangePtr> m_lastChanges;
+    Qt3DCore::QBackendScenePropertyChangePtr m_reply;
 
 };
 
@@ -224,7 +224,7 @@ class ThreadedAnswer : public QThread
 {
     Q_OBJECT
 public:
-    ThreadedAnswer(Qt3D::QChangeArbiter *arbiter, tst_BackendObserverObservable *backend)
+    ThreadedAnswer(Qt3DCore::QChangeArbiter *arbiter, tst_BackendObserverObservable *backend)
         : QThread()
         , m_arbiter(arbiter)
         , m_backendObs(backend)
@@ -233,7 +233,7 @@ public:
     void run() Q_DECL_OVERRIDE
     {
         // create backend change queue on QChangeArbiter
-        Qt3D::QChangeArbiter::createThreadLocalChangeQueue(m_arbiter);
+        Qt3DCore::QChangeArbiter::createThreadLocalChangeQueue(m_arbiter);
         m_backendObs->sendReply();
         // gives time for other threads to start waiting
         QThread::currentThread()->sleep(1);
@@ -243,105 +243,105 @@ public:
     }
 
 private:
-    Qt3D::QChangeArbiter *m_arbiter;
+    Qt3DCore::QChangeArbiter *m_arbiter;
     tst_BackendObserverObservable *m_backendObs;
     QWaitCondition m_waitingForReplyToBeSent;
 };
 
-class tst_PostManObserver : public Qt3D::QAbstractPostman
+class tst_PostManObserver : public Qt3DCore::QAbstractPostman
 {
 public:
 
     tst_PostManObserver() : m_sceneInterface(Q_NULLPTR)
     {}
 
-    void setScene(Qt3D::QScene *scene) Q_DECL_FINAL
+    void setScene(Qt3DCore::QScene *scene) Q_DECL_FINAL
     {
         m_sceneInterface = scene;
     }
 
     // QObserverInterface interface
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     {
         QVERIFY(!e.isNull());
-        Qt3D::QBackendScenePropertyChangePtr change = qSharedPointerDynamicCast<Qt3D::QBackendScenePropertyChange>(e);
+        Qt3DCore::QBackendScenePropertyChangePtr change = qSharedPointerDynamicCast<Qt3DCore::QBackendScenePropertyChange>(e);
         QVERIFY(!change.isNull());
-        Qt3D::QNode *targetNode = m_sceneInterface->lookupNode(change->targetNode());
+        Qt3DCore::QNode *targetNode = m_sceneInterface->lookupNode(change->targetNode());
         QVERIFY(targetNode != Q_NULLPTR);
         m_lastChanges << e;
     }
 
-    Qt3D::QSceneChangePtr lastChange() const
+    Qt3DCore::QSceneChangePtr lastChange() const
     {
         if (m_lastChanges.isEmpty())
-            return Qt3D::QSceneChangePtr();
+            return Qt3DCore::QSceneChangePtr();
         return m_lastChanges.last();
     }
 
-    QList<Qt3D::QSceneChangePtr> lastChanges() const
+    QList<Qt3DCore::QSceneChangePtr> lastChanges() const
     {
         return m_lastChanges;
     }
 
-    void notifyBackend(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL
+    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
     {
         m_sceneInterface->arbiter()->sceneChangeEventWithLock(e);
     }
 
 private:
-    Qt3D::QScene *m_sceneInterface;
-    QList<Qt3D::QSceneChangePtr> m_lastChanges;
+    Qt3DCore::QScene *m_sceneInterface;
+    QList<Qt3DCore::QSceneChangePtr> m_lastChanges;
 };
 
-class tst_SceneObserver : public Qt3D::QSceneObserverInterface
+class tst_SceneObserver : public Qt3DCore::QSceneObserverInterface
 {
     // QSceneObserverInterface interface
 public:
-    void sceneNodeAdded(Qt3D::QSceneChangePtr &e)
+    void sceneNodeAdded(Qt3DCore::QSceneChangePtr &e)
     {
         QVERIFY(!e.isNull());
-        QVERIFY(e->type() == Qt3D::NodeCreated);
+        QVERIFY(e->type() == Qt3DCore::NodeCreated);
         m_lastChange = e;
     }
 
-    void sceneNodeRemoved(Qt3D::QSceneChangePtr &e)
+    void sceneNodeRemoved(Qt3DCore::QSceneChangePtr &e)
     {
         QVERIFY(!e.isNull());
-        QVERIFY((e->type() == Qt3D::NodeDeleted || e->type() == Qt3D::NodeAboutToBeDeleted));
+        QVERIFY((e->type() == Qt3DCore::NodeDeleted || e->type() == Qt3DCore::NodeAboutToBeDeleted));
         m_lastChange = e;
     }
 
-    void sceneNodeUpdated(Qt3D::QSceneChangePtr &e)
+    void sceneNodeUpdated(Qt3DCore::QSceneChangePtr &e)
     {
         m_lastChange = e;
     }
 
-    Qt3D::QSceneChangePtr lastChange() const
+    Qt3DCore::QSceneChangePtr lastChange() const
     {
         return m_lastChange;
     }
 
 private:
-    Qt3D::QSceneChangePtr m_lastChange;
+    Qt3DCore::QSceneChangePtr m_lastChange;
 };
 
 void tst_QChangeArbiter::registerObservers()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QChangeArbiter> arbiter(new Qt3D::QChangeArbiter());
-    QScopedPointer<Qt3D::QScene> scene(new Qt3D::QScene());
-    QScopedPointer<Qt3D::QAbstractPostman> postman(new tst_PostManObserver);
+    QScopedPointer<Qt3DCore::QChangeArbiter> arbiter(new Qt3DCore::QChangeArbiter());
+    QScopedPointer<Qt3DCore::QScene> scene(new Qt3DCore::QScene());
+    QScopedPointer<Qt3DCore::QAbstractPostman> postman(new tst_PostManObserver);
     arbiter->setPostman(postman.data());
     arbiter->setScene(scene.data());
     postman->setScene(scene.data());
     scene->setArbiter(arbiter.data());
     // Replaces initialize as we have no JobManager in this case
-    Qt3D::QChangeArbiter::createThreadLocalChangeQueue(arbiter.data());
+    Qt3DCore::QChangeArbiter::createThreadLocalChangeQueue(arbiter.data());
 
     // WHEN
-    Qt3D::QNode *root = new tst_Node();
-    Qt3D::QNode *child = new tst_Node();
-    Qt3D::QNodePrivate::get(root)->setScene(scene.data());
+    Qt3DCore::QNode *root = new tst_Node();
+    Qt3DCore::QNode *child = new tst_Node();
+    Qt3DCore::QNodePrivate::get(root)->setScene(scene.data());
     scene->addObservable(root);
 
     QList<tst_SimpleObserver *> observers;
@@ -361,29 +361,29 @@ void tst_QChangeArbiter::registerObservers()
     arbiter->syncChanges();
     Q_FOREACH (tst_SimpleObserver *o, observers) {
         QVERIFY(!o->lastChange().isNull());
-        QVERIFY(o->lastChange()->type() == Qt3D::NodeCreated);
+        QVERIFY(o->lastChange()->type() == Qt3DCore::NodeCreated);
     }
 
-    Qt3D::QChangeArbiter::destroyThreadLocalChangeQueue(arbiter.data());
+    Qt3DCore::QChangeArbiter::destroyThreadLocalChangeQueue(arbiter.data());
 }
 
 void tst_QChangeArbiter::registerSceneObserver()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QChangeArbiter> arbiter(new Qt3D::QChangeArbiter());
-    QScopedPointer<Qt3D::QScene> scene(new Qt3D::QScene());
-    QScopedPointer<Qt3D::QAbstractPostman> postman(new tst_PostManObserver);
+    QScopedPointer<Qt3DCore::QChangeArbiter> arbiter(new Qt3DCore::QChangeArbiter());
+    QScopedPointer<Qt3DCore::QScene> scene(new Qt3DCore::QScene());
+    QScopedPointer<Qt3DCore::QAbstractPostman> postman(new tst_PostManObserver);
     arbiter->setPostman(postman.data());
     arbiter->setScene(scene.data());
     postman->setScene(scene.data());
     scene->setArbiter(arbiter.data());
     // Replaces initialize as we have no JobManager in this case
-    Qt3D::QChangeArbiter::createThreadLocalChangeQueue(arbiter.data());
+    Qt3DCore::QChangeArbiter::createThreadLocalChangeQueue(arbiter.data());
 
     // WHEN
     tst_Node *root = new tst_Node();
-    Qt3D::QNode *child = new tst_Node();
-    Qt3D::QNodePrivate::get(root)->setScene(scene.data());
+    Qt3DCore::QNode *child = new tst_Node();
+    Qt3DCore::QNodePrivate::get(root)->setScene(scene.data());
     scene->addObservable(root);
 
     QList<tst_SimpleObserver *> observers;
@@ -415,11 +415,11 @@ void tst_QChangeArbiter::registerSceneObserver()
     // THEN
     Q_FOREACH (tst_SimpleObserver *o, observers) {
         QVERIFY(!o->lastChange().isNull());
-        QVERIFY(o->lastChange()->type() == Qt3D::NodeCreated);
+        QVERIFY(o->lastChange()->type() == Qt3DCore::NodeCreated);
     }
     Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
         QVERIFY(!s->lastChange().isNull());
-        QVERIFY(s->lastChange()->type() == Qt3D::NodeCreated);
+        QVERIFY(s->lastChange()->type() == Qt3DCore::NodeCreated);
     }
 
     // WHEN
@@ -429,33 +429,33 @@ void tst_QChangeArbiter::registerSceneObserver()
     // THEN
     Q_FOREACH (tst_SimpleObserver *o, observers) {
         QVERIFY(!o->lastChange().isNull());
-        QVERIFY(o->lastChange()->type() == Qt3D::ComponentAdded);
+        QVERIFY(o->lastChange()->type() == Qt3DCore::ComponentAdded);
     }
     Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
         QVERIFY(!s->lastChange().isNull());
-        QVERIFY(s->lastChange()->type() == Qt3D::NodeCreated);
+        QVERIFY(s->lastChange()->type() == Qt3DCore::NodeCreated);
     }
 
-    Qt3D::QChangeArbiter::destroyThreadLocalChangeQueue(arbiter.data());
+    Qt3DCore::QChangeArbiter::destroyThreadLocalChangeQueue(arbiter.data());
 }
 
 void tst_QChangeArbiter::unregisterObservers()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QChangeArbiter> arbiter(new Qt3D::QChangeArbiter());
-    QScopedPointer<Qt3D::QScene> scene(new Qt3D::QScene());
-    QScopedPointer<Qt3D::QAbstractPostman> postman(new tst_PostManObserver);
+    QScopedPointer<Qt3DCore::QChangeArbiter> arbiter(new Qt3DCore::QChangeArbiter());
+    QScopedPointer<Qt3DCore::QScene> scene(new Qt3DCore::QScene());
+    QScopedPointer<Qt3DCore::QAbstractPostman> postman(new tst_PostManObserver);
     arbiter->setPostman(postman.data());
     arbiter->setScene(scene.data());
     postman->setScene(scene.data());
     scene->setArbiter(arbiter.data());
     // Replaces initialize as we have no JobManager in this case
-    Qt3D::QChangeArbiter::createThreadLocalChangeQueue(arbiter.data());
+    Qt3DCore::QChangeArbiter::createThreadLocalChangeQueue(arbiter.data());
 
     // WHEN
     tst_Node *root = new tst_Node();
-    Qt3D::QNode *child = new tst_Node();
-    Qt3D::QNodePrivate::get(root)->setScene(scene.data());
+    Qt3DCore::QNode *child = new tst_Node();
+    Qt3DCore::QNodePrivate::get(root)->setScene(scene.data());
     scene->addObservable(root);
 
     QList<tst_SimpleObserver *> observers;
@@ -478,7 +478,7 @@ void tst_QChangeArbiter::unregisterObservers()
     // THEN
     Q_FOREACH (tst_SimpleObserver *o, observers) {
         QVERIFY(!o->lastChange().isNull());
-        QVERIFY(o->lastChange()->type() == Qt3D::NodeCreated);
+        QVERIFY(o->lastChange()->type() == Qt3DCore::NodeCreated);
     }
 
     // WHEN
@@ -491,29 +491,29 @@ void tst_QChangeArbiter::unregisterObservers()
     // THEN
     Q_FOREACH (tst_SimpleObserver *o, observers) {
         QVERIFY(!o->lastChange().isNull());
-        QVERIFY(o->lastChange()->type() == Qt3D::NodeCreated);
+        QVERIFY(o->lastChange()->type() == Qt3DCore::NodeCreated);
     }
 
-    Qt3D::QChangeArbiter::destroyThreadLocalChangeQueue(arbiter.data());
+    Qt3DCore::QChangeArbiter::destroyThreadLocalChangeQueue(arbiter.data());
 }
 
 void tst_QChangeArbiter::unregisterSceneObservers()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QChangeArbiter> arbiter(new Qt3D::QChangeArbiter());
-    QScopedPointer<Qt3D::QScene> scene(new Qt3D::QScene());
-    QScopedPointer<Qt3D::QAbstractPostman> postman(new tst_PostManObserver);
+    QScopedPointer<Qt3DCore::QChangeArbiter> arbiter(new Qt3DCore::QChangeArbiter());
+    QScopedPointer<Qt3DCore::QScene> scene(new Qt3DCore::QScene());
+    QScopedPointer<Qt3DCore::QAbstractPostman> postman(new tst_PostManObserver);
     arbiter->setPostman(postman.data());
     arbiter->setScene(scene.data());
     postman->setScene(scene.data());
     scene->setArbiter(arbiter.data());
     // Replaces initialize as we have no JobManager in this case
-    Qt3D::QChangeArbiter::createThreadLocalChangeQueue(arbiter.data());
+    Qt3DCore::QChangeArbiter::createThreadLocalChangeQueue(arbiter.data());
 
     // WHEN
     tst_Node *root = new tst_Node();
-    Qt3D::QNode *child = new tst_Node();
-    Qt3D::QNodePrivate::get(root)->setScene(scene.data());
+    Qt3DCore::QNode *child = new tst_Node();
+    Qt3DCore::QNodePrivate::get(root)->setScene(scene.data());
     scene->addObservable(root);
 
     QList<tst_SimpleObserver *> observers;
@@ -545,11 +545,11 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     // THEN
     Q_FOREACH (tst_SimpleObserver *o, observers) {
         QVERIFY(!o->lastChange().isNull());
-        QVERIFY(o->lastChange()->type() == Qt3D::NodeCreated);
+        QVERIFY(o->lastChange()->type() == Qt3DCore::NodeCreated);
     }
     Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
         QVERIFY(!s->lastChange().isNull());
-        QVERIFY(s->lastChange()->type() == Qt3D::NodeCreated);
+        QVERIFY(s->lastChange()->type() == Qt3DCore::NodeCreated);
     }
 
     // WHEN
@@ -559,11 +559,11 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     // THEN
     Q_FOREACH (tst_SimpleObserver *o, observers) {
         QVERIFY(!o->lastChange().isNull());
-        QVERIFY(o->lastChange()->type() == Qt3D::ComponentAdded);
+        QVERIFY(o->lastChange()->type() == Qt3DCore::ComponentAdded);
     }
     Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
         QVERIFY(!s->lastChange().isNull());
-        QVERIFY(s->lastChange()->type() == Qt3D::NodeCreated);
+        QVERIFY(s->lastChange()->type() == Qt3DCore::NodeCreated);
     }
 
     // WHEN
@@ -573,11 +573,11 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     // THEN
     Q_FOREACH (tst_SimpleObserver *o, observers) {
         QVERIFY(!o->lastChange().isNull());
-        QVERIFY(o->lastChange()->type() == Qt3D::NodeAboutToBeDeleted);
+        QVERIFY(o->lastChange()->type() == Qt3DCore::NodeAboutToBeDeleted);
     }
     Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
         QVERIFY(!s->lastChange().isNull());
-        QVERIFY(s->lastChange()->type() == Qt3D::NodeAboutToBeDeleted);
+        QVERIFY(s->lastChange()->type() == Qt3DCore::NodeAboutToBeDeleted);
     }
 
     Q_FOREACH (tst_SceneObserver *s, sceneObservers)
@@ -590,32 +590,32 @@ void tst_QChangeArbiter::unregisterSceneObservers()
     // THEN
     Q_FOREACH (tst_SimpleObserver *o, observers) {
         QVERIFY(!o->lastChange().isNull());
-        QVERIFY(o->lastChange()->type() == Qt3D::NodeCreated);
+        QVERIFY(o->lastChange()->type() == Qt3DCore::NodeCreated);
     }
     Q_FOREACH (tst_SceneObserver *s, sceneObservers) {
         QVERIFY(!s->lastChange().isNull());
-        QVERIFY(s->lastChange()->type() == Qt3D::NodeAboutToBeDeleted);
+        QVERIFY(s->lastChange()->type() == Qt3DCore::NodeAboutToBeDeleted);
     }
 
-    Qt3D::QChangeArbiter::destroyThreadLocalChangeQueue(arbiter.data());
+    Qt3DCore::QChangeArbiter::destroyThreadLocalChangeQueue(arbiter.data());
 }
 
 void tst_QChangeArbiter::distributeFrontendChanges()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QChangeArbiter> arbiter(new Qt3D::QChangeArbiter());
-    QScopedPointer<Qt3D::QScene> scene(new Qt3D::QScene());
-    QScopedPointer<Qt3D::QAbstractPostman> postman(new tst_PostManObserver);
+    QScopedPointer<Qt3DCore::QChangeArbiter> arbiter(new Qt3DCore::QChangeArbiter());
+    QScopedPointer<Qt3DCore::QScene> scene(new Qt3DCore::QScene());
+    QScopedPointer<Qt3DCore::QAbstractPostman> postman(new tst_PostManObserver);
     arbiter->setPostman(postman.data());
     arbiter->setScene(scene.data());
     postman->setScene(scene.data());
     scene->setArbiter(arbiter.data());
     // Replaces initialize as we have no JobManager in this case
-    Qt3D::QChangeArbiter::createThreadLocalChangeQueue(arbiter.data());
+    Qt3DCore::QChangeArbiter::createThreadLocalChangeQueue(arbiter.data());
 
     // WHEN
     tst_Node *root = new tst_Node();
-    Qt3D::QNodePrivate::get(root)->setScene(scene.data());
+    Qt3DCore::QNodePrivate::get(root)->setScene(scene.data());
     scene->addObservable(root);
 
     tst_SimpleObserver *backendAllChangedObserver = new tst_SimpleObserver();
@@ -626,11 +626,11 @@ void tst_QChangeArbiter::distributeFrontendChanges()
     tst_SimpleObserver *backendComponentRemovedObserver = new tst_SimpleObserver();
 
     arbiter->registerObserver(backendAllChangedObserver, root->id());
-    arbiter->registerObserver(backendNodeAddedObserver, root->id(), Qt3D::NodeAdded);
-    arbiter->registerObserver(backendNodeUpdatedObserver, root->id(), Qt3D::NodeUpdated);
-    arbiter->registerObserver(backendNodeRemovedObserver, root->id(), Qt3D::NodeRemoved);
-    arbiter->registerObserver(backendComponentAddedObserver, root->id(), Qt3D::ComponentAdded);
-    arbiter->registerObserver(backendComponentRemovedObserver, root->id(), Qt3D::ComponentRemoved);
+    arbiter->registerObserver(backendNodeAddedObserver, root->id(), Qt3DCore::NodeAdded);
+    arbiter->registerObserver(backendNodeUpdatedObserver, root->id(), Qt3DCore::NodeUpdated);
+    arbiter->registerObserver(backendNodeRemovedObserver, root->id(), Qt3DCore::NodeRemoved);
+    arbiter->registerObserver(backendComponentAddedObserver, root->id(), Qt3DCore::ComponentAdded);
+    arbiter->registerObserver(backendComponentRemovedObserver, root->id(), Qt3DCore::ComponentRemoved);
 
     arbiter->syncChanges();
 
@@ -714,22 +714,22 @@ void tst_QChangeArbiter::distributeFrontendChanges()
     QCOMPARE(backendComponentAddedObserver->lastChanges().count(), 2);
     QCOMPARE(backendComponentRemovedObserver->lastChanges().count(), 2);
 
-    Qt3D::QChangeArbiter::destroyThreadLocalChangeQueue(arbiter.data());
+    Qt3DCore::QChangeArbiter::destroyThreadLocalChangeQueue(arbiter.data());
 }
 
 void tst_QChangeArbiter::distributeBackendChanges()
 {
 
     // GIVEN
-    QScopedPointer<Qt3D::QChangeArbiter> arbiter(new Qt3D::QChangeArbiter());
-    QScopedPointer<Qt3D::QScene> scene(new Qt3D::QScene());
+    QScopedPointer<Qt3DCore::QChangeArbiter> arbiter(new Qt3DCore::QChangeArbiter());
+    QScopedPointer<Qt3DCore::QScene> scene(new Qt3DCore::QScene());
     QScopedPointer<tst_PostManObserver> postman(new tst_PostManObserver);
     arbiter->setPostman(postman.data());
     arbiter->setScene(scene.data());
     postman->setScene(scene.data());
     scene->setArbiter(arbiter.data());
     // Replaces initialize as we have no JobManager in this case
-    Qt3D::QChangeArbiter::createThreadLocalChangeQueue(arbiter.data());
+    Qt3DCore::QChangeArbiter::createThreadLocalChangeQueue(arbiter.data());
 
     // In order for backend -> frontend changes to work properly,
     // the backend notification should only be sent
@@ -740,13 +740,13 @@ void tst_QChangeArbiter::distributeBackendChanges()
 
     // WHEN
     tst_Node *root = new tst_Node();
-    Qt3D::QNodePrivate::get(root)->setScene(scene.data());
+    Qt3DCore::QNodePrivate::get(root)->setScene(scene.data());
     scene->addObservable(root);
 
     tst_BackendObserverObservable *backenObserverObservable = new tst_BackendObserverObservable();
-    arbiter->registerObserver(Qt3D::QBackendNodePrivate::get(backenObserverObservable), root->id());
-    arbiter->scene()->addObservable(Qt3D::QBackendNodePrivate::get(backenObserverObservable), root->id());
-    Qt3D::QBackendNodePrivate::get(backenObserverObservable)->setArbiter(arbiter.data());
+    arbiter->registerObserver(Qt3DCore::QBackendNodePrivate::get(backenObserverObservable), root->id());
+    arbiter->scene()->addObservable(Qt3DCore::QBackendNodePrivate::get(backenObserverObservable), root->id());
+    Qt3DCore::QBackendNodePrivate::get(backenObserverObservable)->setArbiter(arbiter.data());
 
     arbiter->syncChanges();
 
@@ -786,16 +786,16 @@ void tst_QChangeArbiter::distributeBackendChanges()
     QCOMPARE(postman->lastChanges().count(), 1);
 
     // verify correctness of the reply
-    Qt3D::QBackendScenePropertyChangePtr c = qSharedPointerDynamicCast<Qt3D::QBackendScenePropertyChange>(postman->lastChange());
+    Qt3DCore::QBackendScenePropertyChangePtr c = qSharedPointerDynamicCast<Qt3DCore::QBackendScenePropertyChange>(postman->lastChange());
     QVERIFY(!c.isNull());
     QVERIFY(c->targetNode() == root->id());
     qDebug() << c->propertyName();
     QVERIFY(strcmp(c->propertyName(), "Reply") == 0);
-    QVERIFY(c->type() == Qt3D::NodeUpdated);
+    QVERIFY(c->type() == Qt3DCore::NodeUpdated);
 
     answer->exit();
     answer->wait();
-    Qt3D::QChangeArbiter::destroyThreadLocalChangeQueue(arbiter.data());
+    Qt3DCore::QChangeArbiter::destroyThreadLocalChangeQueue(arbiter.data());
 }
 
 QTEST_GUILESS_MAIN(tst_QChangeArbiter)
diff --git a/tests/auto/core/qcircularbuffer/tst_qcircularbuffer.cpp b/tests/auto/core/qcircularbuffer/tst_qcircularbuffer.cpp
index 8e76ce843..cc923d052 100644
--- a/tests/auto/core/qcircularbuffer/tst_qcircularbuffer.cpp
+++ b/tests/auto/core/qcircularbuffer/tst_qcircularbuffer.cpp
@@ -39,7 +39,7 @@
 
 #include <Qt3DCore/private/qcircularbuffer_p.h>
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 class tst_QCircularBuffer : public QObject
 {
diff --git a/tests/auto/core/qentity/tst_qentity.cpp b/tests/auto/core/qentity/tst_qentity.cpp
index 2f7ebf314..042b62386 100644
--- a/tests/auto/core/qentity/tst_qentity.cpp
+++ b/tests/auto/core/qentity/tst_qentity.cpp
@@ -39,7 +39,7 @@
 #include <Qt3DCore/qcomponent.h>
 #include <QtCore/qscopedpointer.h>
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 class tst_Entity : public QObject
 {
@@ -66,11 +66,11 @@ private slots:
     void verifyCopy();
 };
 
-class MyQComponent : public Qt3D::QComponent
+class MyQComponent : public Qt3DCore::QComponent
 {
     Q_OBJECT
 public:
-    explicit MyQComponent(Qt3D::QNode *parent = 0)
+    explicit MyQComponent(Qt3DCore::QNode *parent = 0)
         : QComponent(parent)
     {}
 
@@ -84,14 +84,14 @@ protected:
 };
 
 
-class MyEntity : public Qt3D::QEntity
+class MyEntity : public Qt3DCore::QEntity
 {
 public:
-    explicit MyEntity(Qt3D::QNode *parent = 0)
+    explicit MyEntity(Qt3DCore::QNode *parent = 0)
         : QEntity(parent)
     {}
 
-    void makeCopyOf(Qt3D::QEntity *other)
+    void makeCopyOf(Qt3DCore::QEntity *other)
     {
         QEntity::copy(other);
     }
@@ -119,7 +119,7 @@ void tst_Entity::constructionDestruction()
 void tst_Entity::addComponentSingleParentSingleAggregation()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> entity(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity(new QEntity());
     MyQComponent *comp = new MyQComponent(entity.data());
     QCoreApplication::processEvents();
 
@@ -142,8 +142,8 @@ void tst_Entity::addComponentSingleParentSingleAggregation()
 void tst_Entity::addComponentSingleParentSeveralAggregations()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> entity1(new QEntity());
-    QScopedPointer<Qt3D::QEntity> entity2(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity1(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity2(new QEntity());
 
     MyQComponent *comp1 = new MyQComponent(entity1.data());
     MyQComponent *comp2 = new MyQComponent(entity1.data());
@@ -193,8 +193,8 @@ void tst_Entity::addComponentSingleParentSeveralAggregations()
 void tst_Entity::addComponentsSeveralParentsSingleAggregations()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> entity1(new QEntity());
-    QScopedPointer<Qt3D::QEntity> entity2(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity1(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity2(new QEntity());
 
     MyQComponent *comp1 = new MyQComponent(entity1.data());
     MyQComponent *comp2 = new MyQComponent(entity1.data());
@@ -241,8 +241,8 @@ void tst_Entity::addComponentsSeveralParentsSingleAggregations()
 void tst_Entity::addComponentsSeveralParentsSeveralAggregations()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> entity1(new QEntity());
-    QScopedPointer<Qt3D::QEntity> entity2(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity1(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity2(new QEntity());
 
     MyQComponent *comp1 = new MyQComponent(entity1.data());
     MyQComponent *comp2 = new MyQComponent(entity1.data());
@@ -292,7 +292,7 @@ void tst_Entity::addComponentsSeveralParentsSeveralAggregations()
 void tst_Entity::removeComponentSingleParentSingleAggregation()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> entity(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity(new QEntity());
     MyQComponent *comp = new MyQComponent(entity.data());
     QCoreApplication::processEvents();
     entity->addComponent(comp);
@@ -316,8 +316,8 @@ void tst_Entity::removeComponentSingleParentSingleAggregation()
 void tst_Entity::removeComponentSingleParentSeveralAggregations()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> entity1(new QEntity());
-    QScopedPointer<Qt3D::QEntity> entity2(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity1(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity2(new QEntity());
 
     MyQComponent *comp1 = new MyQComponent(entity1.data());
     MyQComponent *comp2 = new MyQComponent(entity1.data());
@@ -391,8 +391,8 @@ void tst_Entity::removeComponentSingleParentSeveralAggregations()
 void tst_Entity::removeComponentsSeveralParentsSingleAggreation()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> entity1(new QEntity());
-    QScopedPointer<Qt3D::QEntity> entity2(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity1(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity2(new QEntity());
 
     MyQComponent *comp1 = new MyQComponent(entity1.data());
     MyQComponent *comp2 = new MyQComponent(entity1.data());
@@ -443,8 +443,8 @@ void tst_Entity::removeComponentsSeveralParentsSingleAggreation()
 void tst_Entity::removeComponentsSeveralParentsSeveralAggregations()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> entity1(new QEntity());
-    QScopedPointer<Qt3D::QEntity> entity2(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity1(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity2(new QEntity());
 
     MyQComponent *comp1 = new MyQComponent(entity1.data());
     MyQComponent *comp2 = new MyQComponent(entity1.data());
@@ -519,7 +519,7 @@ void tst_Entity::removeComponentsSeveralParentsSeveralAggregations()
 void tst_Entity::addSeveralTimesSameComponent()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> entity(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity(new QEntity());
     MyQComponent *comp = new MyQComponent(entity.data());
     QCoreApplication::processEvents();
     entity->addComponent(comp);
@@ -543,7 +543,7 @@ void tst_Entity::addSeveralTimesSameComponent()
 void tst_Entity::removeSeveralTimesSameComponent()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> entity(new QEntity());
+    QScopedPointer<Qt3DCore::QEntity> entity(new QEntity());
     MyQComponent *comp = new MyQComponent(entity.data());
     QCoreApplication::processEvents();
     entity->addComponent(comp);
@@ -568,7 +568,7 @@ void tst_Entity::removeSeveralTimesSameComponent()
 void tst_Entity::verifyCopy()
 {
     // GIVEN
-    QScopedPointer<Qt3D::QEntity> root(new Qt3D::QEntity());
+    QScopedPointer<Qt3DCore::QEntity> root(new Qt3DCore::QEntity());
     MyEntity *parentLessEntity = new MyEntity();
     MyEntity *parentedEntity = new MyEntity(root.data());
 
diff --git a/tests/auto/core/qframeallocator/tst_qframeallocator.cpp b/tests/auto/core/qframeallocator/tst_qframeallocator.cpp
index e78cf568f..cf420bf19 100644
--- a/tests/auto/core/qframeallocator/tst_qframeallocator.cpp
+++ b/tests/auto/core/qframeallocator/tst_qframeallocator.cpp
@@ -110,7 +110,7 @@ private slots:
 
 void tst_QFrameAllocator::initQFrameChunk()
 {
-    Qt3D::QFrameChunk c;
+    Qt3DCore::QFrameChunk c;
 
     c.init(16, 12);
 
@@ -127,7 +127,7 @@ void tst_QFrameAllocator::initQFrameChunk()
 
 void tst_QFrameAllocator::singleAllocationQFrameChunk()
 {
-    Qt3D::QFrameChunk c;
+    Qt3DCore::QFrameChunk c;
 
     c.init(16, 12);
 
@@ -143,7 +143,7 @@ void tst_QFrameAllocator::singleAllocationQFrameChunk()
 
 void tst_QFrameAllocator::qvectorAllocationQFrameChunk()
 {
-    Qt3D::QFrameChunk c;
+    Qt3DCore::QFrameChunk c;
 
     c.init(16, 12);
 
@@ -159,7 +159,7 @@ void tst_QFrameAllocator::qvectorAllocationQFrameChunk()
 
 void tst_QFrameAllocator::multipleAllocationQFrameChunk()
 {
-    Qt3D::QFrameChunk c;
+    Qt3DCore::QFrameChunk c;
 
     c.init(16, 12);
 
@@ -180,7 +180,7 @@ void tst_QFrameAllocator::multipleAllocationQFrameChunk()
 
 void tst_QFrameAllocator::overflowAllocationQFrameChunk()
 {
-    Qt3D::QFrameChunk c;
+    Qt3DCore::QFrameChunk c;
 
     c.init(16, 12);
 
@@ -206,7 +206,7 @@ void tst_QFrameAllocator::overflowAllocationQFrameChunk()
 
 void tst_QFrameAllocator::singleDeallocationQFrameChunk()
 {
-    Qt3D::QFrameChunk c;
+    Qt3DCore::QFrameChunk c;
 
     c.init(16, 12);
 
@@ -227,7 +227,7 @@ void tst_QFrameAllocator::singleDeallocationQFrameChunk()
 
 void tst_QFrameAllocator::multipleDeallocationQFrameChunk()
 {
-    Qt3D::QFrameChunk c;
+    Qt3DCore::QFrameChunk c;
 
     c.init(16, 12);
 
@@ -291,8 +291,8 @@ void tst_QFrameAllocator::multipleDeallocationQFrameChunk()
 
 void tst_QFrameAllocator::containsCheckQFrameChunk()
 {
-    Qt3D::QFrameChunk c;
-    Qt3D::QFrameChunk c2;
+    Qt3DCore::QFrameChunk c;
+    Qt3DCore::QFrameChunk c2;
 
     c.init(16, 12);
     c2.init(16, 12);
@@ -322,7 +322,7 @@ void tst_QFrameAllocator::containsCheckQFrameChunk()
 
 void tst_QFrameAllocator::clearQFrameChunk()
 {
-    Qt3D::QFrameChunk c;
+    Qt3DCore::QFrameChunk c;
 
     c.init(16, 12);
     QList<void *> ptrs;
@@ -342,7 +342,7 @@ void tst_QFrameAllocator::clearQFrameChunk()
 
 void tst_QFrameAllocator::initQFixedFrameAllocator()
 {
-    Qt3D::QFixedFrameAllocator f;
+    Qt3DCore::QFixedFrameAllocator f;
 
     f.init(4);
 
@@ -352,7 +352,7 @@ void tst_QFrameAllocator::initQFixedFrameAllocator()
 
 void tst_QFrameAllocator::allocateQFixedFrameAllocator()
 {
-    Qt3D::QFixedFrameAllocator f;
+    Qt3DCore::QFixedFrameAllocator f;
 
     f.init(4, 128);
 
@@ -390,7 +390,7 @@ void tst_QFrameAllocator::allocateQFixedFrameAllocator()
 
 void tst_QFrameAllocator::deallocateQFixedFrameAllocator()
 {
-    Qt3D::QFixedFrameAllocator f;
+    Qt3DCore::QFixedFrameAllocator f;
 
     f.init(4);
 
@@ -429,7 +429,7 @@ void tst_QFrameAllocator::deallocateQFixedFrameAllocator()
 
 void tst_QFrameAllocator::checkFragmentationQFixedFrameAllocator()
 {
-    Qt3D::QFixedFrameAllocator f;
+    Qt3DCore::QFixedFrameAllocator f;
 
     f.init(4);
 
@@ -459,7 +459,7 @@ void tst_QFrameAllocator::checkFragmentationQFixedFrameAllocator()
 
 void tst_QFrameAllocator::clearQFixedFrameAllocator()
 {
-    Qt3D::QFixedFrameAllocator f;
+    Qt3DCore::QFixedFrameAllocator f;
 
     f.init(16);
 
@@ -485,17 +485,17 @@ void tst_QFrameAllocator::clearQFixedFrameAllocator()
 
 void tst_QFrameAllocator::initQFrameAllocator()
 {
-    Qt3D::QFrameAllocator f(4, 4);
+    Qt3DCore::QFrameAllocator f(4, 4);
     QCOMPARE(f.allocatorPoolSize(), 1);
 
 
-    Qt3D::QFrameAllocator f2(32, 4);
+    Qt3DCore::QFrameAllocator f2(32, 4);
     QCOMPARE(f2.allocatorPoolSize(), 8);
 }
 
 void tst_QFrameAllocator::allocateWithQFrameAllocator()
 {
-    Qt3D::QFrameAllocator f2(256, 4);
+    Qt3DCore::QFrameAllocator f2(256, 4);
     QCOMPARE(f2.allocatorPoolSize(), 256 / 4);
 
     QVERIFY(f2.allocate<small>());
@@ -537,7 +537,7 @@ void tst_QFrameAllocator::allocateWithQFrameAllocator()
 
 void tst_QFrameAllocator::deallocateWithQFrameAllocator()
 {
-    Qt3D::QFrameAllocator f2(256, 4);
+    Qt3DCore::QFrameAllocator f2(256, 4);
     QCOMPARE(f2.allocatorPoolSize(), 256 / 4);
 
     small *s = f2.allocate<small>();
@@ -557,7 +557,7 @@ void tst_QFrameAllocator::deallocateWithQFrameAllocator()
 
 void tst_QFrameAllocator::testAllocationComposedValues()
 {
-    Qt3D::QFrameAllocator f(128, 32);
+    Qt3DCore::QFrameAllocator f(128, 32);
 
     composed t;
 
@@ -600,7 +600,7 @@ void tst_QFrameAllocator::testAllocationComposedValues()
 
 void tst_QFrameAllocator::allocateSubclass()
 {
-    Qt3D::QFrameAllocator f(128, 32);
+    Qt3DCore::QFrameAllocator f(128, 32);
 
     QList<composed *> composeds;
 
@@ -626,7 +626,7 @@ void tst_QFrameAllocator::allocateSubclass()
 
 void tst_QFrameAllocator::deallocateSubclass()
 {
-    Qt3D::QFrameAllocator f(128, 32);
+    Qt3DCore::QFrameAllocator f(128, 32);
 
 
     const int NUM_ITEMS = 256;
@@ -655,7 +655,7 @@ void tst_QFrameAllocator::deallocateSubclass()
 
 void tst_QFrameAllocator::clearQFrameAllocator()
 {
-    Qt3D::QFrameAllocator f(128, 32);
+    Qt3DCore::QFrameAllocator f(128, 32);
 
     for (int i = 0; i < 256; i++) {
         f.allocate<composed>();
@@ -683,7 +683,7 @@ void tst_QFrameAllocator::clearQFrameAllocator()
 void tst_QFrameAllocator::isEmptyQFrameAllocator()
 {
     // GIVEN
-    Qt3D::QFrameAllocator f(128, 32);
+    Qt3DCore::QFrameAllocator f(128, 32);
 
 
     // WHEN
@@ -720,7 +720,7 @@ void tst_QFrameAllocator::isEmptyQFrameAllocator()
 void tst_QFrameAllocator::subclassPointerClearing()
 {
     // GIVEN
-    Qt3D::QFrameAllocator f(128, 32);
+    Qt3DCore::QFrameAllocator f(128, 32);
     QVector<composed *> data;
 
     // WHEN
@@ -746,7 +746,7 @@ void tst_QFrameAllocator::subclassPointerClearing()
 void tst_QFrameAllocator::allocateWithRawMemoryDeallocate()
 {
     // GIVEN
-    Qt3D::QFrameAllocator f(128, 32);
+    Qt3DCore::QFrameAllocator f(128, 32);
     subclass *s = static_cast<subclass *>(f.allocateRawMemory(sizeof(subclass)));
     new (s) subclass();
 
@@ -760,7 +760,7 @@ void tst_QFrameAllocator::allocateWithRawMemoryDeallocate()
 void tst_QFrameAllocator::allocateDeallocateRawMemory()
 {
     // GIVEN
-    Qt3D::QFrameAllocator f(128, 32);
+    Qt3DCore::QFrameAllocator f(128, 32);
     subclass *s = f.allocate<subclass>();
 
     // WHEN
diff --git a/tests/auto/core/qray3d/tst_qray3d.cpp b/tests/auto/core/qray3d/tst_qray3d.cpp
index 1f4f829a2..00253d4c4 100644
--- a/tests/auto/core/qray3d/tst_qray3d.cpp
+++ b/tests/auto/core/qray3d/tst_qray3d.cpp
@@ -139,11 +139,11 @@ void tst_QRay3D::create()
 {
     QFETCH(QVector3D, point);
     QFETCH(QVector3D, direction);
-    Qt3D::QRay3D ray(point, direction);
+    Qt3DCore::QRay3D ray(point, direction);
     QVERIFY(fuzzyCompare(ray.direction(), direction));
     QVERIFY(fuzzyCompare(ray.origin(), point));
 
-    Qt3D::QRay3D ray2;
+    Qt3DCore::QRay3D ray2;
     QCOMPARE(ray2.origin(), QVector3D(0, 0, 0));
     QCOMPARE(ray2.direction(), QVector3D(0, 0, 1));
     ray2.setOrigin(point);
@@ -196,7 +196,7 @@ void tst_QRay3D::projection()
     QFETCH(QVector3D, direction);
     QFETCH(QVector3D, vector);
     QFETCH(QVector3D, expected);
-    Qt3D::QRay3D line(point, direction);
+    Qt3DCore::QRay3D line(point, direction);
     QVector3D result = line.project(vector);
     QVERIFY(fuzzyCompare(result, expected));
 }
@@ -245,7 +245,7 @@ void tst_QRay3D::point()
     QFETCH(QVector3D, direction);
     QFETCH(QVector3D, point_on_line_pos_0_6);
     QFETCH(QVector3D, point_on_line_neg_7_2);
-    Qt3D::QRay3D line(point, direction);
+    Qt3DCore::QRay3D line(point, direction);
     QVERIFY(fuzzyCompare(line.point(0.6), point_on_line_pos_0_6));
     QVERIFY(fuzzyCompare(line.point(-7.2), point_on_line_neg_7_2));
     QVERIFY(fuzzyCompare(line.projectedDistance(point_on_line_pos_0_6), 0.6));
@@ -335,7 +335,7 @@ void tst_QRay3D::contains_point()
     QFETCH(QVector3D, point);
     QFETCH(bool, contains);
 
-    Qt3D::QRay3D line(origin, direction);
+    Qt3DCore::QRay3D line(origin, direction);
     QCOMPARE(line.contains(point), contains);
 }
 
@@ -351,23 +351,23 @@ void tst_QRay3D::contains_ray()
     QFETCH(QVector3D, point);
     QFETCH(bool, contains);
 
-    Qt3D::QRay3D line(origin, direction);
+    Qt3DCore::QRay3D line(origin, direction);
     if (contains) {
-        Qt3D::QRay3D line2(point, direction);
+        Qt3DCore::QRay3D line2(point, direction);
         QVERIFY(line.contains(line2));
         QVERIFY(line2.contains(line));
 
         // Reversed direction is also contained.
-        Qt3D::QRay3D line3(point, -direction);
+        Qt3DCore::QRay3D line3(point, -direction);
         QVERIFY(line.contains(line2));
         QVERIFY(line2.contains(line));
 
         // Different direction.
-        Qt3D::QRay3D line4(point, QVector3D(direction.y(), direction.x(), direction.z()));
+        Qt3DCore::QRay3D line4(point, QVector3D(direction.y(), direction.x(), direction.z()));
         QVERIFY(!line.contains(line4));
         QVERIFY(!line4.contains(line));
     } else {
-        Qt3D::QRay3D line2(point, direction);
+        Qt3DCore::QRay3D line2(point, direction);
         QVERIFY(!line.contains(line2));
         QVERIFY(!line2.contains(line));
     }
@@ -412,15 +412,15 @@ void tst_QRay3D::distance()
     QFETCH(QVector3D, point);
     QFETCH(float, distance);
 
-    Qt3D::QRay3D line(origin, direction);
+    Qt3DCore::QRay3D line(origin, direction);
     QCOMPARE(line.distance(point), distance);
 }
 
 void tst_QRay3D::compare()
 {
-    Qt3D::QRay3D ray1(QVector3D(10, 20, 30), QVector3D(-3, -4, -5));
-    Qt3D::QRay3D ray2(QVector3D(10, 20, 30), QVector3D(1.5f, 2.0f, 2.5f));
-    Qt3D::QRay3D ray3(QVector3D(0, 20, 30), QVector3D(-3, -4, -5));
+    Qt3DCore::QRay3D ray1(QVector3D(10, 20, 30), QVector3D(-3, -4, -5));
+    Qt3DCore::QRay3D ray2(QVector3D(10, 20, 30), QVector3D(1.5f, 2.0f, 2.5f));
+    Qt3DCore::QRay3D ray3(QVector3D(0, 20, 30), QVector3D(-3, -4, -5));
     QVERIFY(ray1 == ray1);
     QVERIFY(!(ray1 != ray1));
     QVERIFY(qFuzzyCompare(ray1, ray1));
@@ -435,7 +435,7 @@ void tst_QRay3D::compare()
 void tst_QRay3D::dataStream()
 {
 #ifndef QT_NO_DATASTREAM
-    Qt3D::QRay3D ray(QVector3D(1.0f, 2.0f, 3.0f), QVector3D(4.0f, 5.0f, 6.0f));
+    Qt3DCore::QRay3D ray(QVector3D(1.0f, 2.0f, 3.0f), QVector3D(4.0f, 5.0f, 6.0f));
 
     QByteArray data;
     {
@@ -443,7 +443,7 @@ void tst_QRay3D::dataStream()
         stream << ray;
     }
 
-    Qt3D::QRay3D ray2;
+    Qt3DCore::QRay3D ray2;
     {
         QDataStream stream2(data);
         stream2 >> ray2;
@@ -468,9 +468,9 @@ void tst_QRay3D::transform()
     m.rotate(45.0f, 1.0f, 1.0f, 1.0f);
     m.scale(23.5f);
 
-    Qt3D::QRay3D ray1(point, direction);
-    Qt3D::QRay3D ray2(ray1);
-    Qt3D::QRay3D ray3;
+    Qt3DCore::QRay3D ray1(point, direction);
+    Qt3DCore::QRay3D ray2(ray1);
+    Qt3DCore::QRay3D ray3;
 
     ray1.transform(m);
     ray3 = ray2.transformed(m);
@@ -485,15 +485,15 @@ void tst_QRay3D::transform()
 class tst_QRay3DProperties : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::QRay3D ray READ ray WRITE setRay)
+    Q_PROPERTY(Qt3DCore::QRay3D ray READ ray WRITE setRay)
 public:
     tst_QRay3DProperties(QObject *parent = 0) : QObject(parent) {}
 
-    Qt3D::QRay3D ray() const { return r; }
-    void setRay(const Qt3D::QRay3D& value) { r = value; }
+    Qt3DCore::QRay3D ray() const { return r; }
+    void setRay(const Qt3DCore::QRay3D& value) { r = value; }
 
 private:
-    Qt3D::QRay3D r;
+    Qt3DCore::QRay3D r;
 };
 
 // Test getting and setting properties via the metaobject system.
@@ -501,35 +501,35 @@ void tst_QRay3D::properties()
 {
     tst_QRay3DProperties obj;
 
-    qRegisterMetaType<Qt3D::QRay3D>();
+    qRegisterMetaType<Qt3DCore::QRay3D>();
 
-    obj.setRay(Qt3D::QRay3D(QVector3D(1, 2, 3), QVector3D(4, 5, 6)));
+    obj.setRay(Qt3DCore::QRay3D(QVector3D(1, 2, 3), QVector3D(4, 5, 6)));
 
-    Qt3D::QRay3D r = qvariant_cast<Qt3D::QRay3D>(obj.property("ray"));
+    Qt3DCore::QRay3D r = qvariant_cast<Qt3DCore::QRay3D>(obj.property("ray"));
     QCOMPARE(r.origin(), QVector3D(1, 2, 3));
     QCOMPARE(r.direction(), QVector3D(4, 5, 6));
 
     obj.setProperty("ray",
                     qVariantFromValue
-                        (Qt3D::QRay3D(QVector3D(-1, -2, -3), QVector3D(-4, -5, -6))));
+                        (Qt3DCore::QRay3D(QVector3D(-1, -2, -3), QVector3D(-4, -5, -6))));
 
-    r = qvariant_cast<Qt3D::QRay3D>(obj.property("ray"));
+    r = qvariant_cast<Qt3DCore::QRay3D>(obj.property("ray"));
     QCOMPARE(r.origin(), QVector3D(-1, -2, -3));
     QCOMPARE(r.direction(), QVector3D(-4, -5, -6));
 }
 
 void tst_QRay3D::metaTypes()
 {
-    int id = qMetaTypeId<Qt3D::QRay3D>();
-    QVERIFY(QMetaType::type("Qt3D::QRay3D") == id);
-    QCOMPARE(QByteArray(QMetaType::typeName(id)), QByteArray("Qt3D::QRay3D"));
+    int id = qMetaTypeId<Qt3DCore::QRay3D>();
+    QVERIFY(QMetaType::type("Qt3DCore::QRay3D") == id);
+    QCOMPARE(QByteArray(QMetaType::typeName(id)), QByteArray("Qt3DCore::QRay3D"));
     QVERIFY(QMetaType::isRegistered(id));
 }
 
 void tst_QRay3D::shouldNotAllowNullDirection()
 {
     // GIVEN
-    Qt3D::QRay3D ray;
+    Qt3DCore::QRay3D ray;
 
     QCOMPARE(ray.origin(), QVector3D(0, 0, 0));
     QCOMPARE(ray.direction(), QVector3D(0, 0, 1));
diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp
index e5d30eccf..a907a62ba 100644
--- a/tests/auto/core/qscene/tst_qscene.cpp
+++ b/tests/auto/core/qscene/tst_qscene.cpp
@@ -62,34 +62,34 @@ private slots:
     void hasEntityForComponent();
 };
 
-class tst_LockableObserver : public Qt3D::QLockableObserverInterface
+class tst_LockableObserver : public Qt3DCore::QLockableObserverInterface
 {
 public:
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &) Q_DECL_OVERRIDE {}
-    void sceneChangeEventWithLock(const Qt3D::QSceneChangePtr &) Q_DECL_OVERRIDE {}
-    void sceneChangeEventWithLock(const Qt3D::QSceneChangeList &) Q_DECL_OVERRIDE {}
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_OVERRIDE {}
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &) Q_DECL_OVERRIDE {}
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &) Q_DECL_OVERRIDE {}
 };
 
-class tst_Observable : public Qt3D::QObservableInterface
+class tst_Observable : public Qt3DCore::QObservableInterface
 {
 public:
-    void setArbiter(Qt3D::QLockableObserverInterface *observer)
+    void setArbiter(Qt3DCore::QLockableObserverInterface *observer)
     {
         m_arbiter = observer;
     }
 
 protected:
-    void notifyObservers(const Qt3D::QSceneChangePtr &) {}
+    void notifyObservers(const Qt3DCore::QSceneChangePtr &) {}
 
 private:
-    Qt3D::QLockableObserverInterface *m_arbiter;
+    Qt3DCore::QLockableObserverInterface *m_arbiter;
 };
 
-class tst_Node : public Qt3D::QNode
+class tst_Node : public Qt3DCore::QNode
 {
     Q_OBJECT
 public:
-    tst_Node() : Qt3D::QNode()
+    tst_Node() : Qt3DCore::QNode()
     {}
 
     ~tst_Node()
@@ -101,11 +101,11 @@ protected:
     QT3D_CLONEABLE(tst_Node)
 };
 
-class tst_Component : public Qt3D::QComponent
+class tst_Component : public Qt3DCore::QComponent
 {
     Q_OBJECT
 public:
-    tst_Component() : Qt3D::QComponent()
+    tst_Component() : Qt3DCore::QComponent()
     {}
 
     ~tst_Component()
@@ -120,15 +120,15 @@ protected:
 void tst_QScene::addObservable()
 {
     // GIVEN
-    Qt3D::QNode *node1 = new tst_Node();
-    Qt3D::QNode *node2 = new tst_Node();
+    Qt3DCore::QNode *node1 = new tst_Node();
+    Qt3DCore::QNode *node2 = new tst_Node();
 
     QList<tst_Observable *> observables;
 
     for (int i = 0; i < 10; i++)
         observables.append(new tst_Observable());
 
-    Qt3D::QScene *scene = new Qt3D::QScene;
+    Qt3DCore::QScene *scene = new Qt3DCore::QScene;
     scene->setArbiter(new tst_LockableObserver);
 
     // WHEN
@@ -138,18 +138,18 @@ void tst_QScene::addObservable()
     for (int i = 0; i < 5; i++)
         scene->addObservable(observables.at(i + 5), node2->id());
 
-    Qt3D::QObservableList obs1 = scene->lookupObservables(node1->id());
-    Qt3D::QObservableList obs2 = scene->lookupObservables(node2->id());
+    Qt3DCore::QObservableList obs1 = scene->lookupObservables(node1->id());
+    Qt3DCore::QObservableList obs2 = scene->lookupObservables(node2->id());
 
     // THEN
     QCOMPARE(obs1.count(), 5);
     QCOMPARE(obs2.count(), obs1.count());
 
-    Q_FOREACH (Qt3D::QObservableInterface *o, obs1) {
+    Q_FOREACH (Qt3DCore::QObservableInterface *o, obs1) {
         QVERIFY(scene->nodeIdFromObservable(o) == node1->id());
         QVERIFY(scene->lookupNode(node1->id()) == Q_NULLPTR);
     }
-    Q_FOREACH (Qt3D::QObservableInterface *o, obs2) {
+    Q_FOREACH (Qt3DCore::QObservableInterface *o, obs2) {
         QVERIFY(scene->nodeIdFromObservable(o) == node2->id());
         QVERIFY(scene->lookupNode(node2->id()) == Q_NULLPTR);
     }
@@ -158,12 +158,12 @@ void tst_QScene::addObservable()
 void tst_QScene::addNodeObservable()
 {
     // GIBEN
-    QList<Qt3D::QNode *> nodes;
+    QList<Qt3DCore::QNode *> nodes;
 
     for (int i = 0; i < 10; i++)
         nodes.append(new tst_Node());
 
-    Qt3D::QScene *scene = new Qt3D::QScene;
+    Qt3DCore::QScene *scene = new Qt3DCore::QScene;
     scene->setArbiter(new tst_LockableObserver);
 
     // WHEN
@@ -171,7 +171,7 @@ void tst_QScene::addNodeObservable()
         scene->addObservable(nodes.at(i));
 
     // THEN
-    Q_FOREACH (Qt3D::QNode *n, nodes) {
+    Q_FOREACH (Qt3DCore::QNode *n, nodes) {
         QVERIFY(n == scene->lookupNode(n->id()));
         QVERIFY(scene->lookupObservables(n->id()).isEmpty());
     }
@@ -180,15 +180,15 @@ void tst_QScene::addNodeObservable()
 void tst_QScene::removeObservable()
 {
     // GIVEN
-    Qt3D::QNode *node1 = new tst_Node();
-    Qt3D::QNode *node2 = new tst_Node();
+    Qt3DCore::QNode *node1 = new tst_Node();
+    Qt3DCore::QNode *node2 = new tst_Node();
 
     QList<tst_Observable *> observables;
 
     for (int i = 0; i < 10; i++)
         observables.append(new tst_Observable());
 
-    Qt3D::QScene *scene = new Qt3D::QScene;
+    Qt3DCore::QScene *scene = new Qt3DCore::QScene;
     scene->setArbiter(new tst_LockableObserver);
 
     // WHEN
@@ -198,8 +198,8 @@ void tst_QScene::removeObservable()
     for (int i = 0; i < 5; i++)
         scene->addObservable(observables.at(i + 5), node2->id());
 
-    Qt3D::QObservableList obs1 = scene->lookupObservables(node1->id());
-    Qt3D::QObservableList obs2 = scene->lookupObservables(node2->id());
+    Qt3DCore::QObservableList obs1 = scene->lookupObservables(node1->id());
+    Qt3DCore::QObservableList obs2 = scene->lookupObservables(node2->id());
 
     // THEN
     QCOMPARE(obs1.count(), 5);
@@ -225,21 +225,21 @@ void tst_QScene::removeObservable()
     scene->removeObservable(observables.at(0), node2->id());
     // THEN
     QCOMPARE(scene->lookupObservables(node2->id()).count(), 5);
-    QVERIFY(scene->nodeIdFromObservable(observables.at(0)) == Qt3D::QNodeId());
+    QVERIFY(scene->nodeIdFromObservable(observables.at(0)) == Qt3DCore::QNodeId());
 }
 
 void tst_QScene::removeNodeObservable()
 {
     // GIVEN
-    Qt3D::QNode *node1 = new tst_Node();
-    Qt3D::QNode *node2 = new tst_Node();
+    Qt3DCore::QNode *node1 = new tst_Node();
+    Qt3DCore::QNode *node2 = new tst_Node();
 
     QList<tst_Observable *> observables;
 
     for (int i = 0; i < 10; i++)
         observables.append(new tst_Observable());
 
-    Qt3D::QScene *scene = new Qt3D::QScene;
+    Qt3DCore::QScene *scene = new Qt3DCore::QScene;
     scene->setArbiter(new tst_LockableObserver);
 
     // WHEN
@@ -253,8 +253,8 @@ void tst_QScene::removeNodeObservable()
         scene->addObservable(observables.at(i + 5), node2->id());
 
     // THEN
-    Qt3D::QObservableList obs1 = scene->lookupObservables(node1->id());
-    Qt3D::QObservableList obs2 = scene->lookupObservables(node2->id());
+    Qt3DCore::QObservableList obs1 = scene->lookupObservables(node1->id());
+    Qt3DCore::QObservableList obs2 = scene->lookupObservables(node2->id());
 
     QCOMPARE(obs1.count(), 5);
     QCOMPARE(obs2.count(), obs1.count());
@@ -265,7 +265,7 @@ void tst_QScene::removeNodeObservable()
     // THEN
     QVERIFY(scene->lookupNode(node1->id()) == Q_NULLPTR);
     QVERIFY(scene->lookupObservables(node1->id()).empty());
-    QVERIFY(scene->nodeIdFromObservable(observables.at(0)) == Qt3D::QNodeId());
+    QVERIFY(scene->nodeIdFromObservable(observables.at(0)) == Qt3DCore::QNodeId());
 
     QVERIFY(scene->lookupNode(node2->id()) == node2);
     QCOMPARE(scene->lookupObservables(node2->id()).count(), 5);
@@ -275,12 +275,12 @@ void tst_QScene::removeNodeObservable()
 void tst_QScene::addChildNode()
 {
     // GIVEN
-    Qt3D::QScene *scene = new Qt3D::QScene;
+    Qt3DCore::QScene *scene = new Qt3DCore::QScene;
 
-    QList<Qt3D::QNode *> nodes;
+    QList<Qt3DCore::QNode *> nodes;
 
-    Qt3D::QNode *root = new tst_Node();
-    Qt3D::QNodePrivate::get(root)->setScene(scene);
+    Qt3DCore::QNode *root = new tst_Node();
+    Qt3DCore::QNodePrivate::get(root)->setScene(scene);
 
     // WHEN
     scene->addObservable(root);
@@ -289,7 +289,7 @@ void tst_QScene::addChildNode()
 
     // WHEN
     for (int i = 0; i < 10; i++) {
-        Qt3D::QNode *child = new tst_Node();
+        Qt3DCore::QNode *child = new tst_Node();
         if (nodes.isEmpty())
             child->setParent(root);
         else
@@ -299,7 +299,7 @@ void tst_QScene::addChildNode()
     QCoreApplication::processEvents();
 
     // THEN
-    Q_FOREACH (Qt3D::QNode *n, nodes) {
+    Q_FOREACH (Qt3DCore::QNode *n, nodes) {
         QVERIFY(scene->lookupNode(n->id()) == n);
     }
 }
@@ -307,17 +307,17 @@ void tst_QScene::addChildNode()
 void tst_QScene::removeChildNode()
 {
     // GIVEN
-    Qt3D::QScene *scene = new Qt3D::QScene;
+    Qt3DCore::QScene *scene = new Qt3DCore::QScene;
 
-    QList<Qt3D::QNode *> nodes;
+    QList<Qt3DCore::QNode *> nodes;
 
-    Qt3D::QNode *root = new tst_Node;
-    Qt3D::QNodePrivate::get(root)->setScene(scene);
+    Qt3DCore::QNode *root = new tst_Node;
+    Qt3DCore::QNodePrivate::get(root)->setScene(scene);
     scene->addObservable(root);
 
     // WHEN
     for (int i = 0; i < 10; i++) {
-        Qt3D::QNode *child = new tst_Node;
+        Qt3DCore::QNode *child = new tst_Node;
         if (nodes.isEmpty())
             child->setParent(root);
         else
@@ -327,7 +327,7 @@ void tst_QScene::removeChildNode()
 
     // THEN
     while (!nodes.isEmpty()) {
-        Qt3D::QNode *lst = nodes.takeLast();
+        Qt3DCore::QNode *lst = nodes.takeLast();
         QVERIFY(scene->lookupNode(lst->id()) == lst);
         if (lst->parentNode() != Q_NULLPTR) {
             lst->setParent(Q_NODE_NULLPTR);
@@ -340,24 +340,24 @@ void tst_QScene::removeChildNode()
 void tst_QScene::addEntityForComponent()
 {
     // GIVEN
-    Qt3D::QScene *scene = new Qt3D::QScene;
+    Qt3DCore::QScene *scene = new Qt3DCore::QScene;
 
-    QList<Qt3D::QEntity *> entities;
-    QList<Qt3D::QComponent *> components;
+    QList<Qt3DCore::QEntity *> entities;
+    QList<Qt3DCore::QComponent *> components;
 
     for (int i = 0; i < 10; i++) {
-        Qt3D::QEntity *entity = new Qt3D::QEntity();
-        Qt3D::QComponent *comp = new tst_Component();
+        Qt3DCore::QEntity *entity = new Qt3DCore::QEntity();
+        Qt3DCore::QComponent *comp = new tst_Component();
 
-        Qt3D::QNodePrivate::get(entity)->setScene(scene);
-        Qt3D::QNodePrivate::get(comp)->setScene(scene);
+        Qt3DCore::QNodePrivate::get(entity)->setScene(scene);
+        Qt3DCore::QNodePrivate::get(comp)->setScene(scene);
         entities << entity;
         components << comp;
     }
 
     // WHEN
     for (int i = 0; i < 10; i++) {
-        Qt3D::QEntity *e = entities.at(i);
+        Qt3DCore::QEntity *e = entities.at(i);
         for (int j = 0; j < 10; j++) {
             e->addComponent(components.at(j));
         }
@@ -365,7 +365,7 @@ void tst_QScene::addEntityForComponent()
 
     // THEN
     for (int i = 0; i < 10; i++) {
-        QList<Qt3D::QNodeId> ids = scene->entitiesForComponent(components.at(i)->id());
+        QList<Qt3DCore::QNodeId> ids = scene->entitiesForComponent(components.at(i)->id());
         QCOMPARE(ids.count(), 10);
     }
 }
@@ -373,24 +373,24 @@ void tst_QScene::addEntityForComponent()
 void tst_QScene::removeEntityForComponent()
 {
     // GIVEN
-    Qt3D::QScene *scene = new Qt3D::QScene;
+    Qt3DCore::QScene *scene = new Qt3DCore::QScene;
 
-    QList<Qt3D::QEntity *> entities;
-    QList<Qt3D::QComponent *> components;
+    QList<Qt3DCore::QEntity *> entities;
+    QList<Qt3DCore::QComponent *> components;
 
     for (int i = 0; i < 10; i++) {
-        Qt3D::QEntity *entity = new Qt3D::QEntity();
-        Qt3D::QComponent *comp = new tst_Component();
+        Qt3DCore::QEntity *entity = new Qt3DCore::QEntity();
+        Qt3DCore::QComponent *comp = new tst_Component();
 
-        Qt3D::QNodePrivate::get(entity)->setScene(scene);
-        Qt3D::QNodePrivate::get(comp)->setScene(scene);
+        Qt3DCore::QNodePrivate::get(entity)->setScene(scene);
+        Qt3DCore::QNodePrivate::get(comp)->setScene(scene);
         entities << entity;
         components << comp;
     }
 
     // WHEN
     for (int i = 0; i < 10; i++) {
-        Qt3D::QEntity *e = entities.at(i);
+        Qt3DCore::QEntity *e = entities.at(i);
         for (int j = 0; j < 10; j++) {
             e->addComponent(components.at(j));
         }
@@ -398,7 +398,7 @@ void tst_QScene::removeEntityForComponent()
 
     // THEN
     for (int i = 0; i < 10; i++) {
-        Qt3D::QEntity *e = entities.at(i);
+        Qt3DCore::QEntity *e = entities.at(i);
         for (int j = 0; j < 10; j++) {
             e->removeComponent(components.at(j));
             QCOMPARE(scene->entitiesForComponent(components.at(j)->id()).count(), 10 - (i + 1));
@@ -409,24 +409,24 @@ void tst_QScene::removeEntityForComponent()
 void tst_QScene::hasEntityForComponent()
 {
     // GIVEN
-    Qt3D::QScene *scene = new Qt3D::QScene;
+    Qt3DCore::QScene *scene = new Qt3DCore::QScene;
 
-    QList<Qt3D::QEntity *> entities;
-    QList<Qt3D::QComponent *> components;
+    QList<Qt3DCore::QEntity *> entities;
+    QList<Qt3DCore::QComponent *> components;
 
     for (int i = 0; i < 10; i++) {
-        Qt3D::QEntity *entity = new Qt3D::QEntity();
-        Qt3D::QComponent *comp = new tst_Component();
+        Qt3DCore::QEntity *entity = new Qt3DCore::QEntity();
+        Qt3DCore::QComponent *comp = new tst_Component();
 
-        Qt3D::QNodePrivate::get(entity)->setScene(scene);
-        Qt3D::QNodePrivate::get(comp)->setScene(scene);
+        Qt3DCore::QNodePrivate::get(entity)->setScene(scene);
+        Qt3DCore::QNodePrivate::get(comp)->setScene(scene);
         entities << entity;
         components << comp;
     }
 
     // WHEN
     for (int i = 0; i < 10; i++) {
-        Qt3D::QEntity *e = entities.at(i);
+        Qt3DCore::QEntity *e = entities.at(i);
         for (int j = 0; j < 10; j++) {
             e->addComponent(components.at(j));
         }
diff --git a/tests/auto/core/qservicelocator/tst_qservicelocator.cpp b/tests/auto/core/qservicelocator/tst_qservicelocator.cpp
index 8c578cd22..3bb1eb8b1 100644
--- a/tests/auto/core/qservicelocator/tst_qservicelocator.cpp
+++ b/tests/auto/core/qservicelocator/tst_qservicelocator.cpp
@@ -41,7 +41,7 @@
 
 #include <QScopedPointer>
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 class DummyService : public QAbstractServiceProvider
 {
diff --git a/tests/auto/core/threadpooler/tst_threadpooler.cpp b/tests/auto/core/threadpooler/tst_threadpooler.cpp
index e3adbeba0..177d7ff16 100644
--- a/tests/auto/core/threadpooler/tst_threadpooler.cpp
+++ b/tests/auto/core/threadpooler/tst_threadpooler.cpp
@@ -61,7 +61,7 @@ public:
     ~tst_ThreadPooler() {}
 
 private:
-    Qt3D::QAspectJobManager *m_jobManager;
+    Qt3DCore::QAspectJobManager *m_jobManager;
 
 private Q_SLOTS:
     void init();
@@ -75,7 +75,7 @@ private Q_SLOTS:
     void perThreadUniqueCall();
 };
 
-typedef Qt3D::QAspectJobManager JobManager;
+typedef Qt3DCore::QAspectJobManager JobManager;
 typedef void (*TestFunction)(QAtomicInt *, int *);
 typedef void (*MassFunction)(QVector3D *data);
 
@@ -86,7 +86,7 @@ void perThreadFunction(void *arg)
 
 // General test AspectJob
 
-class TestAspectJob : public Qt3D::QAspectJob
+class TestAspectJob : public Qt3DCore::QAspectJob
 {
 public:
     TestAspectJob(TestFunction func, QAtomicInt *counter, int *value);
@@ -121,7 +121,7 @@ void TestAspectJob::run()
 
 // Mass test AspectJob
 
-class MassAspectJob : public Qt3D::QAspectJob
+class MassAspectJob : public Qt3DCore::QAspectJob
 {
 public:
     MassAspectJob(MassFunction func, QVector3D *data);
@@ -215,7 +215,7 @@ void tst_ThreadPooler::defaultAspectQueue()
     // GIVEN
     QAtomicInt callCounter;
     int value = 0; // Not used in this test
-    QVector<QSharedPointer<Qt3D::QAspectJob> > jobList;
+    QVector<QSharedPointer<Qt3DCore::QAspectJob> > jobList;
     callCounter.store(0);
     const int jobCount = 5;
 
@@ -241,7 +241,7 @@ void tst_ThreadPooler::doubleAspectQueue()
     // GIVEN
     QAtomicInt callCounter;
     int value = 0; // Not used in this test
-    QVector<QSharedPointer<Qt3D::QAspectJob> > jobList;
+    QVector<QSharedPointer<Qt3DCore::QAspectJob> > jobList;
     callCounter.store(0);
     const int jobCount = 3;
 
@@ -253,7 +253,7 @@ void tst_ThreadPooler::doubleAspectQueue()
     }
     m_jobManager->enqueueJobs(jobList);
 
-    QVector<QSharedPointer<Qt3D::QAspectJob> > jobList2;
+    QVector<QSharedPointer<Qt3DCore::QAspectJob> > jobList2;
     for (int i = 0; i < jobCount; i++) {
         QSharedPointer<TestAspectJob> job(new TestAspectJob(incrementFunctionCallCounter,
                                                             &callCounter, &value));
@@ -275,7 +275,7 @@ void tst_ThreadPooler::dependencyAspectQueue()
     // GIVEN
     QAtomicInt callCounter; // Not used in this test
     int value = 2;
-    QVector<QSharedPointer<Qt3D::QAspectJob> > jobList;
+    QVector<QSharedPointer<Qt3DCore::QAspectJob> > jobList;
 
     // WHEN
     QSharedPointer<TestAspectJob> job1(new TestAspectJob(add2, &callCounter, &value));
@@ -295,7 +295,7 @@ void tst_ThreadPooler::massTest()
 {
     // GIVEN
     const int mass = 600; // 600
-    QVector<QSharedPointer<Qt3D::QAspectJob> > jobList;
+    QVector<QSharedPointer<Qt3DCore::QAspectJob> > jobList;
     QVector3D data[3 * mass];
 
     // WHEN
diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp b/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp
index 37d8ff566..eca8be83c 100644
--- a/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp
+++ b/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp
@@ -48,7 +48,7 @@
 #include <QtQml/qqmlcomponent.h>
 #include <QtQml/qqmlcontext.h>
 
-using namespace Qt3D::Quick;
+using namespace Qt3DCore::Quick;
 
 class tst_quick3dnodeinstantiator: public QQmlDataTest
 {
diff --git a/tests/auto/render/attribute/tst_attribute.cpp b/tests/auto/render/attribute/tst_attribute.cpp
index d2058f1b9..e71f18628 100644
--- a/tests/auto/render/attribute/tst_attribute.cpp
+++ b/tests/auto/render/attribute/tst_attribute.cpp
@@ -56,7 +56,7 @@ private Q_SLOTS:
         attribute.setCount(427);
         attribute.setDivisor(305);
         attribute.setName(QStringLiteral("C3"));
-        attribute.setDataType(Qt3D::QAbstractAttribute::UnsignedShort);
+        attribute.setDataType(Qt3DCore::QAbstractAttribute::UnsignedShort);
         attribute.setDataSize(3);
 
         Qt3DRender::QBuffer buffer(Qt3DRender::QBuffer::IndexBuffer);
@@ -91,7 +91,7 @@ private Q_SLOTS:
         QVERIFY(renderAttribute.bufferId().isNull());
         QVERIFY(renderAttribute.name().isEmpty());
         QCOMPARE(renderAttribute.isDirty(), false);
-        QCOMPARE(renderAttribute.dataType(), Qt3D::QAbstractAttribute::Float);
+        QCOMPARE(renderAttribute.dataType(), Qt3DCore::QAbstractAttribute::Float);
         QCOMPARE(renderAttribute.dataSize(), 1U);
         QCOMPARE(renderAttribute.attributeType(), Qt3DRender::QAttribute::VertexAttribute);
         QCOMPARE(renderAttribute.byteOffset(), 0U);
@@ -107,7 +107,7 @@ private Q_SLOTS:
         attribute.setCount(427);
         attribute.setDivisor(305);
         attribute.setName(QStringLiteral("C3"));
-        attribute.setDataType(Qt3D::QAbstractAttribute::Double);
+        attribute.setDataType(Qt3DCore::QAbstractAttribute::Double);
         attribute.setDataSize(4);
         Qt3DRender::QBuffer buffer(Qt3DRender::QBuffer::IndexBuffer);
         buffer.setUsage(Qt3DRender::QBuffer::DynamicCopy);
@@ -123,7 +123,7 @@ private Q_SLOTS:
         QVERIFY(renderAttribute.bufferId().isNull());
         QVERIFY(renderAttribute.name().isEmpty());
         QCOMPARE(renderAttribute.isDirty(), false);
-        QCOMPARE(renderAttribute.dataType(), Qt3D::QAbstractAttribute::Float);
+        QCOMPARE(renderAttribute.dataType(), Qt3DCore::QAbstractAttribute::Float);
         QCOMPARE(renderAttribute.dataSize(), 1U);
         QCOMPARE(renderAttribute.attributeType(), Qt3DRender::QAttribute::VertexAttribute);
         QCOMPARE(renderAttribute.byteOffset(), 0U);
@@ -140,20 +140,20 @@ private Q_SLOTS:
         QVERIFY(!renderAttribute.isDirty());
 
         // WHEN
-        Qt3D::QScenePropertyChangePtr updateChange(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
-        updateChange->setValue(static_cast<int>(Qt3D::QAbstractAttribute::Int));
+        Qt3DCore::QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
+        updateChange->setValue(static_cast<int>(Qt3DCore::QAbstractAttribute::Int));
         updateChange->setPropertyName("dataType");
         renderAttribute.sceneChangeEvent(updateChange);
 
         // THEN
-        QCOMPARE(renderAttribute.dataType(), Qt3D::QAbstractAttribute::Int);
+        QCOMPARE(renderAttribute.dataType(), Qt3DCore::QAbstractAttribute::Int);
         QVERIFY(renderAttribute.isDirty());
 
         renderAttribute.unsetDirty();
         QVERIFY(!renderAttribute.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(3);
         updateChange->setPropertyName("dataSize");
         renderAttribute.sceneChangeEvent(updateChange);
@@ -166,7 +166,7 @@ private Q_SLOTS:
         QVERIFY(!renderAttribute.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(static_cast<int>(Qt3DRender::QAttribute::IndexAttribute));
         updateChange->setPropertyName("attributeType");
         renderAttribute.sceneChangeEvent(updateChange);
@@ -179,7 +179,7 @@ private Q_SLOTS:
         QVERIFY(!renderAttribute.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(1340);
         updateChange->setPropertyName("count");
         renderAttribute.sceneChangeEvent(updateChange);
@@ -192,7 +192,7 @@ private Q_SLOTS:
         QVERIFY(!renderAttribute.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(QStringLiteral("L88"));
         updateChange->setPropertyName("name");
         renderAttribute.sceneChangeEvent(updateChange);
@@ -205,7 +205,7 @@ private Q_SLOTS:
         QVERIFY(!renderAttribute.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(555);
         updateChange->setPropertyName("byteOffset");
         renderAttribute.sceneChangeEvent(updateChange);
@@ -218,7 +218,7 @@ private Q_SLOTS:
         QVERIFY(!renderAttribute.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(454);
         updateChange->setPropertyName("byteStride");
         renderAttribute.sceneChangeEvent(updateChange);
@@ -231,7 +231,7 @@ private Q_SLOTS:
         QVERIFY(!renderAttribute.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(1450);
         updateChange->setPropertyName("divisor");
         renderAttribute.sceneChangeEvent(updateChange);
@@ -244,8 +244,8 @@ private Q_SLOTS:
         QVERIFY(!renderAttribute.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeAdded, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
-        Qt3D::QNodeId bufferId = Qt3D::QNodeId::createId();
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
+        Qt3DCore::QNodeId bufferId = Qt3DCore::QNodeId::createId();
         updateChange->setValue(QVariant::fromValue(bufferId));
         updateChange->setPropertyName("buffer");
         renderAttribute.sceneChangeEvent(updateChange);
@@ -258,13 +258,13 @@ private Q_SLOTS:
         QVERIFY(!renderAttribute.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeRemoved, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(QVariant::fromValue(bufferId));
         updateChange->setPropertyName("buffer");
         renderAttribute.sceneChangeEvent(updateChange);
 
         // THEN
-        QCOMPARE(renderAttribute.bufferId(), Qt3D::QNodeId());
+        QCOMPARE(renderAttribute.bufferId(), Qt3DCore::QNodeId());
         QVERIFY(renderAttribute.isDirty());
 
         renderAttribute.unsetDirty();
diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp
index ffed836ea..3fb2ad2f3 100644
--- a/tests/auto/render/buffer/tst_buffer.cpp
+++ b/tests/auto/render/buffer/tst_buffer.cpp
@@ -134,7 +134,7 @@ private Q_SLOTS:
         QVERIFY(!renderBuffer.isDirty());
 
         // WHEN
-        Qt3D::QScenePropertyChangePtr updateChange(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        Qt3DCore::QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(static_cast<int>(Qt3DRender::QBuffer::IndexBuffer));
         updateChange->setPropertyName("type");
         renderBuffer.sceneChangeEvent(updateChange);
@@ -147,7 +147,7 @@ private Q_SLOTS:
         QVERIFY(!renderBuffer.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(static_cast<int>(Qt3DRender::QBuffer::DynamicRead));
         updateChange->setPropertyName("usage");
         renderBuffer.sceneChangeEvent(updateChange);
@@ -160,7 +160,7 @@ private Q_SLOTS:
         QVERIFY(!renderBuffer.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(QByteArrayLiteral("LS9"));
         updateChange->setPropertyName("data");
         renderBuffer.sceneChangeEvent(updateChange);
@@ -176,7 +176,7 @@ private Q_SLOTS:
 
         // WHEN
         Qt3DRender::QBufferFunctorPtr functor(new TestFunctor(355));
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(QVariant::fromValue(functor));
         updateChange->setPropertyName("bufferFunctor");
         renderBuffer.sceneChangeEvent(updateChange);
diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp
index 19ba1644a..1f3f1d390 100644
--- a/tests/auto/render/entity/tst_entity.cpp
+++ b/tests/auto/render/entity/tst_entity.cpp
@@ -47,10 +47,10 @@
 #include <Qt3DRenderer/QShaderData>
 #include <Qt3DRenderer/QGeometryRenderer>
 
-typedef Qt3D::QNodeId (*UuidMethod)(Qt3DRender::Render::Entity *);
-typedef QList<Qt3D::QNodeId> (*UuidListMethod)(Qt3DRender::Render::Entity *);
+typedef Qt3DCore::QNodeId (*UuidMethod)(Qt3DRender::Render::Entity *);
+typedef QList<Qt3DCore::QNodeId> (*UuidListMethod)(Qt3DRender::Render::Entity *);
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 using namespace Qt3DRender;
 using namespace Qt3DRender::Render;
 
@@ -78,7 +78,7 @@ private slots:
         QTest::addColumn<QComponent*>("component");
         QTest::addColumn<void*>("functionPtr");
 
-        QComponent *component = new Qt3D::QTransform;
+        QComponent *component = new Qt3DCore::QTransform;
         QTest::newRow("transform") << component << reinterpret_cast<void*>(transformUuid);
 
         component = new QGeometryRenderer;
diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp
index dd99978ac..2fa9a4377 100644
--- a/tests/auto/render/geometry/tst_geometry.cpp
+++ b/tests/auto/render/geometry/tst_geometry.cpp
@@ -113,10 +113,10 @@ private Q_SLOTS:
     {
         // GIVEN
         Qt3DRender::Render::Geometry renderGeometry;
-        Qt3D::QNodeId geometryId = Qt3D::QNodeId::createId();
+        Qt3DCore::QNodeId geometryId = Qt3DCore::QNodeId::createId();
 
         // WHEN
-        Qt3D::QScenePropertyChangePtr updateChange(new Qt3D::QScenePropertyChange(Qt3D::NodeAdded, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        Qt3DCore::QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(QVariant::fromValue(geometryId));
         updateChange->setPropertyName("attribute");
         renderGeometry.sceneChangeEvent(updateChange);
@@ -129,7 +129,7 @@ private Q_SLOTS:
         QVERIFY(!renderGeometry.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeRemoved, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(QVariant::fromValue(geometryId));
         updateChange->setPropertyName("attribute");
         renderGeometry.sceneChangeEvent(updateChange);
@@ -142,7 +142,7 @@ private Q_SLOTS:
         QVERIFY(!renderGeometry.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(QVariant::fromValue(3));
         updateChange->setPropertyName("verticesPerPatch");
         renderGeometry.sceneChangeEvent(updateChange);
diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
index 13e67cf45..ed49918a7 100644
--- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
+++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
@@ -167,7 +167,7 @@ private Q_SLOTS:
         QVERIFY(!renderGeometryRenderer.isDirty());
 
         // WHEN
-        Qt3D::QScenePropertyChangePtr updateChange(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        Qt3DCore::QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setPropertyName("instanceCount");
         updateChange->setValue(2);
         renderGeometryRenderer.sceneChangeEvent(updateChange);
@@ -180,7 +180,7 @@ private Q_SLOTS:
         QVERIFY(!renderGeometryRenderer.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setPropertyName("primitiveCount");
         updateChange->setValue(56);
         renderGeometryRenderer.sceneChangeEvent(updateChange);
@@ -193,7 +193,7 @@ private Q_SLOTS:
         QVERIFY(!renderGeometryRenderer.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setPropertyName("baseVertex");
         updateChange->setValue(65);
         renderGeometryRenderer.sceneChangeEvent(updateChange);
@@ -206,7 +206,7 @@ private Q_SLOTS:
         QVERIFY(!renderGeometryRenderer.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setPropertyName("baseInstance");
         updateChange->setValue(82);
         renderGeometryRenderer.sceneChangeEvent(updateChange);
@@ -219,7 +219,7 @@ private Q_SLOTS:
         QVERIFY(!renderGeometryRenderer.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setPropertyName("restartIndex");
         updateChange->setValue(46);
         renderGeometryRenderer.sceneChangeEvent(updateChange);
@@ -232,7 +232,7 @@ private Q_SLOTS:
         QVERIFY(!renderGeometryRenderer.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setPropertyName("primitiveRestart");
         updateChange->setValue(true);
         renderGeometryRenderer.sceneChangeEvent(updateChange);
@@ -245,7 +245,7 @@ private Q_SLOTS:
         QVERIFY(!renderGeometryRenderer.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setPropertyName("primitiveType");
         updateChange->setValue(static_cast<int>(Qt3DRender::QGeometryRenderer::LineLoop));
         renderGeometryRenderer.sceneChangeEvent(updateChange);
@@ -258,7 +258,7 @@ private Q_SLOTS:
         QVERIFY(!renderGeometryRenderer.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeUpdated, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setPropertyName("geometryFunctor");
         Qt3DRender::QGeometryFunctorPtr functor(new TestFunctor(1450));
         updateChange->setValue(QVariant::fromValue(functor));
@@ -272,8 +272,8 @@ private Q_SLOTS:
         QVERIFY(!renderGeometryRenderer.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeAdded, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
-        Qt3D::QNodeId geometryId = Qt3D::QNodeId::createId();
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeAdded, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
+        Qt3DCore::QNodeId geometryId = Qt3DCore::QNodeId::createId();
         updateChange->setValue(QVariant::fromValue(geometryId));
         updateChange->setPropertyName("geometry");
         renderGeometryRenderer.sceneChangeEvent(updateChange);
@@ -286,13 +286,13 @@ private Q_SLOTS:
         QVERIFY(!renderGeometryRenderer.isDirty());
 
         // WHEN
-        updateChange.reset(new Qt3D::QScenePropertyChange(Qt3D::NodeRemoved, Qt3D::QSceneChange::Node, Qt3D::QNodeId()));
+        updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeRemoved, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
         updateChange->setValue(QVariant::fromValue(geometryId));
         updateChange->setPropertyName("geometry");
         renderGeometryRenderer.sceneChangeEvent(updateChange);
 
         // THEN
-        QCOMPARE(renderGeometryRenderer.geometryId(), Qt3D::QNodeId());
+        QCOMPARE(renderGeometryRenderer.geometryId(), Qt3DCore::QNodeId());
         QVERIFY(renderGeometryRenderer.isDirty());
 
         renderGeometryRenderer.unsetDirty();
diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp
index 39be14e96..abf74c823 100644
--- a/tests/auto/render/material/tst_material.cpp
+++ b/tests/auto/render/material/tst_material.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DCore/QScenePropertyChange>
 
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 using namespace Qt3DRender;
 using namespace Qt3DRender::Render;
 
diff --git a/tests/auto/render/qattribute/tst_qattribute.cpp b/tests/auto/render/qattribute/tst_qattribute.cpp
index 937e9c200..9383012ba 100644
--- a/tests/auto/render/qattribute/tst_qattribute.cpp
+++ b/tests/auto/render/qattribute/tst_qattribute.cpp
@@ -46,29 +46,29 @@
 
 class TestArbiter;
 
-class TestPostman : public Qt3D::QAbstractPostman
+class TestPostman : public Qt3DCore::QAbstractPostman
 {
 public:
     TestPostman(TestArbiter *arbiter)
         : m_arbiter(arbiter)
     {}
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &) Q_DECL_FINAL
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_FINAL
     {}
 
-    void setScene(Qt3D::QScene *) Q_DECL_FINAL
+    void setScene(Qt3DCore::QScene *) Q_DECL_FINAL
     {}
 
-    void notifyBackend(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL;
+    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
 
 private:
     TestArbiter *m_arbiter;
 };
 
-class TestArbiter : public Qt3D::QAbstractArbiter
+class TestArbiter : public Qt3DCore::QAbstractArbiter
 {
 public:
-    TestArbiter(Qt3D::QNode *node)
+    TestArbiter(Qt3DCore::QNode *node)
         : m_postman(new TestPostman(this))
         , m_node(node)
     {
@@ -77,51 +77,51 @@ public:
 
     ~TestArbiter()
     {
-        Qt3D::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
+        Qt3DCore::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
     }
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
     {
         events.push_back(e);
     }
 
-    void sceneChangeEventWithLock(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
     {
         events.push_back(e);
     }
 
-    void sceneChangeEventWithLock(const Qt3D::QSceneChangeList &e) Q_DECL_FINAL
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_FINAL
     {
-        events += QVector<Qt3D::QSceneChangePtr>::fromStdVector(e);
+        events += QVector<Qt3DCore::QSceneChangePtr>::fromStdVector(e);
     }
 
-    Qt3D::QAbstractPostman *postman() const Q_DECL_FINAL
+    Qt3DCore::QAbstractPostman *postman() const Q_DECL_FINAL
     {
         return m_postman;
     }
 
-    QVector<Qt3D::QSceneChangePtr> events;
+    QVector<Qt3DCore::QSceneChangePtr> events;
 
 private:
     TestPostman *m_postman;
-    Qt3D::QNode *m_node;
+    Qt3DCore::QNode *m_node;
 
-    void assignArbiter(Qt3D::QNode *node)
+    void assignArbiter(Qt3DCore::QNode *node)
     {
-        Qt3D::QNodePrivate::get(node)->setArbiter(this);
-        Q_FOREACH (Qt3D::QNode *n, node->childrenNodes())
+        Qt3DCore::QNodePrivate::get(node)->setArbiter(this);
+        Q_FOREACH (Qt3DCore::QNode *n, node->childrenNodes())
             assignArbiter(n);
     }
 };
 
-void TestPostman::notifyBackend(const Qt3D::QSceneChangePtr &e)
+void TestPostman::notifyBackend(const Qt3DCore::QSceneChangePtr &e)
 {
     m_arbiter->sceneChangeEventWithLock(e);
 }
 
 // We need to call QNode::clone which is protected
 // So we sublcass QNode instead of QObject
-class tst_QAttribute: public Qt3D::QNode
+class tst_QAttribute: public Qt3DCore::QNode
 {
     Q_OBJECT
 public:
@@ -142,7 +142,7 @@ private Q_SLOTS:
         Qt3DRender::QAttribute *customVertex = new Qt3DRender::QAttribute();
         Qt3DRender::QBuffer *buffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer);
         customVertex->setBuffer(buffer);
-        customVertex->setAttributeType(Qt3D::QAbstractAttribute::VertexAttribute);
+        customVertex->setAttributeType(Qt3DCore::QAbstractAttribute::VertexAttribute);
         customVertex->setCount(454);
         customVertex->setByteStride(427);
         customVertex->setByteOffset(305);
@@ -155,7 +155,7 @@ private Q_SLOTS:
         Qt3DRender::QAttribute *customIndex = new Qt3DRender::QAttribute();
         Qt3DRender::QBuffer *indexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer);
         customIndex->setBuffer(indexBuffer);
-        customIndex->setAttributeType(Qt3D::QAbstractAttribute::IndexAttribute);
+        customIndex->setAttributeType(Qt3DCore::QAbstractAttribute::IndexAttribute);
         customIndex->setCount(383);
         customIndex->setByteStride(350);
         customIndex->setByteOffset(327);
@@ -207,10 +207,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3D::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "dataType");
         QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QAttribute::Double));
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -220,10 +220,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "dataSize");
         QCOMPARE(change->value().value<uint>(), 4U);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -233,10 +233,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "name");
         QCOMPARE(change->value().value<QString>(), QStringLiteral("Duntov"));
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -246,10 +246,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "count");
         QCOMPARE(change->value().value<uint>(), 883U);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -259,10 +259,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "byteStride");
         QCOMPARE(change->value().value<uint>(), 1340U);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -272,10 +272,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "byteOffset");
         QCOMPARE(change->value().value<uint>(), 1584U);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -285,23 +285,23 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "divisor");
         QCOMPARE(change->value().value<uint>(), 1450U);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
         // WHEN
-        attribute->setAttributeType(Qt3D::QAbstractAttribute::IndexAttribute);
+        attribute->setAttributeType(Qt3DCore::QAbstractAttribute::IndexAttribute);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "attributeType");
-        QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3D::QAbstractAttribute::IndexAttribute));
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DCore::QAbstractAttribute::IndexAttribute));
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -312,10 +312,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "buffer");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), buf.id());
-        QCOMPARE(change->type(), Qt3D::NodeAdded);
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), buf.id());
+        QCOMPARE(change->type(), Qt3DCore::NodeAdded);
 
         arbiter.events.clear();
 
@@ -326,19 +326,19 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 2);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "buffer");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), buf.id());
-        QCOMPARE(change->type(), Qt3D::NodeRemoved);
-        change = arbiter.events.last().staticCast<Qt3D::QScenePropertyChange>();
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), buf.id());
+        QCOMPARE(change->type(), Qt3DCore::NodeRemoved);
+        change = arbiter.events.last().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "buffer");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), buf2.id());
-        QCOMPARE(change->type(), Qt3D::NodeAdded);
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), buf2.id());
+        QCOMPARE(change->type(), Qt3DCore::NodeAdded);
 
     }
 
 protected:
-    Qt3D::QNode *doClone() const Q_DECL_OVERRIDE
+    Qt3DCore::QNode *doClone() const Q_DECL_OVERRIDE
     {
         return Q_NULLPTR;
     }
diff --git a/tests/auto/render/qbuffer/tst_qbuffer.cpp b/tests/auto/render/qbuffer/tst_qbuffer.cpp
index 20dcc28ba..0501fd02e 100644
--- a/tests/auto/render/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/render/qbuffer/tst_qbuffer.cpp
@@ -46,29 +46,29 @@
 
 class TestArbiter;
 
-class TestPostman : public Qt3D::QAbstractPostman
+class TestPostman : public Qt3DCore::QAbstractPostman
 {
 public:
     TestPostman(TestArbiter *arbiter)
         : m_arbiter(arbiter)
     {}
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &) Q_DECL_FINAL
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_FINAL
     {}
 
-    void setScene(Qt3D::QScene *) Q_DECL_FINAL
+    void setScene(Qt3DCore::QScene *) Q_DECL_FINAL
     {}
 
-    void notifyBackend(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL;
+    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
 
 private:
     TestArbiter *m_arbiter;
 };
 
-class TestArbiter : public Qt3D::QAbstractArbiter
+class TestArbiter : public Qt3DCore::QAbstractArbiter
 {
 public:
-    TestArbiter(Qt3D::QNode *node)
+    TestArbiter(Qt3DCore::QNode *node)
         : m_postman(new TestPostman(this))
         , m_node(node)
     {
@@ -77,44 +77,44 @@ public:
 
     ~TestArbiter()
     {
-        Qt3D::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
+        Qt3DCore::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
     }
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
     {
         events.push_back(e);
     }
 
-    void sceneChangeEventWithLock(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
     {
         events.push_back(e);
     }
 
-    void sceneChangeEventWithLock(const Qt3D::QSceneChangeList &e) Q_DECL_FINAL
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_FINAL
     {
-        events += QVector<Qt3D::QSceneChangePtr>::fromStdVector(e);
+        events += QVector<Qt3DCore::QSceneChangePtr>::fromStdVector(e);
     }
 
-    Qt3D::QAbstractPostman *postman() const Q_DECL_FINAL
+    Qt3DCore::QAbstractPostman *postman() const Q_DECL_FINAL
     {
         return m_postman;
     }
 
-    QVector<Qt3D::QSceneChangePtr> events;
+    QVector<Qt3DCore::QSceneChangePtr> events;
 
 private:
     TestPostman *m_postman;
-    Qt3D::QNode *m_node;
+    Qt3DCore::QNode *m_node;
 
-    void assignArbiter(Qt3D::QNode *node)
+    void assignArbiter(Qt3DCore::QNode *node)
     {
-        Qt3D::QNodePrivate::get(node)->setArbiter(this);
-        Q_FOREACH (Qt3D::QNode *n, node->childrenNodes())
+        Qt3DCore::QNodePrivate::get(node)->setArbiter(this);
+        Q_FOREACH (Qt3DCore::QNode *n, node->childrenNodes())
             assignArbiter(n);
     }
 };
 
-void TestPostman::notifyBackend(const Qt3D::QSceneChangePtr &e)
+void TestPostman::notifyBackend(const Qt3DCore::QSceneChangePtr &e)
 {
     m_arbiter->sceneChangeEventWithLock(e);
 }
@@ -147,7 +147,7 @@ private:
 
 // We need to call QNode::clone which is protected
 // So we sublcass QNode instead of QObject
-class tst_QBuffer: public Qt3D::QNode
+class tst_QBuffer: public Qt3DCore::QNode
 {
     Q_OBJECT
 public:
@@ -212,7 +212,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3D::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "type");
         QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QBuffer::IndexBuffer));
 
@@ -224,7 +224,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "usage");
         QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QBuffer::DynamicCopy));
 
@@ -236,7 +236,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "data");
         QCOMPARE(change->value().value<QByteArray>(), QByteArrayLiteral("Z28"));
 
@@ -249,7 +249,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "bufferFunctor");
         QCOMPARE(change->value().value<Qt3DRender::QBufferFunctorPtr>(), functor);
 
@@ -257,7 +257,7 @@ private Q_SLOTS:
     }
 
 protected:
-    Qt3D::QNode *doClone() const Q_DECL_OVERRIDE
+    Qt3DCore::QNode *doClone() const Q_DECL_OVERRIDE
     {
         return Q_NULLPTR;
     }
diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp
index 00c44d953..692cd6f16 100644
--- a/tests/auto/render/qgeometry/tst_qgeometry.cpp
+++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp
@@ -47,29 +47,29 @@
 
 class TestArbiter;
 
-class TestPostman : public Qt3D::QAbstractPostman
+class TestPostman : public Qt3DCore::QAbstractPostman
 {
 public:
     TestPostman(TestArbiter *arbiter)
         : m_arbiter(arbiter)
     {}
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &) Q_DECL_FINAL
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_FINAL
     {}
 
-    void setScene(Qt3D::QScene *) Q_DECL_FINAL
+    void setScene(Qt3DCore::QScene *) Q_DECL_FINAL
     {}
 
-    void notifyBackend(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL;
+    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
 
 private:
     TestArbiter *m_arbiter;
 };
 
-class TestArbiter : public Qt3D::QAbstractArbiter
+class TestArbiter : public Qt3DCore::QAbstractArbiter
 {
 public:
-    TestArbiter(Qt3D::QNode *node)
+    TestArbiter(Qt3DCore::QNode *node)
         : m_postman(new TestPostman(this))
         , m_node(node)
     {
@@ -78,51 +78,51 @@ public:
 
     ~TestArbiter()
     {
-        Qt3D::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
+        Qt3DCore::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
     }
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
     {
         events.push_back(e);
     }
 
-    void sceneChangeEventWithLock(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
     {
         events.push_back(e);
     }
 
-    void sceneChangeEventWithLock(const Qt3D::QSceneChangeList &e) Q_DECL_FINAL
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_FINAL
     {
-        events += QVector<Qt3D::QSceneChangePtr>::fromStdVector(e);
+        events += QVector<Qt3DCore::QSceneChangePtr>::fromStdVector(e);
     }
 
-    Qt3D::QAbstractPostman *postman() const Q_DECL_FINAL
+    Qt3DCore::QAbstractPostman *postman() const Q_DECL_FINAL
     {
         return m_postman;
     }
 
-    QVector<Qt3D::QSceneChangePtr> events;
+    QVector<Qt3DCore::QSceneChangePtr> events;
 
 private:
     TestPostman *m_postman;
-    Qt3D::QNode *m_node;
+    Qt3DCore::QNode *m_node;
 
-    void assignArbiter(Qt3D::QNode *node)
+    void assignArbiter(Qt3DCore::QNode *node)
     {
-        Qt3D::QNodePrivate::get(node)->setArbiter(this);
-        Q_FOREACH (Qt3D::QNode *n, node->childrenNodes())
+        Qt3DCore::QNodePrivate::get(node)->setArbiter(this);
+        Q_FOREACH (Qt3DCore::QNode *n, node->childrenNodes())
             assignArbiter(n);
     }
 };
 
-void TestPostman::notifyBackend(const Qt3D::QSceneChangePtr &e)
+void TestPostman::notifyBackend(const Qt3DCore::QSceneChangePtr &e)
 {
     m_arbiter->sceneChangeEventWithLock(e);
 }
 
 // We need to call QNode::clone which is protected
 // So we sublcass QNode instead of QObject
-class tst_QGeometry: public Qt3D::QNode
+class tst_QGeometry: public Qt3DCore::QNode
 {
     Q_OBJECT
 public:
@@ -203,10 +203,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3D::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "attribute");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), attr.id());
-        QCOMPARE(change->type(), Qt3D::NodeAdded);
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), attr.id());
+        QCOMPARE(change->type(), Qt3DCore::NodeAdded);
 
         arbiter.events.clear();
 
@@ -223,10 +223,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "attribute");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), attr.id());
-        QCOMPARE(change->type(), Qt3D::NodeRemoved);
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), attr.id());
+        QCOMPARE(change->type(), Qt3DCore::NodeRemoved);
 
         arbiter.events.clear();
 
@@ -236,16 +236,16 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "verticesPerPatch");
         QCOMPARE(change->value().toInt(), 2);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
     }
 
 protected:
-    Qt3D::QNode *doClone() const Q_DECL_OVERRIDE
+    Qt3DCore::QNode *doClone() const Q_DECL_OVERRIDE
     {
         return Q_NULLPTR;
     }
diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
index 291a767d4..186b2e9a8 100644
--- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
+++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
@@ -49,29 +49,29 @@
 
 class TestArbiter;
 
-class TestPostman : public Qt3D::QAbstractPostman
+class TestPostman : public Qt3DCore::QAbstractPostman
 {
 public:
     TestPostman(TestArbiter *arbiter)
         : m_arbiter(arbiter)
     {}
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &) Q_DECL_FINAL
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_FINAL
     {}
 
-    void setScene(Qt3D::QScene *) Q_DECL_FINAL
+    void setScene(Qt3DCore::QScene *) Q_DECL_FINAL
     {}
 
-    void notifyBackend(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL;
+    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
 
 private:
     TestArbiter *m_arbiter;
 };
 
-class TestArbiter : public Qt3D::QAbstractArbiter
+class TestArbiter : public Qt3DCore::QAbstractArbiter
 {
 public:
-    TestArbiter(Qt3D::QNode *node)
+    TestArbiter(Qt3DCore::QNode *node)
         : m_postman(new TestPostman(this))
         , m_node(node)
     {
@@ -80,44 +80,44 @@ public:
 
     ~TestArbiter()
     {
-        Qt3D::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
+        Qt3DCore::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
     }
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
     {
         events.push_back(e);
     }
 
-    void sceneChangeEventWithLock(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
     {
         events.push_back(e);
     }
 
-    void sceneChangeEventWithLock(const Qt3D::QSceneChangeList &e) Q_DECL_FINAL
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_FINAL
     {
-        events += QVector<Qt3D::QSceneChangePtr>::fromStdVector(e);
+        events += QVector<Qt3DCore::QSceneChangePtr>::fromStdVector(e);
     }
 
-    Qt3D::QAbstractPostman *postman() const Q_DECL_FINAL
+    Qt3DCore::QAbstractPostman *postman() const Q_DECL_FINAL
     {
         return m_postman;
     }
 
-    QVector<Qt3D::QSceneChangePtr> events;
+    QVector<Qt3DCore::QSceneChangePtr> events;
 
 private:
     TestPostman *m_postman;
-    Qt3D::QNode *m_node;
+    Qt3DCore::QNode *m_node;
 
-    void assignArbiter(Qt3D::QNode *node)
+    void assignArbiter(Qt3DCore::QNode *node)
     {
-        Qt3D::QNodePrivate::get(node)->setArbiter(this);
-        Q_FOREACH (Qt3D::QNode *n, node->childrenNodes())
+        Qt3DCore::QNodePrivate::get(node)->setArbiter(this);
+        Q_FOREACH (Qt3DCore::QNode *n, node->childrenNodes())
             assignArbiter(n);
     }
 };
 
-void TestPostman::notifyBackend(const Qt3D::QSceneChangePtr &e)
+void TestPostman::notifyBackend(const Qt3DCore::QSceneChangePtr &e)
 {
     m_arbiter->sceneChangeEventWithLock(e);
 }
@@ -150,7 +150,7 @@ private:
 
 // We need to call QNode::clone which is protected
 // So we sublcass QNode instead of QObject
-class tst_QGeometryRenderer: public Qt3D::QNode
+class tst_QGeometryRenderer: public Qt3DCore::QNode
 {
     Q_OBJECT
 public:
@@ -237,10 +237,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3D::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "instanceCount");
         QCOMPARE(change->value().value<int>(), 256);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -250,10 +250,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "primitiveCount");
         QCOMPARE(change->value().value<int>(), 1340);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -263,10 +263,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "baseVertex");
         QCOMPARE(change->value().value<int>(), 883);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -276,10 +276,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "baseInstance");
         QCOMPARE(change->value().value<int>(), 1200);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -289,10 +289,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "restartIndex");
         QCOMPARE(change->value().value<int>(), 65535);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -302,10 +302,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "primitiveRestart");
         QCOMPARE(change->value().value<bool>(), true);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -315,10 +315,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "primitiveType");
         QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QGeometryRenderer::Patches));
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -329,10 +329,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "geometryFunctor");
         QCOMPARE(change->value().value<Qt3DRender::QGeometryFunctorPtr>(), functor);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -343,10 +343,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "geometry");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), geom.id());
-        QCOMPARE(change->type(), Qt3D::NodeAdded);
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), geom.id());
+        QCOMPARE(change->type(), Qt3DCore::NodeAdded);
 
         arbiter.events.clear();
 
@@ -357,21 +357,21 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 2);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "geometry");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), geom.id());
-        QCOMPARE(change->type(), Qt3D::NodeRemoved);
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), geom.id());
+        QCOMPARE(change->type(), Qt3DCore::NodeRemoved);
 
-        change = arbiter.events.last().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.last().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "geometry");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), geom2.id());
-        QCOMPARE(change->type(), Qt3D::NodeAdded);
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), geom2.id());
+        QCOMPARE(change->type(), Qt3DCore::NodeAdded);
 
         arbiter.events.clear();
     }
 
 protected:
-    Qt3D::QNode *doClone() const Q_DECL_OVERRIDE
+    Qt3DCore::QNode *doClone() const Q_DECL_OVERRIDE
     {
         return Q_NULLPTR;
     }
diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp
index 01bd361b1..e719a8ea8 100644
--- a/tests/auto/render/qmaterial/tst_qmaterial.cpp
+++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp
@@ -58,7 +58,7 @@
 class TestMaterial : public Qt3DRender::QMaterial
 {
 public:
-    explicit TestMaterial(Qt3D::QNode *parent = 0)
+    explicit TestMaterial(Qt3DCore::QNode *parent = 0)
         : Qt3DRender::QMaterial(parent)
         , m_effect(new Qt3DRender::QEffect(this))
         , m_technique(new Qt3DRender::QTechnique(this))
@@ -84,29 +84,29 @@ public:
 
 class TestArbiter;
 
-class TestPostman : public Qt3D::QAbstractPostman
+class TestPostman : public Qt3DCore::QAbstractPostman
 {
 public:
     TestPostman(TestArbiter *arbiter)
         : m_arbiter(arbiter)
     {}
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &) Q_DECL_FINAL
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_FINAL
     {}
 
-    void setScene(Qt3D::QScene *) Q_DECL_FINAL
+    void setScene(Qt3DCore::QScene *) Q_DECL_FINAL
     {}
 
-    void notifyBackend(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL;
+    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
 
 private:
     TestArbiter *m_arbiter;
 };
 
-class TestArbiter : public Qt3D::QAbstractArbiter
+class TestArbiter : public Qt3DCore::QAbstractArbiter
 {
 public:
-    TestArbiter(Qt3D::QNode *node)
+    TestArbiter(Qt3DCore::QNode *node)
         : m_postman(new TestPostman(this))
         , m_node(node)
     {
@@ -115,51 +115,51 @@ public:
 
     ~TestArbiter()
     {
-        Qt3D::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
+        Qt3DCore::QNodePrivate::get(m_node)->setArbiter(Q_NULLPTR);
     }
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
     {
         events.push_back(e);
     }
 
-    void sceneChangeEventWithLock(const Qt3D::QSceneChangePtr &e) Q_DECL_FINAL
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
     {
         events.push_back(e);
     }
 
-    void sceneChangeEventWithLock(const Qt3D::QSceneChangeList &e) Q_DECL_FINAL
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_FINAL
     {
-        events += QVector<Qt3D::QSceneChangePtr>::fromStdVector(e);
+        events += QVector<Qt3DCore::QSceneChangePtr>::fromStdVector(e);
     }
 
-    Qt3D::QAbstractPostman *postman() const Q_DECL_FINAL
+    Qt3DCore::QAbstractPostman *postman() const Q_DECL_FINAL
     {
         return m_postman;
     }
 
-    QVector<Qt3D::QSceneChangePtr> events;
+    QVector<Qt3DCore::QSceneChangePtr> events;
 
 private:
     TestPostman *m_postman;
-    Qt3D::QNode *m_node;
+    Qt3DCore::QNode *m_node;
 
-    void assignArbiter(Qt3D::QNode *node)
+    void assignArbiter(Qt3DCore::QNode *node)
     {
-        Qt3D::QNodePrivate::get(node)->setArbiter(this);
-        Q_FOREACH (Qt3D::QNode *n, node->childrenNodes())
+        Qt3DCore::QNodePrivate::get(node)->setArbiter(this);
+        Q_FOREACH (Qt3DCore::QNode *n, node->childrenNodes())
             assignArbiter(n);
     }
 };
 
-void TestPostman::notifyBackend(const Qt3D::QSceneChangePtr &e)
+void TestPostman::notifyBackend(const Qt3DCore::QSceneChangePtr &e)
 {
     m_arbiter->sceneChangeEventWithLock(e);
 }
 
 // We need to call QNode::clone which is protected
 // So we sublcass QNode instead of QObject
-class tst_QMaterial : public Qt3D::QNode
+class tst_QMaterial : public Qt3DCore::QNode
 {
     Q_OBJECT
 public:
@@ -340,10 +340,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3D::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "effect");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), effect.id());
-        QCOMPARE(change->type(), Qt3D::NodeAdded);
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), effect.id());
+        QCOMPARE(change->type(), Qt3DCore::NodeAdded);
 
         arbiter.events.clear();
 
@@ -358,15 +358,15 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter2.events.size(), 2);
-        change = arbiter2.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter2.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "effect");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), oldEffect->id());
-        QCOMPARE(change->type(), Qt3D::NodeRemoved);
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), oldEffect->id());
+        QCOMPARE(change->type(), Qt3DCore::NodeRemoved);
 
-        change = arbiter2.events.last().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter2.events.last().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "effect");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), effect.id());
-        QCOMPARE(change->type(), Qt3D::NodeAdded);
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), effect.id());
+        QCOMPARE(change->type(), Qt3DCore::NodeAdded);
     }
 
     void checkDynamicParametersAddedUpdates()
@@ -382,10 +382,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3D::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "parameter");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), param->id());
-        QCOMPARE(change->type(), Qt3D::NodeAdded);
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), param->id());
+        QCOMPARE(change->type(), Qt3DCore::NodeAdded);
 
         arbiter.events.clear();
 
@@ -396,10 +396,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "parameter");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), param->id());
-        QCOMPARE(change->type(), Qt3D::NodeAdded);
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), param->id());
+        QCOMPARE(change->type(), Qt3DCore::NodeAdded);
 
         arbiter.events.clear();
 
@@ -410,10 +410,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "parameter");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), param->id());
-        QCOMPARE(change->type(), Qt3D::NodeAdded);
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), param->id());
+        QCOMPARE(change->type(), Qt3DCore::NodeAdded);
 
         arbiter.events.clear();
 
@@ -424,10 +424,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "parameter");
-        QCOMPARE(change->value().value<Qt3D::QNodeId>(), param->id());
-        QCOMPARE(change->type(), Qt3D::NodeAdded);
+        QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), param->id());
+        QCOMPARE(change->type(), Qt3DCore::NodeAdded);
 
         arbiter.events.clear();
     }
@@ -445,10 +445,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3D::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "vertexShaderCode");
         QCOMPARE(change->value().value<QByteArray>(), vertexCode);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -459,10 +459,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "fragmentShaderCode");
         QCOMPARE(change->value().value<QByteArray>(), fragmentCode);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -473,10 +473,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "geometryShaderCode");
         QCOMPARE(change->value().value<QByteArray>(), geometryCode);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -487,10 +487,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "computeShaderCode");
         QCOMPARE(change->value().value<QByteArray>(), computeCode);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -501,10 +501,10 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "tessellationControlShaderCode");
         QCOMPARE(change->value().value<QByteArray>(), tesselControlCode);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
 
@@ -515,16 +515,16 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        change = arbiter.events.first().staticCast<Qt3D::QScenePropertyChange>();
+        change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "tessellationEvaluationShaderCode");
         QCOMPARE(change->value().value<QByteArray>(), tesselEvalCode);
-        QCOMPARE(change->type(), Qt3D::NodeUpdated);
+        QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
     }
 
 protected:
-    Qt3D::QNode *doClone() const Q_DECL_OVERRIDE
+    Qt3DCore::QNode *doClone() const Q_DECL_OVERRIDE
     {
         return Q_NULLPTR;
     }
diff --git a/tests/auto/render/raycasting/tst_raycasting.cpp b/tests/auto/render/raycasting/tst_raycasting.cpp
index 994778d4a..2aaa92984 100644
--- a/tests/auto/render/raycasting/tst_raycasting.cpp
+++ b/tests/auto/render/raycasting/tst_raycasting.cpp
@@ -41,7 +41,7 @@
 #include <Qt3DCore/qboundingvolumeprovider.h>
 #include <Qt3DCore/qray3d.h>
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 using namespace Qt3DRender;
 using namespace Qt3DRender::Render;
 
diff --git a/tests/auto/render/renderpass/tst_renderpass.cpp b/tests/auto/render/renderpass/tst_renderpass.cpp
index df7d066c9..a5b66a534 100644
--- a/tests/auto/render/renderpass/tst_renderpass.cpp
+++ b/tests/auto/render/renderpass/tst_renderpass.cpp
@@ -66,7 +66,7 @@
 
 #include <Qt3DRenderer/private/renderstates_p.h>
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 using namespace Qt3DRender;
 using namespace Qt3DRender::Render;
 
diff --git a/tests/auto/render/renderviews/tst_renderviews.cpp b/tests/auto/render/renderviews/tst_renderviews.cpp
index ca4ecf6cc..31e6f7997 100644
--- a/tests/auto/render/renderviews/tst_renderviews.cpp
+++ b/tests/auto/render/renderviews/tst_renderviews.cpp
@@ -57,7 +57,7 @@ private Q_SLOTS:
     void checkRenderViewDoesNotLeak()
     {
         // GIVEN
-        Qt3D::QFrameAllocator allocator(128, 16, 128);
+        Qt3DCore::QFrameAllocator allocator(128, 16, 128);
         Qt3DRender::Render::RenderView *rv = allocator.allocate<Qt3DRender::Render::RenderView>();
         rv->setAllocator(&allocator);
 
diff --git a/tests/benchmarks/core/qcircularbuffer/tst_bench_qcircularbuffer.cpp b/tests/benchmarks/core/qcircularbuffer/tst_bench_qcircularbuffer.cpp
index b20e0b010..2e1d990c3 100644
--- a/tests/benchmarks/core/qcircularbuffer/tst_bench_qcircularbuffer.cpp
+++ b/tests/benchmarks/core/qcircularbuffer/tst_bench_qcircularbuffer.cpp
@@ -39,7 +39,7 @@
 
 #include <Qt3DCore/private/qcircularbuffer_p.h>
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 class tst_QCircularBuffer : public QObject
 {
diff --git a/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp b/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp
index 9e6ab6fa4..3c015ee3a 100644
--- a/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp
+++ b/tests/benchmarks/core/qframeallocator/tst_bench_qframeallocator.cpp
@@ -39,7 +39,7 @@
 
 #include <Qt3DCore/QFrameAllocator>
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 class tst_QFrameAllocator : public QObject
 {
diff --git a/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp b/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp
index 3acddc134..29667724a 100644
--- a/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp
+++ b/tests/benchmarks/core/qresourcesmanager/arraypolicy/tst_bench_arraypolicy.cpp
@@ -97,42 +97,42 @@ void benchmarkReleaseResources()
 
 void tst_ArrayPolicy::benchmarkDynamicAllocateSmallResources()
 {
-    benchmarkAllocateResources<Qt3D::ArrayAllocatingPolicy<SmallType, 16>, SmallType>();
+    benchmarkAllocateResources<Qt3DCore::ArrayAllocatingPolicy<SmallType, 16>, SmallType>();
 }
 
 void tst_ArrayPolicy::benchmarkDynamicReleaseSmallResources()
 {
-    benchmarkReleaseResources<Qt3D::ArrayAllocatingPolicy<SmallType, 16>, SmallType>();
+    benchmarkReleaseResources<Qt3DCore::ArrayAllocatingPolicy<SmallType, 16>, SmallType>();
 }
 
 void tst_ArrayPolicy::benchmarkDynamicAllocateBigResources()
 {
-    benchmarkAllocateResources<Qt3D::ArrayAllocatingPolicy<BigType, 16>, BigType>();
+    benchmarkAllocateResources<Qt3DCore::ArrayAllocatingPolicy<BigType, 16>, BigType>();
 }
 
 void tst_ArrayPolicy::benchmarkDynamicReleaseBigResources()
 {
-    benchmarkReleaseResources<Qt3D::ArrayAllocatingPolicy<BigType, 16>, BigType>();
+    benchmarkReleaseResources<Qt3DCore::ArrayAllocatingPolicy<BigType, 16>, BigType>();
 }
 
 void tst_ArrayPolicy::benchmarkPreallocatedAllocateSmallResources()
 {
-    benchmarkAllocateResources<Qt3D::ArrayPreallocationPolicy<SmallType, 16>, SmallType>();
+    benchmarkAllocateResources<Qt3DCore::ArrayPreallocationPolicy<SmallType, 16>, SmallType>();
 }
 
 void tst_ArrayPolicy::benchmarkPreallocatedReleaseSmallResources()
 {
-    benchmarkReleaseResources<Qt3D::ArrayPreallocationPolicy<SmallType, 16>, SmallType>();
+    benchmarkReleaseResources<Qt3DCore::ArrayPreallocationPolicy<SmallType, 16>, SmallType>();
 }
 
 void tst_ArrayPolicy::benchmarkPreallocatedAllocateBigResources()
 {
-    benchmarkAllocateResources<Qt3D::ArrayPreallocationPolicy<BigType, 16>, BigType>();
+    benchmarkAllocateResources<Qt3DCore::ArrayPreallocationPolicy<BigType, 16>, BigType>();
 }
 
 void tst_ArrayPolicy::benchmarkPreallocatedReleaseBigResources()
 {
-    benchmarkReleaseResources<Qt3D::ArrayPreallocationPolicy<BigType, 16>, BigType>();
+    benchmarkReleaseResources<Qt3DCore::ArrayPreallocationPolicy<BigType, 16>, BigType>();
 }
 
 QTEST_APPLESS_MAIN(tst_ArrayPolicy)
diff --git a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp
index d14adc486..221c43e74 100644
--- a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp
+++ b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp
@@ -77,7 +77,7 @@ public:
 template<typename Resource>
 void benchmarkAllocateResources()
 {
-    Qt3D::QResourceManager<Resource, int, 16> manager;
+    Qt3DCore::QResourceManager<Resource, int, 16> manager;
 
     volatile Resource *c;
     QBENCHMARK_ONCE {
@@ -91,9 +91,9 @@ void benchmarkAllocateResources()
 template<typename Resource>
 void benchmarkAccessResources()
 {
-    Qt3D::QResourceManager<Resource, int, 16> manager;
+    Qt3DCore::QResourceManager<Resource, int, 16> manager;
     const int max = (1 << 16) - 1;
-    QVector<Qt3D::QHandle<Resource> > handles(max);
+    QVector<Qt3DCore::QHandle<Resource> > handles(max);
     for (int i = 0; i < max; i++)
         handles[i] = manager.acquire();
 
@@ -107,9 +107,9 @@ void benchmarkAccessResources()
 
 template<typename Resource>
 void benchmarkRandomAccessResource() {
-    Qt3D::QResourceManager<Resource, int, 16> manager;
+    Qt3DCore::QResourceManager<Resource, int, 16> manager;
     const int max = (1 << 16) - 1;
-    QVector<Qt3D::QHandle<Resource> > handles(max);
+    QVector<Qt3DCore::QHandle<Resource> > handles(max);
     for (int i = 0; i < max; i++)
         handles[i] = manager.acquire();
 
@@ -126,7 +126,7 @@ void benchmarkRandomAccessResource() {
 template<typename Resource>
 void benchmarkLookupResources()
 {
-    Qt3D::QResourceManager<Resource, int, 16> manager;
+    Qt3DCore::QResourceManager<Resource, int, 16> manager;
     const int max = (1 << 16) - 1;
     for (int i = 0; i < max; i++)
         manager.getOrCreateResource(i);
@@ -142,7 +142,7 @@ void benchmarkLookupResources()
 template<typename Resource>
 void benchmarkRandomLookupResources()
 {
-    Qt3D::QResourceManager<Resource, int, 16> manager;
+    Qt3DCore::QResourceManager<Resource, int, 16> manager;
     const int max = (1 << 16) - 1;
     QVector<int> resourcesIndices(max);
     for (int i = 0; i < max; i++) {
@@ -162,9 +162,9 @@ void benchmarkRandomLookupResources()
 template<typename Resource>
 void benchmarkReleaseResources()
 {
-    Qt3D::QResourceManager<Resource, int, 16> manager;
+    Qt3DCore::QResourceManager<Resource, int, 16> manager;
     const int max = (1 << 16) - 1;
-    QVector<Qt3D::QHandle<Resource> > handles(max);
+    QVector<Qt3DCore::QHandle<Resource> > handles(max);
     for (int i = 0; i < max; i++)
         handles[i] = manager.acquire();
author	Sean Harmer <sean.harmer@kdab.com>	2015-10-12 20:45:19 +0100
committer	Paul Lemire <paul.lemire@kdab.com>	2015-10-13 13:19:50 +0000
commit	7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch)
tree	53197a9e5eb7501d6f5b497f70c25dad9c265a6f
parent	0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (diff)