Move Render aspect into the Qt3DRender namespace

Updated examples and tests accordingly.

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

30 files changed, 207 insertions, 203 deletions

diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp
index f759d143c..a21ebad09 100644
--- a/src/render/defaults/qdiffusemapmaterial.cpp
+++ b/src/render/defaults/qdiffusemapmaterial.cpp
@@ -50,10 +50,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QDiffuseMapMaterialPrivate
+    \class Qt3DRender::QDiffuseMapMaterialPrivate
     \internal
 */
 QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate()
@@ -129,7 +129,7 @@ void QDiffuseMapMaterialPrivate::init()
 }
 
 /*!
-    \class Qt3D::QDiffuseMapMaterial
+    \class Qt3DRender::QDiffuseMapMaterial
     \brief The QDiffuseMapMaterial provides a default implementation of the phong lighting effect where the diffuse light component
     is read from a texture map.
     \inmodule Qt3DRenderer
@@ -150,7 +150,7 @@ void QDiffuseMapMaterialPrivate::init()
 */
 
 /*!
-    Constructs a new Qt3D::QDiffuseMapMaterial instance with parent object \a parent.
+    Constructs a new Qt3DRender::QDiffuseMapMaterial instance with parent object \a parent.
  */
 QDiffuseMapMaterial::QDiffuseMapMaterial(QNode *parent)
     : QMaterial(*new QDiffuseMapMaterialPrivate, parent)
@@ -172,7 +172,7 @@ QDiffuseMapMaterial::~QDiffuseMapMaterial()
 }
 
 /*!
-    \property Qt3D::QDiffuseMapMaterial::ambient
+    \property Qt3DRender::QDiffuseMapMaterial::ambient
 
     Holds the current ambient color.
 */
@@ -184,7 +184,7 @@ QColor QDiffuseMapMaterial::ambient() const
 }
 
 /*!
-    \property Qt3D::QDiffuseMapMaterial::specular
+    \property Qt3DRender::QDiffuseMapMaterial::specular
 
     Holds the current specular color.
 */
@@ -195,7 +195,7 @@ QColor QDiffuseMapMaterial::specular() const
 }
 
 /*!
-    \property Qt3D::QDiffuseMapMaterial::shininess
+    \property Qt3DRender::QDiffuseMapMaterial::shininess
 
     Holds the current shininess as a float value.
 */
@@ -206,7 +206,7 @@ float QDiffuseMapMaterial::shininess() const
 }
 
 /*!
-    \property Qt3D::QDiffuseMapMaterial::diffuse
+    \property Qt3DRender::QDiffuseMapMaterial::diffuse
 
     Holds the current QTexture used as the diffuse map.
 
@@ -226,7 +226,7 @@ QAbstractTextureProvider *QDiffuseMapMaterial::diffuse() const
 }
 
 /*!
-    \property Qt3D::QDiffuseMapMaterial::textureScale
+    \property Qt3DRender::QDiffuseMapMaterial::textureScale
 
     Holds the current texture scale as a float value.
 
@@ -267,6 +267,6 @@ void QDiffuseMapMaterial::setTextureScale(float textureScale)
     d->m_textureScaleParameter->setValue(textureScale);
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h
index 13a1dd6da..dbbdb21f1 100644
--- a/src/render/defaults/qdiffusemapmaterial.h
+++ b/src/render/defaults/qdiffusemapmaterial.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QDIFFUSEMAPMATERIAL_H
-#define QT3D_RENDER_QDIFFUSEMAPMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H
+#define QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H
 
 #include <Qt3DRenderer/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QDiffuseMapMaterialPrivate;
 class QAbstractTextureProvider;
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
 public:
-    explicit QDiffuseMapMaterial(QNode *parent = 0);
+    explicit QDiffuseMapMaterial(Qt3D::QNode *parent = 0);
     ~QDiffuseMapMaterial();
 
     QColor ambient() const;
@@ -83,8 +83,8 @@ private:
     Q_DECLARE_PRIVATE(QDiffuseMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QDIFFUSEMAPMATERIAL_H
+#endif // QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H
diff --git a/src/render/defaults/qdiffusemapmaterial_p.h b/src/render/defaults/qdiffusemapmaterial_p.h
index 7bda02b57..c96b644f1 100644
--- a/src/render/defaults/qdiffusemapmaterial_p.h
+++ b/src/render/defaults/qdiffusemapmaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QDIFFUSEMAPMATERIAL_P_H
-#define QT3D_RENDER_QDIFFUSEMAPMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_P_H
+#define QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QAbstractTextureProvider;
@@ -80,9 +80,9 @@ class QDiffuseMapMaterialPrivate : public QMaterialPrivate
     Q_DECLARE_PUBLIC(QDiffuseMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QDIFFUSEAPMATERIAL_P_H
+#endif // QT3DRENDER_RENDER_QDIFFUSEAPMATERIAL_P_H
 
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp
index 25ed94490..542cb202d 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp
@@ -51,10 +51,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QDiffuseSpecularMapMaterialPrivate
+    \class Qt3DRender::QDiffuseSpecularMapMaterialPrivate
     \internal
 */
 QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate()
@@ -137,7 +137,7 @@ void QDiffuseSpecularMapMaterialPrivate::init()
 }
 
 /*!
-    \class Qt3D::QDiffuseSpecularMapMaterial
+    \class Qt3DRender::QDiffuseSpecularMapMaterial
     \brief The QDiffuseSpecularMapMaterial provides a default implementation of the phong lighting and bump effect where the diffuse and specular light components
     are read from texture maps.
     \inmodule Qt3DRenderer
@@ -158,7 +158,7 @@ void QDiffuseSpecularMapMaterialPrivate::init()
 */
 
 /*!
-    Constructs a new Qt3D::QDiffuseSpecularMapMaterial instance with parent object \a parent.
+    Constructs a new Qt3DRender::QDiffuseSpecularMapMaterial instance with parent object \a parent.
 */
 QDiffuseSpecularMapMaterial::QDiffuseSpecularMapMaterial(QNode *parent)
     : QMaterial(*new QDiffuseSpecularMapMaterialPrivate, parent)
@@ -180,7 +180,7 @@ QDiffuseSpecularMapMaterial::~QDiffuseSpecularMapMaterial()
 }
 
 /*!
-    \property Qt3D::QDiffuseSpecularMapMaterial::ambient
+    \property Qt3DRender::QDiffuseSpecularMapMaterial::ambient
 
     Holds the current ambient color.
 */
@@ -191,7 +191,7 @@ QColor QDiffuseSpecularMapMaterial::ambient() const
 }
 
 /*!
-    \property Qt3D::QDiffuseSpecularMapMaterial::diffuse
+    \property Qt3DRender::QDiffuseSpecularMapMaterial::diffuse
 
     Holds the current diffuse map texture.
 
@@ -211,7 +211,7 @@ QAbstractTextureProvider *QDiffuseSpecularMapMaterial::diffuse() const
 }
 
 /*!
-    \property Qt3D::QDiffuseSpecularMapMaterial::specular
+    \property Qt3DRender::QDiffuseSpecularMapMaterial::specular
 
     Holds the current specular map texture.
 
@@ -231,7 +231,7 @@ QAbstractTextureProvider *QDiffuseSpecularMapMaterial::specular() const
 }
 
 /*!
-    \property Qt3D::QDiffuseSpecularMapMaterial::shininess
+    \property Qt3DRender::QDiffuseSpecularMapMaterial::shininess
 
     Holds the current shininess as a float value.
 */
@@ -242,7 +242,7 @@ float QDiffuseSpecularMapMaterial::shininess() const
 }
 
 /*!
-    \property Qt3D::QDiffuseSpecularMapMaterial::textureScale
+    \property Qt3DRender::QDiffuseSpecularMapMaterial::textureScale
 
     Holds the current texture scale as a float value.
 */
@@ -282,6 +282,6 @@ void QDiffuseSpecularMapMaterial::setTextureScale(float textureScale)
     d->m_textureScaleParameter->setValue(textureScale);
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.h b/src/render/defaults/qdiffusespecularmapmaterial.h
index e6076ca76..d4568c4a0 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial.h
+++ b/src/render/defaults/qdiffusespecularmapmaterial.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QDIFFUSESPECULARMAPMATERIAL_H
-#define QT3D_RENDER_QDIFFUSESPECULARMAPMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_H
+#define QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_H
 
 #include <Qt3DRenderer/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAbstractTextureProvider;
 class QDiffuseSpecularMapMaterialPrivate;
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
 public:
-    explicit QDiffuseSpecularMapMaterial(QNode *parent = 0);
+    explicit QDiffuseSpecularMapMaterial(Qt3D::QNode *parent = 0);
     ~QDiffuseSpecularMapMaterial();
 
     QColor ambient() const;
@@ -83,8 +83,8 @@ private:
     Q_DECLARE_PRIVATE(QDiffuseSpecularMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QDIFFUSESPECULARMAPMATERIAL_H
+#endif // QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_H
diff --git a/src/render/defaults/qdiffusespecularmapmaterial_p.h b/src/render/defaults/qdiffusespecularmapmaterial_p.h
index 72ab20e83..bac2f5ace 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial_p.h
+++ b/src/render/defaults/qdiffusespecularmapmaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H
-#define QT3D_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H
+#define QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QAbstractTextureProvider;
@@ -82,9 +82,9 @@ public:
     Q_DECLARE_PUBLIC(QDiffuseSpecularMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H
+#endif // QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_P_H
 
diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/render/defaults/qforwardrenderer.cpp
index a7167ca5d..cd6307ec4 100644
--- a/src/render/defaults/qforwardrenderer.cpp
+++ b/src/render/defaults/qforwardrenderer.cpp
@@ -44,10 +44,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QForwardRendererPrivate
+    \class Qt3DRender::QForwardRendererPrivate
     \internal
 */
 QForwardRendererPrivate::QForwardRendererPrivate()
@@ -68,7 +68,7 @@ void QForwardRendererPrivate::init()
 
     m_viewport->setRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f));
     m_viewport->setClearColor(Qt::white);
-    m_clearBuffer->setBuffers(Qt3D::QClearBuffer::ColorDepthBuffer);
+    m_clearBuffer->setBuffers(QClearBuffer::ColorDepthBuffer);
 
     QAnnotation *forwardRenderingStyle = new QAnnotation(q);
     forwardRenderingStyle->setName(QStringLiteral("renderingStyle"));
@@ -77,25 +77,25 @@ void QForwardRendererPrivate::init()
 }
 
 /*!
-    \class Qt3D::QForwardRenderer
-    \brief The Qt3D::QForwardRenderer provides a default \l {QFrameGraph}{FrameGraph} implementation of a forward renderer.
+    \class Qt3DRender::QForwardRenderer
+    \brief The Qt3DRender::QForwardRenderer provides a default \l {QFrameGraph}{FrameGraph} implementation of a forward renderer.
     \inmodule Qt3DRender
     \since 5.5
 
     Forward rendering is how OpenGL is traditionally. It renders directly to the backbuffer
     one object at a time shading each one as it goes.
 
-    Internally the Qt3D::QForwardRenderer is a subclass of Qt3D::QTechniqueFilter.
-    This a is a single leaf Framegraph tree which contains a Qt3D::QViewport, a Qt3D::QCameraSelector
-    and a Qt3D::QClearBuffer.
-    The Qt3D::QForwardRenderer has a default requirement annotation whose name is "renderingStyle" and value "forward".
+    Internally the Qt3DRender::QForwardRenderer is a subclass of Qt3DRender::QTechniqueFilter.
+    This a is a single leaf Framegraph tree which contains a Qt3DRender::QViewport, a Qt3DRender::QCameraSelector
+    and a Qt3DRender::QClearBuffer.
+    The Qt3DRender::QForwardRenderer has a default requirement annotation whose name is "renderingStyle" and value "forward".
     If you need to filter out your techniques, you should do so based on that annotation.
 
     By default the viewport occupies the whole screen and the clear color is white.
 */
 
 /*!
-    Constructs a new Qt3D::QForwardRenderer instance with parent object \a parent.
+    Constructs a new Qt3DRender::QForwardRenderer instance with parent object \a parent.
  */
 QForwardRenderer::QForwardRenderer(QNode *parent)
     : QTechniqueFilter(*new QForwardRendererPrivate, parent)
@@ -131,14 +131,14 @@ void QForwardRenderer::setClearColor(const QColor &clearColor)
 
     \note A camera is a QEntity having a QCameraLens as one of its components.
 */
-void QForwardRenderer::setCamera(QEntity *camera)
+void QForwardRenderer::setCamera(Qt3D::QEntity *camera)
 {
     Q_D(QForwardRenderer);
     d->m_cameraSelector->setCamera(camera);
 }
 
 /*!
-    \property Qt3D::QForwardRenderer::viewportRect
+    \property Qt3DRender::QForwardRenderer::viewportRect
 
     Holds the current viewport rect.
  */
@@ -149,7 +149,7 @@ QRectF QForwardRenderer::viewportRect() const
 }
 
 /*!
-    \property Qt3D::QForwardRenderer::clearColor
+    \property Qt3DRender::QForwardRenderer::clearColor
 
     Holds the current clearColor.
 */
@@ -160,18 +160,18 @@ QColor QForwardRenderer::clearColor() const
 }
 
 /*!
-    \property Qt3D::QForwardRenderer::camera
+    \property Qt3DRender::QForwardRenderer::camera
 
     Holds the current QEntity camera used to render the scene.
 
     \note A camera is a QEntity that has a QCameraLens as one of its components.
 */
-QEntity *QForwardRenderer::camera() const
+Qt3D::QEntity *QForwardRenderer::camera() const
 {
     Q_D(const QForwardRenderer);
     return d->m_cameraSelector->camera();
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qforwardrenderer.h b/src/render/defaults/qforwardrenderer.h
index 4272ea22d..ff485f55f 100644
--- a/src/render/defaults/qforwardrenderer.h
+++ b/src/render/defaults/qforwardrenderer.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QFORWARDRENDERER_H
-#define QT3D_RENDER_QFORWARDRENDERER_H
+#ifndef QT3DRENDER_RENDER_QFORWARDRENDERER_H
+#define QT3DRENDER_RENDER_QFORWARDRENDERER_H
 
 #include <Qt3DRenderer/qtechniquefilter.h>
 #include <QRectF>
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QForwardRendererPrivate;
 
@@ -52,18 +52,18 @@ class QT3DRENDERERSHARED_EXPORT QForwardRenderer : public QTechniqueFilter
     Q_OBJECT
     Q_PROPERTY(QRectF viewportRect READ viewportRect WRITE setViewportRect NOTIFY viewportRectChanged)
     Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged)
-    Q_PROPERTY(QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged)
+    Q_PROPERTY(Qt3D::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged)
 public:
-    explicit QForwardRenderer(QNode *parent = 0);
+    explicit QForwardRenderer(Qt3D::QNode *parent = 0);
     ~QForwardRenderer();
 
     void setViewportRect(const QRectF &viewportRect);
     void setClearColor(const QColor &clearColor);
-    void setCamera(QEntity *camera);
+    void setCamera(Qt3D::QEntity *camera);
 
     QRectF viewportRect() const;
     QColor clearColor() const;
-    QEntity *camera() const;
+    Qt3D::QEntity *camera() const;
 
 Q_SIGNALS:
     void viewportRectChanged();
@@ -74,8 +74,8 @@ private:
     Q_DECLARE_PRIVATE(QForwardRenderer)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDERER_QFORWARDRENDERER_H
+#endif // QT3DRENDER_RENDERER_QFORWARDRENDERER_H
diff --git a/src/render/defaults/qforwardrenderer_p.h b/src/render/defaults/qforwardrenderer_p.h
index e0762e9c8..689dc23de 100644
--- a/src/render/defaults/qforwardrenderer_p.h
+++ b/src/render/defaults/qforwardrenderer_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QFORWARDRENDERER_P_H
-#define QT3D_RENDER_QFORWARDRENDERER_P_H
+#ifndef QT3DRENDER_RENDER_QFORWARDRENDERER_P_H
+#define QT3DRENDER_RENDER_QFORWARDRENDERER_P_H
 
 #include <Qt3DRenderer/private/qtechniquefilter_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QForwardRenderer;
 class QViewport;
@@ -62,9 +62,9 @@ public:
     Q_DECLARE_PUBLIC(QForwardRenderer)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QFORWARDRENDERER_P_H
+#endif // QT3DRENDER_RENDER_QFORWARDRENDERER_P_H
 
diff --git a/src/render/defaults/qgoochmaterial.cpp b/src/render/defaults/qgoochmaterial.cpp
index e8f89b899..e8363d6b1 100644
--- a/src/render/defaults/qgoochmaterial.cpp
+++ b/src/render/defaults/qgoochmaterial.cpp
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
    \class Qt3D::QGoochMaterialPrivate
diff --git a/src/render/defaults/qgoochmaterial.h b/src/render/defaults/qgoochmaterial.h
index 5c8be4a13..88f868a8a 100644
--- a/src/render/defaults/qgoochmaterial.h
+++ b/src/render/defaults/qgoochmaterial.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QGOOCHMATERIAL_H
-#define QT3D_RENDER_QGOOCHMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QGOOCHMATERIAL_H
+#define QT3DRENDER_RENDER_QGOOCHMATERIAL_H
 
 #include <Qt3DRenderer/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QGoochMaterialPrivate;
 
@@ -58,7 +58,7 @@ class QGoochMaterial : public QMaterial
     Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged)
 
 public:
-    explicit QGoochMaterial(QNode *parent = 0);
+    explicit QGoochMaterial(Qt3D::QNode *parent = 0);
     QColor diffuse() const;
     QColor specular() const;
     QColor cool() const;
@@ -86,14 +86,14 @@ Q_SIGNALS:
     void shininessChanged();
 
 protected:
-    QGoochMaterial(QGoochMaterialPrivate &dd, QNode *parent = 0);
+    QGoochMaterial(QGoochMaterialPrivate &dd, Qt3D::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QGoochMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QGOOCHMATERIAL_H
+#endif // QT3DRENDER_RENDER_QGOOCHMATERIAL_H
diff --git a/src/render/defaults/qgoochmaterial_p.h b/src/render/defaults/qgoochmaterial_p.h
index 7f07536e1..ed6b0d663 100644
--- a/src/render/defaults/qgoochmaterial_p.h
+++ b/src/render/defaults/qgoochmaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QGOOCHMATERIAL_P_H
-#define QT3D_RENDER_QGOOCHMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QGOOCHMATERIAL_P_H
+#define QT3DRENDER_RENDER_QGOOCHMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QRenderPass;
@@ -76,9 +76,9 @@ public:
     Q_DECLARE_PUBLIC(QGoochMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QGOOCHMATERIAL_P_H
+#endif // QT3DRENDER_RENDER_QGOOCHMATERIAL_P_H
 
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
index 0c236b56d..a75b8f7f5 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
@@ -53,11 +53,11 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 
 /*!
-    \class Qt3D::QNormalDiffuseMapAlphaMaterialPrivate
+    \class Qt3DRender::QNormalDiffuseMapAlphaMaterialPrivate
     \internal
 */
 QNormalDiffuseMapAlphaMaterialPrivate::QNormalDiffuseMapAlphaMaterialPrivate()
@@ -125,7 +125,7 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init()
 
 
 /*!
-    \class Qt3D::QNormalDiffuseMapAlphaMaterial
+    \class Qt3DRender::QNormalDiffuseMapAlphaMaterial
     \brief The QNormalDiffuseMapAlphaMaterial provides a default implementation of the phong lighting and bump effect where the diffuse light component
     is read from a texture map and the normals of the mesh being rendered from a normal texture map. In addition, it defines an alpha to coverage and
     a depth test to be performed in the rendering pass.
@@ -146,7 +146,7 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init()
     Techniques are provided for OpenGL 2, OpenGL 3 or above as well as OpenGL ES 2.
 */
 /*!
-    Constructs a new Qt3D::QNormalDiffuseMapAlphaMaterial instance with parent object \a parent.
+    Constructs a new Qt3DRender::QNormalDiffuseMapAlphaMaterial instance with parent object \a parent.
 */
 QNormalDiffuseMapAlphaMaterial::QNormalDiffuseMapAlphaMaterial(QNode *parent)
     : QNormalDiffuseMapMaterial(*new QNormalDiffuseMapAlphaMaterialPrivate, parent)
@@ -160,6 +160,6 @@ QNormalDiffuseMapAlphaMaterial::~QNormalDiffuseMapAlphaMaterial()
 {
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.h b/src/render/defaults/qnormaldiffusemapalphamaterial.h
index b21009c8f..ae7c28b71 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial.h
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H
-#define QT3D_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H
+#define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H
 
 #include <Qt3DRenderer/qnormaldiffusemapmaterial.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QNormalDiffuseMapAlphaMaterialPrivate;
 
@@ -49,15 +49,15 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapAlphaMaterial : public QNormalD
 {
     Q_OBJECT
 public:
-    explicit QNormalDiffuseMapAlphaMaterial(QNode *parent = 0);
+    explicit QNormalDiffuseMapAlphaMaterial(Qt3D::QNode *parent = 0);
     ~QNormalDiffuseMapAlphaMaterial();
 
 private:
     Q_DECLARE_PRIVATE(QNormalDiffuseMapAlphaMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H
+#endif // QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial_p.h b/src/render/defaults/qnormaldiffusemapalphamaterial_p.h
index bc3444fc6..a64faf19f 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial_p.h
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_P_H
-#define QT3D_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_P_H
+#define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qnormaldiffusemapmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QNormalDiffuseMapAlphaMaterial;
 
@@ -61,7 +61,7 @@ public:
     Q_DECLARE_PUBLIC(QNormalDiffuseMapAlphaMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp
index 6f64c31eb..64bc8f768 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp
@@ -51,10 +51,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QNormalDiffuseMapMaterialPrivate
+    \class Qt3DRender::QNormalDiffuseMapMaterialPrivate
     \internal
 */
 QNormalDiffuseMapMaterialPrivate::QNormalDiffuseMapMaterialPrivate()
@@ -138,7 +138,7 @@ void QNormalDiffuseMapMaterialPrivate::init()
 }
 
 /*!
-    \class Qt3D::QNormalDiffuseMapMaterial
+    \class Qt3DRender::QNormalDiffuseMapMaterial
     \brief The QNormalDiffuseMapMaterial provides a default implementation of the phong lighting and bump effect where the diffuse light component
     is read from a texture map and the normals of the mesh being rendered from a normal texture map.
     \inmodule Qt3DRenderer
@@ -159,7 +159,7 @@ void QNormalDiffuseMapMaterialPrivate::init()
 */
 
 /*!
-    Constructs a new Qt3D::QNormalDiffuseMapMaterial instance with parent object \a parent.
+    Constructs a new Qt3DRender::QNormalDiffuseMapMaterial instance with parent object \a parent.
 */
 QNormalDiffuseMapMaterial::QNormalDiffuseMapMaterial(QNode *parent)
     : QMaterial(*new QNormalDiffuseMapMaterialPrivate, parent)
@@ -196,7 +196,7 @@ QNormalDiffuseMapMaterial::~QNormalDiffuseMapMaterial()
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseMapMaterial::ambient
+    \property Qt3DRender::QNormalDiffuseMapMaterial::ambient
 
     Holds the current ambient color.
 */
@@ -207,7 +207,7 @@ QColor QNormalDiffuseMapMaterial::ambient() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseMapMaterial::specular
+    \property Qt3DRender::QNormalDiffuseMapMaterial::specular
 
     Holds the current specular color.
 */
@@ -218,7 +218,7 @@ QColor QNormalDiffuseMapMaterial::specular() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseMapMaterial::diffuse
+    \property Qt3DRender::QNormalDiffuseMapMaterial::diffuse
 
     Holds the current diffuse map texture.
 
@@ -238,7 +238,7 @@ QAbstractTextureProvider *QNormalDiffuseMapMaterial::diffuse() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseMapMaterial::normal
+    \property Qt3DRender::QNormalDiffuseMapMaterial::normal
 
     Holds the current normal map texture.
 
@@ -257,7 +257,7 @@ QAbstractTextureProvider *QNormalDiffuseMapMaterial::normal() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseMapMaterial::shininess
+    \property Qt3DRender::QNormalDiffuseMapMaterial::shininess
 
     Holds the current shininess as a float value.
 */
@@ -268,7 +268,7 @@ float QNormalDiffuseMapMaterial::shininess() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseMapMaterial::textureScale
+    \property Qt3DRender::QNormalDiffuseMapMaterial::textureScale
 
     Holds the current texture scale as a float value.
 */
@@ -314,6 +314,6 @@ void QNormalDiffuseMapMaterial::setTextureScale(float textureScale)
     d->m_textureScaleParameter->setValue(textureScale);
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.h b/src/render/defaults/qnormaldiffusemapmaterial.h
index 766e14353..4eb6d662c 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial.h
+++ b/src/render/defaults/qnormaldiffusemapmaterial.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QNORMALDIFFUSEMAPMATERIAL_H
-#define QT3D_RENDER_QNORMALDIFFUSEMAPMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_H
+#define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_H
 
 #include <Qt3DRenderer/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QAbstractTextureProvider;
 class QNormalDiffuseMapMaterialPrivate;
@@ -58,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
 public:
-    explicit QNormalDiffuseMapMaterial(QNode *parent = 0);
+    explicit QNormalDiffuseMapMaterial(Qt3D::QNode *parent = 0);
     ~QNormalDiffuseMapMaterial();
 
     QColor ambient() const;
@@ -84,13 +84,13 @@ Q_SIGNALS:
     void textureScaleChanged();
 
 protected:
-    QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, QNode *parent = 0);
+    QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, Qt3D::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QNormalDiffuseMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
diff --git a/src/render/defaults/qnormaldiffusemapmaterial_p.h b/src/render/defaults/qnormaldiffusemapmaterial_p.h
index ccf986074..161d49d1d 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial_p.h
+++ b/src/render/defaults/qnormaldiffusemapmaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H
-#define QT3D_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H
+#define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QAbstractTextureProvider;
@@ -83,9 +83,9 @@ public:
     Q_DECLARE_PUBLIC(QNormalDiffuseMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H
+#endif // QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_P_H
 
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
index ff312964a..d779768d3 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
@@ -50,10 +50,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QNormalDiffuseSpecularMapMaterialPrivate
+    \class Qt3DRender::QNormalDiffuseSpecularMapMaterialPrivate
     \internal
 */
 QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPrivate()
@@ -144,7 +144,7 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init()
 }
 
 /*!
-    \class Qt3D::QNormalDiffuseSpecularMapMaterial
+    \class Qt3DRender::QNormalDiffuseSpecularMapMaterial
     \brief The QNormalDiffuseSpecularMapMaterial provides a default implementation of the phong lighting and bump effect where the diffuse and specular light components
     are read from texture maps and the normals of the mesh being rendered from a normal texture map.
     \inmodule Qt3DRenderer
@@ -165,7 +165,7 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init()
 */
 
 /*!
-    Constructs a new Qt3D::QNormalDiffuseSpecularMapMaterial instance with parent object \a parent.
+    Constructs a new Qt3DRender::QNormalDiffuseSpecularMapMaterial instance with parent object \a parent.
 */
 QNormalDiffuseSpecularMapMaterial::QNormalDiffuseSpecularMapMaterial(QNode *parent)
     : QMaterial(*new QNormalDiffuseSpecularMapMaterialPrivate, parent)
@@ -195,14 +195,14 @@ QNormalDiffuseSpecularMapMaterial::QNormalDiffuseSpecularMapMaterial(QNormalDiff
 }
 
 /*!
-    Destroys the Qt3D::QNormalDiffuseSpecularMapMaterial instance.
+    Destroys the Qt3DRender::QNormalDiffuseSpecularMapMaterial instance.
 */
 QNormalDiffuseSpecularMapMaterial::~QNormalDiffuseSpecularMapMaterial()
 {
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseSpecularMapMaterial::ambient
+    \property Qt3DRender::QNormalDiffuseSpecularMapMaterial::ambient
 
     Holds the current ambient color.
 */
@@ -213,7 +213,7 @@ QColor QNormalDiffuseSpecularMapMaterial::ambient() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseSpecularMapMaterial::diffuse
+    \property Qt3DRender::QNormalDiffuseSpecularMapMaterial::diffuse
 
     Holds the current diffuse map texture.
 
@@ -233,7 +233,7 @@ QAbstractTextureProvider *QNormalDiffuseSpecularMapMaterial::diffuse() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseSpecularMapMaterial::normal
+    \property Qt3DRender::QNormalDiffuseSpecularMapMaterial::normal
 
     Holds the current normal map texture.
 
@@ -252,7 +252,7 @@ QAbstractTextureProvider *QNormalDiffuseSpecularMapMaterial::normal() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseSpecularMapMaterial::specular
+    \property Qt3DRender::QNormalDiffuseSpecularMapMaterial::specular
 
     Holds the current specular map texture.
 
@@ -272,7 +272,7 @@ QAbstractTextureProvider *QNormalDiffuseSpecularMapMaterial::specular() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseSpecularMapMaterial::shininess
+    \property Qt3DRender::QNormalDiffuseSpecularMapMaterial::shininess
 
     Holds the current shininess as a float value.
 */
@@ -283,7 +283,7 @@ float QNormalDiffuseSpecularMapMaterial::shininess() const
 }
 
 /*!
-    \property Qt3D::QNormalDiffuseSpecularMapMaterial::textureScale
+    \property Qt3DRender::QNormalDiffuseSpecularMapMaterial::textureScale
 
     Holds the current texture scale as a float value.
 */
@@ -329,6 +329,6 @@ void QNormalDiffuseSpecularMapMaterial::setTextureScale(float textureScale)
     d->m_textureScaleParameter->setValue(textureScale);
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.h b/src/render/defaults/qnormaldiffusespecularmapmaterial.h
index c0cdf6912..5d92ebbc2 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial.h
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H
-#define QT3D_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H
+#define QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H
 
 #include <Qt3DRenderer/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QNormalDiffuseSpecularMapMaterialPrivate;
 
@@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMate
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
 public:
-    explicit QNormalDiffuseSpecularMapMaterial(QNode *parent = 0);
+    explicit QNormalDiffuseSpecularMapMaterial(Qt3D::QNode *parent = 0);
     ~QNormalDiffuseSpecularMapMaterial();
 
     QColor ambient() const;
@@ -83,14 +83,14 @@ Q_SIGNALS:
     void textureScaleChanged();
 
 protected:
-    QNormalDiffuseSpecularMapMaterial(QNormalDiffuseSpecularMapMaterialPrivate &dd, QNode *parent = 0);
+    QNormalDiffuseSpecularMapMaterial(QNormalDiffuseSpecularMapMaterialPrivate &dd, Qt3D::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QNormalDiffuseSpecularMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H
+#endif // QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
index 82187eabc..6e3f2ab3b 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H
-#define QT3D_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H
+#define QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QAbstractTextureProvider;
@@ -84,9 +84,9 @@ public:
     Q_DECLARE_PUBLIC(QNormalDiffuseSpecularMapMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H
+#endif // QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_P_H
 
diff --git a/src/render/defaults/qpervertexcolormaterial.cpp b/src/render/defaults/qpervertexcolormaterial.cpp
index 578ff35f4..37fddd691 100644
--- a/src/render/defaults/qpervertexcolormaterial.cpp
+++ b/src/render/defaults/qpervertexcolormaterial.cpp
@@ -49,10 +49,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QPerVertexColorMaterialPrivate
+    \class Qt3DRender::QPerVertexColorMaterialPrivate
     \internal
 */
 QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate()
@@ -72,7 +72,7 @@ QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate()
 }
 
 /*!
-    \class Qt3D::QPerVertexColorMaterial
+    \class Qt3DRender::QPerVertexColorMaterial
     \brief The QPerVertexColorMaterial class provides a default implementation for rendering the color properties set for each vertex.
     \inmodule Qt3DRenderer
     \since 5.5
@@ -90,7 +90,7 @@ QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate()
 */
 
 /*!
-    \fn Qt3D::QPerVertexColorMaterial::QPerVertexColorMaterial(QNode *parent)
+    \fn Qt3DRender::QPerVertexColorMaterial::QPerVertexColorMaterial(QNode *parent)
 
     Constructs a new QPerVertexColorMaterial instance with parent object \a parent.
 */
@@ -102,7 +102,7 @@ QPerVertexColorMaterial::QPerVertexColorMaterial(QNode *parent)
 }
 
 /*!
-   \fn Qt3D::QPerVertexColorMaterial::~QPerVertexColorMaterial()
+   \fn Qt3DRender::QPerVertexColorMaterial::~QPerVertexColorMaterial()
 
    Destroys the QPerVertexColorMaterial
 */
@@ -151,6 +151,6 @@ void QPerVertexColorMaterialPrivate::init()
     q_func()->setEffect(m_vertexEffect);
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qpervertexcolormaterial.h b/src/render/defaults/qpervertexcolormaterial.h
index d0e17c722..a21649858 100644
--- a/src/render/defaults/qpervertexcolormaterial.h
+++ b/src/render/defaults/qpervertexcolormaterial.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QPERVERTEXCOLORMATERIAL_H
-#define QT3D_RENDER_QPERVERTEXCOLORMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_H
+#define QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_H
 
 #include <Qt3DRenderer/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QPerVertexColorMaterialPrivate;
 
@@ -51,15 +51,15 @@ class QT3DRENDERERSHARED_EXPORT QPerVertexColorMaterial : public QMaterial
     Q_OBJECT
 
 public:
-    explicit QPerVertexColorMaterial(QNode *parent = 0);
+    explicit QPerVertexColorMaterial(Qt3D::QNode *parent = 0);
     ~QPerVertexColorMaterial();
 
 private:
     Q_DECLARE_PRIVATE(QPerVertexColorMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QPERVERTEXCOLORMATERIAL_H
+#endif // QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_H
diff --git a/src/render/defaults/qpervertexcolormaterial_p.h b/src/render/defaults/qpervertexcolormaterial_p.h
index 8fdd4ce95..49099b151 100644
--- a/src/render/defaults/qpervertexcolormaterial_p.h
+++ b/src/render/defaults/qpervertexcolormaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QPERVERTEXCOLORMATERIAL_P_H
-#define QT3D_RENDER_QPERVERTEXCOLORMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_P_H
+#define QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QTechnique;
@@ -74,9 +74,9 @@ public:
     Q_DECLARE_PUBLIC(QPerVertexColorMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QPERVERTEXCOLORMATERIAL_P_H
+#endif // QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_P_H
 
diff --git a/src/render/defaults/qphongmaterial.cpp b/src/render/defaults/qphongmaterial.cpp
index a1d313c67..8e9186418 100644
--- a/src/render/defaults/qphongmaterial.cpp
+++ b/src/render/defaults/qphongmaterial.cpp
@@ -49,10 +49,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QPhongMaterialPrivate
+    \class Qt3DRender::QPhongMaterialPrivate
     \internal
 */
 QPhongMaterialPrivate::QPhongMaterialPrivate()
@@ -76,7 +76,7 @@ QPhongMaterialPrivate::QPhongMaterialPrivate()
 }
 
 /*!
-    \class Qt3D::QPhongMaterial
+    \class Qt3DRender::QPhongMaterial
     \brief The QPhongMaterial class provides a default implementation of the phong lighting effect.
     \inmodule Qt3DRenderer
     \since 5.5
@@ -96,7 +96,7 @@ QPhongMaterialPrivate::QPhongMaterialPrivate()
 */
 
 /*!
-    \fn Qt3D::QPhongMaterial::QPhongMaterial(QNode *parent)
+    \fn Qt3DRender::QPhongMaterial::QPhongMaterial(QNode *parent)
 
     Constructs a new QPhongMaterial instance with parent object \a parent.
 */
@@ -112,7 +112,7 @@ QPhongMaterial::QPhongMaterial(QNode *parent)
 }
 
 /*!
-   \fn Qt3D::QPhongMaterial::~QPhongMaterial()
+   \fn Qt3DRender::QPhongMaterial::~QPhongMaterial()
 
    Destroys the QPhongMaterial.
 */
@@ -121,7 +121,7 @@ QPhongMaterial::~QPhongMaterial()
 }
 
 /*!
-    \property Qt3D::QPhongMaterial::ambient
+    \property Qt3DRender::QPhongMaterial::ambient
 
     Holds the ambient color.
 */
@@ -132,7 +132,7 @@ QColor QPhongMaterial::ambient() const
 }
 
 /*!
-    \property Qt3D::QPhongMaterial::diffuse
+    \property Qt3DRender::QPhongMaterial::diffuse
 
     Holds the diffuse color.
 */
@@ -143,7 +143,7 @@ QColor QPhongMaterial::diffuse() const
 }
 
 /*!
-    \property QColor Qt3D::QPhongMaterial::specular
+    \property QColor Qt3DRender::QPhongMaterial::specular
 
     Holds the specular color.
 */
@@ -154,7 +154,7 @@ QColor QPhongMaterial::specular() const
 }
 
 /*!
-    \property Qt3D::QPhongMaterial::shininess
+    \property Qt3DRender::QPhongMaterial::shininess
 
     Holds the shininess exponent.
 */
@@ -233,6 +233,6 @@ void QPhongMaterialPrivate::init()
     q_func()->setEffect(m_phongEffect);
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qphongmaterial.h b/src/render/defaults/qphongmaterial.h
index 6dc900416..a37f0f75c 100644
--- a/src/render/defaults/qphongmaterial.h
+++ b/src/render/defaults/qphongmaterial.h
@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QPHONGMATERIAL_H
-#define QT3D_RENDER_QPHONGMATERIAL_H
+#ifndef QT3DRENDER_RENDER_QPHONGMATERIAL_H
+#define QT3DRENDER_RENDER_QPHONGMATERIAL_H
 
 #include <Qt3DRenderer/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QPhongMaterialPrivate;
 
@@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QPhongMaterial : public QMaterial
     Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged)
 
 public:
-    explicit QPhongMaterial(QNode *parent = 0);
+    explicit QPhongMaterial(Qt3D::QNode *parent = 0);
     ~QPhongMaterial();
 
     QColor ambient() const;
@@ -78,8 +78,8 @@ private:
     Q_DECLARE_PRIVATE(QPhongMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QPHONGMATERIAL_H
+#endif // QT3DRENDER_RENDER_QPHONGMATERIAL_H
diff --git a/src/render/defaults/qphongmaterial_p.h b/src/render/defaults/qphongmaterial_p.h
index be6af94cd..1d4372944 100644
--- a/src/render/defaults/qphongmaterial_p.h
+++ b/src/render/defaults/qphongmaterial_p.h
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QPHONGMATERIAL_P_H
-#define QT3D_RENDER_QPHONGMATERIAL_P_H
+#ifndef QT3DRENDER_RENDER_QPHONGMATERIAL_P_H
+#define QT3DRENDER_RENDER_QPHONGMATERIAL_P_H
 
 #include <Qt3DRenderer/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QEffect;
 class QTechnique;
@@ -78,9 +78,9 @@ public:
     Q_DECLARE_PUBLIC(QPhongMaterial)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QPHONGMATERIAL_P_H
+#endif // QT3DRENDER_RENDER_QPHONGMATERIAL_P_H
 
diff --git a/src/render/defaults/qskyboxentity.cpp b/src/render/defaults/qskyboxentity.cpp
index 45d367c18..c9a271d9e 100644
--- a/src/render/defaults/qskyboxentity.cpp
+++ b/src/render/defaults/qskyboxentity.cpp
@@ -53,8 +53,9 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+using namespace Qt3D;
 
+namespace Qt3DRender {
 
 /*!
  * \class Qt3D::QSkyboxEntityPrivate
@@ -74,7 +75,7 @@ QSkyboxEntityPrivate::QSkyboxEntityPrivate()
     , m_es2RenderPass(new QRenderPass())
     , m_gl3RenderPass(new QRenderPass())
     , m_mesh(new QCuboidMesh())
-    , m_transform(new QTransform())
+    , m_transform(new Qt3D::QTransform())
     , m_translate(new QTranslateTransform())
     , m_textureParameter(new QParameter(QStringLiteral("skyboxTexture"), m_skyboxTexture))
     , m_posXImage(new QTextureImage())
@@ -281,6 +282,6 @@ QVector3D QSkyboxEntity::cameraPosition() const
     return d->m_position;
 }
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/defaults/qskyboxentity.h b/src/render/defaults/qskyboxentity.h
index f2e7a76cb..103f8004a 100644
--- a/src/render/defaults/qskyboxentity.h
+++ b/src/render/defaults/qskyboxentity.h
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QSKYBOXENTITY_H
-#define QT3D_RENDER_QSKYBOXENTITY_H
+#ifndef QT3DRENDER_RENDER_QSKYBOXENTITY_H
+#define QT3DRENDER_RENDER_QSKYBOXENTITY_H
 
 #include <Qt3DCore/qentity.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3D {
+namespace Qt3DRender {
 
 class QSkyboxEntityPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QSkyboxEntity : public QEntity
+class QT3DRENDERERSHARED_EXPORT QSkyboxEntity : public Qt3D::QEntity
 {
     Q_OBJECT
 public:
-    explicit QSkyboxEntity(QNode *parent = 0);
+    explicit QSkyboxEntity(Qt3D::QNode *parent = 0);
     ~QSkyboxEntity();
 
     void setBaseName(const QString &path);
@@ -71,8 +71,8 @@ private:
     Q_DECLARE_PRIVATE(QSkyboxEntity)
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QSKYBOXENTITY_H
+#endif // QT3DRENDER_RENDER_QSKYBOXENTITY_H
diff --git a/src/render/defaults/qskyboxentity_p.h b/src/render/defaults/qskyboxentity_p.h
index a377dd520..f726fb3ec 100644
--- a/src/render/defaults/qskyboxentity_p.h
+++ b/src/render/defaults/qskyboxentity_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDER_QSKYBOXENTITY_P_H
-#define QT3D_RENDER_QSKYBOXENTITY_P_H
+#ifndef QT3DRENDER_RENDER_QSKYBOXENTITY_P_H
+#define QT3DRENDER_RENDER_QSKYBOXENTITY_P_H
 
 #include <Qt3DCore/private/qentity_p.h>
 #include <QVector3D>
@@ -43,8 +43,12 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
-
+class QTransform;
 class QTranslateTransform;
+}
+
+namespace Qt3DRender {
+
 class QTextureCubeMap;
 class QShaderProgram;
 class QSkyboxEntity;
@@ -52,12 +56,11 @@ class QTextureImage;
 class QCuboidMesh;
 class QRenderPass;
 class QTechnique;
-class QTransform;
 class QParameter;
 class QMaterial;
 class QEffect;
 
-class QSkyboxEntityPrivate : public QEntityPrivate
+class QSkyboxEntityPrivate : public Qt3D::QEntityPrivate
 {
     QSkyboxEntityPrivate();
 
@@ -78,8 +81,8 @@ class QSkyboxEntityPrivate : public QEntityPrivate
     QRenderPass *m_es2RenderPass;
     QRenderPass *m_gl3RenderPass;
     QCuboidMesh *m_mesh;
-    QTransform *m_transform;
-    QTranslateTransform *m_translate;
+    Qt3D::QTransform *m_transform;
+    Qt3D::QTranslateTransform *m_translate;
     QParameter *m_textureParameter;
     QTextureImage *m_posXImage;
     QTextureImage *m_posYImage;
@@ -92,9 +95,9 @@ class QSkyboxEntityPrivate : public QEntityPrivate
     QVector3D m_position;
 };
 
-} // Qt3D
+} // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDER_QSKYBOXENTITY_P_H
+#endif // QT3DRENDER_RENDER_QSKYBOXENTITY_P_H