QRenderAttachment renamed to QRenderTargetOutput

As per API review

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

45 files changed, 224 insertions, 222 deletions

diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
index f810d4fa1..0c05bfa4f 100644
--- a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
@@ -60,15 +60,15 @@ GBuffer::GBuffer(Qt3DCore::QNode *parent)
         Qt3DRender::QAbstractTextureProvider::D32F
     };
 
-    const Qt3DRender::QRenderAttachment::AttachmentPoint attachmentPoints[AttachmentsCount] = {
-        Qt3DRender::QRenderAttachment::ColorAttachment0,
-        Qt3DRender::QRenderAttachment::ColorAttachment1,
-        Qt3DRender::QRenderAttachment::ColorAttachment2,
-        Qt3DRender::QRenderAttachment::DepthAttachment
+    const Qt3DRender::QRenderTargetOutput::AttachmentPoint attachmentPoints[AttachmentsCount] = {
+        Qt3DRender::QRenderTargetOutput::ColorAttachment0,
+        Qt3DRender::QRenderTargetOutput::ColorAttachment1,
+        Qt3DRender::QRenderTargetOutput::ColorAttachment2,
+        Qt3DRender::QRenderTargetOutput::DepthAttachment
     };
 
     for (int i = 0; i < AttachmentsCount; i++) {
-        Qt3DRender::QRenderAttachment *attachment = new Qt3DRender::QRenderAttachment(this);
+        Qt3DRender::QRenderTargetOutput *attachment = new Qt3DRender::QRenderTargetOutput(this);
 
         m_textures[i] = new Qt3DRender::QTexture2D();
         m_textures[i]->setFormat(formats[i]);
diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.h b/examples/qt3d/deferred-renderer-cpp/gbuffer.h
index 7762da159..7b79dc5f8 100644
--- a/examples/qt3d/deferred-renderer-cpp/gbuffer.h
+++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.h
@@ -53,7 +53,7 @@
 
 #include <Qt3DRender/QRenderTarget>
 #include <Qt3DRender/qtexture.h>
-#include <Qt3DRender/QRenderAttachment>
+#include <Qt3DRender/QRenderTargetOutput>
 
 class GBuffer : public Qt3DRender::QRenderTarget
 {
@@ -75,7 +75,7 @@ public:
 
 private:
     Qt3DRender::QAbstractTextureProvider *m_textures[AttachmentsCount];
-    Qt3DRender::QRenderAttachment *m_attachments[AttachmentsCount];
+    Qt3DRender::QRenderTargetOutput *m_attachments[AttachmentsCount];
 };
 
 #endif // GBUFFER_H
diff --git a/examples/qt3d/deferred-renderer-qml/GBuffer.qml b/examples/qt3d/deferred-renderer-qml/GBuffer.qml
index 520a821cb..6ed16d9ea 100644
--- a/examples/qt3d/deferred-renderer-qml/GBuffer.qml
+++ b/examples/qt3d/deferred-renderer-qml/GBuffer.qml
@@ -60,10 +60,9 @@ RenderTarget {
 
     attachments : [
 
-        RenderAttachment {
+        RenderTargetOutput {
             objectName : "color"
             attachmentPoint : RenderAttachment.ColorAttachment0
-
             texture : Texture2D {
                 id : colorAttachment
                 width : 1024
@@ -78,10 +77,9 @@ RenderTarget {
                 }
             }
         },
-        RenderAttachment {
+        RenderTargetOutput {
             objectName : "position"
             attachmentPoint : RenderAttachment.ColorAttachment1
-
             texture : Texture2D {
                 id : positionAttachment
                 width : 1024
@@ -98,10 +96,9 @@ RenderTarget {
                 }
             }
         },
-        RenderAttachment {
+        RenderTargetOutput {
             objectName : "normal"
             attachmentPoint : RenderAttachment.ColorAttachment2
-
             texture : Texture2D {
                 id : normalAttachment
                 width : 1024
@@ -118,10 +115,9 @@ RenderTarget {
                 }
             }
         },
-        RenderAttachment {
+        RenderTargetOutput {
             objectName : "depth"
             attachmentPoint : RenderAttachment.DepthAttachment
-
             texture : Texture2D {
                 id : depthAttachment
                 width : 1024
diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
index 8ac0403af..0f20b193b 100644
--- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml
+++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
@@ -73,9 +73,9 @@ FrameGraph {
                 RenderTargetSelector {
                     target: RenderTarget {
                         attachments: [
-                            RenderAttachment {
+                            RenderTargetOutput {
                                 name: "depth"
-                                attachmentPoint: RenderAttachment.DepthAttachment
+                                attachmentPoint: RenderTargetOutput.DepthAttachment
                                 texture: Texture2D {
                                     id: depthTexture
                                     width: mainview.width
diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
index 945bb4457..9c9cb7ab0 100644
--- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
+++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
@@ -69,9 +69,9 @@ FrameGraph {
             RenderTargetSelector {
                 target: RenderTarget {
                     attachments: [
-                        RenderAttachment {
+                        RenderTargetOutput {
                             name: "depth"
-                            attachmentPoint: RenderAttachment.DepthAttachment
+                            attachmentPoint: RenderTargetOutput.DepthAttachment
                             texture: Texture2D {
                                 id: depthTexture
                                 width: 1024
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index 832097286..ce7889f15 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -81,7 +81,7 @@
 #include <Qt3DRender/qstenciltestseparate.h>
 #include <Qt3DRender/qscissortest.h>
 #include <Qt3DRender/qdithering.h>
-#include <Qt3DRender/qrenderattachment.h>
+#include <Qt3DRender/qrendertargetoutput.h>
 #include <Qt3DRender/qclearbuffer.h>
 #include <Qt3DRender/qsortcriterion.h>
 #include <Qt3DRender/qalphacoverage.h>
@@ -121,7 +121,7 @@
 #include <Qt3DQuickRender/private/quick3dtechniquefilter_p.h>
 #include <Qt3DQuickRender/private/quick3dviewport_p.h>
 #include <Qt3DQuickRender/private/quick3drenderpassfilter_p.h>
-#include <Qt3DQuickRender/private/quick3drendertarget_p.h>
+#include <Qt3DQuickRender/private/quick3drendertargetoutput_p.h>
 #include <Qt3DQuickRender/private/quick3deffect_p.h>
 #include <Qt3DQuickRender/private/quick3dscene_p.h>
 #include <Qt3DQuickRender/private/quick3dtexture_p.h>
@@ -279,8 +279,8 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
     qmlRegisterType<Qt3DRender::QDispatchCompute>(uri, 2, 0, "DispatchCompute");
 
     // RenderTarget
-    qmlRegisterType<Qt3DRender::QRenderAttachment>(uri, 2, 0, "RenderAttachment");
-    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QRenderTarget, Qt3DRender::Render::Quick::Quick3DRenderTarget>("QRenderTarget", "Qt3D.Render/RenderTarget", uri, 2, 0, "RenderTarget");
+    qmlRegisterType<Qt3DRender::QRenderTargetOutput>(uri, 2, 0, "RenderTargetOutput");
+    Qt3DRender::Quick::registerExtendedType<Qt3DRender::QRenderTarget, Qt3DRender::Render::Quick::Quick3DRenderTargetOutput>("QRenderTarget", "Qt3D.Render/RenderTarget", uri, 2, 0, "RenderTarget");
 
     // Render surface selector
     qmlRegisterType<Qt3DRender::QRenderSurfaceSelector>(uri, 2, 0, "RenderSurfaceSelector");
diff --git a/src/quick3d/quick3drender/items/items.pri b/src/quick3d/quick3drender/items/items.pri
index 99ffbc801..1de1f800b 100644
--- a/src/quick3d/quick3drender/items/items.pri
+++ b/src/quick3d/quick3drender/items/items.pri
@@ -6,7 +6,6 @@ HEADERS += \
     $$PWD/quick3dmaterial_p.h \
     $$PWD/quick3drenderpass_p.h \
     $$PWD/quick3drenderpassfilter_p.h \
-    $$PWD/quick3drendertarget_p.h \
     $$PWD/quick3drendertargetselector_p.h \
     $$PWD/quick3dscene_p.h \
     $$PWD/quick3dshaderdata_p.h \
@@ -17,11 +16,11 @@ HEADERS += \
     $$PWD/quick3dtexture_p.h \
     $$PWD/quick3dviewport_p.h \
     $$PWD/quick3dparameter_p_p.h \
-    $$PWD/quick3dparameter_p.h
+    $$PWD/quick3dparameter_p.h \
+    $$PWD/quick3drendertargetoutput_p.h
 
 SOURCES += \
     $$PWD/quick3drenderpassfilter.cpp \
-    $$PWD/quick3drendertarget.cpp \
     $$PWD/quick3dtechniquefilter.cpp \
     $$PWD/quick3dviewport.cpp \
     $$PWD/quick3dmaterial.cpp \
@@ -37,6 +36,7 @@ SOURCES += \
     $$PWD/quick3dstateset.cpp \
     $$PWD/quick3drendertargetselector.cpp \
     $$PWD/quick3dgeometry.cpp \
-    $$PWD/quick3dbuffer.cpp
+    $$PWD/quick3dbuffer.cpp \
+    $$PWD/quick3drendertargetoutput.cpp
 
 INCLUDEPATH += $$PWD
diff --git a/src/quick3d/quick3drender/items/quick3drendertarget.cpp b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
index de2dd75e2..bbb57c35f 100644
--- a/src/quick3d/quick3drender/items/quick3drendertarget.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "quick3drendertarget_p.h"
+#include "quick3drendertargetoutput_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -45,48 +45,48 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-Quick3DRenderTarget::Quick3DRenderTarget(QObject * parent)
+Quick3DRenderTargetOutput::Quick3DRenderTargetOutput(QObject * parent)
     : QObject(parent)
 {
 }
 
-QQmlListProperty<QRenderAttachment> Quick3DRenderTarget::qmlAttachments()
+QQmlListProperty<QRenderTargetOutput> Quick3DRenderTargetOutput::qmlAttachments()
 {
-    return QQmlListProperty<QRenderAttachment>(this, 0,
-                                               &Quick3DRenderTarget::appendRenderAttachment,
-                                               &Quick3DRenderTarget::renderAttachmentCount,
-                                               &Quick3DRenderTarget::renderAttachmentAt,
-                                               &Quick3DRenderTarget::clearRenderAttachments);
+    return QQmlListProperty<QRenderTargetOutput>(this, 0,
+                                               &Quick3DRenderTargetOutput::appendRenderAttachment,
+                                               &Quick3DRenderTargetOutput::renderAttachmentCount,
+                                               &Quick3DRenderTargetOutput::renderAttachmentAt,
+                                               &Quick3DRenderTargetOutput::clearRenderAttachments);
 }
 
-void Quick3DRenderTarget::appendRenderAttachment(QQmlListProperty<QRenderAttachment> *list, QRenderAttachment *attachment)
+void Quick3DRenderTargetOutput::appendRenderAttachment(QQmlListProperty<QRenderTargetOutput> *list, QRenderTargetOutput *attachment)
 {
-    Quick3DRenderTarget *rT = qobject_cast<Quick3DRenderTarget *>(list->object);
+    Quick3DRenderTargetOutput *rT = qobject_cast<Quick3DRenderTargetOutput *>(list->object);
     if (rT)
         rT->parentRenderTarget()->addAttachment(attachment);
 }
 
-QRenderAttachment *Quick3DRenderTarget::renderAttachmentAt(QQmlListProperty<QRenderAttachment> *list, int index)
+QRenderTargetOutput *Quick3DRenderTargetOutput::renderAttachmentAt(QQmlListProperty<QRenderTargetOutput> *list, int index)
 {
-    Quick3DRenderTarget *rT = qobject_cast<Quick3DRenderTarget *>(list->object);
+    Quick3DRenderTargetOutput *rT = qobject_cast<Quick3DRenderTargetOutput *>(list->object);
     if (rT)
         return rT->parentRenderTarget()->attachments().at(index);
     return Q_NULLPTR;
 }
 
-int Quick3DRenderTarget::renderAttachmentCount(QQmlListProperty<QRenderAttachment> *list)
+int Quick3DRenderTargetOutput::renderAttachmentCount(QQmlListProperty<QRenderTargetOutput> *list)
 {
-    Quick3DRenderTarget *rT = qobject_cast<Quick3DRenderTarget *>(list->object);
+    Quick3DRenderTargetOutput *rT = qobject_cast<Quick3DRenderTargetOutput *>(list->object);
     if (rT)
         return rT->parentRenderTarget()->attachments().count();
     return -1;
 }
 
-void Quick3DRenderTarget::clearRenderAttachments(QQmlListProperty<QRenderAttachment> *list)
+void Quick3DRenderTargetOutput::clearRenderAttachments(QQmlListProperty<QRenderTargetOutput> *list)
 {
-    Quick3DRenderTarget *rT = qobject_cast<Quick3DRenderTarget *>(list->object);
+    Quick3DRenderTargetOutput *rT = qobject_cast<Quick3DRenderTargetOutput *>(list->object);
     if (rT) {
-        Q_FOREACH (QRenderAttachment *att, rT->parentRenderTarget()->attachments())
+        Q_FOREACH (QRenderTargetOutput *att, rT->parentRenderTarget()->attachments())
             rT->parentRenderTarget()->removeAttachment(att);
     }
 }
diff --git a/src/quick3d/quick3drender/items/quick3drendertarget_p.h b/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h
index 19e3b0904..5a2c8ea54 100644
--- a/src/quick3d/quick3drender/items/quick3drendertarget_p.h
+++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_P_H
-#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_P_H
+#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETOUTPUT_P_H
+#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETOUTPUT_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 
 #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qrendertarget.h>
-#include <Qt3DRender/qrenderattachment.h>
+#include <Qt3DRender/qrendertargetoutput.h>
 #include <QQmlListProperty>
 
 QT_BEGIN_NAMESPACE
@@ -62,21 +62,21 @@ namespace Qt3DRender {
 namespace Render {
 namespace Quick {
 
-class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderTarget : public QObject
+class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderTargetOutput : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderAttachment> attachments READ qmlAttachments)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderTargetOutput> attachments READ qmlAttachments)
 public:
-    explicit Quick3DRenderTarget(QObject *parent = 0);
+    explicit Quick3DRenderTargetOutput(QObject *parent = 0);
 
     inline QRenderTarget *parentRenderTarget() const { return qobject_cast<QRenderTarget *>(parent()); }
-    QQmlListProperty<QRenderAttachment> qmlAttachments();
+    QQmlListProperty<QRenderTargetOutput> qmlAttachments();
 
 private:
-    static void appendRenderAttachment(QQmlListProperty<QRenderAttachment> *list, QRenderAttachment *attachment);
-    static QRenderAttachment *renderAttachmentAt(QQmlListProperty<QRenderAttachment> *list, int index);
-    static int renderAttachmentCount(QQmlListProperty<QRenderAttachment> *list);
-    static void clearRenderAttachments(QQmlListProperty<QRenderAttachment> *list);
+    static void appendRenderAttachment(QQmlListProperty<QRenderTargetOutput> *list, QRenderTargetOutput *attachment);
+    static QRenderTargetOutput *renderAttachmentAt(QQmlListProperty<QRenderTargetOutput> *list, int index);
+    static int renderAttachmentCount(QQmlListProperty<QRenderTargetOutput> *list);
+    static void clearRenderAttachments(QQmlListProperty<QRenderTargetOutput> *list);
 };
 
 } // namespace Quick
@@ -85,4 +85,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGET_P_H
+#endif // QT3DRENDER_RENDER_QUICK_QUICK3DRENDERTARGETOUTPUT_P_H
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
index f5428251a..53cf80384 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertargetselector.cpp
@@ -58,7 +58,7 @@ QVariantList Quick3DRenderTargetSelector::drawBuffers() const
 {
     // Converts RenderAttachmentType to int
     QVariantList l;
-    Q_FOREACH (const QRenderAttachment::AttachmentPoint &b, parentRenderTargetSelector()->drawBuffers())
+    Q_FOREACH (const QRenderTargetOutput::AttachmentPoint &b, parentRenderTargetSelector()->drawBuffers())
         l.append(static_cast<int>(b));
     return l;
 }
@@ -68,9 +68,9 @@ void Quick3DRenderTargetSelector::setDrawBuffers(const QVariantList &buffers)
     if (buffers != drawBuffers()) {
 
         // Converts int to RenderAttachmentType
-        QList<QRenderAttachment::AttachmentPoint> drawBuffersList;
+        QList<QRenderTargetOutput::AttachmentPoint> drawBuffersList;
         Q_FOREACH (const QVariant &buf, buffers)
-            drawBuffersList.append(static_cast<QRenderAttachment::AttachmentPoint>(buf.toInt()));
+            drawBuffersList.append(static_cast<QRenderTargetOutput::AttachmentPoint>(buf.toInt()));
 
         parentRenderTargetSelector()->setDrawBuffers(drawBuffersList);
         emit drawBuffersChanged();
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h b/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h
index fb36f6a4d..a24a6a71f 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h
+++ b/src/quick3d/quick3drender/items/quick3drendertargetselector_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
-#include <Qt3DRender/qrenderattachment.h>
+#include <Qt3DRender/qrendertargetoutput.h>
 #include <Qt3DRender/qrendertargetselector.h>
 #include <QQmlListProperty>
 #include <QVariantList>
diff --git a/src/render/backend/attachmentpack.cpp b/src/render/backend/attachmentpack.cpp
index 6838c573e..dd0df0229 100644
--- a/src/render/backend/attachmentpack.cpp
+++ b/src/render/backend/attachmentpack.cpp
@@ -59,12 +59,12 @@ QVector<Attachment> AttachmentPack::attachments() const
     return m_attachments;
 }
 
-QList<QRenderAttachment::AttachmentPoint> AttachmentPack::drawBuffers() const
+QList<QRenderTargetOutput::AttachmentPoint> AttachmentPack::drawBuffers() const
 {
     return m_drawBuffers;
 }
 
-void AttachmentPack::setDrawBuffers(const QList<QRenderAttachment::AttachmentPoint> &drawBuffers)
+void AttachmentPack::setDrawBuffers(const QList<QRenderTargetOutput::AttachmentPoint> &drawBuffers)
 {
     m_drawBuffers = drawBuffers;
 }
@@ -72,8 +72,8 @@ void AttachmentPack::setDrawBuffers(const QList<QRenderAttachment::AttachmentPoi
 Attachment::Attachment()
     : m_mipLevel(0)
     , m_layer(0)
-    , m_point(QRenderAttachment::ColorAttachment0)
-    , m_face(QRenderAttachment::CubeMapNegativeX)
+    , m_point(QRenderTargetOutput::ColorAttachment0)
+    , m_face(QRenderTargetOutput::CubeMapNegativeX)
 {
 }
 
diff --git a/src/render/backend/attachmentpack_p.h b/src/render/backend/attachmentpack_p.h
index 6a4a25a45..692300d1d 100644
--- a/src/render/backend/attachmentpack_p.h
+++ b/src/render/backend/attachmentpack_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <Qt3DRender/qrenderattachment.h>
+#include <Qt3DRender/qrendertargetoutput.h>
 #include <QVector>
 
 QT_BEGIN_NAMESPACE
@@ -66,8 +66,8 @@ struct Attachment
     int m_mipLevel;
     int m_layer;
     Qt3DCore::QNodeId m_textureUuid;
-    QRenderAttachment::AttachmentPoint m_point;
-    QRenderAttachment::CubeMapFace m_face;
+    QRenderTargetOutput::AttachmentPoint m_point;
+    QRenderTargetOutput::CubeMapFace m_face;
 };
 
 class AttachmentPack
@@ -77,13 +77,13 @@ public:
 
     void addAttachment(const Attachment &attachment);
     QVector<Attachment> attachments() const;
-    QList<QRenderAttachment::AttachmentPoint> drawBuffers() const;
+    QList<QRenderTargetOutput::AttachmentPoint> drawBuffers() const;
 
-    void setDrawBuffers(const QList<QRenderAttachment::AttachmentPoint> &drawBuffers);
+    void setDrawBuffers(const QList<QRenderTargetOutput::AttachmentPoint> &drawBuffers);
 
 private:
     QVector<Attachment> m_attachments;
-    QList<QRenderAttachment::AttachmentPoint> m_drawBuffers;
+    QList<QRenderTargetOutput::AttachmentPoint> m_drawBuffers;
 };
 
 } // namespace Render
diff --git a/src/render/backend/handle_types_p.h b/src/render/backend/handle_types_p.h
index ab572416b..5815f19dc 100644
--- a/src/render/backend/handle_types_p.h
+++ b/src/render/backend/handle_types_p.h
@@ -64,7 +64,7 @@ class QTexImageData;
 
 namespace Render {
 
-class RenderAttachment;
+class RenderTargetOutput;
 class CameraLens;
 class Annotation;
 class Effect;
@@ -94,7 +94,7 @@ class ComputeJob;
 class GLBuffer;
 class RenderStateNode;
 
-typedef Qt3DCore::QHandle<RenderAttachment, 16> HAttachment;
+typedef Qt3DCore::QHandle<RenderTargetOutput, 16> HAttachment;
 typedef Qt3DCore::QHandle<CameraLens, 8> HCamera;
 typedef Qt3DCore::QHandle<Annotation, 16> HCriterion;
 typedef Qt3DCore::QHandle<Effect, 16> HEffect;
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index 858847dda..0c78c2c8d 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <Qt3DCore/private/qresourcemanager_p.h>
-#include <Qt3DRender/private/renderattachment_p.h>
+#include <Qt3DRender/private/rendertargetoutput_p.h>
 #include <Qt3DRender/private/cameralens_p.h>
 #include <Qt3DRender/private/annotation_p.h>
 #include <Qt3DRender/private/effect_p.h>
@@ -87,7 +87,7 @@ namespace Qt3DRender {
 namespace Render {
 
 class AttachmentManager : public Qt3DCore::QResourceManager<
-        RenderAttachment,
+        RenderTargetOutput,
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
diff --git a/src/render/backend/nodemanagers.cpp b/src/render/backend/nodemanagers.cpp
index 0c60351c0..890309d31 100644
--- a/src/render/backend/nodemanagers.cpp
+++ b/src/render/backend/nodemanagers.cpp
@@ -192,7 +192,7 @@ SceneManager *NodeManagers::manager<Scene>() const Q_DECL_NOEXCEPT
 }
 
 template<>
-AttachmentManager *NodeManagers::manager<RenderAttachment>() const Q_DECL_NOEXCEPT
+AttachmentManager *NodeManagers::manager<RenderTargetOutput>() const Q_DECL_NOEXCEPT
 {
     return m_attachmentManager;
 }
diff --git a/src/render/backend/nodemanagers_p.h b/src/render/backend/nodemanagers_p.h
index 305ef975f..1edbc8c24 100644
--- a/src/render/backend/nodemanagers_p.h
+++ b/src/render/backend/nodemanagers_p.h
@@ -113,7 +113,7 @@ class Annotation;
 class FrameGraphNode;
 class Transform;
 class Scene;
-class RenderAttachment;
+class RenderTargetOutput;
 class RenderTarget;
 class ShaderData;
 class SortCriterion;
@@ -291,7 +291,7 @@ template<>
 QT3DRENDERSHARED_PRIVATE_EXPORT SceneManager *NodeManagers::manager<Scene>() const Q_DECL_NOEXCEPT;
 
 template<>
-QT3DRENDERSHARED_PRIVATE_EXPORT AttachmentManager *NodeManagers::manager<RenderAttachment>() const Q_DECL_NOEXCEPT;
+QT3DRENDERSHARED_PRIVATE_EXPORT AttachmentManager *NodeManagers::manager<RenderTargetOutput>() const Q_DECL_NOEXCEPT;
 
 template<>
 QT3DRENDERSHARED_PRIVATE_EXPORT SortCriterionManager *NodeManagers::manager<SortCriterion>() const Q_DECL_NOEXCEPT;
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index 3e9df639d..c8e8784ea 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -12,7 +12,6 @@ HEADERS += \
     $$PWD/renderqueue_p.h \
     $$PWD/parameterpack_p.h \
     $$PWD/rendertarget_p.h \
-    $$PWD/renderattachment_p.h \
     $$PWD/attachmentpack_p.h \
     $$PWD/shadervariables_p.h \
     $$PWD/qgraphicsutils_p.h \
@@ -34,7 +33,8 @@ HEADERS += \
     $$PWD/computejob_p.h \
     $$PWD/renderersettings_p.h \
     $$PWD/stringtoint_p.h \
-    $$PWD/backendnode_p.h
+    $$PWD/backendnode_p.h \
+    $$PWD/rendertargetoutput_p.h
 
 SOURCES += \
     $$PWD/renderthread.cpp \
@@ -46,7 +46,6 @@ SOURCES += \
     $$PWD/renderqueue.cpp \
     $$PWD/parameterpack.cpp \
     $$PWD/rendertarget.cpp \
-    $$PWD/renderattachment.cpp \
     $$PWD/attachmentpack.cpp \
     $$PWD/managers.cpp \
     $$PWD/platformsurfacefilter.cpp \
@@ -62,4 +61,5 @@ SOURCES += \
     $$PWD/computejob.cpp \
     $$PWD/renderersettings.cpp \
     $$PWD/stringtoint.cpp \
-    $$PWD/backendnode.cpp
+    $$PWD/backendnode.cpp \
+    $$PWD/rendertargetoutput.cpp
diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp
index 57580bb7a..9279a63ca 100644
--- a/src/render/backend/rendertarget.cpp
+++ b/src/render/backend/rendertarget.cpp
@@ -40,7 +40,7 @@
 #include <Qt3DRender/private/rendertarget_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DRender/qrendertarget.h>
-#include <Qt3DRender/qrenderattachment.h>
+#include <Qt3DRender/qrendertargetoutput.h>
 #include <QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -59,7 +59,7 @@ void RenderTarget::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QRenderTarget *target = static_cast<QRenderTarget *>(peer);
     m_renderAttachments.clear();
-    Q_FOREACH (QRenderAttachment *att, target->attachments())
+    Q_FOREACH (QRenderTargetOutput *att, target->attachments())
         appendRenderAttachment(att->id());
 }
 
diff --git a/src/render/backend/rendertarget_p.h b/src/render/backend/rendertarget_p.h
index abf2ca075..8a0736bd1 100644
--- a/src/render/backend/rendertarget_p.h
+++ b/src/render/backend/rendertarget_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 class QRenderTarget;
-class QRenderAttachment;
+class QRenderTargetOutput;
 
 namespace Render {
 
diff --git a/src/render/backend/renderattachment.cpp b/src/render/backend/rendertargetoutput.cpp
index fd8dd7d1e..8d551ce07 100644
--- a/src/render/backend/renderattachment.cpp
+++ b/src/render/backend/rendertargetoutput.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include <Qt3DRender/private/renderattachment_p.h>
+#include <Qt3DRender/private/rendertargetoutput_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DRender/qtexture.h>
 #include <QVariant>
@@ -49,14 +49,14 @@ using namespace Qt3DCore;
 namespace Qt3DRender {
 namespace Render {
 
-RenderAttachment::RenderAttachment()
+RenderTargetOutput::RenderTargetOutput()
     : BackendNode()
 {
 }
 
-void RenderAttachment::updateFromPeer(Qt3DCore::QNode *peer)
+void RenderTargetOutput::updateFromPeer(Qt3DCore::QNode *peer)
 {
-    QRenderAttachment *attachment = static_cast<QRenderAttachment *>(peer);
+    QRenderTargetOutput *attachment = static_cast<QRenderTargetOutput *>(peer);
 
     m_attachmentData.m_mipLevel = attachment->mipLevel();
     m_attachmentData.m_layer = attachment->layer();
@@ -66,37 +66,42 @@ void RenderAttachment::updateFromPeer(Qt3DCore::QNode *peer)
         m_attachmentData.m_textureUuid = attachment->texture()->id();
 }
 
-Qt3DCore::QNodeId RenderAttachment::textureUuid() const
+Qt3DCore::QNodeId RenderTargetOutput::textureUuid() const
 {
     return m_attachmentData.m_textureUuid;
 }
 
-int RenderAttachment::mipLevel() const
+int RenderTargetOutput::mipLevel() const
 {
     return m_attachmentData.m_mipLevel;
 }
 
-int RenderAttachment::layer() const
+int RenderTargetOutput::layer() const
 {
     return m_attachmentData.m_layer;
 }
 
-QRenderAttachment::CubeMapFace RenderAttachment::face() const
+QString RenderTargetOutput::name() const
+{
+    return m_attachmentData.m_name;
+}
+
+QRenderTargetOutput::CubeMapFace RenderTargetOutput::face() const
 {
     return m_attachmentData.m_face;
 }
 
-QRenderAttachment::AttachmentPoint RenderAttachment::point() const
+QRenderTargetOutput::AttachmentPoint RenderTargetOutput::point() const
 {
     return m_attachmentData.m_point;
 }
 
-void RenderAttachment::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
+void RenderTargetOutput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (e->type() == NodeUpdated) {
         if (propertyChange->propertyName() == QByteArrayLiteral("type")) {
-            m_attachmentData.m_point = static_cast<QRenderAttachment::AttachmentPoint>(propertyChange->value().toInt());
+            m_attachmentData.m_point = static_cast<QRenderTargetOutput::AttachmentPoint>(propertyChange->value().toInt());
         }
         else if (propertyChange->propertyName() == QByteArrayLiteral("texture")) {
             m_attachmentData.m_textureUuid = propertyChange->value().value<QNodeId>();
@@ -108,13 +113,13 @@ void RenderAttachment::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
             m_attachmentData.m_layer = propertyChange->value().toInt();
         }
         else if (propertyChange->propertyName() == QByteArrayLiteral("face")) {
-            m_attachmentData.m_face = static_cast<QRenderAttachment::CubeMapFace>(propertyChange->value().toInt());
+            m_attachmentData.m_face = static_cast<QRenderTargetOutput::CubeMapFace>(propertyChange->value().toInt());
         }
         markDirty(AbstractRenderer::AllDirty);
     }
 }
 
-Attachment RenderAttachment::attachment() const
+Attachment RenderTargetOutput::attachment() const
 {
     return m_attachmentData;
 }
diff --git a/src/render/backend/renderattachment_p.h b/src/render/backend/rendertargetoutput_p.h
index 7b7928da5..204918c28 100644
--- a/src/render/backend/renderattachment_p.h
+++ b/src/render/backend/rendertargetoutput_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_RENDERATTACHMENT_H
-#define QT3DRENDER_RENDER_RENDERATTACHMENT_H
+#ifndef QT3DRENDER_RENDER_RENDERTARGETOUTPUT_H
+#define QT3DRENDER_RENDER_RENDERTARGETOUTPUT_H
 
 //
 //  W A R N I N G
@@ -52,31 +52,32 @@
 //
 
 #include <Qt3DRender/private/backendnode_p.h>
-#include <Qt3DRender/qrenderattachment.h>
+#include <Qt3DRender/qrendertargetoutput.h>
 #include <Qt3DRender/private/attachmentpack_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QRenderAttachment;
+class QRenderTargetOutput;
 
 namespace Render {
 
 class AttachmentManager;
 
-class RenderAttachment : public BackendNode
+class RenderTargetOutput : public BackendNode
 {
 public:
-    RenderAttachment();
+    RenderTargetOutput();
 
     void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
     Qt3DCore::QNodeId textureUuid() const;
     int mipLevel() const;
     int layer() const;
-    QRenderAttachment::CubeMapFace face() const;
-    QRenderAttachment::AttachmentPoint point() const;
+    QString name() const;
+    QRenderTargetOutput::CubeMapFace face() const;
+    QRenderTargetOutput::AttachmentPoint point() const;
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     Attachment attachment() const;
 
@@ -91,4 +92,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_RENDERATTACHMENT_H
+#endif // QT3DRENDER_RENDER_RENDERTARGETOUTPUT_H
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index c6abea751..30b863702 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -824,7 +824,7 @@ void RenderView::setShaderAndUniforms(RenderCommand *command, RenderPass *rPass,
             QHash<QString, int> fragOutputs;
             if (!m_renderTarget.isNull() && !shader->isLoaded()) {
                 Q_FOREACH (const Attachment &att, m_attachmentPack.attachments()) {
-                    if (att.m_point <= QRenderAttachment::ColorAttachment15)
+                    if (att.m_point <= QRenderTargetOutput::ColorAttachment15)
                         fragOutputs.insert(att.m_name, att.m_point);
                 }
             }
diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h
index 1f682e02d..a27f1edb5 100644
--- a/src/render/backend/renderview_p.h
+++ b/src/render/backend/renderview_p.h
@@ -230,7 +230,7 @@ public:
     void gatherLights(Entity *preprocessedTreeRoot);
 
     void addRenderAttachment(Attachment attachment) { m_attachmentPack.addAttachment(attachment); }
-    void setDrawBuffers(const QList<QRenderAttachment::AttachmentPoint> &drawBuffers) { m_attachmentPack.setDrawBuffers(drawBuffers); }
+    void setDrawBuffers(const QList<QRenderTargetOutput::AttachmentPoint> &drawBuffers) { m_attachmentPack.setDrawBuffers(drawBuffers); }
     const AttachmentPack &attachmentPack() const;
 
     void setRenderTargetHandle(HTarget renderTargetHandle) Q_DECL_NOEXCEPT { m_renderTarget = renderTargetHandle; }
diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp
index 31f1e1d6d..909414a74 100644
--- a/src/render/framegraph/qrendertargetselector.cpp
+++ b/src/render/framegraph/qrendertargetselector.cpp
@@ -98,7 +98,7 @@ QRenderTarget *QRenderTargetSelector::target() const
 /*!
  * \internal
  * Sets the draw buffers \a buffers to be used. The draw buffers should be
- * matching the Qt3DRender::QRenderAttachment::RenderAttachmentType
+ * matching the Qt3DRender::QRenderTargetOutput::RenderAttachmentType
  * defined in the attachments of the Qt3DRender::QRenderTarget associated to the
  * Qt3DRender::QRenderTargetSelector instance.
  *
@@ -106,7 +106,7 @@ QRenderTarget *QRenderTargetSelector::target() const
  * default to using all the attachments' draw buffers.
  *
  */
-void QRenderTargetSelector::setDrawBuffers(const QList<QRenderAttachment::AttachmentPoint> &buffers)
+void QRenderTargetSelector::setDrawBuffers(const QList<QRenderTargetOutput::AttachmentPoint> &buffers)
 {
     Q_D(QRenderTargetSelector);
     if (buffers != d->m_drawBuffers) {
@@ -124,7 +124,7 @@ void QRenderTargetSelector::setDrawBuffers(const QList<QRenderAttachment::Attach
 /*!
  * Returns the list of draw buffers for the current Qt3DRender::QRenderTargetSelector instance.
  */
-QList<QRenderAttachment::AttachmentPoint> QRenderTargetSelector::drawBuffers() const
+QList<QRenderTargetOutput::AttachmentPoint> QRenderTargetSelector::drawBuffers() const
 {
     Q_D(const QRenderTargetSelector);
     return d->m_drawBuffers;
diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h
index 28badd1c2..67b002ed4 100644
--- a/src/render/framegraph/qrendertargetselector.h
+++ b/src/render/framegraph/qrendertargetselector.h
@@ -43,7 +43,7 @@
 #include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DCore/qnode.h>
 #include <Qt3DRender/qframegraphnode.h>
-#include <Qt3DRender/qrenderattachment.h>
+#include <Qt3DRender/qrendertargetoutput.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -62,8 +62,8 @@ public:
 
     QRenderTarget *target() const;
 
-    void setDrawBuffers(const QList<QRenderAttachment::AttachmentPoint> &buffers);
-    QList<QRenderAttachment::AttachmentPoint> drawBuffers() const;
+    void setDrawBuffers(const QList<QRenderTargetOutput::AttachmentPoint> &buffers);
+    QList<QRenderTargetOutput::AttachmentPoint> drawBuffers() const;
 
 public Q_SLOTS:
     void setTarget(QRenderTarget *target);
@@ -84,6 +84,6 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QList<Qt3DRender::QRenderAttachment::AttachmentPoint>)
+Q_DECLARE_METATYPE(QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>)
 
 #endif // QT3DRENDER_QRENDERTARGETSELECTOR_H
diff --git a/src/render/framegraph/qrendertargetselector_p.h b/src/render/framegraph/qrendertargetselector_p.h
index a32cb68ad..d6f663cd3 100644
--- a/src/render/framegraph/qrendertargetselector_p.h
+++ b/src/render/framegraph/qrendertargetselector_p.h
@@ -67,7 +67,7 @@ public:
 
     Q_DECLARE_PUBLIC(QRenderTargetSelector)
     QRenderTarget *m_target;
-    QList<QRenderAttachment::AttachmentPoint> m_drawBuffers;
+    QList<QRenderTargetOutput::AttachmentPoint> m_drawBuffers;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp
index 725eaa06b..d54021aac 100644
--- a/src/render/framegraph/rendertargetselectornode.cpp
+++ b/src/render/framegraph/rendertargetselectornode.cpp
@@ -44,7 +44,7 @@
 #include <Qt3DRender/qrendertarget.h>
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DRender/private/renderlogging_p.h>
-#include <Qt3DRender/qrenderattachment.h>
+#include <Qt3DRender/qrendertargetoutput.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -78,7 +78,7 @@ void RenderTargetSelector::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
         else if (propertyChange->propertyName() == QByteArrayLiteral("enabled"))
             setEnabled(propertyChange->value().toBool());
         else if (propertyChange->propertyName() == QByteArrayLiteral("drawBuffers"))
-            m_drawBuffers = propertyChange->value().value<QList<Qt3DRender::QRenderAttachment::AttachmentPoint> >();
+            m_drawBuffers = propertyChange->value().value<QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >();
         markDirty(AbstractRenderer::AllDirty);
     }
 }
@@ -88,7 +88,7 @@ Qt3DCore::QNodeId RenderTargetSelector::renderTargetUuid() const
     return m_renderTargetUuid;
 }
 
-QList<QRenderAttachment::AttachmentPoint> RenderTargetSelector::drawBuffers() const
+QList<QRenderTargetOutput::AttachmentPoint> RenderTargetSelector::drawBuffers() const
 {
     return m_drawBuffers;
 }
diff --git a/src/render/framegraph/rendertargetselectornode_p.h b/src/render/framegraph/rendertargetselectornode_p.h
index 7baa2ed99..61f7891ca 100644
--- a/src/render/framegraph/rendertargetselectornode_p.h
+++ b/src/render/framegraph/rendertargetselectornode_p.h
@@ -69,11 +69,11 @@ public:
     void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     Qt3DCore::QNodeId renderTargetUuid() const;
-    QList<QRenderAttachment::AttachmentPoint> drawBuffers() const;
+    QList<QRenderTargetOutput::AttachmentPoint> drawBuffers() const;
 
 private:
     Qt3DCore::QNodeId m_renderTargetUuid;
-    QList<QRenderAttachment::AttachmentPoint> m_drawBuffers;
+    QList<QRenderTargetOutput::AttachmentPoint> m_drawBuffers;
 };
 
 } // namespace Render
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index 3b24b8701..2a72cb485 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -260,7 +260,7 @@ void QRenderAspect::registerBackendTypes()
     registerBackendType<QRenderPass>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::RenderPass, Render::RenderPassManager>(d->m_renderer, d->m_nodeManagers->renderPassManager())));
     registerBackendType<QAbstractSceneLoader>(QBackendNodeMapperPtr(new Render::RenderSceneFunctor(d->m_renderer, d->m_nodeManagers->sceneManager())));
     registerBackendType<QRenderTarget>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::RenderTarget, Render::RenderTargetManager>(d->m_renderer, d->m_nodeManagers->renderTargetManager())));
-    registerBackendType<QRenderAttachment>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::RenderAttachment, Render::AttachmentManager>(d->m_renderer, d->m_nodeManagers->attachmentManager())));
+    registerBackendType<QRenderTargetOutput>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::RenderTargetOutput, Render::AttachmentManager>(d->m_renderer, d->m_nodeManagers->attachmentManager())));
     registerBackendType<QSortCriterion>(QBackendNodeMapperPtr(new Render::NodeFunctor<Render::SortCriterion, Render::SortCriterionManager>(d->m_renderer, d->m_nodeManagers->sortCriterionManager())));
     registerBackendType<QClearBuffer>(QBackendNodeMapperPtr(new Render::FrameGraphNodeFunctor<Render::ClearBuffer, QClearBuffer>(d->m_renderer, d->m_nodeManagers->frameGraphManager())));
     registerBackendType<QTechniqueFilter>(QBackendNodeMapperPtr(new Render::FrameGraphNodeFunctor<Render::TechniqueFilter, QTechniqueFilter>(d->m_renderer, d->m_nodeManagers->frameGraphManager())));
diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp
index f0091b449..9410fe695 100644
--- a/src/render/frontend/qrendertarget.cpp
+++ b/src/render/frontend/qrendertarget.cpp
@@ -39,7 +39,7 @@
 
 #include "qrendertarget.h"
 #include "qrendertarget_p.h"
-#include "qrenderattachment.h"
+#include "qrendertargetoutput.h"
 #include <Qt3DCore/qscenepropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -57,8 +57,8 @@ void QRenderTarget::copy(const QNode *ref)
 {
     QNode::copy(ref);
     const QRenderTarget *other = static_cast<const QRenderTarget*>(ref);
-    Q_FOREACH (QRenderAttachment *attachment, other->d_func()->m_attachments)
-        addAttachment(qobject_cast<QRenderAttachment *>(QNode::clone(attachment)));
+    Q_FOREACH (QRenderTargetOutput *attachment, other->d_func()->m_attachments)
+        addAttachment(qobject_cast<QRenderTargetOutput *>(QNode::clone(attachment)));
 }
 
 QRenderTarget::QRenderTarget(QNode *parent)
@@ -77,7 +77,7 @@ QRenderTarget::QRenderTarget(QRenderTargetPrivate &dd, QNode *parent)
 {
 }
 
-void QRenderTarget::addAttachment(QRenderAttachment *attachment)
+void QRenderTarget::addAttachment(QRenderTargetOutput *attachment)
 {
     Q_D(QRenderTarget);
     if (!d->m_attachments.contains(attachment)) {
@@ -95,7 +95,7 @@ void QRenderTarget::addAttachment(QRenderAttachment *attachment)
     }
 }
 
-void QRenderTarget::removeAttachment(QRenderAttachment *attachment)
+void QRenderTarget::removeAttachment(QRenderTargetOutput *attachment)
 {
     Q_D(QRenderTarget);
 
@@ -108,7 +108,7 @@ void QRenderTarget::removeAttachment(QRenderAttachment *attachment)
     d->m_attachments.removeOne(attachment);
 }
 
-QList<QRenderAttachment *> QRenderTarget::attachments() const
+QList<QRenderTargetOutput *> QRenderTarget::attachments() const
 {
     Q_D(const QRenderTarget);
     return d->m_attachments;
diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h
index 6d58714c0..0ee136973 100644
--- a/src/render/frontend/qrendertarget.h
+++ b/src/render/frontend/qrendertarget.h
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 class QRenderTargetPrivate;
-class QRenderAttachment;
+class QRenderTargetOutput;
 
 class QT3DRENDERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent
 {
@@ -57,9 +57,9 @@ public:
     explicit QRenderTarget(Qt3DCore::QNode *parent = 0);
     ~QRenderTarget();
 
-    void addAttachment(QRenderAttachment *attachment);
-    void removeAttachment(QRenderAttachment *attachment);
-    QList<QRenderAttachment *> attachments() const;
+    void addAttachment(QRenderTargetOutput *attachment);
+    void removeAttachment(QRenderTargetOutput *attachment);
+    QList<QRenderTargetOutput *> attachments() const;
 
 protected:
     QRenderTarget(QRenderTargetPrivate &dd, Qt3DCore::QNode *parent = 0);
diff --git a/src/render/frontend/qrendertarget_p.h b/src/render/frontend/qrendertarget_p.h
index 5af913d15..60d51a625 100644
--- a/src/render/frontend/qrendertarget_p.h
+++ b/src/render/frontend/qrendertarget_p.h
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QRenderAttachment;
+class QRenderTargetOutput;
 class QRenderTarget;
 
 class QRenderTargetPrivate : public Qt3DCore::QComponentPrivate
@@ -66,7 +66,7 @@ public:
     QRenderTargetPrivate();
 
     Q_DECLARE_PUBLIC(QRenderTarget)
-    QList<QRenderAttachment *> m_attachments;
+    QList<QRenderTargetOutput *> m_attachments;
 };
 
 }
diff --git a/src/render/frontend/qrenderattachment.cpp b/src/render/frontend/qrendertargetoutput.cpp
index cc3a54bb9..48bc9e5a0 100644
--- a/src/render/frontend/qrenderattachment.cpp
+++ b/src/render/frontend/qrendertargetoutput.cpp
@@ -36,8 +36,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qrenderattachment_p.h"
-#include "qrenderattachment.h"
+#include "qrendertargetoutput_p.h"
+#include "qrendertargetoutput.h"
 #include "qtexture.h"
 #include <Qt3DCore/qscenepropertychange.h>
 
@@ -45,58 +45,58 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-QRenderAttachmentPrivate::QRenderAttachmentPrivate()
+QRenderTargetOutputPrivate::QRenderTargetOutputPrivate()
     : QNodePrivate()
     , m_texture(Q_NULLPTR)
-    , m_attachmentPoint(QRenderAttachment::ColorAttachment0)
+    , m_attachmentPoint(QRenderTargetOutput::ColorAttachment0)
     , m_mipLevel(0)
     , m_layer(0)
-    , m_face(QRenderAttachment::CubeMapNegativeX)
+    , m_face(QRenderTargetOutput::CubeMapNegativeX)
 {
 }
 
-void QRenderAttachment::copy(const QNode *ref)
+void QRenderTargetOutput::copy(const QNode *ref)
 {
     QNode::copy(ref);
-    const QRenderAttachment *rA = static_cast<const QRenderAttachment*>(ref);
+    const QRenderTargetOutput *rA = static_cast<const QRenderTargetOutput*>(ref);
     d_func()->m_attachmentPoint = rA->d_func()->m_attachmentPoint;
     setTexture(qobject_cast<QAbstractTextureProvider *>(QNode::clone(rA->d_func()->m_texture)));
 }
 
-QRenderAttachment::QRenderAttachment(QNode *parent)
-    : QNode(*new QRenderAttachmentPrivate, parent)
+QRenderTargetOutput::QRenderTargetOutput(QNode *parent)
+    : QNode(*new QRenderTargetOutputPrivate, parent)
 {
 }
 
-QRenderAttachment::~QRenderAttachment()
+QRenderTargetOutput::~QRenderTargetOutput()
 {
     QNode::cleanup();
 }
 
 /*! \internal */
-QRenderAttachment::QRenderAttachment(QRenderAttachmentPrivate &dd, QNode *parent)
+QRenderTargetOutput::QRenderTargetOutput(QRenderTargetOutputPrivate &dd, QNode *parent)
     : QNode(dd, parent)
 {
 }
 
-void QRenderAttachment::setAttachmentPoint(QRenderAttachment::AttachmentPoint attachmentPoint)
+void QRenderTargetOutput::setAttachmentPoint(QRenderTargetOutput::AttachmentPoint attachmentPoint)
 {
-    Q_D(QRenderAttachment);
+    Q_D(QRenderTargetOutput);
     if (attachmentPoint != d->m_attachmentPoint) {
         d->m_attachmentPoint = attachmentPoint;
         emit attachmentPointChanged(attachmentPoint);
     }
 }
 
-QRenderAttachment::AttachmentPoint QRenderAttachment::attachmentPoint() const
+QRenderTargetOutput::AttachmentPoint QRenderTargetOutput::attachmentPoint() const
 {
-    Q_D(const QRenderAttachment);
+    Q_D(const QRenderTargetOutput);
     return d->m_attachmentPoint;
 }
 
-void QRenderAttachment::setTexture(QAbstractTextureProvider *texture)
+void QRenderTargetOutput::setTexture(QAbstractTextureProvider *texture)
 {
-    Q_D(QRenderAttachment);
+    Q_D(QRenderTargetOutput);
     if (texture != d->m_texture) {
         d->m_texture = texture;
 
@@ -107,54 +107,54 @@ void QRenderAttachment::setTexture(QAbstractTextureProvider *texture)
     }
 }
 
-QAbstractTextureProvider *QRenderAttachment::texture() const
+QAbstractTextureProvider *QRenderTargetOutput::texture() const
 {
-    Q_D(const QRenderAttachment);
+    Q_D(const QRenderTargetOutput);
     return d->m_texture;
 }
 
-void QRenderAttachment::setMipLevel(int level)
+void QRenderTargetOutput::setMipLevel(int level)
 {
-    Q_D(QRenderAttachment);
+    Q_D(QRenderTargetOutput);
     if (d->m_mipLevel != level) {
         d->m_mipLevel = level;
         emit mipLevelChanged(level);
     }
 }
 
-int QRenderAttachment::mipLevel() const
+int QRenderTargetOutput::mipLevel() const
 {
-    Q_D(const QRenderAttachment);
+    Q_D(const QRenderTargetOutput);
     return d->m_mipLevel;
 }
 
-void QRenderAttachment::setLayer(int layer)
+void QRenderTargetOutput::setLayer(int layer)
 {
-    Q_D(QRenderAttachment);
+    Q_D(QRenderTargetOutput);
     if (d->m_layer != layer) {
         d->m_layer = layer;
         emit layerChanged(layer);
     }
 }
 
-int QRenderAttachment::layer() const
+int QRenderTargetOutput::layer() const
 {
-    Q_D(const QRenderAttachment);
+    Q_D(const QRenderTargetOutput);
     return d->m_layer;
 }
 
-void QRenderAttachment::setFace(QRenderAttachment::CubeMapFace face)
+void QRenderTargetOutput::setFace(QRenderTargetOutput::CubeMapFace face)
 {
-    Q_D(QRenderAttachment);
+    Q_D(QRenderTargetOutput);
     if (d->m_face != face) {
         d->m_face = face;
         emit faceChanged(face);
     }
 }
 
-QRenderAttachment::CubeMapFace QRenderAttachment::face() const
+QRenderTargetOutput::CubeMapFace QRenderTargetOutput::face() const
 {
-    Q_D(const QRenderAttachment);
+    Q_D(const QRenderTargetOutput);
     return d->m_face;
 }
 
diff --git a/src/render/frontend/qrenderattachment.h b/src/render/frontend/qrendertargetoutput.h
index 0307f83a4..c935ab03a 100644
--- a/src/render/frontend/qrenderattachment.h
+++ b/src/render/frontend/qrendertargetoutput.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_QRENDERATTACHMENT_H
-#define QT3DRENDER_QRENDERATTACHMENT_H
+#ifndef QT3DRENDER_QRENDERTARGETOUTPUT_H
+#define QT3DRENDER_QRENDERTARGETOUTPUT_H
 
 #include <Qt3DCore/qnode.h>
 #include <Qt3DRender/qt3drender_global.h>
@@ -48,9 +48,9 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 class QAbstractTextureProvider;
-class QRenderAttachmentPrivate;
+class QRenderTargetOutputPrivate;
 
-class QT3DRENDERSHARED_EXPORT QRenderAttachment : public Qt3DCore::QNode
+class QT3DRENDERSHARED_EXPORT QRenderTargetOutput : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(AttachmentPoint attachmentPoint READ attachmentPoint WRITE setAttachmentPoint NOTIFY attachmentPointChanged)
@@ -93,8 +93,8 @@ public:
     };
     Q_ENUM(CubeMapFace)
 
-    explicit QRenderAttachment(Qt3DCore::QNode *parent = 0);
-    ~QRenderAttachment();
+    explicit QRenderTargetOutput(Qt3DCore::QNode *parent = 0);
+    ~QRenderTargetOutput();
 
     AttachmentPoint attachmentPoint() const;
     QAbstractTextureProvider *texture() const;
@@ -117,18 +117,18 @@ Q_SIGNALS:
     void faceChanged(CubeMapFace face);
 
 protected:
-    QRenderAttachment(QRenderAttachmentPrivate &dd, Qt3DCore::QNode *parent = 0);
+    QRenderTargetOutput(QRenderTargetOutputPrivate &dd, Qt3DCore::QNode *parent = 0);
     void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
-    Q_DECLARE_PRIVATE(QRenderAttachment)
-    QT3D_CLONEABLE(QRenderAttachment)
+    Q_DECLARE_PRIVATE(QRenderTargetOutput)
+    QT3D_CLONEABLE(QRenderTargetOutput)
 };
 
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3DRender::QRenderAttachment::AttachmentPoint)
+Q_DECLARE_METATYPE(Qt3DRender::QRenderTargetOutput::AttachmentPoint)
 
-#endif // QT3DRENDER_QRENDERATTACHMENT_H
+#endif // QT3DRENDER_QRENDERTARGETOUTPUT_H
diff --git a/src/render/frontend/qrenderattachment_p.h b/src/render/frontend/qrendertargetoutput_p.h
index d6b9e418a..c948b44ad 100644
--- a/src/render/frontend/qrenderattachment_p.h
+++ b/src/render/frontend/qrendertargetoutput_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_QRENDERATTACHMENT_P_H
-#define QT3DRENDER_QRENDERATTACHMENT_P_H
+#ifndef QT3DRENDER_QRENDERTARGETOUTPUT_P_H
+#define QT3DRENDER_QRENDERTARGETOUTPUT_P_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 //
 
 #include <Qt3DCore/private/qnode_p.h>
-#include <Qt3DRender/qrenderattachment.h>
+#include <Qt3DRender/qrendertargetoutput.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -60,22 +60,22 @@ namespace Qt3DRender {
 
 class QAbstractTextureProvider;
 
-class QRenderAttachmentPrivate : public Qt3DCore::QNodePrivate
+class QRenderTargetOutputPrivate : public Qt3DCore::QNodePrivate
 {
 public:
-    QRenderAttachmentPrivate();
+    QRenderTargetOutputPrivate();
 
-    Q_DECLARE_PUBLIC(QRenderAttachment)
+    Q_DECLARE_PUBLIC(QRenderTargetOutput)
 
     QAbstractTextureProvider *m_texture;
-    QRenderAttachment::AttachmentPoint m_attachmentPoint;
+    QRenderTargetOutput::AttachmentPoint m_attachmentPoint;
     int m_mipLevel;
     int m_layer;
-    QRenderAttachment::CubeMapFace m_face;
+    QRenderTargetOutput::CubeMapFace m_face;
 };
 
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_QRENDERATTACHMENT_P_H
+#endif // QT3DRENDER_QRENDERTARGETOUTPUT_P_H
diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri
index e4894a883..1f67475ea 100644
--- a/src/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
@@ -7,8 +7,6 @@ HEADERS += \
     $$PWD/qitemmodelbuffer.h \
     $$PWD/qlayer.h \
     $$PWD/qlayer_p.h \
-    $$PWD/qrenderattachment.h \
-    $$PWD/qrenderattachment_p.h \
     $$PWD/qrendertarget.h \
     $$PWD/qrendertarget_p.h \
     $$PWD/sphere_p.h \
@@ -20,7 +18,9 @@ HEADERS += \
     $$PWD/qcameralens.h \
     $$PWD/qcameralens_p.h \
     $$PWD/qrenderersettings.h \
-    $$PWD/qrenderersettings_p.h
+    $$PWD/qrenderersettings_p.h \
+    $$PWD/qrendertargetoutput.h \
+    $$PWD/qrendertargetoutput_p.h
 
 SOURCES += \
     $$PWD/qabstractfunctor.cpp \
@@ -28,10 +28,10 @@ SOURCES += \
     $$PWD/qitemmodelbuffer.cpp \
     $$PWD/sphere.cpp \
     $$PWD/qlayer.cpp \
-    $$PWD/qrenderattachment.cpp \
     $$PWD/qrendertarget.cpp \
     $$PWD/qboundingvolumedebug.cpp \
     $$PWD/qcomputejob.cpp \
     $$PWD/qcamera.cpp \
     $$PWD/qcameralens.cpp \
-    $$PWD/qrenderersettings.cpp
+    $$PWD/qrenderersettings.cpp \
+    $$PWD/qrendertargetoutput.cpp
diff --git a/src/render/graphicshelpers/graphicscontext.cpp b/src/render/graphicshelpers/graphicscontext.cpp
index a30f09f48..3c8600eef 100644
--- a/src/render/graphicshelpers/graphicscontext.cpp
+++ b/src/render/graphicshelpers/graphicscontext.cpp
@@ -488,19 +488,19 @@ void GraphicsContext::bindFrameBufferAttachmentHelper(GLuint fboId, const Attach
 
 void GraphicsContext::activateDrawBuffers(const AttachmentPack &attachments)
 {
-    int activeDrawBuffers[QRenderAttachment::ColorAttachment15 + 1];
+    int activeDrawBuffers[QRenderTargetOutput::ColorAttachment15 + 1];
     int i = 0;
 
-    const QList<QRenderAttachment::AttachmentPoint> &drawBuffers = attachments.drawBuffers();
+    const QList<QRenderTargetOutput::AttachmentPoint> &drawBuffers = attachments.drawBuffers();
 
     // If drawBuffers is empty, use all the attachments as draw buffers
     if (drawBuffers.isEmpty()) {
         Q_FOREACH (const Attachment &attachment, attachments.attachments())
-            if (attachment.m_point <= QRenderAttachment::ColorAttachment15)
+            if (attachment.m_point <= QRenderTargetOutput::ColorAttachment15)
                 activeDrawBuffers[i++] = attachment.m_point;
     } else {
-        Q_FOREACH (const QRenderAttachment::AttachmentPoint drawBuffer, drawBuffers)
-            if (drawBuffer <= QRenderAttachment::ColorAttachment15)
+        Q_FOREACH (const QRenderTargetOutput::AttachmentPoint drawBuffer, drawBuffers)
+            if (drawBuffer <= QRenderTargetOutput::ColorAttachment15)
                 activeDrawBuffers[i++] = drawBuffer;
     }
 
diff --git a/src/render/graphicshelpers/graphicshelperes2.cpp b/src/render/graphicshelpers/graphicshelperes2.cpp
index ce1f60368..c43caafcc 100644
--- a/src/render/graphicshelpers/graphicshelperes2.cpp
+++ b/src/render/graphicshelpers/graphicshelperes2.cpp
@@ -320,11 +320,11 @@ void GraphicsHelperES2::bindFrameBufferAttachment(QOpenGLTexture *texture, const
 {
     GLenum attr = GL_COLOR_ATTACHMENT0;
 
-    if (attachment.m_point == QRenderAttachment::ColorAttachment0)
+    if (attachment.m_point == QRenderTargetOutput::ColorAttachment0)
         attr = GL_COLOR_ATTACHMENT0;
-    else if (attachment.m_point == QRenderAttachment::DepthAttachment)
+    else if (attachment.m_point == QRenderTargetOutput::DepthAttachment)
         attr = GL_DEPTH_ATTACHMENT;
-    else if (attachment.m_point == QRenderAttachment::StencilAttachment)
+    else if (attachment.m_point == QRenderTargetOutput::StencilAttachment)
         attr = GL_STENCIL_ATTACHMENT;
     else
         qCritical() << "Unsupported FBO attachment OpenGL ES 2.0";
diff --git a/src/render/graphicshelpers/graphicshelpergl2.cpp b/src/render/graphicshelpers/graphicshelpergl2.cpp
index c632d51a0..9779e4cd7 100644
--- a/src/render/graphicshelpers/graphicshelpergl2.cpp
+++ b/src/render/graphicshelpers/graphicshelpergl2.cpp
@@ -301,11 +301,11 @@ void GraphicsHelperGL2::bindFrameBufferAttachment(QOpenGLTexture *texture, const
     if (m_fboFuncs != Q_NULLPTR) {
         GLenum attr = GL_DEPTH_STENCIL_ATTACHMENT;
 
-        if (attachment.m_point <= QRenderAttachment::ColorAttachment15)
+        if (attachment.m_point <= QRenderTargetOutput::ColorAttachment15)
             attr = GL_COLOR_ATTACHMENT0 + attachment.m_point;
-        else if (attachment.m_point == QRenderAttachment::DepthAttachment)
+        else if (attachment.m_point == QRenderTargetOutput::DepthAttachment)
             attr = GL_DEPTH_ATTACHMENT;
-        else if (attachment.m_point == QRenderAttachment::StencilAttachment)
+        else if (attachment.m_point == QRenderTargetOutput::StencilAttachment)
             attr = GL_STENCIL_ATTACHMENT;
         else
             qCritical() << "DepthStencil Attachment not supported on OpenGL 2.0";
diff --git a/src/render/graphicshelpers/graphicshelpergl3.cpp b/src/render/graphicshelpers/graphicshelpergl3.cpp
index 08b8d3f8e..afce394e0 100644
--- a/src/render/graphicshelpers/graphicshelpergl3.cpp
+++ b/src/render/graphicshelpers/graphicshelpergl3.cpp
@@ -351,11 +351,11 @@ void GraphicsHelperGL3::bindFrameBufferAttachment(QOpenGLTexture *texture, const
 {
     GLenum attr = GL_DEPTH_STENCIL_ATTACHMENT;
 
-    if (attachment.m_point <= QRenderAttachment::ColorAttachment15)
+    if (attachment.m_point <= QRenderTargetOutput::ColorAttachment15)
         attr = GL_COLOR_ATTACHMENT0 + attachment.m_point;
-    else if (attachment.m_point == QRenderAttachment::DepthAttachment)
+    else if (attachment.m_point == QRenderTargetOutput::DepthAttachment)
         attr = GL_DEPTH_ATTACHMENT;
-    else if (attachment.m_point == QRenderAttachment::StencilAttachment)
+    else if (attachment.m_point == QRenderTargetOutput::StencilAttachment)
         attr = GL_STENCIL_ATTACHMENT;
 
     texture->bind();
diff --git a/src/render/graphicshelpers/graphicshelpergl3_3.cpp b/src/render/graphicshelpers/graphicshelpergl3_3.cpp
index 0ee157453..90b670349 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_3.cpp
+++ b/src/render/graphicshelpers/graphicshelpergl3_3.cpp
@@ -348,11 +348,11 @@ void GraphicsHelperGL3_3::bindFrameBufferAttachment(QOpenGLTexture *texture, con
 {
     GLenum attr = GL_DEPTH_STENCIL_ATTACHMENT;
 
-    if (attachment.m_point <= QRenderAttachment::ColorAttachment15)
+    if (attachment.m_point <= QRenderTargetOutput::ColorAttachment15)
         attr = GL_COLOR_ATTACHMENT0 + attachment.m_point;
-    else if (attachment.m_point == QRenderAttachment::DepthAttachment)
+    else if (attachment.m_point == QRenderTargetOutput::DepthAttachment)
         attr = GL_DEPTH_ATTACHMENT;
-    else if (attachment.m_point == QRenderAttachment::StencilAttachment)
+    else if (attachment.m_point == QRenderTargetOutput::StencilAttachment)
         attr = GL_STENCIL_ATTACHMENT;
 
     texture->bind();
diff --git a/src/render/graphicshelpers/graphicshelpergl4.cpp b/src/render/graphicshelpers/graphicshelpergl4.cpp
index 99a93cccd..bd4ec8615 100644
--- a/src/render/graphicshelpers/graphicshelpergl4.cpp
+++ b/src/render/graphicshelpers/graphicshelpergl4.cpp
@@ -341,11 +341,11 @@ void GraphicsHelperGL4::bindFrameBufferAttachment(QOpenGLTexture *texture, const
 {
     GLenum attr = GL_DEPTH_STENCIL_ATTACHMENT;
 
-    if (attachment.m_point <= QRenderAttachment::ColorAttachment15)
+    if (attachment.m_point <= QRenderTargetOutput::ColorAttachment15)
         attr = GL_COLOR_ATTACHMENT0 + attachment.m_point;
-    else if (attachment.m_point == QRenderAttachment::DepthAttachment)
+    else if (attachment.m_point == QRenderTargetOutput::DepthAttachment)
         attr = GL_DEPTH_ATTACHMENT;
-    else if (attachment.m_point == QRenderAttachment::StencilAttachment)
+    else if (attachment.m_point == QRenderTargetOutput::StencilAttachment)
         attr = GL_STENCIL_ATTACHMENT;
 
     texture->bind();
diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp
index 8de844d30..e77a5cf37 100644
--- a/src/render/jobs/renderviewjobutils.cpp
+++ b/src/render/jobs/renderviewjobutils.cpp
@@ -142,7 +142,7 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN
 
                         // Copy attachments
                         Q_FOREACH (QNodeId attachmentId, renderTarget->renderAttachments()) {
-                            RenderAttachment *attachment = manager->attachmentManager()->lookupResource(attachmentId);
+                            RenderTargetOutput *attachment = manager->attachmentManager()->lookupResource(attachmentId);
                             if (attachment)
                                 rv->addRenderAttachment(attachment->attachment());
                         }
diff --git a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp
index 6576c0144..249c476ea 100644
--- a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp
+++ b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp
@@ -59,21 +59,21 @@ private Q_SLOTS:
     void checkCloning_data()
     {
         QTest::addColumn<Qt3DRender::QRenderTargetSelector *>("renderTargetSelector");
-        QTest::addColumn<QList<Qt3DRender::QRenderAttachment::AttachmentPoint> >("drawBuffers");
+        QTest::addColumn<QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >("drawBuffers");
         QTest::addColumn<Qt3DRender::QRenderTarget * >("target");
 
         Qt3DRender::QRenderTargetSelector *defaultConstructed = new Qt3DRender::QRenderTargetSelector();
-        QTest::newRow("defaultConstructed") << defaultConstructed << QList<Qt3DRender::QRenderAttachment::AttachmentPoint>() << static_cast<Qt3DRender::QRenderTarget *>(Q_NULLPTR);
+        QTest::newRow("defaultConstructed") << defaultConstructed << QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>() << static_cast<Qt3DRender::QRenderTarget *>(Q_NULLPTR);
 
         Qt3DRender::QRenderTargetSelector *renderTargetSelectorWithTarget = new Qt3DRender::QRenderTargetSelector();
         Qt3DRender::QRenderTarget *target1 = new Qt3DRender::QRenderTarget();
         renderTargetSelectorWithTarget->setTarget(target1);
-        QTest::newRow("renderTargetSelectorWithTarget") << renderTargetSelectorWithTarget << QList<Qt3DRender::QRenderAttachment::AttachmentPoint>() << target1;
+        QTest::newRow("renderTargetSelectorWithTarget") << renderTargetSelectorWithTarget << QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>() << target1;
 
         Qt3DRender::QRenderTargetSelector *renderTargetSelectorWithTargetAndBuffers = new Qt3DRender::QRenderTargetSelector();
         Qt3DRender::QRenderTarget *target2 = new Qt3DRender::QRenderTarget();
         renderTargetSelectorWithTargetAndBuffers->setTarget(target2);
-        QList<Qt3DRender::QRenderAttachment::AttachmentPoint> attachmentPoints = QList<Qt3DRender::QRenderAttachment::AttachmentPoint>() << Qt3DRender::QRenderAttachment::ColorAttachment0 << Qt3DRender::QRenderAttachment::DepthAttachment;
+        QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> attachmentPoints = QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>() << Qt3DRender::QRenderTargetOutput::ColorAttachment0 << Qt3DRender::QRenderTargetOutput::DepthAttachment;
         renderTargetSelectorWithTargetAndBuffers->setDrawBuffers(attachmentPoints);
         QTest::newRow("renderTargetSelectorWithTargetAndDrawBuffers") << renderTargetSelectorWithTargetAndBuffers << attachmentPoints << target2;
     }
@@ -82,7 +82,7 @@ private Q_SLOTS:
     {
         // GIVEN
         QFETCH(Qt3DRender::QRenderTargetSelector*, renderTargetSelector);
-        QFETCH(QList<Qt3DRender::QRenderAttachment::AttachmentPoint>, drawBuffers);
+        QFETCH(QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>, drawBuffers);
         QFETCH(Qt3DRender::QRenderTarget *, target);
 
         // THEN
@@ -150,8 +150,8 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN
-        QList<Qt3DRender::QRenderAttachment::AttachmentPoint> drawBuffers;
-        drawBuffers << Qt3DRender::QRenderAttachment::ColorAttachment0 << Qt3DRender::QRenderAttachment::DepthAttachment;
+        QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> drawBuffers;
+        drawBuffers << Qt3DRender::QRenderTargetOutput::ColorAttachment0 << Qt3DRender::QRenderTargetOutput::DepthAttachment;
         renderTargetSelector->setDrawBuffers(drawBuffers);
         QCoreApplication::processEvents();
 
@@ -160,7 +160,7 @@ private Q_SLOTS:
         change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "drawBuffers");
         QCOMPARE(change->subjectId(), renderTargetSelector->id());
-        QCOMPARE(change->value().value<QList<Qt3DRender::QRenderAttachment::AttachmentPoint> >(), drawBuffers);
+        QCOMPARE(change->value().value<QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >(), drawBuffers);
         QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();
@@ -173,7 +173,7 @@ private Q_SLOTS:
         QCOMPARE(arbiter.events.size(), 0);
 
         // WHEN
-        renderTargetSelector->setDrawBuffers(QList<Qt3DRender::QRenderAttachment::AttachmentPoint>());
+        renderTargetSelector->setDrawBuffers(QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>());
         QCoreApplication::processEvents();
 
         // THEN
@@ -181,7 +181,7 @@ private Q_SLOTS:
         change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "drawBuffers");
         QCOMPARE(change->subjectId(), renderTargetSelector->id());
-        QCOMPARE(change->value().value<QList<Qt3DRender::QRenderAttachment::AttachmentPoint> >(), QList<Qt3DRender::QRenderAttachment::AttachmentPoint>());
+        QCOMPARE(change->value().value<QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint> >(), QList<Qt3DRender::QRenderTargetOutput::AttachmentPoint>());
         QCOMPARE(change->type(), Qt3DCore::NodeUpdated);