Renamed Node to QNode

Change-Id: I0a0ebde1c107db8831b596eab1e512a2062979f7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
author: Paul Lemire <paul.lemire@kdab.com> 2014-07-04 09:59:09 +0200
committer: Paul Lemire <paul.lemire@kdab.com> 2014-07-05 19:06:21 +0200
commit: e14d91b6522cbbae08c307e036cff37b0fc6b529 (patch)
tree: 5416044c313179296b43421877f90d8f01e8979b /src
parent: 603e22c60e240773a01e578372fe263d132504b6 (diff)
127 files changed, 354 insertions, 354 deletions
diff --git a/src/bulletphysics/qabstractcollider.cpp b/src/bulletphysics/qabstractcollider.cpp
index edfbc9967..de83b3359 100644
--- a/src/bulletphysics/qabstractcollider.cpp
+++ b/src/bulletphysics/qabstractcollider.cpp
@@ -53,12 +53,12 @@ QAbstractColliderPrivate::QAbstractColliderPrivate(QAbstractCollider *qq)
 {
 }
 
-QAbstractCollider::QAbstractCollider(Node *parent)
+QAbstractCollider::QAbstractCollider(QNode *parent)
     : Qt3D::Component(*new QAbstractColliderPrivate(this), parent)
 {
 }
 
-QAbstractCollider::QAbstractCollider(QAbstractColliderPrivate &dd, Qt3D::Node *parent)
+QAbstractCollider::QAbstractCollider(QAbstractColliderPrivate &dd, Qt3D::QNode *parent)
     : Qt3D::Component(dd, parent)
 {
 }
diff --git a/src/bulletphysics/qabstractcollider.h b/src/bulletphysics/qabstractcollider.h
index 4c356516d..06bbda139 100644
--- a/src/bulletphysics/qabstractcollider.h
+++ b/src/bulletphysics/qabstractcollider.h
@@ -60,7 +60,7 @@ class QT3DBULLETPHYSICSSHARED_EXPORT QAbstractCollider : public Qt3D::Component
     Q_PROPERTY(CollisionBehavior collisionBehavior READ collisionBehavior WRITE setCollisionBehavior NOTIFY collisionBehaviorChanged)
 
 public:
-    explicit QAbstractCollider(Node *parent = 0);
+    explicit QAbstractCollider(QNode *parent = 0);
 
     enum CollisionBehavior {
         SolidColliderBehavior = 0,
@@ -75,7 +75,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QAbstractCollider)
-    QAbstractCollider(QAbstractColliderPrivate &dd, Qt3D::Node *parent = 0);
+    QAbstractCollider(QAbstractColliderPrivate &dd, Qt3D::QNode *parent = 0);
 };
 
 } // namespace BulletPhysics
diff --git a/src/bulletphysics/qboxcollider.cpp b/src/bulletphysics/qboxcollider.cpp
index 45e51b3fc..b94323460 100644
--- a/src/bulletphysics/qboxcollider.cpp
+++ b/src/bulletphysics/qboxcollider.cpp
@@ -55,12 +55,12 @@ QBoxColliderPrivate::QBoxColliderPrivate(QBoxCollider *qq)
 }
 
 
-QBoxCollider::QBoxCollider(Qt3D::Node *parent)
+QBoxCollider::QBoxCollider(Qt3D::QNode *parent)
     : QAbstractCollider(*new QBoxColliderPrivate(this), parent)
 {
 }
 
-QBoxCollider::QBoxCollider(QBoxColliderPrivate &dd, Node *parent)
+QBoxCollider::QBoxCollider(QBoxColliderPrivate &dd, QNode *parent)
     : QAbstractCollider(dd, parent)
 {
 }
diff --git a/src/bulletphysics/qboxcollider.h b/src/bulletphysics/qboxcollider.h
index 4c6555b97..53fa1ea36 100644
--- a/src/bulletphysics/qboxcollider.h
+++ b/src/bulletphysics/qboxcollider.h
@@ -62,7 +62,7 @@ class QBoxCollider : public Qt3D::BulletPhysics::QAbstractCollider
     Q_PROPERTY(QVector3D halfExtents READ halfExtents WRITE setHalfExtents NOTIFY halfExtentsChanged)
 
 public:
-    explicit QBoxCollider(Qt3D::Node *parent = 0);
+    explicit QBoxCollider(Qt3D::QNode *parent = 0);
 
     void setCenter(const QVector3D &center);
     QVector3D center() const;
@@ -76,7 +76,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QBoxCollider)
-    QBoxCollider(QBoxColliderPrivate &dd, Node *parent = 0);
+    QBoxCollider(QBoxColliderPrivate &dd, QNode *parent = 0);
 };
 
 } // namespace BulletPhysics
diff --git a/src/bulletphysics/qspherecollider.cpp b/src/bulletphysics/qspherecollider.cpp
index a903b992f..0d5b108e2 100644
--- a/src/bulletphysics/qspherecollider.cpp
+++ b/src/bulletphysics/qspherecollider.cpp
@@ -55,12 +55,12 @@ QSphereColliderPrivate::QSphereColliderPrivate(QSphereCollider *qq)
 }
 
 
-QSphereCollider::QSphereCollider(Qt3D::Node *parent)
+QSphereCollider::QSphereCollider(Qt3D::QNode *parent)
     : QAbstractCollider(*new QSphereColliderPrivate(this), parent)
 {
 }
 
-QSphereCollider::QSphereCollider(QSphereColliderPrivate &dd, Node *parent)
+QSphereCollider::QSphereCollider(QSphereColliderPrivate &dd, QNode *parent)
     : QAbstractCollider(dd, parent)
 {
 }
diff --git a/src/bulletphysics/qspherecollider.h b/src/bulletphysics/qspherecollider.h
index 1175764c8..92e16d0d4 100644
--- a/src/bulletphysics/qspherecollider.h
+++ b/src/bulletphysics/qspherecollider.h
@@ -62,7 +62,7 @@ class QT3DBULLETPHYSICSSHARED_EXPORT QSphereCollider : public Qt3D::BulletPhysic
     Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged)
 
 public:
-    explicit QSphereCollider(Qt3D::Node *parent = 0);
+    explicit QSphereCollider(Qt3D::QNode *parent = 0);
 
     void setCenter(const QVector3D &center);
     QVector3D center() const;
@@ -76,7 +76,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QSphereCollider)
-    QSphereCollider(QSphereColliderPrivate &dd, Node *parent = 0);
+    QSphereCollider(QSphereColliderPrivate &dd, QNode *parent = 0);
 };
 
 } // namespace BulletPhysics
diff --git a/src/bulletphysics/rigidbody.cpp b/src/bulletphysics/rigidbody.cpp
index 15b8f97ad..f4f906074 100644
--- a/src/bulletphysics/rigidbody.cpp
+++ b/src/bulletphysics/rigidbody.cpp
@@ -55,12 +55,12 @@ RigidBodyPrivate::RigidBodyPrivate(RigidBody *qq)
 }
 
 
-RigidBody::RigidBody(Qt3D::Node *parent)
+RigidBody::RigidBody(Qt3D::QNode *parent)
     : Qt3D::Component(*new RigidBodyPrivate(this), parent)
 {
 }
 
-RigidBody::RigidBody(RigidBodyPrivate &dd, Qt3D::Node *parent)
+RigidBody::RigidBody(RigidBodyPrivate &dd, Qt3D::QNode *parent)
     : Qt3D::Component(dd, parent)
 {
 }
diff --git a/src/bulletphysics/rigidbody.h b/src/bulletphysics/rigidbody.h
index 9175e7171..4382e275e 100644
--- a/src/bulletphysics/rigidbody.h
+++ b/src/bulletphysics/rigidbody.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class Node;
+class QNode;
 
 namespace BulletPhysics {
 
@@ -65,7 +65,7 @@ class QT3DBULLETPHYSICSSHARED_EXPORT RigidBody : public Qt3D::Component
     Q_PROPERTY(QVector3D centerOfMass READ centerOfMass WRITE setCenterOfMass NOTIFY centerOfMassChanged)
 
 public:
-    explicit RigidBody(Qt3D::Node *parent = 0);
+    explicit RigidBody(Qt3D::QNode *parent = 0);
 
     void setMass(float mass);
     float mass() const;
@@ -79,7 +79,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(RigidBody)
-    RigidBody(RigidBodyPrivate &dd, Qt3D::Node *parent = 0);
+    RigidBody(RigidBodyPrivate &dd, Qt3D::QNode *parent = 0);
 };
 
 } // namespace BulletPhysics
diff --git a/src/core/aspects/abstractaspect.h b/src/core/aspects/abstractaspect.h
index ad5395090..1e28565a2 100644
--- a/src/core/aspects/abstractaspect.h
+++ b/src/core/aspects/abstractaspect.h
@@ -54,7 +54,7 @@ class QWindow;
 namespace Qt3D {
 
 class QAspectManager;
-class Node;
+class QNode;
 class Entity;
 
 class QT3DCORESHARED_EXPORT AbstractAspect : public QObject, public QJobProviderInterface
diff --git a/src/core/aspects/qaspectmanager.h b/src/core/aspects/qaspectmanager.h
index 9b9ca34bf..64588461a 100644
--- a/src/core/aspects/qaspectmanager.h
+++ b/src/core/aspects/qaspectmanager.h
@@ -54,7 +54,7 @@ class QWindow;
 namespace Qt3D {
 
 class AbstractAspect;
-class Node;
+class QNode;
 class QChangeArbiter;
 class QJobManagerInterface;
 class QScheduler;
diff --git a/src/core/core-components/camera.cpp b/src/core/core-components/camera.cpp
index b619cd399..ba76050c3 100644
--- a/src/core/core-components/camera.cpp
+++ b/src/core/core-components/camera.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-Camera::Camera(Node *parent) : Entity(parent)
+Camera::Camera(QNode *parent) : Entity(parent)
   , d_ptr(new CameraPrivate(this))
 {
     qDebug() << Q_FUNC_INFO;
diff --git a/src/core/core-components/camera.h b/src/core/core-components/camera.h
index cfdfe3277..b9e20bece 100644
--- a/src/core/core-components/camera.h
+++ b/src/core/core-components/camera.h
@@ -64,7 +64,7 @@ class QT3DCORESHARED_EXPORT Camera : public Entity
     Q_PROPERTY(Qt3D::Transform *transform READ transform WRITE setTransform NOTIFY transformChanged)
 
 public:
-    explicit Camera(Node *parent = 0);
+    explicit Camera(QNode *parent = 0);
 
 
     enum CameraTranslationOption {
diff --git a/src/core/core-components/cameralens.cpp b/src/core/core-components/cameralens.cpp
index 42e9f1678..ea3a5d088 100644
--- a/src/core/core-components/cameralens.cpp
+++ b/src/core/core-components/cameralens.cpp
@@ -62,12 +62,12 @@ CameraLensPrivate::CameraLensPrivate(CameraLens *qq)
 }
 
 
-CameraLens::CameraLens(Node *parent)
+CameraLens::CameraLens(QNode *parent)
     : Component(*new CameraLensPrivate(this), parent)
 {
 }
 
-CameraLens::CameraLens(CameraLensPrivate &dd, Node *parent)
+CameraLens::CameraLens(CameraLensPrivate &dd, QNode *parent)
     : Component(dd, parent)
 {
 }
diff --git a/src/core/core-components/cameralens.h b/src/core/core-components/cameralens.h
index 2d731a6de..d02feadd2 100644
--- a/src/core/core-components/cameralens.h
+++ b/src/core/core-components/cameralens.h
@@ -71,7 +71,7 @@ class QT3DCORESHARED_EXPORT CameraLens : public Component
     Q_PROPERTY(float top READ top WRITE setTop NOTIFY topChanged)
 
 public:
-    explicit CameraLens(Node *parent = 0);
+    explicit CameraLens(QNode *parent = 0);
 
     enum ProjectionType {
         OrthogonalProjection,
@@ -128,7 +128,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(CameraLens)
-    CameraLens(CameraLensPrivate &dd, Node *parent = 0);
+    CameraLens(CameraLensPrivate &dd, QNode *parent = 0);
 };
 
 } // Qt3D
diff --git a/src/core/core-components/qabstracteffect.cpp b/src/core/core-components/qabstracteffect.cpp
index b6d5e268c..34298059c 100644
--- a/src/core/core-components/qabstracteffect.cpp
+++ b/src/core/core-components/qabstracteffect.cpp
@@ -64,16 +64,16 @@ namespace Qt3D {
 
 
 QAbstractEffectPrivate::QAbstractEffectPrivate(QAbstractEffect *qq)
-        : NodePrivate(qq)
+        : QNodePrivate(qq)
     {}
 
-QAbstractEffect::QAbstractEffect(Node *parent)
-    : Node(*new QAbstractEffectPrivate(this), parent)
+QAbstractEffect::QAbstractEffect(QNode *parent)
+    : QNode(*new QAbstractEffectPrivate(this), parent)
 {
 }
 
-QAbstractEffect::QAbstractEffect(QAbstractEffectPrivate &dd, Node *parent)
-    : Node(dd, parent)
+QAbstractEffect::QAbstractEffect(QAbstractEffectPrivate &dd, QNode *parent)
+    : QNode(dd, parent)
 {
 }
 
diff --git a/src/core/core-components/qabstracteffect.h b/src/core/core-components/qabstracteffect.h
index af7395f79..c4cdcf9df 100644
--- a/src/core/core-components/qabstracteffect.h
+++ b/src/core/core-components/qabstracteffect.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_QABSTRACTEFFECT_H
 #define QT3D_QABSTRACTEFFECT_H
 
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -55,11 +55,11 @@ class QAbstractEffectPrivate;
 // the class
 
 class QT3DCORESHARED_EXPORT QAbstractEffect
-        : public Node
+        : public QNode
 {
     Q_OBJECT
 public:
-    explicit QAbstractEffect(Node *parent = 0);
+    explicit QAbstractEffect(QNode *parent = 0);
 
     virtual void addTechnique(QAbstractTechnique *t);
     virtual void removeTechnique(QAbstractTechnique *t);
@@ -73,7 +73,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QAbstractEffect)
-    QAbstractEffect(QAbstractEffectPrivate &dd, Node *parent = 0);
+    QAbstractEffect(QAbstractEffectPrivate &dd, QNode *parent = 0);
 };
 
 } // Qt3D
diff --git a/src/core/core-components/qabstracteffect_p.h b/src/core/core-components/qabstracteffect_p.h
index 8927b6f19..bcf5d1847 100644
--- a/src/core/core-components/qabstracteffect_p.h
+++ b/src/core/core-components/qabstracteffect_p.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_QABSTRACTEFFECT_P_H
 #define QT3D_QABSTRACTEFFECT_P_H
 
-#include <private/node_p.h>
+#include <private/qnode_p.h>
 #include <Qt3DCore/qt3dcore_global.h>
 
 QT_BEGIN_NAMESPACE
@@ -52,7 +52,7 @@ namespace Qt3D {
 class QAbstractEffect;
 class QAbstractTechnique;
 
-class QT3DCORESHARED_EXPORT QAbstractEffectPrivate : public NodePrivate
+class QT3DCORESHARED_EXPORT QAbstractEffectPrivate : public QNodePrivate
 {
 public :
     QAbstractEffectPrivate(QAbstractEffect *qq);
diff --git a/src/core/core-components/qabstractmaterial.cpp b/src/core/core-components/qabstractmaterial.cpp
index 4526ba546..deccbcfc2 100644
--- a/src/core/core-components/qabstractmaterial.cpp
+++ b/src/core/core-components/qabstractmaterial.cpp
@@ -68,12 +68,12 @@ QAbstractMaterialPrivate::QAbstractMaterialPrivate(QAbstractMaterial *qq)
     , m_effect(Q_NULLPTR)
 {}
 
-QAbstractMaterial::QAbstractMaterial(Node *parent)
+QAbstractMaterial::QAbstractMaterial(QNode *parent)
     : Component(*new QAbstractMaterialPrivate(this), parent)
 {
 }
 
-QAbstractMaterial::QAbstractMaterial(QAbstractMaterialPrivate &dd, Node *parent)
+QAbstractMaterial::QAbstractMaterial(QAbstractMaterialPrivate &dd, QNode *parent)
     : Component(dd, parent)
 {
 }
diff --git a/src/core/core-components/qabstractmaterial.h b/src/core/core-components/qabstractmaterial.h
index d35172134..1f9a0178c 100644
--- a/src/core/core-components/qabstractmaterial.h
+++ b/src/core/core-components/qabstractmaterial.h
@@ -57,7 +57,7 @@ class QT3DCORESHARED_EXPORT QAbstractMaterial : public Component
     Q_OBJECT
     Q_PROPERTY(Qt3D::QAbstractEffect* effect READ effect WRITE setEffect NOTIFY effectChanged)
 public:
-    QAbstractMaterial(Node *parent = 0);
+    QAbstractMaterial(QNode *parent = 0);
 
     virtual void setEffect(Qt3D::QAbstractEffect *effect);
     QAbstractEffect *effect() const;
@@ -67,7 +67,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QAbstractMaterial)
-    QAbstractMaterial(QAbstractMaterialPrivate &dd, Node *parent = 0);
+    QAbstractMaterial(QAbstractMaterialPrivate &dd, QNode *parent = 0);
 };
 
 } // Qt3D
diff --git a/src/core/core-components/qabstractmesh.cpp b/src/core/core-components/qabstractmesh.cpp
index 9923abd8d..5220a3c80 100644
--- a/src/core/core-components/qabstractmesh.cpp
+++ b/src/core/core-components/qabstractmesh.cpp
@@ -67,12 +67,12 @@ QAbstractMeshPrivate::QAbstractMeshPrivate(QAbstractMesh *qq)
 }
 
 
-QAbstractMesh::QAbstractMesh(Node *parent)
+QAbstractMesh::QAbstractMesh(QNode *parent)
     : Component(*new QAbstractMeshPrivate(this), parent)
 {
 }
 
-QAbstractMesh::QAbstractMesh(QAbstractMeshPrivate &dd, Node *parent)
+QAbstractMesh::QAbstractMesh(QAbstractMeshPrivate &dd, QNode *parent)
     : Component(dd, parent)
 {
 }
diff --git a/src/core/core-components/qabstractmesh.h b/src/core/core-components/qabstractmesh.h
index 56d29e25d..c09cd5cf2 100644
--- a/src/core/core-components/qabstractmesh.h
+++ b/src/core/core-components/qabstractmesh.h
@@ -59,7 +59,7 @@ class QT3DCORESHARED_EXPORT QAbstractMesh : public Component
     Q_OBJECT
 
 public:
-    QAbstractMesh(Node *parent = 0);
+    QAbstractMesh(QNode *parent = 0);
 
     const QUuid uuid() const;
 
@@ -74,7 +74,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QAbstractMesh)
-    QAbstractMesh(QAbstractMeshPrivate &dd, Node *parent = 0);
+    QAbstractMesh(QAbstractMeshPrivate &dd, QNode *parent = 0);
 
     void setData(QAbstractMeshDataPtr data);
 };
diff --git a/src/core/core-components/qabstractrenderpass.cpp b/src/core/core-components/qabstractrenderpass.cpp
index 5eb6a1ba4..20d91724a 100644
--- a/src/core/core-components/qabstractrenderpass.cpp
+++ b/src/core/core-components/qabstractrenderpass.cpp
@@ -49,18 +49,18 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 QAbstractRenderPassPrivate::QAbstractRenderPassPrivate(QAbstractRenderPass *qq)
-    : NodePrivate(qq)
+    : QNodePrivate(qq)
     , m_shader(Q_NULLPTR)
 {
 }
 
-QAbstractRenderPass::QAbstractRenderPass(Node *parent)
-    : Node(*new QAbstractRenderPassPrivate(this), parent)
+QAbstractRenderPass::QAbstractRenderPass(QNode *parent)
+    : QNode(*new QAbstractRenderPassPrivate(this), parent)
 {
 }
 
-QAbstractRenderPass::QAbstractRenderPass(QAbstractRenderPassPrivate &dd, Node *parent)
-    : Node(dd, parent)
+QAbstractRenderPass::QAbstractRenderPass(QAbstractRenderPassPrivate &dd, QNode *parent)
+    : QNode(dd, parent)
 {
 }
 
diff --git a/src/core/core-components/qabstractrenderpass.h b/src/core/core-components/qabstractrenderpass.h
index b22709d02..71a48dec3 100644
--- a/src/core/core-components/qabstractrenderpass.h
+++ b/src/core/core-components/qabstractrenderpass.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_QABSTRACTRENDERPASS_H
 #define QT3D_QABSTRACTRENDERPASS_H
 
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -52,14 +52,14 @@ class QAbstractShader;
 class QAbstractRenderPassPrivate;
 
 class QT3DCORESHARED_EXPORT QAbstractRenderPass
-        : public Node
+        : public QNode
 {
     Q_OBJECT
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(Qt3D::QAbstractShader * shaderProgram READ shaderProgram WRITE setShaderProgram NOTIFY shaderProgramChanged)
 
 public:
-    explicit QAbstractRenderPass(Node *parent = 0);
+    explicit QAbstractRenderPass(QNode *parent = 0);
 
     virtual void setName(const QString &name);
     QString name() const;
@@ -72,7 +72,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QAbstractRenderPass)
-    QAbstractRenderPass(QAbstractRenderPassPrivate &dd, Node *parent = 0);
+    QAbstractRenderPass(QAbstractRenderPassPrivate &dd, QNode *parent = 0);
 };
 
 } // Qt3D
diff --git a/src/core/core-components/qabstractrenderpass_p.h b/src/core/core-components/qabstractrenderpass_p.h
index 793845b72..ffc1f75b4 100644
--- a/src/core/core-components/qabstractrenderpass_p.h
+++ b/src/core/core-components/qabstractrenderpass_p.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_QABSTRACTRENDERPASS_P_H
 #define QT3D_QABSTRACTRENDERPASS_P_H
 
-#include <private/node_p.h>
+#include <private/qnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -51,7 +51,7 @@ namespace Qt3D {
 class QAbstractRenderPass;
 class QAbstractShader;
 
-class QT3DCORESHARED_EXPORT QAbstractRenderPassPrivate : public NodePrivate
+class QT3DCORESHARED_EXPORT QAbstractRenderPassPrivate : public QNodePrivate
 {
 public:
     QAbstractRenderPassPrivate(QAbstractRenderPass *qq);
diff --git a/src/core/core-components/qabstractshader.cpp b/src/core/core-components/qabstractshader.cpp
index 6736813aa..3168fd9e5 100644
--- a/src/core/core-components/qabstractshader.cpp
+++ b/src/core/core-components/qabstractshader.cpp
@@ -69,8 +69,8 @@ public:
     QAbstractShader *q_ptr;
 };
 
-QAbstractShader::QAbstractShader(Node *parent)
-    : Node(parent)
+QAbstractShader::QAbstractShader(QNode *parent)
+    : QNode(parent)
     , d_ptr(new QAbstractShaderPrivate(this))
 {
 }
diff --git a/src/core/core-components/qabstractshader.h b/src/core/core-components/qabstractshader.h
index 7ac6e6f64..cc1b52493 100644
--- a/src/core/core-components/qabstractshader.h
+++ b/src/core/core-components/qabstractshader.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_QABSTRACTSHADER_H
 #define QT3D_QABSTRACTSHADER_H
 
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 #include <QUuid>
 
 QT_BEGIN_NAMESPACE
@@ -52,11 +52,11 @@ namespace Qt3D {
 class QAbstractShaderPrivate;
 
 class QT3DCORESHARED_EXPORT QAbstractShader
-        : public Node
+        : public QNode
 {
     Q_OBJECT
 public:
-    explicit QAbstractShader(Node *parent = 0);
+    explicit QAbstractShader(QNode *parent = 0);
 
     QUuid uuid() const;
 
diff --git a/src/core/core-components/qabstracttechnique.cpp b/src/core/core-components/qabstracttechnique.cpp
index 94c28b71f..1adbec22d 100644
--- a/src/core/core-components/qabstracttechnique.cpp
+++ b/src/core/core-components/qabstracttechnique.cpp
@@ -68,18 +68,18 @@ namespace Qt3D {
 
 
 QAbstractTechniquePrivate::QAbstractTechniquePrivate(QAbstractTechnique *qq)
-    : NodePrivate(qq)
+    : QNodePrivate(qq)
 {
 }
 
-QAbstractTechnique::QAbstractTechnique(Node *parent)
-    : Node(*new QAbstractTechniquePrivate(this), parent)
+QAbstractTechnique::QAbstractTechnique(QNode *parent)
+    : QNode(*new QAbstractTechniquePrivate(this), parent)
 {
 }
 
 
-QAbstractTechnique::QAbstractTechnique(QAbstractTechniquePrivate &dd, Node *parent)
-    : Node(dd, parent)
+QAbstractTechnique::QAbstractTechnique(QAbstractTechniquePrivate &dd, QNode *parent)
+    : QNode(dd, parent)
 {
 }
 
diff --git a/src/core/core-components/qabstracttechnique.h b/src/core/core-components/qabstracttechnique.h
index b50509063..093c96112 100644
--- a/src/core/core-components/qabstracttechnique.h
+++ b/src/core/core-components/qabstracttechnique.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_QABSTRACTTECHNIQUE_H
 #define QT3D_QABSTRACTTECHNIQUE_H
 
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -52,13 +52,13 @@ class QAbstractRenderPass;
 class QAbstractTechniquePrivate;
 
 class QT3DCORESHARED_EXPORT QAbstractTechnique
-        : public Node
+        : public QNode
 {
     Q_OBJECT
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
 
 public:
-    explicit QAbstractTechnique(Node *parent = 0);
+    explicit QAbstractTechnique(QNode *parent = 0);
 
     virtual void setName(const QString &name);
     QString name() const;
@@ -72,7 +72,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QAbstractTechnique)
-    QAbstractTechnique(QAbstractTechniquePrivate &dd, Node *parent = 0);
+    QAbstractTechnique(QAbstractTechniquePrivate &dd, QNode *parent = 0);
 };
 
 } // Qt3D
diff --git a/src/core/core-components/qabstracttechnique_p.h b/src/core/core-components/qabstracttechnique_p.h
index 72d686ce2..23a761fbc 100644
--- a/src/core/core-components/qabstracttechnique_p.h
+++ b/src/core/core-components/qabstracttechnique_p.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_QABSTRACTTECHNIQUE_P_H
 #define QT3D_QABSTRACTTECHNIQUE_P_H
 
-#include <private/node_p.h>
+#include <private/qnode_p.h>
 #include <Qt3DCore/qt3dcore_global.h>
 
 QT_BEGIN_NAMESPACE
@@ -52,7 +52,7 @@ namespace Qt3D {
 class QAbstractTechnique;
 class QAbstractRenderPass;
 
-class QT3DCORESHARED_EXPORT QAbstractTechniquePrivate : public NodePrivate
+class QT3DCORESHARED_EXPORT QAbstractTechniquePrivate : public QNodePrivate
 {
 public:
     QAbstractTechniquePrivate(QAbstractTechnique *qq);
diff --git a/src/core/nodes/component.cpp b/src/core/nodes/component.cpp
index d61b2c4d4..36bef3423 100644
--- a/src/core/nodes/component.cpp
+++ b/src/core/nodes/component.cpp
@@ -47,18 +47,18 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 ComponentPrivate::ComponentPrivate(Component *qq)
-    : NodePrivate(qq)
+    : QNodePrivate(qq)
     , m_enabled(true)
 {
 }
 
-Component::Component(Node *parent)
-    : Node(*new ComponentPrivate(this), parent)
+Component::Component(QNode *parent)
+    : QNode(*new ComponentPrivate(this), parent)
 {
 }
 
-Component::Component(ComponentPrivate &dd, Node *parent)
-    : Node(dd, parent)
+Component::Component(ComponentPrivate &dd, QNode *parent)
+    : QNode(dd, parent)
 {
 }
 
diff --git a/src/core/nodes/component.h b/src/core/nodes/component.h
index e3f77b798..1880ddb20 100644
--- a/src/core/nodes/component.h
+++ b/src/core/nodes/component.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_COMPONENT_H
 #define QT3D_COMPONENT_H
 
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qt3dcore_global.h>
 
 QT_BEGIN_NAMESPACE
@@ -51,14 +51,14 @@ namespace Qt3D {
 
 class ComponentPrivate;
 
-class QT3DCORESHARED_EXPORT Component : public Node
+class QT3DCORESHARED_EXPORT Component : public QNode
 {
     Q_OBJECT
 
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
 
 public:
-    explicit Component(Node *parent = 0);
+    explicit Component(QNode *parent = 0);
 
     void setEnabled(bool enabled);
     bool isEnabled() const;
@@ -68,7 +68,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(Component)
-    Component(ComponentPrivate &dd, Node *parent = 0);
+    Component(ComponentPrivate &dd, QNode *parent = 0);
 };
 
 } // namespace Qt3D
diff --git a/src/core/nodes/component_p.h b/src/core/nodes/component_p.h
index 015e996ed..913f1dae3 100644
--- a/src/core/nodes/component_p.h
+++ b/src/core/nodes/component_p.h
@@ -43,13 +43,13 @@
 #define QT3D_COMPONENT_P_H
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <private/node_p.h>
+#include <private/qnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DCORESHARED_EXPORT ComponentPrivate : public NodePrivate
+class QT3DCORESHARED_EXPORT ComponentPrivate : public QNodePrivate
 {
 public:
     explicit ComponentPrivate(Component *qq);
diff --git a/src/core/nodes/entity.cpp b/src/core/nodes/entity.cpp
index 297d489b4..8efb90644 100644
--- a/src/core/nodes/entity.cpp
+++ b/src/core/nodes/entity.cpp
@@ -54,13 +54,13 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-Entity::Entity(Node *parent)
-    : Node(*new EntityPrivate(this), parent)
+Entity::Entity(QNode *parent)
+    : QNode(*new EntityPrivate(this), parent)
 {
 }
 
-Entity::Entity(EntityPrivate &dd, Node *parent)
-    : Node(dd, parent)
+Entity::Entity(EntityPrivate &dd, QNode *parent)
+    : QNode(dd, parent)
 {
 }
 
@@ -120,7 +120,7 @@ void Entity::setEnabled(bool on)
 
 Entity *Entity::parentEntity()
 {
-    return qobject_cast<Entity*>(Node::parent());
+    return qobject_cast<Entity*>(QNode::parent());
 }
 
 Entity *Entity::asEntity()
diff --git a/src/core/nodes/entity.h b/src/core/nodes/entity.h
index bac69cba2..7a137bd0f 100644
--- a/src/core/nodes/entity.h
+++ b/src/core/nodes/entity.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_ENTITY_H
 #define QT3D_ENTITY_H
 
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qt3dcore_global.h>
 
 #include <QMetaType>
@@ -58,14 +58,14 @@ class EntityPrivate;
 
 typedef QList<Component*> ComponentList;
 
-class QT3DCORESHARED_EXPORT Entity : public Node
+class QT3DCORESHARED_EXPORT Entity : public QNode
 {
     Q_OBJECT
 
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
 
 public:
-    explicit Entity(Node *parent = 0);
+    explicit Entity(QNode *parent = 0);
 
     const QUuid uuid() const;
 
@@ -85,7 +85,7 @@ public:
     }
 
     template <class T>
-    static T* findComponentInTree(Node* root)
+    static T* findComponentInTree(QNode* root)
     {
         if (!root)
             return Q_NULLPTR;
@@ -98,7 +98,7 @@ public:
             } // of component iteration
         } // of is-entity
 
-        foreach (Node* child, root->children()) {
+        foreach (QNode* child, root->children()) {
             T* i = findComponentInTree<T>(child);
             if (i)
                 return i;
@@ -108,13 +108,13 @@ public:
     }
 
     template <class T>
-    static T* findEntityInTree(Node* root)
+    static T* findEntityInTree(QNode* root)
     {
         if (!root)
             return Q_NULLPTR;
 
         if (root->asEntity()) {
-            foreach (Node* child, root->children()) {
+            foreach (QNode* child, root->children()) {
                 if (!qobject_cast<Entity*>(child))
                     continue;
                 T* i = qobject_cast<T*>(child);
@@ -123,7 +123,7 @@ public:
             } // of child iteration
         } // of is-entity
 
-        foreach (Node* child, root->children()) {
+        foreach (QNode* child, root->children()) {
             T* i = findEntityInTree<T>(child);
             if (i)
                 return i;
@@ -146,7 +146,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(Entity)
-    Entity(EntityPrivate &dd, Node *parent = 0);
+    Entity(EntityPrivate &dd, QNode *parent = 0);
 };
 
 } // namespace Qt3D
diff --git a/src/core/nodes/entity_p.h b/src/core/nodes/entity_p.h
index 8c5b02823..f5d513208 100644
--- a/src/core/nodes/entity_p.h
+++ b/src/core/nodes/entity_p.h
@@ -43,18 +43,18 @@
 #define ENTITY_P_H
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/private/node_p.h>
+#include <Qt3DCore/private/qnode_p.h>
 #include "entity.h"
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DCORESHARED_EXPORT EntityPrivate : public NodePrivate
+class QT3DCORESHARED_EXPORT EntityPrivate : public QNodePrivate
 {
 public :
     EntityPrivate(Entity *qq)
-        : NodePrivate(qq)
+        : QNodePrivate(qq)
         , m_uuid(QUuid::createUuid())
         , m_enabled(true)
     {}
diff --git a/src/core/nodes/nodes.pri b/src/core/nodes/nodes.pri
index ba8d3c872..1427bf852 100644
--- a/src/core/nodes/nodes.pri
+++ b/src/core/nodes/nodes.pri
@@ -1,8 +1,8 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/node.h \
-    $$PWD/node_p.h \
+    $$PWD/qnode.h \
+    $$PWD/qnode_p.h \
     $$PWD/nodevisitor.h \
     $$PWD/component.h \
     $$PWD/component_p.h \
@@ -10,7 +10,7 @@ HEADERS += \
     $$PWD/entity_p.h
 
 SOURCES += \
-    $$PWD/node.cpp \
+    $$PWD/qnode.cpp \
     $$PWD/nodevisitor.cpp \
     $$PWD/component.cpp \
     $$PWD/entity.cpp
diff --git a/src/core/nodes/nodevisitor.cpp b/src/core/nodes/nodevisitor.cpp
index 3a7d8323a..7cc75a262 100644
--- a/src/core/nodes/nodevisitor.cpp
+++ b/src/core/nodes/nodevisitor.cpp
@@ -41,7 +41,7 @@
 
 #include "nodevisitor.h"
 
-#include "node.h"
+#include "qnode.h"
 #include "entity.h"
 
 QT_BEGIN_NAMESPACE
@@ -53,7 +53,7 @@ NodeVisitor::NodeVisitor()
 {
 }
 
-void NodeVisitor::traverse(Node *rootNode)
+void NodeVisitor::traverse(QNode *rootNode)
 {
     m_path = NodeList() << rootNode;
 
@@ -68,12 +68,12 @@ void NodeVisitor::traverse(Node *rootNode)
         visitNode(rootNode);
 }
 
-Node* NodeVisitor::rootNode() const
+QNode* NodeVisitor::rootNode() const
 {
     return m_path.front();
 }
 
-Node* NodeVisitor::currentNode() const
+QNode* NodeVisitor::currentNode() const
 {
     return m_path.back();
 }
@@ -93,7 +93,7 @@ void NodeVisitor::setTraverseDisabled(bool on)
     m_traverseDisabled = on;
 }
 
-void NodeVisitor::visitNode(Node *nd)
+void NodeVisitor::visitNode(QNode *nd)
 {
     Q_UNUSED(nd);
     traverseChildren();
@@ -106,12 +106,12 @@ void NodeVisitor::visitEntity(Entity *nd)
 
 void NodeVisitor::traverseChildren()
 {
-    foreach (Node* n, currentNode()->children()) {
+    foreach (QNode* n, currentNode()->children()) {
         outerVisitNode(n);
     } // of children iteration
 }
 
-void NodeVisitor::outerVisitNode(Node *n)
+void NodeVisitor::outerVisitNode(QNode *n)
 {
     m_path.append(n);
     Entity* e = n->asEntity();
diff --git a/src/core/nodes/nodevisitor.h b/src/core/nodes/nodevisitor.h
index 4d7c3b8d6..90fdf3c80 100644
--- a/src/core/nodes/nodevisitor.h
+++ b/src/core/nodes/nodevisitor.h
@@ -50,21 +50,21 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D
 {
 
-class Node;
+class QNode;
 class Entity;
 
-typedef QList<Node *> NodeList;
+typedef QList<QNode *> NodeList;
 
 class QT3DCORESHARED_EXPORT NodeVisitor
 {
 public:
     NodeVisitor();
 
-    void traverse(Node *rootNode);
+    void traverse(QNode *rootNode);
 
-    Node *rootNode() const;
+    QNode *rootNode() const;
 
-    Node *currentNode() const;
+    QNode *currentNode() const;
 
     QMatrix4x4 currentMatrix() const;
 
@@ -73,7 +73,7 @@ public:
     void setTraverseDisabled(bool on);
 
 protected:
-    virtual void visitNode(Node *nd);
+    virtual void visitNode(QNode *nd);
     virtual void visitEntity(Entity *ent);
 
     void traverseChildren();
@@ -83,7 +83,7 @@ private:
     QVector<QMatrix4x4> m_matrixStack;
     bool m_traverseDisabled;
 
-    void outerVisitNode(Node *n);
+    void outerVisitNode(QNode *n);
 };
 
 } // namespace Qt3D
diff --git a/src/core/nodes/node.cpp b/src/core/nodes/qnode.cpp
index 466122a8a..a6c424c64 100644
--- a/src/core/nodes/node.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "node.h"
-#include "node_p.h"
+#include "qnode.h"
+#include "qnode_p.h"
 
 #include <Qt3DCore/entity.h>
 #include <Qt3DCore/qscenepropertychange.h>
@@ -54,25 +54,25 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-Node::Node(Node *parent)
-    : QObject(*new NodePrivate(this), parent)
+QNode::QNode(QNode *parent)
+    : QObject(*new QNodePrivate(this), parent)
 {
     if (parent)
         parent->addChild(this);
 }
 
-Node::Node(NodePrivate &dd, Node *parent)
+QNode::QNode(QNodePrivate &dd, QNode *parent)
     : QObject(dd, parent)
 {
     if (parent)
         parent->addChild(this);
 }
 
-Node::~Node()
+QNode::~QNode()
 {
 }
 
-void Node::dump()
+void QNode::dump()
 {
     const QMetaObject *meta = metaObject();
     QStringList result;
@@ -88,24 +88,24 @@ void Node::dump()
     qCDebug(Nodes) << result.join(QStringLiteral("\n"));
 
     foreach (QObject *child, children()) {
-        Node *node = qobject_cast<Node *>(child);
+        QNode *node = qobject_cast<QNode *>(child);
         if (!node)
             continue;
         node->dump();
     }
 }
 
-NodeList Node::children() const
+NodeList QNode::children() const
 {
-    Q_D(const Node);
+    Q_D(const QNode);
     return d->m_children;
 }
 
-void Node::addChild(Node *childNode)
+void QNode::addChild(QNode *childNode)
 {
     Q_ASSERT(childNode);
 
-    Q_D(Node);
+    Q_D(QNode);
     if (d->m_children.contains(childNode))
         return ;
 
@@ -118,13 +118,13 @@ void Node::addChild(Node *childNode)
     notifyObservers(e);
 }
 
-void Node::removeChild(Node *childNode)
+void QNode::removeChild(QNode *childNode)
 {
     Q_ASSERT(childNode);
     if (childNode->parent() != this)
         qCWarning(Nodes) << Q_FUNC_INFO << "not a child";
 
-    Q_D(Node);
+    Q_D(QNode);
     d->m_children.removeOne(childNode);
     childNode->setParent(NULL);
 
@@ -134,44 +134,44 @@ void Node::removeChild(Node *childNode)
     notifyObservers(e);
 }
 
-void Node::removeAllChildren()
+void QNode::removeAllChildren()
 {
     foreach (QObject *child, children()) {
         child->deleteLater();
     }
-    Q_D(Node);
+    Q_D(QNode);
     d->m_children.clear();
 }
 
-Entity *Node::asEntity()
+Entity *QNode::asEntity()
 {
     return Q_NULLPTR;
 }
 
-Node *Node::parentNode() const
+QNode *QNode::parentNode() const
 {
-    return qobject_cast<Node*>(parent());
+    return qobject_cast<QNode*>(parent());
 }
 
-void Node::registerObserver(QObserverInterface *observer)
+void QNode::registerObserver(QObserverInterface *observer)
 {
     Q_CHECK_PTR(observer);
 
     // For now we only care about the QChangeArbiter observing us
     QChangeArbiter *changeArbiter = dynamic_cast<QChangeArbiter *>(observer);
     if (changeArbiter) {
-        Q_D(Node);
+        Q_D(QNode);
         QWriteLocker locker(&d->m_observerLock);
         d->m_changeArbiter = changeArbiter;
     }
 }
 
-void Node::unregisterObserver(QObserverInterface *observer)
+void QNode::unregisterObserver(QObserverInterface *observer)
 {
     Q_CHECK_PTR(observer);
 
     // For now we only care about the QChangeArbiter observing us
-    Q_D(Node);
+    Q_D(QNode);
     QChangeArbiter *changeArbiter = dynamic_cast<QChangeArbiter *>(observer);
     if (changeArbiter == d->m_changeArbiter) {
         QWriteLocker locker(&d->m_observerLock);
@@ -179,10 +179,10 @@ void Node::unregisterObserver(QObserverInterface *observer)
     }
 }
 
-void Node::notifyObservers(const QSceneChangePtr &change)
+void QNode::notifyObservers(const QSceneChangePtr &change)
 {
     Q_CHECK_PTR(change);
-    Q_D(Node);
+    Q_D(QNode);
     QReadLocker locker(&d->m_observerLock);
     QChangeArbiter *changeArbiter = d->m_changeArbiter;
     locker.unlock();
diff --git a/src/core/nodes/node.h b/src/core/nodes/qnode.h
index ae562df0e..7e4067439 100644
--- a/src/core/nodes/node.h
+++ b/src/core/nodes/qnode.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_NODE_H
-#define QT3D_NODE_H
+#ifndef QT3D_QNODE_H
+#define QT3D_QNODE_H
 
 #include <QObject>
 #include <Qt3DCore/qt3dcore_global.h>
@@ -53,31 +53,31 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class Node;
-class NodePrivate;
+class QNode;
+class QNodePrivate;
 class Entity;
 
-typedef QList<Node *> NodeList;
+typedef QList<QNode *> NodeList;
 
-class QT3DCORESHARED_EXPORT Node : public QObject, public QObservableInterface
+class QT3DCORESHARED_EXPORT QNode : public QObject, public QObservableInterface
 {
     Q_OBJECT
 
 public:
-    explicit Node(Node *parent = 0);
-    ~Node();
+    explicit QNode(QNode *parent = 0);
+    ~QNode();
 
     void dump();
 
     NodeList children() const;
-    void addChild(Node *childNode);
-    void removeChild(Node *childNode);
+    void addChild(QNode *childNode);
+    void removeChild(QNode *childNode);
 
     void removeAllChildren();
 
     virtual Entity* asEntity();
 
-    Node *parentNode() const;
+    QNode *parentNode() const;
 
     void registerObserver(QObserverInterface *observer) Q_DECL_OVERRIDE;
     void unregisterObserver(QObserverInterface *observer) Q_DECL_OVERRIDE;
@@ -85,14 +85,14 @@ public:
 protected:
     virtual void notifyObservers(const QSceneChangePtr &change);
 
-    Q_DECLARE_PRIVATE(Node)
-    Node(NodePrivate &dd, Node *parent = 0);
+    Q_DECLARE_PRIVATE(QNode)
+    QNode(QNodePrivate &dd, QNode *parent = 0);
 };
 
 } // namespace Qt3D
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::Node *)
+Q_DECLARE_METATYPE(Qt3D::QNode *)
 
 #endif
diff --git a/src/core/nodes/node_p.h b/src/core/nodes/qnode_p.h
index 9543bcaaa..c35e96191 100644
--- a/src/core/nodes/node_p.h
+++ b/src/core/nodes/qnode_p.h
@@ -39,21 +39,21 @@
 **
 ****************************************************************************/
 
-#ifndef NODE_P_H
-#define NODE_P_H
+#ifndef QT3D_QNODE_P_H
+#define QT3D_QNODE_P_H
 
 #include <Qt3DCore/qt3dcore_global.h>
 #include <private/qobject_p.h>
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DCORESHARED_EXPORT NodePrivate : public QObjectPrivate
+class QT3DCORESHARED_EXPORT QNodePrivate : public QObjectPrivate
 {
 public:
-    NodePrivate(Node *qq)
+    QNodePrivate(QNode *qq)
         : QObjectPrivate()
         , m_changeArbiter(Q_NULLPTR)
     {
@@ -72,4 +72,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // NODE_P_H
+#endif // QT3D_NODE_P_H
diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp
index 0970ad1db..52b664b1f 100644
--- a/src/core/qchangearbiter.cpp
+++ b/src/core/qchangearbiter.cpp
@@ -97,7 +97,7 @@ void QChangeArbiter::distributeQueueChanges(ChangeQueue *changeQueue)
         }
 
         case QSceneChange::NodeType: {
-            Node *subject = change->m_subject.m_node;
+            QNode *subject = change->m_subject.m_node;
             if (m_nodeObservations.contains(subject)) {
                 QObserverList &observers = m_nodeObservations[subject];
                 Q_FOREACH (const QObserverPair&observer, observers) {
@@ -135,7 +135,7 @@ void QChangeArbiter::registerObserver(QObserverInterface *observer,
 }
 
 void QChangeArbiter::registerObserver(QObserverInterface *observer,
-                                      Node *observable,
+                                      QNode *observable,
                                       ChangeFlags changeFlags)
 {
     QMutexLocker locker(&m_mutex);
@@ -173,7 +173,7 @@ void QChangeArbiter::unregisterObserver(QObserverInterface *observer,
     }
 }
 
-void QChangeArbiter::unregisterObserver(QObserverInterface *observer, Node *subject)
+void QChangeArbiter::unregisterObserver(QObserverInterface *observer, QNode *subject)
 {
     QMutexLocker locker(&m_mutex);
     if (m_nodeObservations.contains(subject)) {
diff --git a/src/core/qchangearbiter.h b/src/core/qchangearbiter.h
index 9cbba33c9..0be739800 100644
--- a/src/core/qchangearbiter.h
+++ b/src/core/qchangearbiter.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class Node;
+class QNode;
 class QObservableInterface;
 class QJobManagerInterface;
 
@@ -80,14 +80,14 @@ public:
                           ChangeFlags changeFlags = AllChanges);
 
     void registerObserver(QObserverInterface *observer,
-                          Node *observable,
+                          QNode *observable,
                           ChangeFlags changeFlags = AllChanges);
 
     void unregisterObserver(QObserverInterface *observer,
                             QObservableInterface *subject);
 
     void unregisterObserver(QObserverInterface *observer,
-                            Node *subject);
+                            QNode *subject);
 
     void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;                 // QObserverInterface impl
     void sceneChangeEventWithLock(const QSceneChangePtr &e);
@@ -121,7 +121,7 @@ private:
     // We keep these distinct because we do not manage the main thread which means
     // the mechanisms for working with objects there is different.
     QHash<QObservableInterface *, QObserverList> m_aspectObservations;
-    QHash<Node *, QObserverList> m_nodeObservations;
+    QHash<QNode *, QObserverList> m_nodeObservations;
 
     // Each thread has a TLS ChangeQueue so we never need to lock whilst
     // receiving a QSceneChange.
diff --git a/src/core/qscenechange.h b/src/core/qscenechange.h
index bc6e59762..5024cb086 100644
--- a/src/core/qscenechange.h
+++ b/src/core/qscenechange.h
@@ -63,7 +63,7 @@ enum ChangeFlag {
 Q_DECLARE_FLAGS(ChangeFlags, ChangeFlag)
 Q_DECLARE_OPERATORS_FOR_FLAGS(ChangeFlags)
 
-class Node;
+class QNode;
 class QObservableInterface;
 
 class QT3DCORESHARED_EXPORT QSceneChange
@@ -84,7 +84,7 @@ public:
         m_subjectType = ObservableType;
     }
 
-    QSceneChange(ChangeFlag type, Node *node, Priority priority = Standard)
+    QSceneChange(ChangeFlag type, QNode *node, Priority priority = Standard)
         : m_type(type),
           m_priority(priority),
           m_timestamp(QDateTime::currentMSecsSinceEpoch())
@@ -95,7 +95,7 @@ public:
 
     union {
         QObservableInterface *m_observable;
-        Node *m_node;
+        QNode *m_node;
     } m_subject;
 
     enum ObservableType {
diff --git a/src/core/qscenepropertychange.h b/src/core/qscenepropertychange.h
index 3347db595..3c757a36f 100644
--- a/src/core/qscenepropertychange.h
+++ b/src/core/qscenepropertychange.h
@@ -58,7 +58,7 @@ public:
     {
     }
 
-    QScenePropertyChange(ChangeFlag type, Node *node, Priority priority = Standard)
+    QScenePropertyChange(ChangeFlag type, QNode *node, Priority priority = Standard)
         : QSceneChange(type, node, priority)
     {
     }
diff --git a/src/core/transforms/abstracttransform.cpp b/src/core/transforms/abstracttransform.cpp
index b8bebbbef..51b1edc70 100644
--- a/src/core/transforms/abstracttransform.cpp
+++ b/src/core/transforms/abstracttransform.cpp
@@ -45,8 +45,8 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-AbstractTransform::AbstractTransform(Node *parent)
-    : Node(parent)
+AbstractTransform::AbstractTransform(QNode *parent)
+    : QNode(parent)
 {
 }
 
diff --git a/src/core/transforms/abstracttransform.h b/src/core/transforms/abstracttransform.h
index 6543196b4..a05f5c0ec 100644
--- a/src/core/transforms/abstracttransform.h
+++ b/src/core/transforms/abstracttransform.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_ABSTRACT_TRANSFORM_H
 #define QT3D_ABSTRACT_TRANSFORM_H
 
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qt3dcore_global.h>
 
 #include <QMatrix4x4>
@@ -51,11 +51,11 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DCORESHARED_EXPORT AbstractTransform : public Node
+class QT3DCORESHARED_EXPORT AbstractTransform : public QNode
 {
     Q_OBJECT
 public:
-    explicit AbstractTransform(Node *parent = 0);
+    explicit AbstractTransform(QNode *parent = 0);
     virtual ~AbstractTransform();
 
     virtual QMatrix4x4 matrix() const = 0;
diff --git a/src/core/transforms/lookattransform.cpp b/src/core/transforms/lookattransform.cpp
index 4383f900f..bedec7e2d 100644
--- a/src/core/transforms/lookattransform.cpp
+++ b/src/core/transforms/lookattransform.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-LookAtTransform::LookAtTransform(Node *parent)
+LookAtTransform::LookAtTransform(QNode *parent)
     : AbstractTransform(parent)
     , m_matrixDirty(true)
 {
diff --git a/src/core/transforms/lookattransform.h b/src/core/transforms/lookattransform.h
index 3bc114941..a673aede6 100644
--- a/src/core/transforms/lookattransform.h
+++ b/src/core/transforms/lookattransform.h
@@ -60,7 +60,7 @@ class QT3DCORESHARED_EXPORT LookAtTransform : public Qt3D::AbstractTransform
     Q_PROPERTY(QVector3D viewVector READ viewVector NOTIFY viewVectorChanged)
 
 public:
-    explicit LookAtTransform(Node *parent = 0);
+    explicit LookAtTransform(QNode *parent = 0);
 
     QMatrix4x4 matrix() const Q_DECL_OVERRIDE;
 
diff --git a/src/core/transforms/rotatetransform.cpp b/src/core/transforms/rotatetransform.cpp
index ecfde03e3..551ad3711 100644
--- a/src/core/transforms/rotatetransform.cpp
+++ b/src/core/transforms/rotatetransform.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-RotateTransform::RotateTransform(Node *parent)
+RotateTransform::RotateTransform(QNode *parent)
     : AbstractTransform(parent),
       m_angleDeg(0)
 {
diff --git a/src/core/transforms/rotatetransform.h b/src/core/transforms/rotatetransform.h
index bbc6c4af4..be47cc762 100644
--- a/src/core/transforms/rotatetransform.h
+++ b/src/core/transforms/rotatetransform.h
@@ -61,7 +61,7 @@ class QT3DCORESHARED_EXPORT RotateTransform : public AbstractTransform
     Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged)
 
 public:
-    explicit RotateTransform(Node *parent = 0);
+    explicit RotateTransform(QNode *parent = 0);
 
     float angleDeg() const;
 
diff --git a/src/core/transforms/scaletransform.cpp b/src/core/transforms/scaletransform.cpp
index e4ee8f436..c36e261bf 100644
--- a/src/core/transforms/scaletransform.cpp
+++ b/src/core/transforms/scaletransform.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D
 {
 
-ScaleTransform::ScaleTransform(Node *parent) :
+ScaleTransform::ScaleTransform(QNode *parent) :
     AbstractTransform(parent)
 {
 }
diff --git a/src/core/transforms/scaletransform.h b/src/core/transforms/scaletransform.h
index 2fb8eb24a..d9848d75f 100644
--- a/src/core/transforms/scaletransform.h
+++ b/src/core/transforms/scaletransform.h
@@ -55,7 +55,7 @@ class QT3DCORESHARED_EXPORT ScaleTransform : public AbstractTransform
     Q_PROPERTY(QVector3D scale3D READ scale3D WRITE setScale3D NOTIFY scale3DChanged)
     Q_PROPERTY(float scale READ scale WRITE setScale NOTIFY scaleChanged)
 public:
-    explicit ScaleTransform(Node *parent = 0);
+    explicit ScaleTransform(QNode *parent = 0);
 
     QVector3D scale3D() const;
     void    setScale3D(const QVector3D &scale3D);
diff --git a/src/core/transforms/transform.cpp b/src/core/transforms/transform.cpp
index 6da32efcc..17ab5839b 100644
--- a/src/core/transforms/transform.cpp
+++ b/src/core/transforms/transform.cpp
@@ -57,14 +57,14 @@ TransformPrivate::TransformPrivate(Transform *qq)
 {
 }
 
-Transform::Transform(Node *parent)
+Transform::Transform(QNode *parent)
     : Qt3D::Component(*new TransformPrivate(this), parent)
 {
     Q_D(Transform);
     d->m_transformsDirty.fetchAndStoreOrdered(0);
 }
 
-Transform::Transform(TransformPrivate &dd, Node *parent)
+Transform::Transform(TransformPrivate &dd, QNode *parent)
     : Component(dd, parent)
 {
 
diff --git a/src/core/transforms/transform.h b/src/core/transforms/transform.h
index 04f6cecdf..ad83b8f6c 100644
--- a/src/core/transforms/transform.h
+++ b/src/core/transforms/transform.h
@@ -59,7 +59,7 @@ class QT3DCORESHARED_EXPORT Transform : public Component
     Q_OBJECT
 
 public:
-    explicit Transform(Node *parent = 0);
+    explicit Transform(QNode *parent = 0);
 
     QMatrix4x4 matrix() const;
     void setMatrix(const QMatrix4x4 &m);
@@ -90,7 +90,7 @@ protected:
     QList<AbstractTransform *> transformList() const;
 
     Q_DECLARE_PRIVATE(Transform)
-    Transform(TransformPrivate &dd, Node *parent = 0);
+    Transform(TransformPrivate &dd, QNode *parent = 0);
 };
 
 } // namespace Qt3D
diff --git a/src/core/transforms/translatetransform.cpp b/src/core/transforms/translatetransform.cpp
index f76ac63dd..a4a398674 100644
--- a/src/core/transforms/translatetransform.cpp
+++ b/src/core/transforms/translatetransform.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-TranslateTransform::TranslateTransform(Node *parent)
+TranslateTransform::TranslateTransform(QNode *parent)
     : AbstractTransform(parent)
 {
 }
diff --git a/src/core/transforms/translatetransform.h b/src/core/transforms/translatetransform.h
index ea0972ad0..08c027118 100644
--- a/src/core/transforms/translatetransform.h
+++ b/src/core/transforms/translatetransform.h
@@ -61,7 +61,7 @@ class QT3DCORESHARED_EXPORT TranslateTransform : public AbstractTransform
     Q_PROPERTY(QVector3D t READ translation WRITE setTranslation NOTIFY translateChanged)
 
 public:
-    explicit TranslateTransform(Node *parent = 0);
+    explicit TranslateTransform(QNode *parent = 0);
 
     float dx() const;
     float dy() const;
diff --git a/src/core/window.cpp b/src/core/window.cpp
index d32b05838..b47e99143 100644
--- a/src/core/window.cpp
+++ b/src/core/window.cpp
@@ -46,7 +46,7 @@
 #include <QMouseEvent>
 #include <QGuiApplication>
 
-#include "node.h"
+#include "qnode.h"
 #include "camera.h"
 #include "entity.h"
 #include "corelogging.h"
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
index d7a88229d..f4d64ba95 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
@@ -75,7 +75,7 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri)
     qmlRegisterExtendedType<Qt3D::Transform, Qt3D::Quick::Quick3DTransform>(uri, 2, 0, "Transform");
     // Ideally we want to make Node an uncreatable type
     // We would need qmlRegisterUncreatableExtendedType for that
-    qmlRegisterExtendedType<Qt3D::Node, Qt3D::Quick::Quick3DNode>(uri, 2, 0, "Node");
+    qmlRegisterExtendedType<Qt3D::QNode, Qt3D::Quick::Quick3DNode>(uri, 2, 0, "Node");
     qmlRegisterExtendedType<Qt3D::Camera, Qt3D::Quick::Quick3DNode>(uri, 2, 0, "Camera");
     qmlRegisterType<Qt3D::CameraLens>(uri, 2, 0, "CameraLens");
     qmlRegisterType<Qt3D::MatrixTransform>(uri, 2, 0, "MatrixTransform");
diff --git a/src/quick3d/quick3d/items/quick3dnode.cpp b/src/quick3d/quick3d/items/quick3dnode.cpp
index c1945f1e4..9bb3f62ea 100644
--- a/src/quick3d/quick3d/items/quick3dnode.cpp
+++ b/src/quick3d/quick3d/items/quick3dnode.cpp
@@ -61,9 +61,9 @@ QQmlListProperty<QObject> Quick3DNode::data()
                                      Quick3DNode::clearData);
 }
 
-QQmlListProperty<Node> Quick3DNode::childNodes()
+QQmlListProperty<QNode> Quick3DNode::childNodes()
 {
-    return QQmlListProperty<Node>(this, 0,
+    return QQmlListProperty<QNode>(this, 0,
                                   Quick3DNode::appendChild,
                                   Quick3DNode::childCount,
                                   Quick3DNode::childAt,
@@ -77,8 +77,8 @@ void Quick3DNode::appendData(QQmlListProperty<QObject> *list, QObject *obj)
 
     QObject *self = static_cast<QObject *>(list->object);
 
-    Node *parentNode = qobject_cast<Quick3DNode *>(self)->parentNode();
-    Node *node = qobject_cast<Qt3D::Node *>(obj);
+    QNode *parentNode = qobject_cast<Quick3DNode *>(self)->parentNode();
+    QNode *node = qobject_cast<Qt3D::QNode *>(obj);
     if (node && parentNode)
         parentNode->addChild(node);
     // Set after otherwise addChild might not work
@@ -104,7 +104,7 @@ void Quick3DNode::clearData(QQmlListProperty<QObject> *list)
         child->setParent(0);
 }
 
-void Quick3DNode::appendChild(QQmlListProperty<Qt3D::Node> *list, Qt3D::Node *obj)
+void Quick3DNode::appendChild(QQmlListProperty<Qt3D::QNode> *list, Qt3D::QNode *obj)
 {
     if (!obj)
         return;
@@ -117,22 +117,22 @@ void Quick3DNode::appendChild(QQmlListProperty<Qt3D::Node> *list, Qt3D::Node *ob
     self->parentNode()->addChild(obj);
 }
 
-Qt3D::Node *Quick3DNode::childAt(QQmlListProperty<Qt3D::Node> *list, int index)
+Qt3D::QNode *Quick3DNode::childAt(QQmlListProperty<Qt3D::QNode> *list, int index)
 {
     Quick3DNode *self = static_cast<Quick3DNode *>(list->object);
     return self->parentNode()->children().at(index);
 }
 
-int Quick3DNode::childCount(QQmlListProperty<Qt3D::Node> *list)
+int Quick3DNode::childCount(QQmlListProperty<Qt3D::QNode> *list)
 {
     Quick3DNode *self = static_cast<Quick3DNode *>(list->object);
     return self->parentNode()->children().count();
 }
 
-void Quick3DNode::clearChildren(QQmlListProperty<Qt3D::Node> *list)
+void Quick3DNode::clearChildren(QQmlListProperty<Qt3D::QNode> *list)
 {
     Quick3DNode *self = static_cast<Quick3DNode *>(list->object);
-    Q_FOREACH (Node *const child, self->parentNode()->children())
+    Q_FOREACH (QNode *const child, self->parentNode()->children())
         self->parentNode()->removeChild(child);
 }
 
diff --git a/src/quick3d/quick3d/items/quick3dnode.h b/src/quick3d/quick3d/items/quick3dnode.h
index 1c0f97808..010d9c610 100644
--- a/src/quick3d/quick3d/items/quick3dnode.h
+++ b/src/quick3d/quick3d/items/quick3dnode.h
@@ -43,7 +43,7 @@
 #define QT3D_QUICK_QUICK3DNODE_H
 
 #include <QQmlListProperty>
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 #include <Qt3DQuick/qt3dquick_global.h>
 
 QT_BEGIN_NAMESPACE
@@ -56,15 +56,15 @@ class QT3DQUICKSHARED_EXPORT Quick3DNode : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<QObject> data READ data)
-    Q_PROPERTY(QQmlListProperty<Qt3D::Node> childNodes READ childNodes)
+    Q_PROPERTY(QQmlListProperty<Qt3D::QNode> childNodes READ childNodes)
     Q_CLASSINFO("DefaultProperty", "data")
 public:
     explicit Quick3DNode(QObject *parent = 0);
 
     QQmlListProperty<QObject> data();
-    QQmlListProperty<Qt3D::Node> childNodes();
+    QQmlListProperty<Qt3D::QNode> childNodes();
 
-    inline Node *parentNode() const { return qobject_cast<Node*>(parent()); }
+    inline QNode *parentNode() const { return qobject_cast<QNode*>(parent()); }
 
 private:
     static void appendData(QQmlListProperty<QObject> *list, QObject *obj);
@@ -72,10 +72,10 @@ private:
     static int dataCount(QQmlListProperty<QObject> *list);
     static void clearData(QQmlListProperty<QObject> *list);
 
-    static void appendChild(QQmlListProperty<Qt3D::Node> *list, Qt3D::Node *obj);
-    static Node *childAt(QQmlListProperty<Qt3D::Node> *list, int index);
-    static int childCount(QQmlListProperty<Qt3D::Node> *list);
-    static void clearChildren(QQmlListProperty<Qt3D::Node> *list);
+    static void appendChild(QQmlListProperty<Qt3D::QNode> *list, Qt3D::QNode *obj);
+    static QNode *childAt(QQmlListProperty<Qt3D::QNode> *list, int index);
+    static int childCount(QQmlListProperty<Qt3D::QNode> *list);
+    static void clearChildren(QQmlListProperty<Qt3D::QNode> *list);
 };
 
 } // Quick;
diff --git a/src/quick3d/quick3drenderer/items/quick3dscene.cpp b/src/quick3d/quick3drenderer/items/quick3dscene.cpp
index 47caacb82..2d6fb437b 100644
--- a/src/quick3d/quick3drenderer/items/quick3dscene.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dscene.cpp
@@ -54,12 +54,12 @@ Quick3DScene::Quick3DScene(QObject *parent)
 {
 }
 
-Node *Quick3DScene::node(QString id)
+QNode *Quick3DScene::node(QString id)
 {
     return parentScene()->node(id);
 }
 
-Node *Quick3DScene::scene(QString id)
+QNode *Quick3DScene::scene(QString id)
 {
     return parentScene()->scene(id);
 }
diff --git a/src/quick3d/quick3drenderer/items/quick3dscene.h b/src/quick3d/quick3drenderer/items/quick3dscene.h
index d8e2942a6..8589ebebf 100644
--- a/src/quick3d/quick3drenderer/items/quick3dscene.h
+++ b/src/quick3d/quick3drenderer/items/quick3dscene.h
@@ -62,8 +62,8 @@ public:
 
     inline QAbstractScene *parentScene() const { return qobject_cast<QAbstractScene*>(parent()); }
 
-    Q_INVOKABLE Node *node(QString id);
-    Q_INVOKABLE Node *scene(QString id);
+    Q_INVOKABLE QNode *node(QString id);
+    Q_INVOKABLE QNode *scene(QString id);
 };
 
 } // Quick
diff --git a/src/render/backend/framegraph/cameraselectornode.cpp b/src/render/backend/framegraph/cameraselectornode.cpp
index 808acf071..8c9a9b918 100644
--- a/src/render/backend/framegraph/cameraselectornode.cpp
+++ b/src/render/backend/framegraph/cameraselectornode.cpp
@@ -85,7 +85,7 @@ void CameraSelector::sceneChangeEvent(const QSceneChangePtr &e)
     if (e->m_type == ComponentUpdated) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
         if (propertyChange->m_propertyName == QByteArrayLiteral("camera"))
-            setCameraEntity(qobject_cast<Entity*>(propertyChange->m_value.value<Node*>()));
+            setCameraEntity(qobject_cast<Entity*>(propertyChange->m_value.value<QNode*>()));
     }
 }
 
diff --git a/src/render/backend/renderentity.cpp b/src/render/backend/renderentity.cpp
index 95bf02730..3c8028fb4 100644
--- a/src/render/backend/renderentity.cpp
+++ b/src/render/backend/renderentity.cpp
@@ -157,7 +157,7 @@ void RenderEntity::sceneChangeEvent(const QSceneChangePtr &e)
     }
     case ComponentUpdated: {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
-        Node *node = propertyChange->m_subject.m_node;
+        QNode *node = propertyChange->m_subject.m_node;
         if (node == m_transform
                 && propertyChange->m_propertyName == QByteArrayLiteral("matrix"))
             *localTransform() = propertyChange->m_value.value<QMatrix4x4>();
diff --git a/src/render/backend/renderentity.h b/src/render/backend/renderentity.h
index 45d0571c8..d62b6f797 100644
--- a/src/render/backend/renderentity.h
+++ b/src/render/backend/renderentity.h
@@ -54,7 +54,7 @@ namespace Qt3D {
 
 class RendererAspect;
 class Sphere;
-class Node;
+class QNode;
 class Entity;
 class Transform;
 
diff --git a/src/render/backend/rendereraspect.cpp b/src/render/backend/rendereraspect.cpp
index 46bd7f3d9..7d74c5227 100644
--- a/src/render/backend/rendereraspect.cpp
+++ b/src/render/backend/rendereraspect.cpp
@@ -49,7 +49,7 @@
 #include <updateworldtransformjob.h>
 #include <updateboundingvolumejob.h>
 
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 
 #include <QDebug>
 #include <QThread>
diff --git a/src/render/backend/renderscenebuilder.cpp b/src/render/backend/renderscenebuilder.cpp
index c3c0b8a9f..a1e766be8 100644
--- a/src/render/backend/renderscenebuilder.cpp
+++ b/src/render/backend/renderscenebuilder.cpp
@@ -112,7 +112,7 @@ void RenderSceneBuilder::initializeFrameGraph()
  * Returns Q_NULLPTR if \a is also Q_NULLPTR or if there is no FrameGraphComponent
  * in node's children tree.
  */
-Render::FrameGraphNode *RenderSceneBuilder::buildFrameGraph(Node *node)
+Render::FrameGraphNode *RenderSceneBuilder::buildFrameGraph(QNode *node)
 {
     Q_ASSERT(node);
 
@@ -129,7 +129,7 @@ Render::FrameGraphNode *RenderSceneBuilder::buildFrameGraph(Node *node)
     // we need to travel the node's children tree to find either the FG root Node or
     // its children
     QList<FrameGraphNode *> fgChildNodes;
-    Q_FOREACH (Node *child, node->children()) {
+    Q_FOREACH (QNode *child, node->children()) {
         FrameGraphNode* fgChildNode = buildFrameGraph(child);
         if (fgChildNode != Q_NULLPTR)
             fgChildNodes << fgChildNode;
@@ -150,7 +150,7 @@ Render::FrameGraphNode *RenderSceneBuilder::buildFrameGraph(Node *node)
  * Returns a proper FrameGraphNode subclass instance from \a block.
  * If no subclass corresponds, Q_NULLPTR is returned.
  */
-Render::FrameGraphNode *RenderSceneBuilder::backendFrameGraphNode(Node *block)
+Render::FrameGraphNode *RenderSceneBuilder::backendFrameGraphNode(QNode *block)
 {
     if (qobject_cast<Qt3D::QTechniqueFilter*>(block) != Q_NULLPTR) {
         Qt3D::QTechniqueFilter* techniqueFilter = qobject_cast<Qt3D::QTechniqueFilter*>(block);
@@ -263,7 +263,7 @@ void RenderSceneBuilder::createFrameGraph(QFrameGraph *fg)
 {
     // Entity has a reference to a framegraph configuration
     // Build a tree of FrameGraphNodes by reading the tree of FrameGraphBuildingBlocks
-    Render::FrameGraphNode* frameGraphRootNode = buildFrameGraph(qobject_cast<Node*>(fg->activeFrameGraph()));
+    Render::FrameGraphNode* frameGraphRootNode = buildFrameGraph(qobject_cast<QNode*>(fg->activeFrameGraph()));
     qCDebug(Backend) << Q_FUNC_INFO << "FrameGraphRoot" <<  frameGraphRootNode;
     m_renderer->setFrameGraphRoot(frameGraphRootNode);
 }
diff --git a/src/render/backend/renderscenebuilder.h b/src/render/backend/renderscenebuilder.h
index 51c8492d8..0093913ae 100644
--- a/src/render/backend/renderscenebuilder.h
+++ b/src/render/backend/renderscenebuilder.h
@@ -83,8 +83,8 @@ private:
     QStack<HRenderNode> m_nodeStack;
     HRenderNode m_frameGraphEntityNode;
 
-    Render::FrameGraphNode* buildFrameGraph(Node *node);
-    Render::FrameGraphNode* backendFrameGraphNode(Node *);
+    Render::FrameGraphNode* buildFrameGraph(QNode *node);
+    Render::FrameGraphNode* backendFrameGraphNode(QNode *);
 
     HRenderNode createRenderNode(Entity *node);
     void createRenderMaterial(Entity *entity);
diff --git a/src/render/frontend/framegraph-components/qcameraselector.cpp b/src/render/frontend/framegraph-components/qcameraselector.cpp
index cbf62a2b4..09b887405 100644
--- a/src/render/frontend/framegraph-components/qcameraselector.cpp
+++ b/src/render/frontend/framegraph-components/qcameraselector.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-QCameraSelector::QCameraSelector(QCameraSelectorPrivate &dd, Node *parent)
+QCameraSelector::QCameraSelector(QCameraSelectorPrivate &dd, QNode *parent)
     : QFrameGraphItem(dd, parent)
 {
 }
@@ -58,7 +58,7 @@ QCameraSelectorPrivate::QCameraSelectorPrivate(Qt3D::QCameraSelector *qq)
     , m_camera(Q_NULLPTR)
 {}
 
-QCameraSelector::QCameraSelector(Qt3D::Node *parent)
+QCameraSelector::QCameraSelector(Qt3D::QNode *parent)
     :   QFrameGraphItem(*new QCameraSelectorPrivate(this), parent)
 {}
 
diff --git a/src/render/frontend/framegraph-components/qcameraselector.h b/src/render/frontend/framegraph-components/qcameraselector.h
index 8019fd003..803f38904 100644
--- a/src/render/frontend/framegraph-components/qcameraselector.h
+++ b/src/render/frontend/framegraph-components/qcameraselector.h
@@ -58,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphItem
     Q_PROPERTY(Qt3D::Entity *camera READ camera WRITE setCamera NOTIFY cameraChanged)
 
 public:
-    explicit QCameraSelector(Node *parent = 0);
+    explicit QCameraSelector(QNode *parent = 0);
 
     void setCamera(Entity *camera);
     Entity *camera() const;
@@ -68,7 +68,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QCameraSelector)
-    QCameraSelector(QCameraSelectorPrivate &dd, Node *parent = 0);
+    QCameraSelector(QCameraSelectorPrivate &dd, QNode *parent = 0);
 };
 
 } // namespace Qt3D
diff --git a/src/render/frontend/framegraph-components/qframegraph.cpp b/src/render/frontend/framegraph-components/qframegraph.cpp
index 9d6dbfa1a..f509a64f1 100644
--- a/src/render/frontend/framegraph-components/qframegraph.cpp
+++ b/src/render/frontend/framegraph-components/qframegraph.cpp
@@ -68,12 +68,12 @@ QFrameGraphPrivate::QFrameGraphPrivate(QFrameGraph *qq)
  * \namespace Qt3D
  */
 
-QFrameGraph::QFrameGraph(Node *parent)
+QFrameGraph::QFrameGraph(QNode *parent)
     : Component(*new QFrameGraphPrivate(this), parent)
 {
 }
 
-QFrameGraph::QFrameGraph(QFrameGraphPrivate &dd, Node *parent)
+QFrameGraph::QFrameGraph(QFrameGraphPrivate &dd, QNode *parent)
     : Component(dd, parent)
 {
 }
@@ -81,7 +81,7 @@ QFrameGraph::QFrameGraph(QFrameGraphPrivate &dd, Node *parent)
 /*!
  * Returns the current activeFrameGraph root node.
  */
-Node *QFrameGraph::activeFrameGraph() const
+QNode *QFrameGraph::activeFrameGraph() const
 {
     Q_D(const QFrameGraph);
     return d->m_activeFrameGraph;
@@ -90,7 +90,7 @@ Node *QFrameGraph::activeFrameGraph() const
 /*!
  * Sets the root node \a activeFrameGraph of the FrameGraph.
  */
-void QFrameGraph::setActiveFrameGraph(Node *activeFrameGraph)
+void QFrameGraph::setActiveFrameGraph(QNode *activeFrameGraph)
 {
     Q_D(QFrameGraph);
     if (activeFrameGraph != d->m_activeFrameGraph) {
diff --git a/src/render/frontend/framegraph-components/qframegraph.h b/src/render/frontend/framegraph-components/qframegraph.h
index b7d808929..ca922a842 100644
--- a/src/render/frontend/framegraph-components/qframegraph.h
+++ b/src/render/frontend/framegraph-components/qframegraph.h
@@ -56,21 +56,21 @@ class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3D::Component
     Q_OBJECT
     // Note : The full namespace has to be used to define the property
     // otherwise this results in an error "cannot assign object to property"
-    Q_PROPERTY(Qt3D::Node *activeFrameGraph READ activeFrameGraph WRITE setActiveFrameGraph NOTIFY activeFrameGraphChanged)
+    Q_PROPERTY(Qt3D::QNode *activeFrameGraph READ activeFrameGraph WRITE setActiveFrameGraph NOTIFY activeFrameGraphChanged)
     Q_CLASSINFO("DefaultProperty", "activeFrameGraph")
 
 public:
-    explicit QFrameGraph(Node *parent = 0);
+    explicit QFrameGraph(QNode *parent = 0);
 
-    Node *activeFrameGraph() const;
-    void setActiveFrameGraph(Node *activeFrameGraph);
+    QNode *activeFrameGraph() const;
+    void setActiveFrameGraph(QNode *activeFrameGraph);
 
 Q_SIGNALS:
     void activeFrameGraphChanged();
 
 protected:
     Q_DECLARE_PRIVATE(QFrameGraph)
-    QFrameGraph(QFrameGraphPrivate &dd, Node *parent = 0);
+    QFrameGraph(QFrameGraphPrivate &dd, QNode *parent = 0);
 };
 
 } //Qt3D
diff --git a/src/render/frontend/framegraph-components/qframegraph_p.h b/src/render/frontend/framegraph-components/qframegraph_p.h
index 33c2ba137..f8f7eec57 100644
--- a/src/render/frontend/framegraph-components/qframegraph_p.h
+++ b/src/render/frontend/framegraph-components/qframegraph_p.h
@@ -58,7 +58,7 @@ public:
 
     Q_DECLARE_PUBLIC(QFrameGraph)
 
-    Node *m_activeFrameGraph;
+    QNode *m_activeFrameGraph;
 };
 
 }
diff --git a/src/render/frontend/framegraph-components/qframegraphitem.cpp b/src/render/frontend/framegraph-components/qframegraphitem.cpp
index cad5a114c..c28b9e713 100644
--- a/src/render/frontend/framegraph-components/qframegraphitem.cpp
+++ b/src/render/frontend/framegraph-components/qframegraphitem.cpp
@@ -59,18 +59,18 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 QFrameGraphItemPrivate::QFrameGraphItemPrivate(QFrameGraphItem *qq)
-    : NodePrivate(qq)
+    : QNodePrivate(qq)
     , m_enabled(true)
 {
 }
 
-QFrameGraphItem::QFrameGraphItem(Node *parent)
-    : Node(*new QFrameGraphItemPrivate(this), parent)
+QFrameGraphItem::QFrameGraphItem(QNode *parent)
+    : QNode(*new QFrameGraphItemPrivate(this), parent)
 {
 }
 
-QFrameGraphItem::QFrameGraphItem(QFrameGraphItemPrivate &dd, Node *parent)
-    : Node(dd, parent)
+QFrameGraphItem::QFrameGraphItem(QFrameGraphItemPrivate &dd, QNode *parent)
+    : QNode(dd, parent)
 {
 }
 
diff --git a/src/render/frontend/framegraph-components/qframegraphitem.h b/src/render/frontend/framegraph-components/qframegraphitem.h
index d9425e855..cee14f268 100644
--- a/src/render/frontend/framegraph-components/qframegraphitem.h
+++ b/src/render/frontend/framegraph-components/qframegraphitem.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_QFRAMEGRAPHNODE_H
 #define QT3D_QFRAMEGRAPHNODE_H
 
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <QObject>
 
@@ -52,11 +52,11 @@ namespace Qt3D {
 
 class QFrameGraphItemPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QFrameGraphItem : public Node
+class QT3DRENDERERSHARED_EXPORT QFrameGraphItem : public QNode
 {
     Q_OBJECT
 public:
-    explicit QFrameGraphItem(Node *parent = 0);
+    explicit QFrameGraphItem(QNode *parent = 0);
 
     void setEnabled(bool enabled);
     bool isEnabled() const;
@@ -66,7 +66,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QFrameGraphItem)
-    QFrameGraphItem(QFrameGraphItemPrivate &dd, Node *parent = 0);
+    QFrameGraphItem(QFrameGraphItemPrivate &dd, QNode *parent = 0);
 };
 
 } // Qt3D
diff --git a/src/render/frontend/framegraph-components/qframegraphitem_p.h b/src/render/frontend/framegraph-components/qframegraphitem_p.h
index 349b73255..269b8fa39 100644
--- a/src/render/frontend/framegraph-components/qframegraphitem_p.h
+++ b/src/render/frontend/framegraph-components/qframegraphitem_p.h
@@ -43,7 +43,7 @@
 #define QT3D_QFRAMEGRAPHITEM_P_H
 
 #include <QtCore/QtGlobal>
-#include <private/node_p.h>
+#include <private/qnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -51,7 +51,7 @@ namespace Qt3D {
 
 class QFrameGraphItem;
 
-class QFrameGraphItemPrivate : public NodePrivate
+class QFrameGraphItemPrivate : public QNodePrivate
 {
 public:
     QFrameGraphItemPrivate(QFrameGraphItem *qq);
diff --git a/src/render/frontend/framegraph-components/qlayerfilter.cpp b/src/render/frontend/framegraph-components/qlayerfilter.cpp
index 3a11fd372..89478d505 100644
--- a/src/render/frontend/framegraph-components/qlayerfilter.cpp
+++ b/src/render/frontend/framegraph-components/qlayerfilter.cpp
@@ -52,13 +52,13 @@ QLayerFilterPrivate::QLayerFilterPrivate(QLayerFilter *qq)
 {
 }
 
-QLayerFilter::QLayerFilter(Node *parent)
+QLayerFilter::QLayerFilter(QNode *parent)
     : QFrameGraphItem(*new QLayerFilterPrivate(this), parent)
 {
 }
 
 
-QLayerFilter::QLayerFilter(QLayerFilterPrivate &dd, Node *parent)
+QLayerFilter::QLayerFilter(QLayerFilterPrivate &dd, QNode *parent)
     : QFrameGraphItem(dd, parent)
 {
 }
diff --git a/src/render/frontend/framegraph-components/qlayerfilter.h b/src/render/frontend/framegraph-components/qlayerfilter.h
index cbf34cd2a..8a96623f8 100644
--- a/src/render/frontend/framegraph-components/qlayerfilter.h
+++ b/src/render/frontend/framegraph-components/qlayerfilter.h
@@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QLayerFilter : public QFrameGraphItem
     Q_OBJECT
     Q_PROPERTY(QStringList layers READ layers WRITE setLayers NOTIFY layersChanged)
 public:
-    explicit QLayerFilter(Node *parent = 0);
+    explicit QLayerFilter(QNode *parent = 0);
 
     void setLayers(const QStringList &layers);
     QStringList layers() const;
@@ -65,7 +65,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QLayerFilter)
-    QLayerFilter(QLayerFilterPrivate &dd, Node *parent = 0);
+    QLayerFilter(QLayerFilterPrivate &dd, QNode *parent = 0);
 };
 
 } // Qt3D
diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
index 5981d1ad3..84e8b016b 100644
--- a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
+++ b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
@@ -50,11 +50,11 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-QRenderPassFilter::QRenderPassFilter(Node *parent)
+QRenderPassFilter::QRenderPassFilter(QNode *parent)
     : QFrameGraphItem(*new QRenderPassFilterPrivate(this), parent)
 {}
 
-QRenderPassFilter::QRenderPassFilter(QRenderPassFilterPrivate &dd, Node *parent)
+QRenderPassFilter::QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent)
     : QFrameGraphItem(dd, parent)
 {
 }
diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.h b/src/render/frontend/framegraph-components/qrenderpassfilter.h
index dabfd9552..08abbe605 100644
--- a/src/render/frontend/framegraph-components/qrenderpassfilter.h
+++ b/src/render/frontend/framegraph-components/qrenderpassfilter.h
@@ -60,7 +60,7 @@ class QT3DRENDERERSHARED_EXPORT QRenderPassFilter : public QFrameGraphItem
     Q_PROPERTY(QString renderPassName READ renderPassName WRITE setRenderPassName NOTIFY renderPassNameChanged)
 
 public:
-    explicit QRenderPassFilter(Node *parent = 0);
+    explicit QRenderPassFilter(QNode *parent = 0);
 
     void setRenderPassName(const QString &renderpassName);
     QString renderPassName() const;
@@ -73,7 +73,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QRenderPassFilter)
-    QRenderPassFilter(QRenderPassFilterPrivate &dd, Node *parent = 0);
+    QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent = 0);
 };
 
 } // namespace Qt3D
diff --git a/src/render/frontend/framegraph-components/qrendertargetselector.cpp b/src/render/frontend/framegraph-components/qrendertargetselector.cpp
index 07189290f..5984ad850 100644
--- a/src/render/frontend/framegraph-components/qrendertargetselector.cpp
+++ b/src/render/frontend/framegraph-components/qrendertargetselector.cpp
@@ -51,12 +51,12 @@ QRenderTargetSelectorPrivate::QRenderTargetSelectorPrivate(QRenderTargetSelector
 {
 }
 
-QRenderTargetSelector::QRenderTargetSelector(Node *parent)
+QRenderTargetSelector::QRenderTargetSelector(QNode *parent)
     : QFrameGraphItem(*new QRenderTargetSelectorPrivate(this), parent)
 {
 }
 
-QRenderTargetSelector::QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Node *parent)
+QRenderTargetSelector::QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, QNode *parent)
     : QFrameGraphItem(dd, parent)
 {
 }
diff --git a/src/render/frontend/framegraph-components/qrendertargetselector.h b/src/render/frontend/framegraph-components/qrendertargetselector.h
index 13fde1dae..757ae24c4 100644
--- a/src/render/frontend/framegraph-components/qrendertargetselector.h
+++ b/src/render/frontend/framegraph-components/qrendertargetselector.h
@@ -43,7 +43,7 @@
 #define QT3D_QRENDERTARGETSELECTOR_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 #include <Qt3DRenderer/qframegraphitem.h>
 
 QT_BEGIN_NAMESPACE
@@ -56,11 +56,11 @@ class QT3DRENDERERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphItem
 {
     Q_OBJECT
 public:
-    explicit QRenderTargetSelector(Node *parent = 0);
+    explicit QRenderTargetSelector(QNode *parent = 0);
 
 protected:
     Q_DECLARE_PRIVATE(QRenderTargetSelector)
-    QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Node *parent = 0);
+    QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, QNode *parent = 0);
 };
 
 } // Qt3D
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.cpp b/src/render/frontend/framegraph-components/qtechniquefilter.cpp
index d5da0ebc8..cc5e45704 100644
--- a/src/render/frontend/framegraph-components/qtechniquefilter.cpp
+++ b/src/render/frontend/framegraph-components/qtechniquefilter.cpp
@@ -55,12 +55,12 @@ QTechniqueFilterPrivate::QTechniqueFilterPrivate(QTechniqueFilter *qq)
 {
 }
 
-QTechniqueFilter::QTechniqueFilter(Node *parent)
+QTechniqueFilter::QTechniqueFilter(QNode *parent)
     : QFrameGraphItem(*new QTechniqueFilterPrivate(this), parent)
 {
 }
 
-QTechniqueFilter::QTechniqueFilter(QTechniqueFilterPrivate &dd, Node *parent)
+QTechniqueFilter::QTechniqueFilter(QTechniqueFilterPrivate &dd, QNode *parent)
     : QFrameGraphItem(dd, parent)
 {
 }
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.h b/src/render/frontend/framegraph-components/qtechniquefilter.h
index d12480657..1746ce69d 100644
--- a/src/render/frontend/framegraph-components/qtechniquefilter.h
+++ b/src/render/frontend/framegraph-components/qtechniquefilter.h
@@ -56,7 +56,7 @@ class QT3DRENDERERSHARED_EXPORT QTechniqueFilter : public QFrameGraphItem
 {
     Q_OBJECT
 public:
-    explicit QTechniqueFilter(Node *parent = 0);
+    explicit QTechniqueFilter(QNode *parent = 0);
 
     QList<TechniqueCriterion *> criteria() const;
     void addCriterion(TechniqueCriterion *criterion);
@@ -67,7 +67,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QTechniqueFilter)
-    QTechniqueFilter(QTechniqueFilterPrivate &dd, Node *parent = 0);
+    QTechniqueFilter(QTechniqueFilterPrivate &dd, QNode *parent = 0);
 };
 
 } // namespace Qt3D
diff --git a/src/render/frontend/framegraph-components/qviewport.cpp b/src/render/frontend/framegraph-components/qviewport.cpp
index 2bafe04e4..d2dc0526f 100644
--- a/src/render/frontend/framegraph-components/qviewport.cpp
+++ b/src/render/frontend/framegraph-components/qviewport.cpp
@@ -53,12 +53,12 @@ QViewportPrivate::QViewportPrivate(QViewport *qq) :
 {
 }
 
-QViewport::QViewport(Node *parent)
+QViewport::QViewport(QNode *parent)
     : QFrameGraphItem(*new QViewportPrivate(this), parent)
 {
 }
 
-QViewport::QViewport(QViewportPrivate &dd, Node *parent)
+QViewport::QViewport(QViewportPrivate &dd, QNode *parent)
     : QFrameGraphItem(dd, parent)
 {
 }
diff --git a/src/render/frontend/framegraph-components/qviewport.h b/src/render/frontend/framegraph-components/qviewport.h
index 23c447c59..c483e0f62 100644
--- a/src/render/frontend/framegraph-components/qviewport.h
+++ b/src/render/frontend/framegraph-components/qviewport.h
@@ -58,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QViewport : public QFrameGraphItem
     Q_PROPERTY(QRectF rect READ rect WRITE setRect NOTIFY rectChanged)
 
 public:
-    explicit QViewport(Node *parent = 0);
+    explicit QViewport(QNode *parent = 0);
 
     QRectF rect() const;
     void setRect(const QRectF& rect);
@@ -68,7 +68,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QViewport)
-    QViewport(QViewportPrivate &dd, Node *parent = 0);
+    QViewport(QViewportPrivate &dd, QNode *parent = 0);
 };
 
 } // Qt3D
diff --git a/src/render/frontend/parameter.cpp b/src/render/frontend/parameter.cpp
index 1d4663ea6..da57ff4f7 100644
--- a/src/render/frontend/parameter.cpp
+++ b/src/render/frontend/parameter.cpp
@@ -47,21 +47,21 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-Parameter::Parameter(Node *parent, const QString &name, const QVariant &value)
-    : Node(parent)
+Parameter::Parameter(QNode *parent, const QString &name, const QVariant &value)
+    : QNode(parent)
     , m_name(name)
     , m_value(value)
 {
 }
 
-Parameter::Parameter(Node *parent)
-    : Node(parent)
+Parameter::Parameter(QNode *parent)
+    : QNode(parent)
     , m_type(Undefined)
 {
 }
 
-Parameter::Parameter(Node *parent, const QString &name, const QVariant &value, Parameter::OpenGLTypes ty)
-    : Node(parent)
+Parameter::Parameter(QNode *parent, const QString &name, const QVariant &value, Parameter::OpenGLTypes ty)
+    : QNode(parent)
     , m_name(name)
     , m_type(ty)
     , m_value(value)
diff --git a/src/render/frontend/parameter.h b/src/render/frontend/parameter.h
index 2416131e0..6d4f562fc 100644
--- a/src/render/frontend/parameter.h
+++ b/src/render/frontend/parameter.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_PARAMETER_H
 #define QT3D_PARAMETER_H
 
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/quniformvalue.h>
 
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DRENDERERSHARED_EXPORT Parameter : public Node
+class QT3DRENDERERSHARED_EXPORT Parameter : public QNode
 {
     Q_OBJECT
     Q_ENUMS(OpenGLTypes)
@@ -112,9 +112,9 @@ public:
         IntVec4
     };
 
-    explicit Parameter(Node *parent = 0);
-    Parameter(Node* parent, const QString& name, const QVariant& value);
-    Parameter(Node* parent, const QString& name, const QVariant& value, OpenGLTypes ty);
+    explicit Parameter(QNode *parent = 0);
+    Parameter(QNode* parent, const QString& name, const QVariant& value);
+    Parameter(QNode* parent, const QString& name, const QVariant& value, OpenGLTypes ty);
 
     void setName(const QString &name);
     QString name() const
diff --git a/src/render/frontend/qabstractlight.cpp b/src/render/frontend/qabstractlight.cpp
index e086eb606..d26221d00 100644
--- a/src/render/frontend/qabstractlight.cpp
+++ b/src/render/frontend/qabstractlight.cpp
@@ -64,12 +64,12 @@ QAbstractLightPrivate::QAbstractLightPrivate(QAbstractLight *qq)
 /*!
  * Constructs a new QAbstractLight with the given \a parent.
  */
-QAbstractLight::QAbstractLight(Qt3D::Node *parent) :
+QAbstractLight::QAbstractLight(Qt3D::QNode *parent) :
     Component(*new QAbstractLightPrivate(this), parent)
 {
 }
 
-QAbstractLight::QAbstractLight(QAbstractLightPrivate &dd, Node *parent)
+QAbstractLight::QAbstractLight(QAbstractLightPrivate &dd, QNode *parent)
     : Component(dd, parent)
 {
 }
diff --git a/src/render/frontend/qabstractlight.h b/src/render/frontend/qabstractlight.h
index 3560f7a45..5cfde9e33 100644
--- a/src/render/frontend/qabstractlight.h
+++ b/src/render/frontend/qabstractlight.h
@@ -63,7 +63,7 @@ class QT3DRENDERERSHARED_EXPORT QAbstractLight : public Component
 
 public :
 
-    explicit QAbstractLight(Node *parent = 0);
+    explicit QAbstractLight(QNode *parent = 0);
 
     QColor color() const;
     void setColor(const QColor &color);
@@ -75,7 +75,7 @@ public :
 
 protected :
     Q_DECLARE_PRIVATE(QAbstractLight)
-    QAbstractLight(QAbstractLightPrivate &dd, Node *parent = 0);
+    QAbstractLight(QAbstractLightPrivate &dd, QNode *parent = 0);
 
 Q_SIGNALS:
     void colorChanged();
diff --git a/src/render/frontend/qabstractscene.cpp b/src/render/frontend/qabstractscene.cpp
index 87cc1ad70..569a3cac2 100644
--- a/src/render/frontend/qabstractscene.cpp
+++ b/src/render/frontend/qabstractscene.cpp
@@ -60,12 +60,12 @@ QAbstractScenePrivate::QAbstractScenePrivate(QAbstractScene *qq)
 {
 }
 
-QAbstractScene::QAbstractScene(QAbstractScenePrivate &dd, Node *parent)
+QAbstractScene::QAbstractScene(QAbstractScenePrivate &dd, QNode *parent)
     : Entity(dd, parent)
 {
 }
 
-QAbstractScene::QAbstractScene(Node *parent)
+QAbstractScene::QAbstractScene(QNode *parent)
     : Entity(*new QAbstractScenePrivate(this), parent)
 {
     Q_D(QAbstractScene);
@@ -84,7 +84,7 @@ QString QAbstractScene::sceneId() const
     return d->m_sceneId;
 }
 
-QAbstractScene *QAbstractScene::findInTree(Node *root)
+QAbstractScene *QAbstractScene::findInTree(QNode *root)
 {
     if (!root)
         return Q_NULLPTR;
@@ -94,7 +94,7 @@ QAbstractScene *QAbstractScene::findInTree(Node *root)
         return s;
 
     // recursive walk down the tree
-    foreach (Node* nd, root->children()) {
+    foreach (QNode* nd, root->children()) {
         s = findInTree(nd);
         if (s)
             return s;
@@ -129,7 +129,7 @@ void QAbstractScene::setSceneId(QString arg)
     }
 }
 
-Node *QAbstractScene::node(QString id)
+QNode *QAbstractScene::node(QString id)
 {
     Q_D(QAbstractScene);
     if (d->m_currentParser)
@@ -137,7 +137,7 @@ Node *QAbstractScene::node(QString id)
     return Q_NULLPTR;
 }
 
-Node *QAbstractScene::scene(QString id)
+QNode *QAbstractScene::scene(QString id)
 {
     Q_D(QAbstractScene);
     if (d->m_currentParser)
diff --git a/src/render/frontend/qabstractscene.h b/src/render/frontend/qabstractscene.h
index c6943615d..d024a1c14 100644
--- a/src/render/frontend/qabstractscene.h
+++ b/src/render/frontend/qabstractscene.h
@@ -62,7 +62,7 @@ class QT3DRENDERERSHARED_EXPORT QAbstractScene : public Entity
     Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(QString sceneId READ sceneId WRITE setSceneId NOTIFY sceneIdChanged)
 public:
-    explicit QAbstractScene(Node *parent = 0);
+    explicit QAbstractScene(QNode *parent = 0);
 
     QString source() const;
     void setSource(QString arg);
@@ -70,8 +70,8 @@ public:
     QString sceneId() const;
     void setSceneId(QString arg);
 
-    virtual Node *node(QString id);
-    virtual Node *scene(QString id);
+    virtual QNode *node(QString id);
+    virtual QNode *scene(QString id);
 
     void clear();
 
@@ -81,7 +81,7 @@ public:
      * @param root - the found Scene or NULL if no Scene was found
      * @return
      */
-    static QAbstractScene* findInTree(Node* root);
+    static QAbstractScene* findInTree(QNode* root);
 Q_SIGNALS:
 
     void sourceChanged(QString arg);
@@ -90,7 +90,7 @@ Q_SIGNALS:
 protected:
     void rebuild();
     Q_DECLARE_PRIVATE(QAbstractScene)
-    QAbstractScene(QAbstractScenePrivate &dd, Node *parent = 0);
+    QAbstractScene(QAbstractScenePrivate &dd, QNode *parent = 0);
 };
 
 } // Render
diff --git a/src/render/frontend/qabstractscene_p.h b/src/render/frontend/qabstractscene_p.h
index 8880f9676..fc35858e5 100644
--- a/src/render/frontend/qabstractscene_p.h
+++ b/src/render/frontend/qabstractscene_p.h
@@ -64,8 +64,8 @@ public:
 
     QString m_source;
     QString m_sceneId;
-    Node *m_sceneNode;
-    Node *m_sceneChild;
+    QNode *m_sceneNode;
+    QNode *m_sceneChild;
     AbstractSceneParser *m_currentParser;
 };
 
diff --git a/src/render/frontend/qabstractshapemesh.cpp b/src/render/frontend/qabstractshapemesh.cpp
index e485c76dc..f418e1fc7 100644
--- a/src/render/frontend/qabstractshapemesh.cpp
+++ b/src/render/frontend/qabstractshapemesh.cpp
@@ -54,12 +54,12 @@ QAbstractShapeMeshPrivate::QAbstractShapeMeshPrivate(QAbstractShapeMesh *qq)
 {
 }
 
-QAbstractShapeMesh::QAbstractShapeMesh(Node *parent) :
+QAbstractShapeMesh::QAbstractShapeMesh(QNode *parent) :
     QAbstractMesh(*new QAbstractShapeMeshPrivate(this), parent)
 {
 }
 
-QAbstractShapeMesh::QAbstractShapeMesh(QAbstractShapeMeshPrivate &dd, Node *parent)
+QAbstractShapeMesh::QAbstractShapeMesh(QAbstractShapeMeshPrivate &dd, QNode *parent)
     : QAbstractMesh(dd, parent)
 {
 }
diff --git a/src/render/frontend/qabstractshapemesh.h b/src/render/frontend/qabstractshapemesh.h
index 83a8c0c5d..3afc1f79e 100644
--- a/src/render/frontend/qabstractshapemesh.h
+++ b/src/render/frontend/qabstractshapemesh.h
@@ -59,7 +59,7 @@ class QT3DRENDERERSHARED_EXPORT QAbstractShapeMesh : public QAbstractMesh
     Q_OBJECT
 
 public:
-    explicit QAbstractShapeMesh(Node *parent = 0);
+    explicit QAbstractShapeMesh(QNode *parent = 0);
 
     bool load() Q_DECL_OVERRIDE;
 
@@ -67,7 +67,7 @@ public:
 
 protected:
     Q_DECLARE_PRIVATE(QAbstractShapeMesh)
-    QAbstractShapeMesh(QAbstractShapeMeshPrivate &dd, Node* parent = 0);
+    QAbstractShapeMesh(QAbstractShapeMeshPrivate &dd, QNode* parent = 0);
 
 };
 
diff --git a/src/render/frontend/qdirectionallight.cpp b/src/render/frontend/qdirectionallight.cpp
index 809658314..221863a56 100644
--- a/src/render/frontend/qdirectionallight.cpp
+++ b/src/render/frontend/qdirectionallight.cpp
@@ -53,12 +53,12 @@ QDirectionalLightPrivate::QDirectionalLightPrivate(QDirectionalLight *qq)
 {
 }
 
-QDirectionalLight::QDirectionalLight(Node *parent)
+QDirectionalLight::QDirectionalLight(QNode *parent)
     : QAbstractLight(*new QDirectionalLightPrivate(this), parent)
 {
 }
 
-QDirectionalLight::QDirectionalLight(QDirectionalLightPrivate &dd, Node *parent)
+QDirectionalLight::QDirectionalLight(QDirectionalLightPrivate &dd, QNode *parent)
     : QAbstractLight(dd, parent)
 {
 }
diff --git a/src/render/frontend/qdirectionallight.h b/src/render/frontend/qdirectionallight.h
index 163dc4111..4483f295c 100644
--- a/src/render/frontend/qdirectionallight.h
+++ b/src/render/frontend/qdirectionallight.h
@@ -56,7 +56,7 @@ class QT3DRENDERERSHARED_EXPORT QDirectionalLight : public QAbstractLight
     Q_PROPERTY(QVector3D direction READ direction WRITE setDirection NOTIFY directionChanged)
 
 public:
-    explicit QDirectionalLight(Node *parent = 0);
+    explicit QDirectionalLight(QNode *parent = 0);
 
     void setDirection(const QVector3D &direction);
     QVector3D direction() const;
@@ -68,7 +68,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QDirectionalLight)
-    QDirectionalLight(QDirectionalLightPrivate &dd, Node *parent = 0);
+    QDirectionalLight(QDirectionalLightPrivate &dd, QNode *parent = 0);
 };
 
 } // Qt3D
diff --git a/src/render/frontend/qeffect.cpp b/src/render/frontend/qeffect.cpp
index c11ab48b0..3423a46f9 100644
--- a/src/render/frontend/qeffect.cpp
+++ b/src/render/frontend/qeffect.cpp
@@ -54,12 +54,12 @@ QEffectPrivate::QEffectPrivate(QEffect *qq)
     : QAbstractEffectPrivate(qq)
 {}
 
-QEffect::QEffect(Node *parent)
+QEffect::QEffect(QNode *parent)
     : QAbstractEffect(*new QEffectPrivate(this), parent)
 {
 }
 
-QEffect::QEffect(QEffectPrivate &dd, Node *parent)
+QEffect::QEffect(QEffectPrivate &dd, QNode *parent)
     : QAbstractEffect(dd, parent)
 {
 }
diff --git a/src/render/frontend/qeffect.h b/src/render/frontend/qeffect.h
index 3ccac6ff1..c603db726 100644
--- a/src/render/frontend/qeffect.h
+++ b/src/render/frontend/qeffect.h
@@ -43,7 +43,7 @@
 #define QT3D_QEFFECT_H
 
 #include <Qt3DCore/qabstracteffect.h>
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
@@ -58,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QEffect
 {
     Q_OBJECT
 public:
-    explicit QEffect(Node *parent = 0);
+    explicit QEffect(QNode *parent = 0);
 
     void addTechnique(QAbstractTechnique *t) Q_DECL_OVERRIDE;
     void removeTechnique(QAbstractTechnique *t) Q_DECL_OVERRIDE;
@@ -69,7 +69,7 @@ public:
 
 protected:
     Q_DECLARE_PRIVATE(QEffect)
-    QEffect(QEffectPrivate &dd, Node *parent = 0);
+    QEffect(QEffectPrivate &dd, QNode *parent = 0);
 };
 
 } // Qt3D
diff --git a/src/render/frontend/qlayer.cpp b/src/render/frontend/qlayer.cpp
index 0e33f2ff8..3c14feed1 100644
--- a/src/render/frontend/qlayer.cpp
+++ b/src/render/frontend/qlayer.cpp
@@ -51,12 +51,12 @@ QLayerPrivate::QLayerPrivate(QLayer *qq)
 {
 }
 
-QLayer::QLayer(Node *parent)
+QLayer::QLayer(QNode *parent)
     : Component(*new QLayerPrivate(this), parent)
 {
 }
 
-QLayer::QLayer(QLayerPrivate &dd, Node *parent)
+QLayer::QLayer(QLayerPrivate &dd, QNode *parent)
     : Component(dd, parent)
 {
 }
diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h
index 56239684f..db2210305 100644
--- a/src/render/frontend/qlayer.h
+++ b/src/render/frontend/qlayer.h
@@ -56,7 +56,7 @@ class QT3DRENDERERSHARED_EXPORT QLayer : public Component
     Q_OBJECT
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
 public:
-    explicit QLayer(Node *parent = 0);
+    explicit QLayer(QNode *parent = 0);
 
     QString name() const;
     void setName(const QString &name);
@@ -66,7 +66,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QLayer)
-    QLayer(QLayerPrivate &dd, Node *parent = 0);
+    QLayer(QLayerPrivate &dd, QNode *parent = 0);
 };
 
 } // Qt3D
diff --git a/src/render/frontend/qmaterial.cpp b/src/render/frontend/qmaterial.cpp
index d65c467de..2072d49da 100644
--- a/src/render/frontend/qmaterial.cpp
+++ b/src/render/frontend/qmaterial.cpp
@@ -56,12 +56,12 @@ QMaterialPrivate::QMaterialPrivate(QMaterial *qq)
         : QAbstractMaterialPrivate(qq)
     {}
 
-QMaterial::QMaterial(QMaterialPrivate &dd, Node *parent)
+QMaterial::QMaterial(QMaterialPrivate &dd, QNode *parent)
     : QAbstractMaterial(dd, parent)
 {
 }
 
-QMaterial::QMaterial(Node *parent)
+QMaterial::QMaterial(QNode *parent)
     : QAbstractMaterial(*new QMaterialPrivate(this), parent)
 {
 }
diff --git a/src/render/frontend/qmaterial.h b/src/render/frontend/qmaterial.h
index 8446cb768..7ff7df504 100644
--- a/src/render/frontend/qmaterial.h
+++ b/src/render/frontend/qmaterial.h
@@ -65,7 +65,7 @@ class QT3DRENDERERSHARED_EXPORT QMaterial : public QAbstractMaterial
     Q_OBJECT
 
 public:
-    explicit QMaterial(Node *parent = 0);
+    explicit QMaterial(QNode *parent = 0);
 
     void setEffect(QAbstractEffect *effect) Q_DECL_OVERRIDE;
 
@@ -79,7 +79,7 @@ public:
 
 protected:
     Q_DECLARE_PRIVATE(QMaterial)
-    QMaterial(QMaterialPrivate &dd, Node *parent = 0);
+    QMaterial(QMaterialPrivate &dd, QNode *parent = 0);
 };
 
 }
diff --git a/src/render/frontend/qmesh.cpp b/src/render/frontend/qmesh.cpp
index d335cba40..0679d2555 100644
--- a/src/render/frontend/qmesh.cpp
+++ b/src/render/frontend/qmesh.cpp
@@ -59,12 +59,12 @@ QMeshPrivate::QMeshPrivate(QMesh *qq)
     : QAbstractMeshPrivate(qq)
 {}
 
-QMesh::QMesh(Node *parent)
+QMesh::QMesh(QNode *parent)
     : QAbstractMesh(*new QMeshPrivate(this), parent)
 {
 }
 
-QMesh::QMesh(QMeshPrivate &dd, Node *parent)
+QMesh::QMesh(QMeshPrivate &dd, QNode *parent)
     : QAbstractMesh(dd, parent)
 {
 }
diff --git a/src/render/frontend/qmesh.h b/src/render/frontend/qmesh.h
index f6a6d08c3..f582e748a 100644
--- a/src/render/frontend/qmesh.h
+++ b/src/render/frontend/qmesh.h
@@ -64,7 +64,7 @@ class QT3DRENDERERSHARED_EXPORT QMesh : public QAbstractMesh
     Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged)
 
 public:
-    explicit QMesh(Node *parent = 0);
+    explicit QMesh(QNode *parent = 0);
 
     void setSource(const QString &source);
     QString source() const;
@@ -76,7 +76,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QMesh)
-    QMesh(QMeshPrivate &dd, Node *parent = 0);
+    QMesh(QMeshPrivate &dd, QNode *parent = 0);
 
 };
 
diff --git a/src/render/frontend/qpointlight.cpp b/src/render/frontend/qpointlight.cpp
index 5c3f7f716..a00ce079c 100644
--- a/src/render/frontend/qpointlight.cpp
+++ b/src/render/frontend/qpointlight.cpp
@@ -51,7 +51,7 @@ QPointLightPrivate::QPointLightPrivate(QPointLight *qq)
 {
 }
 
-QPointLight::QPointLight(Node *parent)
+QPointLight::QPointLight(QNode *parent)
     : QAbstractLight(*new QPointLightPrivate(this), parent)
 {
 }
@@ -61,7 +61,7 @@ QHash<QString, QVariant> QPointLight::lightProperties() const
     return QHash<QString, QVariant>();
 }
 
-QPointLight::QPointLight(QPointLightPrivate &dd, Node *parent)
+QPointLight::QPointLight(QPointLightPrivate &dd, QNode *parent)
     : QAbstractLight(dd, parent)
 {
 }
diff --git a/src/render/frontend/qpointlight.h b/src/render/frontend/qpointlight.h
index 589422a59..af2286c73 100644
--- a/src/render/frontend/qpointlight.h
+++ b/src/render/frontend/qpointlight.h
@@ -55,12 +55,12 @@ class QT3DRENDERERSHARED_EXPORT QPointLight : public QAbstractLight
     Q_OBJECT
 
 public:
-    explicit QPointLight(Node *parent = 0);
+    explicit QPointLight(QNode *parent = 0);
     QHash<QString, QVariant> lightProperties() const;
 
 protected:
     Q_DECLARE_PRIVATE(QPointLight)
-    QPointLight(QPointLightPrivate &dd, Node *parent);
+    QPointLight(QPointLightPrivate &dd, QNode *parent);
 };
 
 } // Qt3D
diff --git a/src/render/frontend/qrenderpass.cpp b/src/render/frontend/qrenderpass.cpp
index 45fa5d42d..d2c98b27f 100644
--- a/src/render/frontend/qrenderpass.cpp
+++ b/src/render/frontend/qrenderpass.cpp
@@ -55,12 +55,12 @@ QRenderPassPrivate::QRenderPassPrivate(QRenderPass *qq)
 {
 }
 
-QRenderPass::QRenderPass(Node *parent)
+QRenderPass::QRenderPass(QNode *parent)
     : QAbstractRenderPass(*new QRenderPassPrivate(this), parent)
 {
 }
 
-QRenderPass::QRenderPass(QRenderPassPrivate &dd, Node *parent)
+QRenderPass::QRenderPass(QRenderPassPrivate &dd, QNode *parent)
     : QAbstractRenderPass(dd, parent)
 {
 }
diff --git a/src/render/frontend/qrenderpass.h b/src/render/frontend/qrenderpass.h
index 9f583e817..fd8277b90 100644
--- a/src/render/frontend/qrenderpass.h
+++ b/src/render/frontend/qrenderpass.h
@@ -67,7 +67,7 @@ class QT3DRENDERERSHARED_EXPORT QRenderPass : public QAbstractRenderPass
     Q_OBJECT
 
 public:
-    explicit QRenderPass(Node *parent = 0);
+    explicit QRenderPass(QNode *parent = 0);
 
     void addUniformBinding(Parameter* param, QString glslUniformName);
 
@@ -91,7 +91,7 @@ public:
 
 protected:
     Q_DECLARE_PRIVATE(QRenderPass)
-    QRenderPass(QRenderPassPrivate &dd, Node *parent = 0);
+    QRenderPass(QRenderPassPrivate &dd, QNode *parent = 0);
 };
 
 }
diff --git a/src/render/frontend/qscene.cpp b/src/render/frontend/qscene.cpp
index c08d9a580..79188558f 100644
--- a/src/render/frontend/qscene.cpp
+++ b/src/render/frontend/qscene.cpp
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-QScene::QScene(Node *parent)
+QScene::QScene(QNode *parent)
     : Render::QAbstractScene(parent)
 {
 }
diff --git a/src/render/frontend/qscene.h b/src/render/frontend/qscene.h
index 2ebd3d2fe..dd98cdf9b 100644
--- a/src/render/frontend/qscene.h
+++ b/src/render/frontend/qscene.h
@@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QScene : public Render::QAbstractScene
 {
     Q_OBJECT
 public:
-    explicit QScene(Node *parent = 0);
+    explicit QScene(QNode *parent = 0);
 };
 
 } // Qt3D
diff --git a/src/render/frontend/qspheremesh.cpp b/src/render/frontend/qspheremesh.cpp
index 9c6a69b46..c69eba837 100644
--- a/src/render/frontend/qspheremesh.cpp
+++ b/src/render/frontend/qspheremesh.cpp
@@ -69,7 +69,7 @@ class QSphereMeshPrivate : public QAbstractShapeMeshPrivate
     float m_radius;
 };
 
-QSphereMesh::QSphereMesh(Node *parent)
+QSphereMesh::QSphereMesh(QNode *parent)
     : QAbstractShapeMesh(*new QSphereMeshPrivate(this), parent)
 {
 }
diff --git a/src/render/frontend/qspheremesh.h b/src/render/frontend/qspheremesh.h
index c981ee586..e3dc7f0cd 100644
--- a/src/render/frontend/qspheremesh.h
+++ b/src/render/frontend/qspheremesh.h
@@ -61,7 +61,7 @@ class QT3DRENDERERSHARED_EXPORT QSphereMesh : public Qt3D::QAbstractShapeMesh
     Q_PROPERTY(bool generateTangents READ generateTangents WRITE setGenerateTangents NOTIFY generateTangentsChanged)
 
 public:
-    explicit QSphereMesh(Node *parent = 0);
+    explicit QSphereMesh(QNode *parent = 0);
 
     void setRings(int rings);
     void setSlices(int slices);
diff --git a/src/render/frontend/qspotlight.cpp b/src/render/frontend/qspotlight.cpp
index dce891053..6b23d4220 100644
--- a/src/render/frontend/qspotlight.cpp
+++ b/src/render/frontend/qspotlight.cpp
@@ -55,12 +55,12 @@ QSpotLightPrivate::QSpotLightPrivate(QSpotLight *qq)
 }
 
 
-QSpotLight::QSpotLight(Node *parent)
+QSpotLight::QSpotLight(QNode *parent)
     : QAbstractLight(*new QSpotLightPrivate(this), parent)
 {
 }
 
-QSpotLight::QSpotLight(QSpotLightPrivate &dd, Node *parent)
+QSpotLight::QSpotLight(QSpotLightPrivate &dd, QNode *parent)
     : QAbstractLight(dd, parent)
 {
 }
diff --git a/src/render/frontend/qspotlight.h b/src/render/frontend/qspotlight.h
index 89debb517..6856fe295 100644
--- a/src/render/frontend/qspotlight.h
+++ b/src/render/frontend/qspotlight.h
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QSpotLight : public QAbstractLight
     Q_PROPERTY(float cutOffAngle READ cutOffAngle WRITE setCutOffAngle NOTIFY cutOffAngleChanged)
 
 public:
-    explicit QSpotLight(Node *parent = 0);
+    explicit QSpotLight(QNode *parent = 0);
 
     QVector3D direction() const;
     float cutOffAngle() const;
@@ -73,7 +73,7 @@ Q_SIGNALS:
 
 protected:
     Q_DECLARE_PRIVATE(QSpotLight)
-    QSpotLight(QSpotLightPrivate &dd, Node *parent = 0);
+    QSpotLight(QSpotLightPrivate &dd, QNode *parent = 0);
 };
 
 } // Qt3D
diff --git a/src/render/frontend/qtechnique.cpp b/src/render/frontend/qtechnique.cpp
index a93e75f78..a125c917b 100644
--- a/src/render/frontend/qtechnique.cpp
+++ b/src/render/frontend/qtechnique.cpp
@@ -54,12 +54,12 @@ QTechniquePrivate::QTechniquePrivate(QTechnique *qq)
 {
 }
 
-QTechnique::QTechnique(Node *parent)
+QTechnique::QTechnique(QNode *parent)
     : QAbstractTechnique(*new QTechniquePrivate(this), parent)
 {
 }
 
-QTechnique::QTechnique(QTechniquePrivate &dd, Node *parent)
+QTechnique::QTechnique(QTechniquePrivate &dd, QNode *parent)
     : QAbstractTechnique(dd, parent)
 {
 }
diff --git a/src/render/frontend/qtechnique.h b/src/render/frontend/qtechnique.h
index ea8509fc1..1d7d9c588 100644
--- a/src/render/frontend/qtechnique.h
+++ b/src/render/frontend/qtechnique.h
@@ -43,7 +43,7 @@
 #define QT3D_TECHNIQUE_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 #include <Qt3DRenderer/tag.h>
 #include <Qt3DRenderer/qrenderpass.h>
 #include <Qt3DCore/qabstracttechnique.h>
@@ -63,7 +63,7 @@ class QT3DRENDERERSHARED_EXPORT QTechnique : public QAbstractTechnique
     Q_OBJECT
 
 public:
-    explicit QTechnique(Node *parent = 0);
+    explicit QTechnique(QNode *parent = 0);
 
     void addCriterion(TechniqueCriterion *criterion);
     void removeCriterion(TechniqueCriterion *criterion);
@@ -84,7 +84,7 @@ public:
 
 protected:
     Q_DECLARE_PRIVATE(QTechnique)
-    QTechnique(QTechniquePrivate &dd, Node *parent = 0);
+    QTechnique(QTechniquePrivate &dd, QNode *parent = 0);
 };
 
 }
diff --git a/src/render/frontend/qtorusmesh.cpp b/src/render/frontend/qtorusmesh.cpp
index 1de0f1729..1dcdd15e4 100644
--- a/src/render/frontend/qtorusmesh.cpp
+++ b/src/render/frontend/qtorusmesh.cpp
@@ -68,7 +68,7 @@ class QTorusMeshPrivate : public QAbstractShapeMeshPrivate
     float m_minorRadius;
 };
 
-QTorusMesh::QTorusMesh(Node *parent)
+QTorusMesh::QTorusMesh(QNode *parent)
     : QAbstractShapeMesh(*new QTorusMeshPrivate(this), parent)
 {
 }
diff --git a/src/render/frontend/qtorusmesh.h b/src/render/frontend/qtorusmesh.h
index 7908fee37..aec539176 100644
--- a/src/render/frontend/qtorusmesh.h
+++ b/src/render/frontend/qtorusmesh.h
@@ -60,7 +60,7 @@ class QT3DRENDERERSHARED_EXPORT QTorusMesh : public Qt3D::QAbstractShapeMesh
     Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged)
     Q_PROPERTY(float minorRadius READ minorRadius WRITE setMinorRadius NOTIFY minorRadiusChanged)
 public:
-    explicit QTorusMesh(Node *parent = 0);
+    explicit QTorusMesh(QNode *parent = 0);
 
     void setRings(int rings);
     void setSlices(int slices);
diff --git a/src/render/frontend/shaderprogram.cpp b/src/render/frontend/shaderprogram.cpp
index f66abcd3e..9ea851c28 100644
--- a/src/render/frontend/shaderprogram.cpp
+++ b/src/render/frontend/shaderprogram.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-ShaderProgram::ShaderProgram(Node *parent)
+ShaderProgram::ShaderProgram(QNode *parent)
     : QAbstractShader(parent)
     , m_vertexSourceFile()
     , m_fragmentSourceFile()
diff --git a/src/render/frontend/shaderprogram.h b/src/render/frontend/shaderprogram.h
index b552ea0b1..ff6b84d24 100644
--- a/src/render/frontend/shaderprogram.h
+++ b/src/render/frontend/shaderprogram.h
@@ -59,7 +59,7 @@ class QT3DRENDERERSHARED_EXPORT ShaderProgram : public QAbstractShader
     Q_PROPERTY(QByteArray fragmentShader READ fragmentSourceCode WRITE setFragmentShader NOTIFY fragmentShaderChanged)
 
 public:
-    explicit ShaderProgram(Node *parent = 0);
+    explicit ShaderProgram(QNode *parent = 0);
 
     void setVertexSourceFile(const QString &vertexSourceFile);
     QString vertexSourceFile() const;
diff --git a/src/render/frontend/tag.h b/src/render/frontend/tag.h
index ec4e2e746..775fc4a95 100644
--- a/src/render/frontend/tag.h
+++ b/src/render/frontend/tag.h
@@ -45,13 +45,13 @@
 #include <QDebug>
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DCore/node.h>
+#include <Qt3DCore/qnode.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DRENDERERSHARED_EXPORT Tag : public Node
+class QT3DRENDERERSHARED_EXPORT Tag : public QNode
 {
     Q_OBJECT
 
@@ -59,8 +59,8 @@ class QT3DRENDERERSHARED_EXPORT Tag : public Node
     Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
 
 public:
-    Tag(Node *parent = 0)
-        : Node(parent)
+    Tag(QNode *parent = 0)
+        : QNode(parent)
         , m_name()
         , m_value()
     {}
diff --git a/src/render/io/assimpparser.cpp b/src/render/io/assimpparser.cpp
index 6b4dcdacd..64f5f56f1 100644
--- a/src/render/io/assimpparser.cpp
+++ b/src/render/io/assimpparser.cpp
@@ -771,7 +771,7 @@ void AssimpParser::copyMaterialFloatProperties(QMaterial *material, aiMaterial *
         material->addParameter(new Parameter(material, ASSIMP_MATERIAL_REFLECTIVITY, value));
 }
 
-AssimpParser::AssimpMesh::AssimpMesh(Node *parent)
+AssimpParser::AssimpMesh::AssimpMesh(QNode *parent)
     : QAbstractMesh(parent)
 {
 }
diff --git a/src/render/io/assimpparser.h b/src/render/io/assimpparser.h
index 6e6b80286..18c10be3c 100644
--- a/src/render/io/assimpparser.h
+++ b/src/render/io/assimpparser.h
@@ -93,7 +93,7 @@ private :
     class AssimpMesh : public QAbstractMesh
     {
     public :
-        AssimpMesh(Node *parent = 0);
+        AssimpMesh(QNode *parent = 0);
 
         bool load() Q_DECL_OVERRIDE;
         void setData(MeshDataPtr data);
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp
index 4db8928ea..c2d6d8209 100644
--- a/src/render/io/gltfparser.cpp
+++ b/src/render/io/gltfparser.cpp
@@ -960,7 +960,7 @@ QVariant GLTFParser::parameterValueFromJSON(Parameter* p, QJsonValue val)
     return QVariant();
 }
 
-GLTFParser::GLTFParserMesh::GLTFParserMesh(Node *parent)
+GLTFParser::GLTFParserMesh::GLTFParserMesh(QNode *parent)
     : QAbstractMesh(parent)
 {
 }
diff --git a/src/render/io/gltfparser.h b/src/render/io/gltfparser.h
index 098e0b80a..43cc86c4d 100644
--- a/src/render/io/gltfparser.h
+++ b/src/render/io/gltfparser.h
@@ -101,7 +101,7 @@ private:
     class GLTFParserMesh : public QAbstractMesh
     {
     public:
-        GLTFParserMesh(Node *parent = 0);
+        GLTFParserMesh(QNode *parent = 0);
 
         bool load() Q_DECL_OVERRIDE;
         void setData(MeshDataPtr data);
author	Paul Lemire <paul.lemire@kdab.com>	2014-07-04 09:59:09 +0200
committer	Paul Lemire <paul.lemire@kdab.com>	2014-07-05 19:06:21 +0200
commit	e14d91b6522cbbae08c307e036cff37b0fc6b529 (patch)
tree	5416044c313179296b43421877f90d8f01e8979b /src
parent	603e22c60e240773a01e578372fe263d132504b6 (diff)