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>

49 files changed, 90 insertions, 90 deletions

diff --git a/src/render/framegraph/cameraselectornode.cpp b/src/render/framegraph/cameraselectornode.cpp
index 96377e9e7..71084a7a5 100644
--- a/src/render/framegraph/cameraselectornode.cpp
+++ b/src/render/framegraph/cameraselectornode.cpp
@@ -35,13 +35,13 @@
 ****************************************************************************/
 
 #include "cameraselectornode_p.h"
-#include <Qt3DRenderer/private/qcameraselector_p.h>
-#include <Qt3DRenderer/private/renderer_p.h>
+#include <Qt3DRender/private/qcameraselector_p.h>
+#include <Qt3DRender/private/renderer_p.h>
 #include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/private/renderlogging_p.h>
+#include <Qt3DRender/private/renderlogging_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/cameraselectornode_p.h b/src/render/framegraph/cameraselectornode_p.h
index e7075334a..32f243135 100644
--- a/src/render/framegraph/cameraselectornode_p.h
+++ b/src/render/framegraph/cameraselectornode_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/framegraphnode_p.h>
+#include <Qt3DRender/private/framegraphnode_p.h>
 #include <Qt3DCore/qnodeid.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/framegraph/clearbuffer_p.h b/src/render/framegraph/clearbuffer_p.h
index 67c4542a2..f14b476c6 100644
--- a/src/render/framegraph/clearbuffer_p.h
+++ b/src/render/framegraph/clearbuffer_p.h
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/framegraphnode_p.h>
-#include <Qt3DRenderer/qclearbuffer.h>
+#include <Qt3DRender/private/framegraphnode_p.h>
+#include <Qt3DRender/qclearbuffer.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/framegraphnode.cpp b/src/render/framegraph/framegraphnode.cpp
index 84b1b2238..10629f1d8 100644
--- a/src/render/framegraph/framegraphnode.cpp
+++ b/src/render/framegraph/framegraphnode.cpp
@@ -35,8 +35,8 @@
 ****************************************************************************/
 
 #include "framegraphnode_p.h"
-#include <Qt3DRenderer/private/renderer_p.h>
-#include <Qt3DRenderer/qframegraph.h>
+#include <Qt3DRender/private/renderer_p.h>
+#include <Qt3DRender/qframegraph.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h
index e11222e21..e68d0b9bc 100644
--- a/src/render/framegraph/framegraphnode_p.h
+++ b/src/render/framegraph/framegraphnode_p.h
@@ -51,8 +51,8 @@
 #include <Qt3DCore/qhandle.h>
 #include <Qt3DCore/qnode.h>
 #include <Qt3DCore/qbackendnode.h>
-#include <Qt3DRenderer/qframegraphnode.h>
-#include <Qt3DRenderer/private/managers_p.h>
+#include <Qt3DRender/qframegraphnode.h>
+#include <Qt3DRender/private/managers_p.h>
 #include <qglobal.h>
 #include <QVector>
 
diff --git a/src/render/framegraph/framegraphsubtreeselector_p.h b/src/render/framegraph/framegraphsubtreeselector_p.h
index 72e4ac4a4..b06238348 100644
--- a/src/render/framegraph/framegraphsubtreeselector_p.h
+++ b/src/render/framegraph/framegraphsubtreeselector_p.h
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/framegraphnode_p.h>
-#include <Qt3DRenderer/qframegraphselector.h>
+#include <Qt3DRender/private/framegraphnode_p.h>
+#include <Qt3DRender/qframegraphselector.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/framegraphvisitor.cpp b/src/render/framegraph/framegraphvisitor.cpp
index 29de86e98..60307469a 100644
--- a/src/render/framegraph/framegraphvisitor.cpp
+++ b/src/render/framegraph/framegraphvisitor.cpp
@@ -37,7 +37,7 @@
 #include "framegraphvisitor_p.h"
 
 #include "framegraphnode_p.h"
-#include <Qt3DRenderer/private/renderer_p.h>
+#include <Qt3DRender/private/renderer_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/layerfilternode_p.h b/src/render/framegraph/layerfilternode_p.h
index 7d5ba58b0..cff04b13a 100644
--- a/src/render/framegraph/layerfilternode_p.h
+++ b/src/render/framegraph/layerfilternode_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/framegraphnode_p.h>
+#include <Qt3DRender/private/framegraphnode_p.h>
 #include <QStringList>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/framegraph/nodraw.cpp b/src/render/framegraph/nodraw.cpp
index 55b0359c1..0d5b6578a 100644
--- a/src/render/framegraph/nodraw.cpp
+++ b/src/render/framegraph/nodraw.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "nodraw_p.h"
-#include <Qt3DRenderer/qnodraw.h>
+#include <Qt3DRender/qnodraw.h>
 #include <Qt3DCore/qscenepropertychange.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/framegraph/nodraw_p.h b/src/render/framegraph/nodraw_p.h
index 2289f79bd..49bd818b6 100644
--- a/src/render/framegraph/nodraw_p.h
+++ b/src/render/framegraph/nodraw_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/framegraphnode_p.h>
+#include <Qt3DRender/private/framegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/qcameraselector.h b/src/render/framegraph/qcameraselector.h
index 4088f6e8b..3a663768f 100644
--- a/src/render/framegraph/qcameraselector.h
+++ b/src/render/framegraph/qcameraselector.h
@@ -37,8 +37,8 @@
 #ifndef QT3DRENDER_QCAMERASELECTOR_H
 #define QT3DRENDER_QCAMERASELECTOR_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/qframegraphnode.h>
+#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/qframegraphnode.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QCameraSelectorPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphNode
+class QT3DRENDERSHARED_EXPORT QCameraSelector : public QFrameGraphNode
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged)
diff --git a/src/render/framegraph/qcameraselector_p.h b/src/render/framegraph/qcameraselector_p.h
index aec10ae94..d4fb3f24d 100644
--- a/src/render/framegraph/qcameraselector_p.h
+++ b/src/render/framegraph/qcameraselector_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <private/qframegraphnode_p.h>
-#include <Qt3DRenderer/qcameraselector.h>
+#include <Qt3DRender/qcameraselector.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/qclearbuffer.h b/src/render/framegraph/qclearbuffer.h
index 62b645a06..d6adcf209 100644
--- a/src/render/framegraph/qclearbuffer.h
+++ b/src/render/framegraph/qclearbuffer.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QCLEARBUFFER_H
 #define QT3DRENDER_QCLEARBUFFER_H
 
-#include <Qt3DRenderer/qframegraphnode.h>
+#include <Qt3DRender/qframegraphnode.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,7 +45,7 @@ namespace Qt3DRender {
 
 class QClearBufferPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QClearBuffer : public QFrameGraphNode
+class QT3DRENDERSHARED_EXPORT QClearBuffer : public QFrameGraphNode
 {
     Q_OBJECT
     Q_PROPERTY(BufferType buffers READ buffers WRITE setBuffers NOTIFY buffersChanged)
diff --git a/src/render/framegraph/qclearbuffer_p.h b/src/render/framegraph/qclearbuffer_p.h
index 23ee280ac..544b17e37 100644
--- a/src/render/framegraph/qclearbuffer_p.h
+++ b/src/render/framegraph/qclearbuffer_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <private/qframegraphnode_p.h>
-#include <Qt3DRenderer/qclearbuffer.h>
+#include <Qt3DRender/qclearbuffer.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/qframegraph.cpp b/src/render/framegraph/qframegraph.cpp
index a6193a4c9..8c8c34f59 100644
--- a/src/render/framegraph/qframegraph.cpp
+++ b/src/render/framegraph/qframegraph.cpp
@@ -37,8 +37,8 @@
 #include "qframegraph.h"
 #include "qframegraph_p.h"
 #include <Qt3DCore/qentity.h>
-#include <Qt3DRenderer/qframegraphnode.h>
-#include <Qt3DRenderer/private/qframegraphnode_p.h>
+#include <Qt3DRender/qframegraphnode.h>
+#include <Qt3DRender/private/qframegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/qframegraph.h b/src/render/framegraph/qframegraph.h
index 0b720ea72..35cf09b09 100644
--- a/src/render/framegraph/qframegraph.h
+++ b/src/render/framegraph/qframegraph.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QFRAMEGRAPH_H
 #define QT3DRENDER_QFRAMEGRAPH_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DCore/qcomponent.h>
 
 QT_BEGIN_NAMESPACE
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 class QFrameGraphPrivate;
 class QFrameGraphNode;
 
-class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3DCore::QComponent
+class QT3DRENDERSHARED_EXPORT QFrameGraph : public Qt3DCore::QComponent
 {
     Q_OBJECT
     // Note : The full namespace has to be used to define the property
diff --git a/src/render/framegraph/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h
index 826edd36f..cbde0be3e 100644
--- a/src/render/framegraph/qframegraphnode.h
+++ b/src/render/framegraph/qframegraphnode.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QFRAMEGRAPHNODE_H
 
 #include <Qt3DCore/qnode.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <QObject>
 
 QT_BEGIN_NAMESPACE
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 
 class QFrameGraphNodePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QFrameGraphNode : public Qt3DCore::QNode
+class QT3DRENDERSHARED_EXPORT QFrameGraphNode : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
diff --git a/src/render/framegraph/qframegraphnode_p.h b/src/render/framegraph/qframegraphnode_p.h
index 1bcab0c29..32ba8ae38 100644
--- a/src/render/framegraph/qframegraphnode_p.h
+++ b/src/render/framegraph/qframegraphnode_p.h
@@ -50,7 +50,7 @@
 
 #include <QtCore/QtGlobal>
 #include <private/qnode_p.h>
-#include <Qt3DRenderer/qframegraphnode.h>
+#include <Qt3DRender/qframegraphnode.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/qframegraphselector.h b/src/render/framegraph/qframegraphselector.h
index 64f8bf9fb..e88fcbba8 100644
--- a/src/render/framegraph/qframegraphselector.h
+++ b/src/render/framegraph/qframegraphselector.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QFRAMEGRAPHSELECTOR_H
 #define QT3DRENDER_QFRAMEGRAPHSELECTOR_H
 
-#include <Qt3DRenderer/qframegraphnode.h>
+#include <Qt3DRender/qframegraphnode.h>
 #include <Qt3DCore/qnode.h>
 
 QT_BEGIN_NAMESPACE
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QFrameGraphSelectorPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QFrameGraphSelectorFunctor
+class QT3DRENDERSHARED_EXPORT QFrameGraphSelectorFunctor
 {
 public:
     virtual QVector<int> operator()() = 0;
@@ -55,7 +55,7 @@ public:
 
 typedef QSharedPointer<QFrameGraphSelectorFunctor> QFrameGraphSelectorFunctorPtr;
 
-class QT3DRENDERERSHARED_EXPORT QFrameGraphSelector : public QFrameGraphNode
+class QT3DRENDERSHARED_EXPORT QFrameGraphSelector : public QFrameGraphNode
 {
     Q_OBJECT
 public:
diff --git a/src/render/framegraph/qframegraphselector_p.h b/src/render/framegraph/qframegraphselector_p.h
index 3f90efadd..afe91601a 100644
--- a/src/render/framegraph/qframegraphselector_p.h
+++ b/src/render/framegraph/qframegraphselector_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qframegraphnode_p.h>
+#include <Qt3DRender/private/qframegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h
index 5d20ca30e..5ba129ba7 100644
--- a/src/render/framegraph/qlayerfilter.h
+++ b/src/render/framegraph/qlayerfilter.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QLAYERFILTER_H
 #define QT3DRENDER_QLAYERFILTER_H
 
-#include <Qt3DRenderer/qframegraphnode.h>
+#include <Qt3DRender/qframegraphnode.h>
 #include <QStringList>
 
 QT_BEGIN_NAMESPACE
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QLayerFilterPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QLayerFilter : public QFrameGraphNode
+class QT3DRENDERSHARED_EXPORT QLayerFilter : public QFrameGraphNode
 {
     Q_OBJECT
     Q_PROPERTY(QStringList layers READ layers WRITE setLayers NOTIFY layersChanged)
diff --git a/src/render/framegraph/qlayerfilter_p.h b/src/render/framegraph/qlayerfilter_p.h
index c2108145f..6df0b8b18 100644
--- a/src/render/framegraph/qlayerfilter_p.h
+++ b/src/render/framegraph/qlayerfilter_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <private/qframegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -57,7 +57,7 @@ namespace Qt3DRender {
 
 class QLayerFilter;
 
-class QT3DRENDERERSHARED_EXPORT QLayerFilterPrivate : public QFrameGraphNodePrivate
+class QT3DRENDERSHARED_EXPORT QLayerFilterPrivate : public QFrameGraphNodePrivate
 {
 public:
     QLayerFilterPrivate();
diff --git a/src/render/framegraph/qnodraw.h b/src/render/framegraph/qnodraw.h
index 3daee3212..312e0c808 100644
--- a/src/render/framegraph/qnodraw.h
+++ b/src/render/framegraph/qnodraw.h
@@ -37,13 +37,13 @@
 #ifndef QT3DRENDER_QNODRAW_H
 #define QT3DRENDER_QNODRAW_H
 
-#include <Qt3DRenderer/qframegraphnode.h>
+#include <Qt3DRender/qframegraphnode.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QNoDraw : public QFrameGraphNode
+class QT3DRENDERSHARED_EXPORT QNoDraw : public QFrameGraphNode
 {
     Q_OBJECT
 public:
diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp
index 0eb9fc45e..f95bd032b 100644
--- a/src/render/framegraph/qrenderpassfilter.cpp
+++ b/src/render/framegraph/qrenderpassfilter.cpp
@@ -38,8 +38,8 @@
 #include "qrenderpassfilter_p.h"
 
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/qannotation.h>
-#include <Qt3DRenderer/qparameter.h>
+#include <Qt3DRender/qannotation.h>
+#include <Qt3DRender/qparameter.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h
index 15ff9738b..941a22a8f 100644
--- a/src/render/framegraph/qrenderpassfilter.h
+++ b/src/render/framegraph/qrenderpassfilter.h
@@ -37,8 +37,8 @@
 #ifndef QT3DRENDER_QRENDERPASSFILTER_H
 #define QT3DRENDER_QRENDERPASSFILTER_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/qframegraphnode.h>
+#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/qframegraphnode.h>
 #include <QString>
 
 
@@ -50,7 +50,7 @@ class QRenderPassFilterPrivate;
 class QAnnotation;
 class QParameter;
 
-class QT3DRENDERERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode
+class QT3DRENDERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode
 {
     Q_OBJECT
 
diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp
index c3fca07a7..1cd17d911 100644
--- a/src/render/framegraph/qrendertargetselector.cpp
+++ b/src/render/framegraph/qrendertargetselector.cpp
@@ -36,9 +36,9 @@
 
 #include "qrendertargetselector.h"
 #include "qrendertargetselector_p.h"
-#include <Qt3DRenderer/qrendertarget.h>
+#include <Qt3DRender/qrendertarget.h>
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/private/qrenderpass_p.h>
+#include <Qt3DRender/private/qrenderpass_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h
index a83029f3b..dc50adb97 100644
--- a/src/render/framegraph/qrendertargetselector.h
+++ b/src/render/framegraph/qrendertargetselector.h
@@ -37,10 +37,10 @@
 #ifndef QT3DRENDER_QRENDERTARGETSELECTOR_H
 #define QT3DRENDER_QRENDERTARGETSELECTOR_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DCore/qnode.h>
-#include <Qt3DRenderer/qframegraphnode.h>
-#include <Qt3DRenderer/qrenderattachment.h>
+#include <Qt3DRender/qframegraphnode.h>
+#include <Qt3DRender/qrenderattachment.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -49,7 +49,7 @@ namespace Qt3DRender {
 class QRenderTargetSelectorPrivate;
 class QRenderTarget;
 
-class QT3DRENDERERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode
+class QT3DRENDERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged)
diff --git a/src/render/framegraph/qsortcriterion.h b/src/render/framegraph/qsortcriterion.h
index f056a3b94..72f6cd76c 100644
--- a/src/render/framegraph/qsortcriterion.h
+++ b/src/render/framegraph/qsortcriterion.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QSORTCRITERION_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 QSortCriterionPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QSortCriterion : public Qt3DCore::QNode
+class QT3DRENDERSHARED_EXPORT QSortCriterion : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(Qt3DRender::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged)
diff --git a/src/render/framegraph/qsortcriterion_p.h b/src/render/framegraph/qsortcriterion_p.h
index f9f39f747..f78bd1fd5 100644
--- a/src/render/framegraph/qsortcriterion_p.h
+++ b/src/render/framegraph/qsortcriterion_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <private/qnode_p.h>
-#include <Qt3DRenderer/qsortcriterion.h>
+#include <Qt3DRender/qsortcriterion.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/qsortmethod.cpp b/src/render/framegraph/qsortmethod.cpp
index 2eece78f1..d2a4aa6ab 100644
--- a/src/render/framegraph/qsortmethod.cpp
+++ b/src/render/framegraph/qsortmethod.cpp
@@ -38,7 +38,7 @@
 #include "qsortmethod_p.h"
 #include "qsortcriterion_p.h"
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/qsortcriterion.h>
+#include <Qt3DRender/qsortcriterion.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/qsortmethod.h b/src/render/framegraph/qsortmethod.h
index 337eaebf6..e8866a726 100644
--- a/src/render/framegraph/qsortmethod.h
+++ b/src/render/framegraph/qsortmethod.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QSORTMETHOD_H
 #define QT3DRENDER_QSORTMETHOD_H
 
-#include <Qt3DRenderer/qframegraphnode.h>
+#include <Qt3DRender/qframegraphnode.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 class QSortCriterion;
 class QSortMethodPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QSortMethod : public QFrameGraphNode
+class QT3DRENDERSHARED_EXPORT QSortMethod : public QFrameGraphNode
 {
     Q_OBJECT
 
diff --git a/src/render/framegraph/qstateset.cpp b/src/render/framegraph/qstateset.cpp
index f6dbfa35d..8ba2d9bc5 100644
--- a/src/render/framegraph/qstateset.cpp
+++ b/src/render/framegraph/qstateset.cpp
@@ -38,7 +38,7 @@
 #include "qstateset_p.h"
 
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/qrenderstate.h>
+#include <Qt3DRender/qrenderstate.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/qstateset.h b/src/render/framegraph/qstateset.h
index 7e4ff1257..db9972a45 100644
--- a/src/render/framegraph/qstateset.h
+++ b/src/render/framegraph/qstateset.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QSTATESET_H
 #define QT3DRENDER_QSTATESET_H
 
-#include <Qt3DRenderer/qframegraphnode.h>
+#include <Qt3DRender/qframegraphnode.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 class QStateSetPrivate;
 class QRenderState;
 
-class QT3DRENDERERSHARED_EXPORT QStateSet : public QFrameGraphNode
+class QT3DRENDERSHARED_EXPORT QStateSet : public QFrameGraphNode
 {
     Q_OBJECT
 
diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp
index 37fad6f70..4e754fee9 100644
--- a/src/render/framegraph/qtechniquefilter.cpp
+++ b/src/render/framegraph/qtechniquefilter.cpp
@@ -37,8 +37,8 @@
 
 #include "qtechniquefilter.h"
 #include "qtechniquefilter_p.h"
-#include <Qt3DRenderer/qannotation.h>
-#include <Qt3DRenderer/qparameter.h>
+#include <Qt3DRender/qannotation.h>
+#include <Qt3DRender/qparameter.h>
 #include <Qt3DCore/qscenepropertychange.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h
index b0798a04a..7637941dc 100644
--- a/src/render/framegraph/qtechniquefilter.h
+++ b/src/render/framegraph/qtechniquefilter.h
@@ -37,8 +37,8 @@
 #ifndef QT3DRENDER_QTECHNIQUEFILTER_H
 #define QT3DRENDER_QTECHNIQUEFILTER_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/qframegraphnode.h>
+#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/qframegraphnode.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -48,7 +48,7 @@ class QTechniqueFilterPrivate;
 class QAnnotation;
 class QParameter;
 
-class QT3DRENDERERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode
+class QT3DRENDERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode
 {
     Q_OBJECT
 public:
diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h
index baa6aeb1a..63750a98f 100644
--- a/src/render/framegraph/qviewport.h
+++ b/src/render/framegraph/qviewport.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QVIEWPORT_H
 #define QT3DRENDER_QVIEWPORT_H
 
-#include <Qt3DRenderer/qframegraphnode.h>
+#include <Qt3DRender/qframegraphnode.h>
 #include <QRectF>
 #include <QColor>
 
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 
 class QViewportPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QViewport : public QFrameGraphNode
+class QT3DRENDERSHARED_EXPORT QViewport : public QFrameGraphNode
 {
     Q_OBJECT
     Q_PROPERTY(QRectF rect READ rect WRITE setRect NOTIFY rectChanged)
diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp
index a2088d0aa..bd1a48286 100644
--- a/src/render/framegraph/renderpassfilternode.cpp
+++ b/src/render/framegraph/renderpassfilternode.cpp
@@ -38,7 +38,7 @@
 #include "qannotation.h"
 #include "qrenderpassfilter.h"
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/qparameter.h>
+#include <Qt3DRender/qparameter.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h
index 498afd70d..e1625c3ba 100644
--- a/src/render/framegraph/renderpassfilternode_p.h
+++ b/src/render/framegraph/renderpassfilternode_p.h
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/framegraphnode_p.h>
-#include <Qt3DRenderer/private/parameterpack_p.h>
+#include <Qt3DRender/private/framegraphnode_p.h>
+#include <Qt3DRender/private/parameterpack_p.h>
 #include <QList>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp
index 50171e700..4e6aa2b8a 100644
--- a/src/render/framegraph/rendertargetselectornode.cpp
+++ b/src/render/framegraph/rendertargetselectornode.cpp
@@ -35,14 +35,14 @@
 ****************************************************************************/
 
 #include "rendertargetselectornode_p.h"
-#include <Qt3DRenderer/private/renderer_p.h>
+#include <Qt3DRender/private/renderer_p.h>
 #include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
-#include <Qt3DRenderer/qrendertargetselector.h>
-#include <Qt3DRenderer/qrendertarget.h>
+#include <Qt3DRender/qrendertargetselector.h>
+#include <Qt3DRender/qrendertarget.h>
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/private/renderlogging_p.h>
-#include <Qt3DRenderer/qrenderattachment.h>
+#include <Qt3DRender/private/renderlogging_p.h>
+#include <Qt3DRender/qrenderattachment.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/rendertargetselectornode_p.h b/src/render/framegraph/rendertargetselectornode_p.h
index f6e1605a2..1c5abc10c 100644
--- a/src/render/framegraph/rendertargetselectornode_p.h
+++ b/src/render/framegraph/rendertargetselectornode_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/framegraphnode_p.h>
+#include <Qt3DRender/private/framegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/sortcriterion_p.h b/src/render/framegraph/sortcriterion_p.h
index d0e20b603..b230cb1bb 100644
--- a/src/render/framegraph/sortcriterion_p.h
+++ b/src/render/framegraph/sortcriterion_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/qsortcriterion.h>
+#include <Qt3DRender/qsortcriterion.h>
 #include <Qt3DCore/qbackendnode.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/framegraph/sortmethod.cpp b/src/render/framegraph/sortmethod.cpp
index 32cba9307..9a6a91f97 100644
--- a/src/render/framegraph/sortmethod.cpp
+++ b/src/render/framegraph/sortmethod.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "sortmethod_p.h"
-#include <Qt3DRenderer/qsortcriterion.h>
+#include <Qt3DRender/qsortcriterion.h>
 #include <Qt3DCore/qscenepropertychange.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/framegraph/sortmethod_p.h b/src/render/framegraph/sortmethod_p.h
index 2222a76ea..206aa220e 100644
--- a/src/render/framegraph/sortmethod_p.h
+++ b/src/render/framegraph/sortmethod_p.h
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/framegraphnode_p.h>
-#include <Qt3DRenderer/qsortmethod.h>
+#include <Qt3DRender/private/framegraphnode_p.h>
+#include <Qt3DRender/qsortmethod.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp
index d7832c256..30d6ffbcf 100644
--- a/src/render/framegraph/statesetnode.cpp
+++ b/src/render/framegraph/statesetnode.cpp
@@ -37,9 +37,9 @@
 #include "statesetnode_p.h"
 
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/qstateset.h>
-#include <Qt3DRenderer/private/genericstate_p.h>
-#include <Qt3DRenderer/private/renderstateset_p.h>
+#include <Qt3DRender/qstateset.h>
+#include <Qt3DRender/private/genericstate_p.h>
+#include <Qt3DRender/private/renderstateset_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/statesetnode_p.h b/src/render/framegraph/statesetnode_p.h
index 7a9563cc0..e6cc72de2 100644
--- a/src/render/framegraph/statesetnode_p.h
+++ b/src/render/framegraph/statesetnode_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/framegraphnode_p.h>
+#include <Qt3DRender/private/framegraphnode_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp
index 7e8ac5723..fae93ae2a 100644
--- a/src/render/framegraph/techniquefilternode.cpp
+++ b/src/render/framegraph/techniquefilternode.cpp
@@ -37,9 +37,9 @@
 #include "techniquefilternode_p.h"
 #include "qannotation.h"
 #include "qtechniquefilter.h"
-#include <Qt3DRenderer/private/managers_p.h>
+#include <Qt3DRender/private/managers_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/qparameter.h>
+#include <Qt3DRender/qparameter.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h
index 59688a557..17e0d7066 100644
--- a/src/render/framegraph/techniquefilternode_p.h
+++ b/src/render/framegraph/techniquefilternode_p.h
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/framegraphnode_p.h>
-#include <Qt3DRenderer/private/parameterpack_p.h>
+#include <Qt3DRender/private/framegraphnode_p.h>
+#include <Qt3DRender/private/parameterpack_p.h>
 
 #include <QList>
 #include <QString>
diff --git a/src/render/framegraph/viewportnode.cpp b/src/render/framegraph/viewportnode.cpp
index a016d9686..5834a5950 100644
--- a/src/render/framegraph/viewportnode.cpp
+++ b/src/render/framegraph/viewportnode.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "viewportnode_p.h"
-#include <Qt3DRenderer/qviewport.h>
+#include <Qt3DRender/qviewport.h>
 #include <Qt3DCore/qscenepropertychange.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/framegraph/viewportnode_p.h b/src/render/framegraph/viewportnode_p.h
index 50ac79efa..439f1b70b 100644
--- a/src/render/framegraph/viewportnode_p.h
+++ b/src/render/framegraph/viewportnode_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/framegraphnode_p.h>
+#include <Qt3DRender/private/framegraphnode_p.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE