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>

33 files changed, 85 insertions, 85 deletions

diff --git a/src/render/materialsystem/annotation_p.h b/src/render/materialsystem/annotation_p.h
index 564fe1671..4cb549d0c 100644
--- a/src/render/materialsystem/annotation_p.h
+++ b/src/render/materialsystem/annotation_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/qannotation.h>
+#include <Qt3DRender/qannotation.h>
 #include <Qt3DCore/qbackendnode.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp
index bf0e64a58..bc88f3c16 100644
--- a/src/render/materialsystem/effect.cpp
+++ b/src/render/materialsystem/effect.cpp
@@ -34,10 +34,10 @@
 **
 ****************************************************************************/
 
-#include <Qt3DRenderer/private/effect_p.h>
-#include <Qt3DRenderer/private/renderer_p.h>
-#include <Qt3DRenderer/qeffect.h>
-#include <Qt3DRenderer/qparameter.h>
+#include <Qt3DRender/private/effect_p.h>
+#include <Qt3DRender/private/renderer_p.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qparameter.h>
 
 #include <Qt3DCore/qscenepropertychange.h>
 
diff --git a/src/render/materialsystem/effect_p.h b/src/render/materialsystem/effect_p.h
index 0d307d0c5..17214497f 100644
--- a/src/render/materialsystem/effect_p.h
+++ b/src/render/materialsystem/effect_p.h
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/private/parameterpack_p.h>
+#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/private/parameterpack_p.h>
 #include <Qt3DCore/qbackendnode.h>
 #include <Qt3DCore/qnodeid.h>
 #include <QList>
diff --git a/src/render/materialsystem/material_p.h b/src/render/materialsystem/material_p.h
index f45912ab6..c9f54512c 100644
--- a/src/render/materialsystem/material_p.h
+++ b/src/render/materialsystem/material_p.h
@@ -50,8 +50,8 @@
 
 #include <QVariant>
 
-#include <Qt3DRenderer/private/quniformvalue_p.h>
-#include <Qt3DRenderer/private/parameterpack_p.h>
+#include <Qt3DRender/private/quniformvalue_p.h>
+#include <Qt3DRender/private/parameterpack_p.h>
 #include <Qt3DCore/qbackendnode.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp
index 34eb395f7..fea400e0b 100644
--- a/src/render/materialsystem/parameter.cpp
+++ b/src/render/materialsystem/parameter.cpp
@@ -36,11 +36,11 @@
 
 #include "parameter_p.h"
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qtexture.h>
-#include <Qt3DRenderer/qshaderdata.h>
+#include <Qt3DRender/qparameter.h>
+#include <Qt3DRender/qtexture.h>
+#include <Qt3DRender/qshaderdata.h>
 
-#include <Qt3DRenderer/private/managers_p.h>
+#include <Qt3DRender/private/managers_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/materialsystem/parametermapping_p.h b/src/render/materialsystem/parametermapping_p.h
index 7c5df3c31..4043c8dd1 100644
--- a/src/render/materialsystem/parametermapping_p.h
+++ b/src/render/materialsystem/parametermapping_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/qparametermapping.h>
+#include <Qt3DRender/qparametermapping.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/materialsystem/qannotation.h b/src/render/materialsystem/qannotation.h
index e36bfe46e..28b2e87d8 100644
--- a/src/render/materialsystem/qannotation.h
+++ b/src/render/materialsystem/qannotation.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QANNOTATION_H
 #define QT3DRENDER_QANNOTATION_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DCore/qnode.h>
 #include <QVariant>
 
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 
 class QAnnotationPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QAnnotation : public Qt3DCore::QNode
+class QT3DRENDERSHARED_EXPORT QAnnotation : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
diff --git a/src/render/materialsystem/qannotation_p.h b/src/render/materialsystem/qannotation_p.h
index f37004b0c..c91a4df87 100644
--- a/src/render/materialsystem/qannotation_p.h
+++ b/src/render/materialsystem/qannotation_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <Qt3DCore/private/qnode_p.h>
-#include <Qt3DRenderer/qannotation.h>
+#include <Qt3DRender/qannotation.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h
index be1d4a21b..0f806f02b 100644
--- a/src/render/materialsystem/qeffect.h
+++ b/src/render/materialsystem/qeffect.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QEFFECT_H
 
 #include <Qt3DCore/qnode.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -48,7 +48,7 @@ class QParameter;
 class QTechnique;
 class QEffectPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QEffect
+class QT3DRENDERSHARED_EXPORT QEffect
         : public Qt3DCore::QNode
 {
     Q_OBJECT
diff --git a/src/render/materialsystem/qeffect_p.h b/src/render/materialsystem/qeffect_p.h
index 844016022..6cc5eb25d 100644
--- a/src/render/materialsystem/qeffect_p.h
+++ b/src/render/materialsystem/qeffect_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <private/qnode_p.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -59,7 +59,7 @@ class QEffect;
 class QParameter;
 class QTechnique;
 
-class QT3DRENDERERSHARED_EXPORT QEffectPrivate : public Qt3DCore::QNodePrivate
+class QT3DRENDERSHARED_EXPORT QEffectPrivate : public Qt3DCore::QNodePrivate
 {
 public :
     QEffectPrivate();
diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp
index 3610c4e3b..e0ab55019 100644
--- a/src/render/materialsystem/qmaterial.cpp
+++ b/src/render/materialsystem/qmaterial.cpp
@@ -38,7 +38,7 @@
 #include "qmaterial_p.h"
 #include "qtexture.h"
 #include "qeffect.h"
-#include <Qt3DRenderer/private/renderlogging_p.h>
+#include <Qt3DRender/private/renderlogging_p.h>
 #include "qparameter.h"
 #include <Qt3DCore/qscenepropertychange.h>
 
diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h
index cfc3c0d99..daf580c11 100644
--- a/src/render/materialsystem/qmaterial.h
+++ b/src/render/materialsystem/qmaterial.h
@@ -40,7 +40,7 @@
 #include <QVariant>
 
 #include <Qt3DCore/qcomponent.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -52,7 +52,7 @@ class QMaterialPrivate;
 class QEffect;
 typedef QMap<QString, QAbstractTextureProvider*> TextureDict;
 
-class QT3DRENDERERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent
+class QT3DRENDERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QEffect *effect READ effect WRITE setEffect NOTIFY effectChanged)
diff --git a/src/render/materialsystem/qmaterial_p.h b/src/render/materialsystem/qmaterial_p.h
index c84aeb6c1..9f305b074 100644
--- a/src/render/materialsystem/qmaterial_p.h
+++ b/src/render/materialsystem/qmaterial_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <private/qcomponent_p.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -58,7 +58,7 @@ namespace Qt3DRender {
 class QParameter;
 class QEffect;
 
-class QT3DRENDERERSHARED_EXPORT QMaterialPrivate : public Qt3DCore::QComponentPrivate
+class QT3DRENDERSHARED_EXPORT QMaterialPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QMaterialPrivate();
diff --git a/src/render/materialsystem/qopenglfilter.h b/src/render/materialsystem/qopenglfilter.h
index 9c4b729bd..a7d46b285 100644
--- a/src/render/materialsystem/qopenglfilter.h
+++ b/src/render/materialsystem/qopenglfilter.h
@@ -39,7 +39,7 @@
 
 #include <QObject>
 #include <QStringList>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <QSurfaceFormat>
 
 QT_BEGIN_NAMESPACE
@@ -48,7 +48,7 @@ namespace Qt3DRender {
 
 class QOpenGLFilterPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QOpenGLFilter : public QObject
+class QT3DRENDERSHARED_EXPORT QOpenGLFilter : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QOpenGLFilter::Api api READ api WRITE setApi NOTIFY apiChanged)
diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp
index fd14603a8..2535d5608 100644
--- a/src/render/materialsystem/qparameter.cpp
+++ b/src/render/materialsystem/qparameter.cpp
@@ -35,10 +35,10 @@
 ****************************************************************************/
 
 #include "qparameter.h"
-#include <Qt3DRenderer/private/renderlogging_p.h>
+#include <Qt3DRender/private/renderlogging_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
 #include <private/qparameter_p.h>
-#include <Qt3DRenderer/qtexture.h>
+#include <Qt3DRender/qtexture.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h
index b0a9c9b2e..5278829c6 100644
--- a/src/render/materialsystem/qparameter.h
+++ b/src/render/materialsystem/qparameter.h
@@ -39,7 +39,7 @@
 
 #include <QVariant>
 #include <Qt3DCore/qnode.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -48,7 +48,7 @@ namespace Qt3DRender {
 class QParameterPrivate;
 class QAbstractTextureProvider;
 
-class QT3DRENDERERSHARED_EXPORT QParameter : public Qt3DCore::QNode
+class QT3DRENDERSHARED_EXPORT QParameter : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
diff --git a/src/render/materialsystem/qparameter_p.h b/src/render/materialsystem/qparameter_p.h
index 01bdf63c2..96db66b7a 100644
--- a/src/render/materialsystem/qparameter_p.h
+++ b/src/render/materialsystem/qparameter_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <private/qnode_p.h>
-#include <private/qt3drenderer_global_p.h>
+#include <private/qt3drender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -57,7 +57,7 @@ namespace Qt3DRender {
 
 class QParameter;
 
-class QT3DRENDERERSHARED_PRIVATE_EXPORT QParameterPrivate : public Qt3DCore::QNodePrivate
+class QT3DRENDERSHARED_PRIVATE_EXPORT QParameterPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QParameterPrivate();
diff --git a/src/render/materialsystem/qparametermapping.h b/src/render/materialsystem/qparametermapping.h
index e104f4001..9b6bbfd57 100644
--- a/src/render/materialsystem/qparametermapping.h
+++ b/src/render/materialsystem/qparametermapping.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QPARAMETERMAPPING_H
 
 #include <Qt3DCore/qnode.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QParameterMappingPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QParameterMapping : public Qt3DCore::QNode
+class QT3DRENDERSHARED_EXPORT QParameterMapping : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(QString parameterName READ parameterName WRITE setParameterName NOTIFY parameterNameChanged)
diff --git a/src/render/materialsystem/qparametermapping_p.h b/src/render/materialsystem/qparametermapping_p.h
index 940f3983e..a53627703 100644
--- a/src/render/materialsystem/qparametermapping_p.h
+++ b/src/render/materialsystem/qparametermapping_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <private/qnode_p.h>
-#include <Qt3DRenderer/QParameterMapping>
+#include <Qt3DRender/QParameterMapping>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h
index b7018e7a1..569ae8377 100644
--- a/src/render/materialsystem/qrenderpass.h
+++ b/src/render/materialsystem/qrenderpass.h
@@ -38,11 +38,11 @@
 #ifndef QT3DRENDER_QRENDERPASS_H
 #define QT3DRENDER_QRENDERPASS_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
-#include <Qt3DRenderer/qshaderprogram.h>
-#include <Qt3DRenderer/qrenderstate.h>
-#include <Qt3DRenderer/qannotation.h>
+#include <Qt3DRender/qshaderprogram.h>
+#include <Qt3DRender/qrenderstate.h>
+#include <Qt3DRender/qannotation.h>
 
 #include <QHash>
 #include <QList>
@@ -58,7 +58,7 @@ typedef QList<QParameter*> ParameterList;
 
 class QRenderPassPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QRenderPass : public Qt3DCore::QNode
+class QT3DRENDERSHARED_EXPORT QRenderPass : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QShaderProgram *shaderProgram READ shaderProgram WRITE setShaderProgram NOTIFY shaderProgramChanged)
diff --git a/src/render/materialsystem/qrenderpass_p.h b/src/render/materialsystem/qrenderpass_p.h
index b587b7708..86c9da84d 100644
--- a/src/render/materialsystem/qrenderpass_p.h
+++ b/src/render/materialsystem/qrenderpass_p.h
@@ -50,8 +50,8 @@
 //
 
 #include <private/qnode_p.h>
-#include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qrenderpass.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -68,7 +68,7 @@ namespace Render
 class RenderStateSet;
 }
 
-class QT3DRENDERERSHARED_EXPORT QRenderPassPrivate : public Qt3DCore::QNodePrivate
+class QT3DRENDERSHARED_EXPORT QRenderPassPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QRenderPassPrivate();
diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h
index 35f195f88..5d18eda70 100644
--- a/src/render/materialsystem/qshaderdata.h
+++ b/src/render/materialsystem/qshaderdata.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QSHADERDATA_H
 
 #include <Qt3DCore/qcomponent.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QShaderDataPrivate;
 
-class QT3DRENDERERSHARED_EXPORT PropertyReaderInterface
+class QT3DRENDERSHARED_EXPORT PropertyReaderInterface
 {
 public:
     virtual ~PropertyReaderInterface() {}
@@ -55,7 +55,7 @@ public:
 
 typedef QSharedPointer<PropertyReaderInterface> PropertyReaderInterfacePtr;
 
-class QT3DRENDERERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent
+class QT3DRENDERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent
 {
     Q_OBJECT
 public:
diff --git a/src/render/materialsystem/qshaderdata_p.h b/src/render/materialsystem/qshaderdata_p.h
index 8a0c78e05..add621b5e 100644
--- a/src/render/materialsystem/qshaderdata_p.h
+++ b/src/render/materialsystem/qshaderdata_p.h
@@ -49,8 +49,8 @@
 //
 
 #include <private/qcomponent_p.h>
-#include <Qt3DRenderer/qshaderdata.h>
-#include <Qt3DRenderer/private/qt3drenderer_global_p.h>
+#include <Qt3DRender/qshaderdata.h>
+#include <Qt3DRender/private/qt3drender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -83,7 +83,7 @@ class QShaderDataPropertyReader: public PropertyReaderInterface
     }
 };
 
-class QT3DRENDERERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public Qt3DCore::QComponentPrivate
+class QT3DRENDERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QShaderDataPrivate();
diff --git a/src/render/materialsystem/qshaderprogram.h b/src/render/materialsystem/qshaderprogram.h
index c229ad704..7b286802c 100644
--- a/src/render/materialsystem/qshaderprogram.h
+++ b/src/render/materialsystem/qshaderprogram.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QSHADERPROGRAM_H
 
 #include <Qt3DCore/qnode.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QShaderProgramPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QShaderProgram : public Qt3DCore::QNode
+class QT3DRENDERSHARED_EXPORT QShaderProgram : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(QByteArray vertexShaderCode READ vertexShaderCode WRITE setVertexShaderCode NOTIFY vertexShaderCodeChanged)
diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h
index 4a8863d73..7e28f313b 100644
--- a/src/render/materialsystem/qtechnique.h
+++ b/src/render/materialsystem/qtechnique.h
@@ -37,10 +37,10 @@
 #ifndef QT3DRENDER_QTECHNIQUE_H
 #define QT3DRENDER_QTECHNIQUE_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DCore/qnode.h>
-#include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qannotation.h>
+#include <Qt3DRender/qrenderpass.h>
+#include <Qt3DRender/qannotation.h>
 #include <QList>
 #include <QSharedPointer>
 
@@ -52,7 +52,7 @@ class QParameter;
 class QTechniquePrivate;
 class QOpenGLFilter;
 
-class QT3DRENDERERSHARED_EXPORT QTechnique : public Qt3DCore::QNode
+class QT3DRENDERSHARED_EXPORT QTechnique : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QOpenGLFilter *openGLFilter READ openGLFilter)
diff --git a/src/render/materialsystem/qtechnique_p.h b/src/render/materialsystem/qtechnique_p.h
index 669a75a56..da92fe5c4 100644
--- a/src/render/materialsystem/qtechnique_p.h
+++ b/src/render/materialsystem/qtechnique_p.h
@@ -49,8 +49,8 @@
 //
 
 #include <private/qnode_p.h>
-#include <Qt3DRenderer/qopenglfilter.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -61,7 +61,7 @@ class QAnnotation;
 class QParameter;
 class QRenderPass;
 
-class QT3DRENDERERSHARED_EXPORT QTechniquePrivate : public Qt3DCore::QNodePrivate
+class QT3DRENDERSHARED_EXPORT QTechniquePrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QTechniquePrivate();
diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp
index cdbf92126..e499a85ba 100644
--- a/src/render/materialsystem/renderpass.cpp
+++ b/src/render/materialsystem/renderpass.cpp
@@ -36,14 +36,14 @@
 ****************************************************************************/
 
 #include "renderpass_p.h"
-#include <Qt3DRenderer/private/annotation_p.h>
-#include <Qt3DRenderer/qparametermapping.h>
-#include <Qt3DRenderer/qrenderstate.h>
-#include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qparameter.h>
-
-#include <Qt3DRenderer/private/renderstates_p.h>
-#include <Qt3DRenderer/private/renderstateset_p.h>
+#include <Qt3DRender/private/annotation_p.h>
+#include <Qt3DRender/qparametermapping.h>
+#include <Qt3DRender/qrenderstate.h>
+#include <Qt3DRender/qrenderpass.h>
+#include <Qt3DRender/qparameter.h>
+
+#include <Qt3DRender/private/renderstates_p.h>
+#include <Qt3DRender/private/renderstateset_p.h>
 
 #include <Qt3DCore/qscenepropertychange.h>
 
diff --git a/src/render/materialsystem/renderpass_p.h b/src/render/materialsystem/renderpass_p.h
index 2d5a2a6d8..ad1c329f4 100644
--- a/src/render/materialsystem/renderpass_p.h
+++ b/src/render/materialsystem/renderpass_p.h
@@ -49,9 +49,9 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/private/parametermapping_p.h>
-#include <Qt3DRenderer/private/parameterpack_p.h>
+#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/private/parametermapping_p.h>
+#include <Qt3DRender/private/parameterpack_p.h>
 #include <Qt3DCore/private/qabstractaspect_p.h>
 #include <Qt3DCore/qbackendnode.h>
 #include <Qt3DCore/qnodeid.h>
diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp
index f52d01543..f2e7bce78 100644
--- a/src/render/materialsystem/shader.cpp
+++ b/src/render/materialsystem/shader.cpp
@@ -42,8 +42,8 @@
 #include <QOpenGLShaderProgram>
 #include <QMutexLocker>
 #include <qshaderprogram.h>
-#include <Qt3DRenderer/private/graphicscontext_p.h>
-#include <Qt3DRenderer/private/attachmentpack_p.h>
+#include <Qt3DRender/private/graphicscontext_p.h>
+#include <Qt3DRender/private/attachmentpack_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h
index 3dd9570ac..cc38f8c4a 100644
--- a/src/render/materialsystem/shader_p.h
+++ b/src/render/materialsystem/shader_p.h
@@ -49,8 +49,8 @@
 //
 
 #include <QVector>
-#include <Qt3DRenderer/private/quniformvalue_p.h>
-#include <Qt3DRenderer/private/shadervariables_p.h>
+#include <Qt3DRender/private/quniformvalue_p.h>
+#include <Qt3DRender/private/shadervariables_p.h>
 #include <Qt3DCore/qbackendnode.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h
index c87196776..b45395f07 100644
--- a/src/render/materialsystem/shaderdata_p.h
+++ b/src/render/materialsystem/shaderdata_p.h
@@ -50,7 +50,7 @@
 
 #include <Qt3DCore/qbackendnode.h>
 #include <private/shadervariables_p.h>
-#include <Qt3DRenderer/qshaderdata.h>
+#include <Qt3DRender/qshaderdata.h>
 #include <QMutex>
 #include <QMatrix4x4>
 
diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp
index ac2e4554c..866161bf8 100644
--- a/src/render/materialsystem/technique.cpp
+++ b/src/render/materialsystem/technique.cpp
@@ -36,13 +36,13 @@
 
 #include "technique_p.h"
 
-#include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qtechnique.h>
-#include <Qt3DRenderer/qopenglfilter.h>
-#include <Qt3DRenderer/private/renderer_p.h>
-#include <Qt3DRenderer/private/annotation_p.h>
-#include <Qt3DRenderer/private/shader_p.h>
+#include <Qt3DRender/qrenderpass.h>
+#include <Qt3DRender/qparameter.h>
+#include <Qt3DRender/qtechnique.h>
+#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/private/renderer_p.h>
+#include <Qt3DRender/private/annotation_p.h>
+#include <Qt3DRender/private/shader_p.h>
 #include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
diff --git a/src/render/materialsystem/technique_p.h b/src/render/materialsystem/technique_p.h
index 77c96d4f0..896642d58 100644
--- a/src/render/materialsystem/technique_p.h
+++ b/src/render/materialsystem/technique_p.h
@@ -51,8 +51,8 @@
 
 #include <QVector>
 #include <QStringList>
-#include <Qt3DRenderer/private/parameterpack_p.h>
-#include <Qt3DRenderer/qannotation.h>
+#include <Qt3DRender/private/parameterpack_p.h>
+#include <Qt3DRender/qannotation.h>
 #include <Qt3DCore/qbackendnode.h>
 
 QT_BEGIN_NAMESPACE