Move Qt3DCore into Qt3DCore namespace

Update other aspects, tests and examples accordingly.

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

68 files changed, 215 insertions, 215 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());