Move Qt3DCore into Qt3DCore namespace

Update other aspects, tests and examples accordingly.

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

14 files changed, 246 insertions, 246 deletions

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);