Rename Renderer -> Render throughout

This is for consistency between the C++ namespaces and QML imports and
with the other aspects.

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

44 files changed, 94 insertions, 94 deletions

diff --git a/src/render/geometry/attribute.cpp b/src/render/geometry/attribute.cpp
index 292021e0f..bb568678f 100644
--- a/src/render/geometry/attribute.cpp
+++ b/src/render/geometry/attribute.cpp
@@ -36,7 +36,7 @@
 
 #include "attribute_p.h"
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/qbuffer.h>
+#include <Qt3DRender/qbuffer.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/attribute_p.h b/src/render/geometry/attribute_p.h
index 83a5dfacf..8791d98a2 100644
--- a/src/render/geometry/attribute_p.h
+++ b/src/render/geometry/attribute_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <Qt3DCore/qbackendnode.h>
-#include <Qt3DRenderer/qattribute.h>
+#include <Qt3DRender/qattribute.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp
index 0fdd258a1..1aee9ca59 100644
--- a/src/render/geometry/buffer.cpp
+++ b/src/render/geometry/buffer.cpp
@@ -37,7 +37,7 @@
 #include "buffer_p.h"
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DCore/qbackendscenepropertychange.h>
-#include <Qt3DRenderer/private/buffermanager_p.h>
+#include <Qt3DRender/private/buffermanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h
index 7da08a2a2..2aad578ea 100644
--- a/src/render/geometry/buffer_p.h
+++ b/src/render/geometry/buffer_p.h
@@ -49,8 +49,8 @@
 //
 
 #include <Qt3DCore/qbackendnode.h>
-#include <Qt3DRenderer/qbuffer.h>
-#include <Qt3DRenderer/qbufferfunctor.h>
+#include <Qt3DRender/qbuffer.h>
+#include <Qt3DRender/qbufferfunctor.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/buffermanager_p.h b/src/render/geometry/buffermanager_p.h
index 50bfc2a94..52b8c0ffd 100644
--- a/src/render/geometry/buffermanager_p.h
+++ b/src/render/geometry/buffermanager_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <Qt3DCore/private/qresourcemanager_p.h>
-#include <Qt3DRenderer/private/buffer_p.h>
+#include <Qt3DRender/private/buffer_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp
index 0be114fa7..6b63c6294 100644
--- a/src/render/geometry/geometry.cpp
+++ b/src/render/geometry/geometry.cpp
@@ -37,7 +37,7 @@
 #include "geometry_p.h"
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DCore/qabstractattribute.h>
-#include <Qt3DRenderer/qgeometry.h>
+#include <Qt3DRender/qgeometry.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp
index a7fb93818..13780781d 100644
--- a/src/render/geometry/geometryrenderer.cpp
+++ b/src/render/geometry/geometryrenderer.cpp
@@ -36,7 +36,7 @@
 
 #include "geometryrenderer_p.h"
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/private/geometryrenderermanager_p.h>
+#include <Qt3DRender/private/geometryrenderermanager_p.h>
 #include <Qt3DCore/qbackendscenepropertychange.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h
index 2f974bf27..81a37295c 100644
--- a/src/render/geometry/geometryrenderer_p.h
+++ b/src/render/geometry/geometryrenderer_p.h
@@ -49,8 +49,8 @@
 //
 
 #include <Qt3DCore/qbackendnode.h>
-#include <Qt3DRenderer/qgeometryrenderer.h>
-#include <Qt3DRenderer/qgeometryfunctor.h>
+#include <Qt3DRender/qgeometryrenderer.h>
+#include <Qt3DRender/qgeometryfunctor.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/geometryrenderermanager_p.h b/src/render/geometry/geometryrenderermanager_p.h
index 69066b7a0..1c3afe68c 100644
--- a/src/render/geometry/geometryrenderermanager_p.h
+++ b/src/render/geometry/geometryrenderermanager_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <Qt3DCore/private/qresourcemanager_p.h>
-#include <Qt3DRenderer/private/geometryrenderer_p.h>
+#include <Qt3DRender/private/geometryrenderer_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp
index 8c3bb2aad..615945188 100644
--- a/src/render/geometry/qattribute.cpp
+++ b/src/render/geometry/qattribute.cpp
@@ -40,8 +40,8 @@
 #include <QVector3D>
 #include <QVector2D>
 #include <QVector>
-#include <Qt3DRenderer/qbuffer.h>
-#include <Qt3DRenderer/private/renderlogging_p.h>
+#include <Qt3DRender/qbuffer.h>
+#include <Qt3DRender/private/renderlogging_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h
index 46429273a..7634ddae5 100644
--- a/src/render/geometry/qattribute.h
+++ b/src/render/geometry/qattribute.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QATTRIBUTE_H
 
 #include <Qt3DCore/qabstractattribute.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <QtCore/QSharedPointer>
 
 QT_BEGIN_NAMESPACE
@@ -48,7 +48,7 @@ namespace Qt3DRender {
 class QAttributePrivate;
 class QBuffer;
 
-class QT3DRENDERERSHARED_EXPORT QAttribute : public Qt3DCore::QAbstractAttribute
+class QT3DRENDERSHARED_EXPORT QAttribute : public Qt3DCore::QAbstractAttribute
 {
     Q_OBJECT
 
diff --git a/src/render/geometry/qattribute_p.h b/src/render/geometry/qattribute_p.h
index 7968266e1..3d481e467 100644
--- a/src/render/geometry/qattribute_p.h
+++ b/src/render/geometry/qattribute_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <private/qabstractattribute_p.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -57,7 +57,7 @@ namespace Qt3DRender {
 
 class QAttribute;
 
-class QT3DRENDERERSHARED_EXPORT QAttributePrivate : public Qt3DCore::QAbstractAttributePrivate
+class QT3DRENDERSHARED_EXPORT QAttributePrivate : public Qt3DCore::QAbstractAttributePrivate
 {
 public:
     QAttributePrivate();
diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp
index df789486b..ad4bc6be6 100644
--- a/src/render/geometry/qbuffer.cpp
+++ b/src/render/geometry/qbuffer.cpp
@@ -36,7 +36,7 @@
 
 #include "qbuffer.h"
 #include "qbuffer_p.h"
-#include <Qt3DRenderer/private/renderlogging_p.h>
+#include <Qt3DRender/private/renderlogging_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h
index da1e4293f..031d1a8b2 100644
--- a/src/render/geometry/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QBUFFER_H
 
 #include <Qt3DCore/qabstractbuffer.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <QSharedPointer>
 #include <QOpenGLBuffer>
 
@@ -54,7 +54,7 @@ class QBufferPrivate;
 class QBufferFunctor;
 typedef QSharedPointer<QBufferFunctor> QBufferFunctorPtr;
 
-class QT3DRENDERERSHARED_EXPORT QBuffer : public Qt3DCore::QAbstractBuffer
+class QT3DRENDERSHARED_EXPORT QBuffer : public Qt3DCore::QAbstractBuffer
 {
     Q_OBJECT
     Q_PROPERTY(BufferType type READ type WRITE setType NOTIFY typeChanged)
diff --git a/src/render/geometry/qbuffer_p.h b/src/render/geometry/qbuffer_p.h
index e84ac2273..6f96774e9 100644
--- a/src/render/geometry/qbuffer_p.h
+++ b/src/render/geometry/qbuffer_p.h
@@ -49,16 +49,16 @@
 //
 
 #include <private/qabstractbuffer_p.h>
-#include <Qt3DRenderer/qbuffer.h>
-#include <Qt3DRenderer/qbufferfunctor.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qbuffer.h>
+#include <Qt3DRender/qbufferfunctor.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <QOpenGLBuffer>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QBufferPrivate : public Qt3DCore::QAbstractBufferPrivate
+class QT3DRENDERSHARED_EXPORT QBufferPrivate : public Qt3DCore::QAbstractBufferPrivate
 {
 public:
     QBufferPrivate();
diff --git a/src/render/geometry/qbufferfunctor.h b/src/render/geometry/qbufferfunctor.h
index 36c4b3a12..b3e1074cc 100644
--- a/src/render/geometry/qbufferfunctor.h
+++ b/src/render/geometry/qbufferfunctor.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QBUFFERFUNCTOR
 #define QT3DRENDER_QBUFFERFUNCTOR
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DCore/qabstractfunctor.h>
 #include <QSharedPointer>
 
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QBufferFunctor : public Qt3DCore::QAbstractFunctor
+class QT3DRENDERSHARED_EXPORT QBufferFunctor : public Qt3DCore::QAbstractFunctor
 {
 public:
     virtual ~QBufferFunctor() {}
diff --git a/src/render/geometry/qcuboidgeometry.cpp b/src/render/geometry/qcuboidgeometry.cpp
index 205cb74e4..9b6b7f703 100644
--- a/src/render/geometry/qcuboidgeometry.cpp
+++ b/src/render/geometry/qcuboidgeometry.cpp
@@ -36,10 +36,10 @@
 
 #include "qcuboidgeometry.h"
 #include "qcuboidgeometry_p.h"
-#include <Qt3DRenderer/qattribute.h>
-#include <Qt3DRenderer/qbuffer.h>
-#include <Qt3DRenderer/qbufferfunctor.h>
-#include <Qt3DRenderer/private/renderlogging_p.h>
+#include <Qt3DRender/qattribute.h>
+#include <Qt3DRender/qbuffer.h>
+#include <Qt3DRender/qbufferfunctor.h>
+#include <Qt3DRender/private/renderlogging_p.h>
 #include <limits>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/geometry/qcuboidgeometry.h b/src/render/geometry/qcuboidgeometry.h
index a760499d4..e2e5aa3cb 100644
--- a/src/render/geometry/qcuboidgeometry.h
+++ b/src/render/geometry/qcuboidgeometry.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QCUBOIDGEOMETRY_H
 #define QT3DRENDER_QCUBOIDGEOMETRY_H
 
-#include <Qt3DRenderer/qgeometry.h>
+#include <Qt3DRender/qgeometry.h>
 #include <QSize>
 
 QT_BEGIN_NAMESPACE
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QCuboidGeometryPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QCuboidGeometry : public QGeometry
+class QT3DRENDERSHARED_EXPORT QCuboidGeometry : public QGeometry
 {
     Q_OBJECT
     Q_PROPERTY(float xExtent READ xExtent WRITE setXExtent NOTIFY xExtentChanged)
diff --git a/src/render/geometry/qcuboidgeometry_p.h b/src/render/geometry/qcuboidgeometry_p.h
index b4e331983..34b4ef29d 100644
--- a/src/render/geometry/qcuboidgeometry_p.h
+++ b/src/render/geometry/qcuboidgeometry_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qgeometry_p.h>
+#include <Qt3DRender/private/qgeometry_p.h>
 #include <QSize>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/geometry/qcuboidmesh.h b/src/render/geometry/qcuboidmesh.h
index 1bb9c6157..74c9871b5 100644
--- a/src/render/geometry/qcuboidmesh.h
+++ b/src/render/geometry/qcuboidmesh.h
@@ -37,15 +37,15 @@
 #ifndef QT3DRENDER_CUBOIDMESH_H
 #define QT3DRENDER_CUBOIDMESH_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/qgeometryrenderer.h>
+#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/qgeometryrenderer.h>
 #include <QSize>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QCuboidMesh : public QGeometryRenderer
+class QT3DRENDERSHARED_EXPORT QCuboidMesh : public QGeometryRenderer
 {
     Q_OBJECT
 
diff --git a/src/render/geometry/qcylindergeometry.cpp b/src/render/geometry/qcylindergeometry.cpp
index a1fff8a5f..9aed11f1d 100644
--- a/src/render/geometry/qcylindergeometry.cpp
+++ b/src/render/geometry/qcylindergeometry.cpp
@@ -40,9 +40,9 @@
 
 #include "qcylindergeometry.h"
 #include "qcylindergeometry_p.h"
-#include <Qt3DRenderer/qbuffer.h>
-#include <Qt3DRenderer/qbufferfunctor.h>
-#include <Qt3DRenderer/qattribute.h>
+#include <Qt3DRender/qbuffer.h>
+#include <Qt3DRender/qbufferfunctor.h>
+#include <Qt3DRender/qattribute.h>
 #include <qmath.h>
 #include <QVector3D>
 
diff --git a/src/render/geometry/qcylindergeometry.h b/src/render/geometry/qcylindergeometry.h
index 3f381c609..930eade88 100644
--- a/src/render/geometry/qcylindergeometry.h
+++ b/src/render/geometry/qcylindergeometry.h
@@ -37,8 +37,8 @@
 #ifndef QT3DRENDER_QCYLINDERGEOMETRY_H
 #define QT3DRENDER_QCYLINDERGEOMETRY_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/qgeometry.h>
+#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/qgeometry.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QCylinderGeometryPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QCylinderGeometry : public QGeometry
+class QT3DRENDERSHARED_EXPORT QCylinderGeometry : public QGeometry
 {
     Q_OBJECT
     Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged)
diff --git a/src/render/geometry/qcylindergeometry_p.h b/src/render/geometry/qcylindergeometry_p.h
index 6ef399767..b6aad91c7 100644
--- a/src/render/geometry/qcylindergeometry_p.h
+++ b/src/render/geometry/qcylindergeometry_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qgeometry_p.h>
+#include <Qt3DRender/private/qgeometry_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/qcylindermesh.cpp b/src/render/geometry/qcylindermesh.cpp
index 8d9783493..4c714c06a 100644
--- a/src/render/geometry/qcylindermesh.cpp
+++ b/src/render/geometry/qcylindermesh.cpp
@@ -41,9 +41,9 @@
 
 #include "qcylindermesh.h"
 #include "qcylindergeometry.h"
-#include <Qt3DRenderer/qbuffer.h>
-#include <Qt3DRenderer/qbufferfunctor.h>
-#include <Qt3DRenderer/qattribute.h>
+#include <Qt3DRender/qbuffer.h>
+#include <Qt3DRender/qbufferfunctor.h>
+#include <Qt3DRender/qattribute.h>
 #include <qmath.h>
 #include <QVector3D>
 
diff --git a/src/render/geometry/qcylindermesh.h b/src/render/geometry/qcylindermesh.h
index 3c4294d07..30e888f14 100644
--- a/src/render/geometry/qcylindermesh.h
+++ b/src/render/geometry/qcylindermesh.h
@@ -37,15 +37,15 @@
 #ifndef QT3DRENDER_QCYLINDERMESH_H
 #define QT3DRENDER_QCYLINDERMESH_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/qgeometryrenderer.h>
+#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/qgeometryrenderer.h>
 
 QT_BEGIN_NAMESPACE
 
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QCylinderMesh : public QGeometryRenderer
+class QT3DRENDERSHARED_EXPORT QCylinderMesh : public QGeometryRenderer
 {
     Q_OBJECT
     Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged)
diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h
index 37e2dede0..c7dde6074 100644
--- a/src/render/geometry/qgeometry.h
+++ b/src/render/geometry/qgeometry.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QGEOMETRY_H
 
 #include <Qt3DCore/qnode.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -52,7 +52,7 @@ class QGeometryPrivate;
 
 typedef QVector<Qt3DCore::QAbstractAttribute *> QAttributeList;
 
-class QT3DRENDERERSHARED_EXPORT QGeometry : public Qt3DCore::QNode
+class QT3DRENDERSHARED_EXPORT QGeometry : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(int verticesPerPatch READ verticesPerPatch WRITE setVerticesPerPatch NOTIFY verticesPerPatchChanged)
diff --git a/src/render/geometry/qgeometryfunctor.h b/src/render/geometry/qgeometryfunctor.h
index e7075d614..71b1ab672 100644
--- a/src/render/geometry/qgeometryfunctor.h
+++ b/src/render/geometry/qgeometryfunctor.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QGEOMETRYFUNCTOR
 #define QT3DRENDER_QGEOMETRYFUNCTOR
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DCore/qabstractfunctor.h>
 #include <QSharedPointer>
 
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 
 class QGeometry;
 
-class QT3DRENDERERSHARED_EXPORT QGeometryFunctor : public Qt3DCore::QAbstractFunctor
+class QT3DRENDERSHARED_EXPORT QGeometryFunctor : public Qt3DCore::QAbstractFunctor
 {
 public:
     virtual ~QGeometryFunctor() {}
diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h
index bb4d8a85b..4898b15bc 100644
--- a/src/render/geometry/qgeometryrenderer.h
+++ b/src/render/geometry/qgeometryrenderer.h
@@ -38,8 +38,8 @@
 #define QT3DRENDER_QGEOMETRYRENDERER_H
 
 #include <Qt3DCore/qcomponent.h>
-#include <Qt3DRenderer/qgeometry.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qgeometry.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -50,7 +50,7 @@ class QGeometryFunctor;
 
 typedef QSharedPointer<QGeometryFunctor> QGeometryFunctorPtr;
 
-class QT3DRENDERERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent
+class QT3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(int instanceCount READ instanceCount WRITE setInstanceCount NOTIFY instanceCountChanged)
diff --git a/src/render/geometry/qgeometryrenderer_p.h b/src/render/geometry/qgeometryrenderer_p.h
index b0b4f62ef..d6e34e4da 100644
--- a/src/render/geometry/qgeometryrenderer_p.h
+++ b/src/render/geometry/qgeometryrenderer_p.h
@@ -49,8 +49,8 @@
 //
 
 #include <Qt3DCore/private/qcomponent_p.h>
-#include <Qt3DRenderer/qgeometryrenderer.h>
-#include <Qt3DRenderer/qgeometryfunctor.h>
+#include <Qt3DRender/qgeometryrenderer.h>
+#include <Qt3DRender/qgeometryfunctor.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp
index 953dbe8c0..9c5de99bc 100644
--- a/src/render/geometry/qmesh.cpp
+++ b/src/render/geometry/qmesh.cpp
@@ -40,9 +40,9 @@
 #include <QDebug>
 #include <QFile>
 #include <QFileInfo>
-#include <Qt3DRenderer/private/objloader_p.h>
+#include <Qt3DRender/private/objloader_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/private/renderlogging_p.h>
+#include <Qt3DRender/private/renderlogging_p.h>
 #include <Qt3DCore/private/qurlhelper_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h
index ae4877b11..3125f26d0 100644
--- a/src/render/geometry/qmesh.h
+++ b/src/render/geometry/qmesh.h
@@ -37,8 +37,8 @@
 #ifndef QT3DRENDER_QMESH_H
 #define QT3DRENDER_QMESH_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/qgeometryrenderer.h>
+#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/qgeometryrenderer.h>
 #include <QUrl>
 
 QT_BEGIN_NAMESPACE
@@ -51,7 +51,7 @@ class QMeshPrivate;
 * @brief Simple static mesh
 *
 */
-class QT3DRENDERERSHARED_EXPORT QMesh : public QGeometryRenderer
+class QT3DRENDERSHARED_EXPORT QMesh : public QGeometryRenderer
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
diff --git a/src/render/geometry/qmesh_p.h b/src/render/geometry/qmesh_p.h
index 11140e9f9..4c493442a 100644
--- a/src/render/geometry/qmesh_p.h
+++ b/src/render/geometry/qmesh_p.h
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/private/qgeometryrenderer_p.h>
+#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/private/qgeometryrenderer_p.h>
 #include <QUrl>
 
 QT_BEGIN_NAMESPACE
@@ -58,7 +58,7 @@ namespace Qt3DRender {
 
 class QMesh;
 
-class QT3DRENDERERSHARED_EXPORT QMeshPrivate : public QGeometryRendererPrivate
+class QT3DRENDERSHARED_EXPORT QMeshPrivate : public QGeometryRendererPrivate
 {
 public:
     QMeshPrivate();
diff --git a/src/render/geometry/qplanegeometry.cpp b/src/render/geometry/qplanegeometry.cpp
index 952e28f5b..a8f9b8065 100644
--- a/src/render/geometry/qplanegeometry.cpp
+++ b/src/render/geometry/qplanegeometry.cpp
@@ -36,9 +36,9 @@
 
 #include "qplanegeometry.h"
 #include "qplanegeometry_p.h"
-#include <Qt3DRenderer/qattribute.h>
-#include <Qt3DRenderer/qbuffer.h>
-#include <Qt3DRenderer/qbufferfunctor.h>
+#include <Qt3DRender/qattribute.h>
+#include <Qt3DRender/qbuffer.h>
+#include <Qt3DRender/qbufferfunctor.h>
 #include <limits>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/geometry/qplanegeometry.h b/src/render/geometry/qplanegeometry.h
index 7012fbfb1..a51e589c6 100644
--- a/src/render/geometry/qplanegeometry.h
+++ b/src/render/geometry/qplanegeometry.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QPLANEGEOMETRY_H
 #define QT3DRENDER_QPLANEGEOMETRY_H
 
-#include <Qt3DRenderer/qgeometry.h>
+#include <Qt3DRender/qgeometry.h>
 #include <QSize>
 
 QT_BEGIN_NAMESPACE
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QPlaneGeometryPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QPlaneGeometry : public QGeometry
+class QT3DRENDERSHARED_EXPORT QPlaneGeometry : public QGeometry
 {
     Q_OBJECT
     Q_PROPERTY(float width READ width WRITE setWidth NOTIFY widthChanged)
diff --git a/src/render/geometry/qplanegeometry_p.h b/src/render/geometry/qplanegeometry_p.h
index 9705c044d..3b8d84fba 100644
--- a/src/render/geometry/qplanegeometry_p.h
+++ b/src/render/geometry/qplanegeometry_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qgeometry_p.h>
+#include <Qt3DRender/private/qgeometry_p.h>
 #include <QSize>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/geometry/qplanemesh.h b/src/render/geometry/qplanemesh.h
index f9867b4de..0a730ca6a 100644
--- a/src/render/geometry/qplanemesh.h
+++ b/src/render/geometry/qplanemesh.h
@@ -37,15 +37,15 @@
 #ifndef QT3DRENDER_QPLANEMESH_H
 #define QT3DRENDER_QPLANEMESH_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/qgeometryrenderer.h>
+#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/qgeometryrenderer.h>
 #include <QSize>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QPlaneMesh : public QGeometryRenderer
+class QT3DRENDERSHARED_EXPORT QPlaneMesh : public QGeometryRenderer
 {
     Q_OBJECT
     Q_PROPERTY(float width READ width WRITE setWidth NOTIFY widthChanged)
diff --git a/src/render/geometry/qspheregeometry.cpp b/src/render/geometry/qspheregeometry.cpp
index 4cc655d98..6fab1c95a 100644
--- a/src/render/geometry/qspheregeometry.cpp
+++ b/src/render/geometry/qspheregeometry.cpp
@@ -36,9 +36,9 @@
 
 #include "qspheregeometry.h"
 #include "qspheregeometry_p.h"
-#include <Qt3DRenderer/qbufferfunctor.h>
-#include <Qt3DRenderer/qbuffer.h>
-#include <Qt3DRenderer/qattribute.h>
+#include <Qt3DRender/qbufferfunctor.h>
+#include <Qt3DRender/qbuffer.h>
+#include <Qt3DRender/qattribute.h>
 
 #ifndef _USE_MATH_DEFINES
 # define _USE_MATH_DEFINES // For MSVC
diff --git a/src/render/geometry/qspheregeometry.h b/src/render/geometry/qspheregeometry.h
index c836d9e07..71d32a8da 100644
--- a/src/render/geometry/qspheregeometry.h
+++ b/src/render/geometry/qspheregeometry.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QSPHEREGEOMETRY_H
 #define QT3DRENDER_QSPHEREGEOMETRY_H
 
-#include <Qt3DRenderer/qgeometry.h>
+#include <Qt3DRender/qgeometry.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,7 +45,7 @@ namespace Qt3DRender {
 
 class QSphereGeometryPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QSphereGeometry : public QGeometry
+class QT3DRENDERSHARED_EXPORT QSphereGeometry : public QGeometry
 {
     Q_OBJECT
     Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged)
diff --git a/src/render/geometry/qspheregeometry_p.h b/src/render/geometry/qspheregeometry_p.h
index 7b5c632f3..d46ef9ecd 100644
--- a/src/render/geometry/qspheregeometry_p.h
+++ b/src/render/geometry/qspheregeometry_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qgeometry_p.h>
+#include <Qt3DRender/private/qgeometry_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/qspheremesh.h b/src/render/geometry/qspheremesh.h
index 57f810092..9ac2ac281 100644
--- a/src/render/geometry/qspheremesh.h
+++ b/src/render/geometry/qspheremesh.h
@@ -37,8 +37,8 @@
 #ifndef QT3DRENDER_QSPHEREMESH_H
 #define QT3DRENDER_QSPHEREMESH_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/qgeometryrenderer.h>
+#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/qgeometryrenderer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QSphereMeshPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QSphereMesh : public QGeometryRenderer
+class QT3DRENDERSHARED_EXPORT QSphereMesh : public QGeometryRenderer
 {
     Q_OBJECT
     Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged)
diff --git a/src/render/geometry/qtorusgeometry.cpp b/src/render/geometry/qtorusgeometry.cpp
index d4236e9c9..e18651793 100644
--- a/src/render/geometry/qtorusgeometry.cpp
+++ b/src/render/geometry/qtorusgeometry.cpp
@@ -36,9 +36,9 @@
 
 #include "qtorusgeometry.h"
 #include "qtorusgeometry_p.h"
-#include <Qt3DRenderer/qbuffer.h>
-#include <Qt3DRenderer/qbufferfunctor.h>
-#include <Qt3DRenderer/qattribute.h>
+#include <Qt3DRender/qbuffer.h>
+#include <Qt3DRender/qbufferfunctor.h>
+#include <Qt3DRender/qattribute.h>
 #include <qmath.h>
 #include <QVector3D>
 
diff --git a/src/render/geometry/qtorusgeometry.h b/src/render/geometry/qtorusgeometry.h
index 69b30f856..f2c6ad3c5 100644
--- a/src/render/geometry/qtorusgeometry.h
+++ b/src/render/geometry/qtorusgeometry.h
@@ -37,8 +37,8 @@
 #ifndef QT3D_QTORUSGEOMETRY_H
 #define QT3D_QTORUSGEOMETRY_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/qgeometry.h>
+#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/qgeometry.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QTorusGeometryPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QTorusGeometry : public QGeometry
+class QT3DRENDERSHARED_EXPORT QTorusGeometry : public QGeometry
 {
     Q_OBJECT
     Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged)
diff --git a/src/render/geometry/qtorusgeometry_p.h b/src/render/geometry/qtorusgeometry_p.h
index 60886363a..ba19d1b9f 100644
--- a/src/render/geometry/qtorusgeometry_p.h
+++ b/src/render/geometry/qtorusgeometry_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qgeometry_p.h>
+#include <Qt3DRender/private/qgeometry_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/geometry/qtorusmesh.h b/src/render/geometry/qtorusmesh.h
index 1f8778bbd..6b470b1b1 100644
--- a/src/render/geometry/qtorusmesh.h
+++ b/src/render/geometry/qtorusmesh.h
@@ -37,14 +37,14 @@
 #ifndef QT3DRENDER_QTORUSMESH_H
 #define QT3DRENDER_QTORUSMESH_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/qgeometryrenderer.h>
+#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/qgeometryrenderer.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QTorusMesh : public QGeometryRenderer
+class QT3DRENDERSHARED_EXPORT QTorusMesh : public QGeometryRenderer
 {
     Q_OBJECT
     Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged)