Renamed ParameterBinder to ParameterMapper

Change-Id: I3334a09f992d84988e1f6c82b439a6457546a77b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

13 files changed, 66 insertions, 66 deletions

diff --git a/examples/simple-qml/main.qml b/examples/simple-qml/main.qml
index 79776da68..1c6c83a46 100644
--- a/examples/simple-qml/main.qml
+++ b/examples/simple-qml/main.qml
@@ -274,12 +274,12 @@ Node {
                             RenderPass {
                                 criteria : []
                                 bindings : [ // Add only the bindings needed for a shader
-                                    ParameterBinder {parameterName: "normal"; shaderVariableName: "vertexNormal"; bindingType: ParameterBinder.Attribute},
-                                    ParameterBinder {parameterName: "position"; shaderVariableName: "vertexPosition"; bindingType: ParameterBinder.Attribute},
-                                    ParameterBinder {parameterName: "ambient"; shaderVariableName: "ka"; bindingType: ParameterBinder.Uniform},
-                                    ParameterBinder {parameterName: "diffuse"; shaderVariableName: "kd"; bindingType: ParameterBinder.Uniform},
-                                    ParameterBinder {parameterName: "lightPos"; shaderVariableName: "lightPosition"; bindingType: ParameterBinder.Uniform},
-                                    ParameterBinder {parameterName: "lightIntensity"; shaderVariableName: "lightIntensity"; bindingType: ParameterBinder.Uniform}
+                                    ParameterMapper {parameterName: "normal"; shaderVariableName: "vertexNormal"; bindingType: ParameterMapper.Attribute},
+                                    ParameterMapper {parameterName: "position"; shaderVariableName: "vertexPosition"; bindingType: ParameterMapper.Attribute},
+                                    ParameterMapper {parameterName: "ambient"; shaderVariableName: "ka"; bindingType: ParameterMapper.Uniform},
+                                    ParameterMapper {parameterName: "diffuse"; shaderVariableName: "kd"; bindingType: ParameterMapper.Uniform},
+                                    ParameterMapper {parameterName: "lightPos"; shaderVariableName: "lightPosition"; bindingType: ParameterMapper.Uniform},
+                                    ParameterMapper {parameterName: "lightIntensity"; shaderVariableName: "lightIntensity"; bindingType: ParameterMapper.Uniform}
                                 ]
                                 shaderProgram : ShaderProgram {
                                     id : diffuseShader
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index d571927c8..9cd80751f 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -59,7 +59,7 @@
 #include <Qt3DRenderer/effect.h>
 #include <Qt3DRenderer/parameter.h>
 #include <Qt3DRenderer/renderpasscriterion.h>
-#include <Qt3DRenderer/parameterbinder.h>
+#include <Qt3DRenderer/parametermapper.h>
 #include <Qt3DQuickRenderer/quick3dtechnique.h>
 #include <Qt3DQuickRenderer/quick3dmaterial.h>
 #include <Qt3DQuickRenderer/quick3dtechniquefilter.h>
@@ -85,7 +85,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
     qmlRegisterType<Qt3D::RenderPassCriterion>(uri, 2, 0, "RenderPassCriterion");
     qmlRegisterType<Qt3D::Tag>(uri, 2, 0, "Tag");
     qmlRegisterType<Qt3D::Parameter>(uri, 2, 0, "Parameter");
-    qmlRegisterType<Qt3D::ParameterBinder>(uri, 2, 0, "ParameterBinder");
+    qmlRegisterType<Qt3D::ParameterMapper>(uri, 2, 0, "ParameterMapper");
     qmlRegisterType<Qt3D::Mesh>(uri, 2, 0, "Mesh");
     qmlRegisterExtendedType<Qt3D::Material, Qt3D::Render::Quick::Quick3DMaterial>(uri, 2, 0, "Material");
     qmlRegisterExtendedType<Qt3D::RenderPass, Qt3D::Render::Quick::Quick3DRenderPass>(uri, 2, 0, "RenderPass");
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp b/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
index c6ae323c1..3584b7c25 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "quick3drenderpass.h"
-#include <Qt3DRenderer/parameterbinder.h>
+#include <Qt3DRenderer/parametermapper.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -64,9 +64,9 @@ QQmlListProperty<RenderPassCriterion> Quick3DRenderPass::criteriaList()
                                                        &Quick3DRenderPass::clearCriteria);
 }
 
-QQmlListProperty<ParameterBinder> Quick3DRenderPass::bindingList()
+QQmlListProperty<ParameterMapper> Quick3DRenderPass::bindingList()
 {
-    return QQmlListProperty<Qt3D::ParameterBinder>(this, 0,
+    return QQmlListProperty<Qt3D::ParameterMapper>(this, 0,
                                                    &Quick3DRenderPass::appendBinding,
                                                    &Quick3DRenderPass::bindingsCount,
                                                    &Quick3DRenderPass::bindingAt,
@@ -98,28 +98,28 @@ void Quick3DRenderPass::clearCriteria(QQmlListProperty<RenderPassCriterion> *lis
         rPass->parentRenderPass()->removeCriterion(c);
 }
 
-void Quick3DRenderPass::appendBinding(QQmlListProperty<ParameterBinder> *list, ParameterBinder *binding)
+void Quick3DRenderPass::appendBinding(QQmlListProperty<ParameterMapper> *list, ParameterMapper *binding)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
     rPass->parentRenderPass()->addBinding(binding);
 }
 
-ParameterBinder *Quick3DRenderPass::bindingAt(QQmlListProperty<ParameterBinder> *list, int index)
+ParameterMapper *Quick3DRenderPass::bindingAt(QQmlListProperty<ParameterMapper> *list, int index)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
     return rPass->parentRenderPass()->bindings().at(index);
 }
 
-int Quick3DRenderPass::bindingsCount(QQmlListProperty<ParameterBinder> *list)
+int Quick3DRenderPass::bindingsCount(QQmlListProperty<ParameterMapper> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
     return rPass->parentRenderPass()->bindings().count();
 }
 
-void Quick3DRenderPass::clearBindings(QQmlListProperty<ParameterBinder> *list)
+void Quick3DRenderPass::clearBindings(QQmlListProperty<ParameterMapper> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    Q_FOREACH (ParameterBinder *binding, rPass->parentRenderPass()->bindings())
+    Q_FOREACH (ParameterMapper *binding, rPass->parentRenderPass()->bindings())
         rPass->parentRenderPass()->removeBinding(binding);
 }
 
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.h b/src/quick3d/quick3drenderer/items/quick3drenderpass.h
index f05d59dbe..0aa3e9d10 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.h
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.h
@@ -58,12 +58,12 @@ class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPass : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<Qt3D::RenderPassCriterion> criteria READ criteriaList)
-    Q_PROPERTY(QQmlListProperty<Qt3D::ParameterBinder> bindings READ bindingList)
+    Q_PROPERTY(QQmlListProperty<Qt3D::ParameterMapper> bindings READ bindingList)
 public:
     explicit Quick3DRenderPass(QObject *parent = 0);
 
     QQmlListProperty<Qt3D::RenderPassCriterion> criteriaList();
-    QQmlListProperty<Qt3D::ParameterBinder> bindingList();
+    QQmlListProperty<Qt3D::ParameterMapper> bindingList();
     inline RenderPass *parentRenderPass() const { return qobject_cast<RenderPass *>(parent()); }
 
 private:
@@ -72,10 +72,10 @@ private:
     static int criteriaCount(QQmlListProperty<Qt3D::RenderPassCriterion> *list);
     static void clearCriteria(QQmlListProperty<Qt3D::RenderPassCriterion> *list);
 
-    static void appendBinding(QQmlListProperty<Qt3D::ParameterBinder> *list, ParameterBinder *binding);
-    static ParameterBinder *bindingAt(QQmlListProperty<Qt3D::ParameterBinder> *list, int index);
-    static int bindingsCount(QQmlListProperty<Qt3D::ParameterBinder> *list);
-    static void clearBindings(QQmlListProperty<Qt3D::ParameterBinder> *list);
+    static void appendBinding(QQmlListProperty<Qt3D::ParameterMapper> *list, ParameterMapper *binding);
+    static ParameterMapper *bindingAt(QQmlListProperty<Qt3D::ParameterMapper> *list, int index);
+    static int bindingsCount(QQmlListProperty<Qt3D::ParameterMapper> *list);
+    static void clearBindings(QQmlListProperty<Qt3D::ParameterMapper> *list);
 };
 
 } // Quick
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index a5cbd84e7..29c3db166 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -84,7 +84,7 @@
 #include <effectmanager.h>
 #include <renderpassmanager.h>
 #include "renderlogging.h"
-#include "parameterbinder.h"
+#include "parametermapper.h"
 
 #include <Qt3DCore/cameralens.h>
 #include <Qt3DCore/qabstracteffect.h>
@@ -167,41 +167,41 @@ void Renderer::buildDefaultTechnique()
 
     Parameter* vp = new Parameter(m_defaultTechnique, QStringLiteral("position"), Parameter::FloatVec3);
     m_defaultTechnique->addParameter(vp);
-    basicPass->addBinding(new ParameterBinder(QStringLiteral("position"), QStringLiteral("vertexPosition"), ParameterBinder::Attribute));
+    basicPass->addBinding(new ParameterMapper(QStringLiteral("position"), QStringLiteral("vertexPosition"), ParameterMapper::Attribute));
 
     Parameter* np = new Parameter(m_defaultTechnique, QStringLiteral("normal"), Parameter::FloatVec3);
     m_defaultTechnique->addParameter(np);
-    basicPass->addBinding(new ParameterBinder(QStringLiteral("normal"), QStringLiteral("vertexNormal"), ParameterBinder::Attribute));
+    basicPass->addBinding(new ParameterMapper(QStringLiteral("normal"), QStringLiteral("vertexNormal"), ParameterMapper::Attribute));
 
     // matrix uniforms from standard
     Parameter* mvMat = new Parameter(m_defaultTechnique, QStringLiteral("modelView"), Parameter::FloatMat4);
     m_defaultTechnique->addParameter(mvMat);
-    basicPass->addBinding(new ParameterBinder(QStringLiteral("modelView"), QStringLiteral("modelViewMatrix"), ParameterBinder::StandardUniform));
+    basicPass->addBinding(new ParameterMapper(QStringLiteral("modelView"), QStringLiteral("modelViewMatrix"), ParameterMapper::StandardUniform));
 
     Parameter* nMat = new Parameter(m_defaultTechnique, QStringLiteral("normalMat"), Parameter::FloatMat4);
     m_defaultTechnique->addParameter(nMat);
-    basicPass->addBinding(new ParameterBinder(QStringLiteral("normalMat"), QStringLiteral("normalMatrix"), ParameterBinder::StandardUniform));
+    basicPass->addBinding(new ParameterMapper(QStringLiteral("normalMat"), QStringLiteral("normalMatrix"), ParameterMapper::StandardUniform));
 
     Parameter* mvpMat = new Parameter(m_defaultTechnique, QStringLiteral("mvp"), Parameter::FloatMat4);
     m_defaultTechnique->addParameter(mvpMat);
-    basicPass->addBinding(new ParameterBinder(QStringLiteral("mvp"), QStringLiteral("mvp"), ParameterBinder::StandardUniform));
+    basicPass->addBinding(new ParameterMapper(QStringLiteral("mvp"), QStringLiteral("mvp"), ParameterMapper::StandardUniform));
 
     // diffuse lighting uniforms
     Parameter* lightPos = new Parameter(m_defaultTechnique, QStringLiteral("lightPos"), Parameter::FloatVec4, QVector4D(10.0f, 10.0f, 0.0f, 1.0f));
     m_defaultTechnique->addParameter(lightPos);
-    basicPass->addBinding(new ParameterBinder(QStringLiteral("lightPos"), QStringLiteral("lightPosition"), ParameterBinder::Uniform));
+    basicPass->addBinding(new ParameterMapper(QStringLiteral("lightPos"), QStringLiteral("lightPosition"), ParameterMapper::Uniform));
 
     Parameter* lightIntensity = new Parameter(m_defaultTechnique, QStringLiteral("lightIntensity"), Parameter::FloatVec3, QVector3D(0.5f, 0.5f, 0.5f));
     m_defaultTechnique->addParameter(lightIntensity);
-    basicPass->addBinding(new ParameterBinder(QStringLiteral("lightIntensity"), QStringLiteral("lightIntensity"), ParameterBinder::Uniform));
+    basicPass->addBinding(new ParameterMapper(QStringLiteral("lightIntensity"), QStringLiteral("lightIntensity"), ParameterMapper::Uniform));
 
     Parameter* kd = new Parameter(m_defaultTechnique, QStringLiteral("diffuse"), Parameter::FloatVec3, QVector3D(1.0f, 0.5f, 0.0f));
     m_defaultTechnique->addParameter(kd);
-    basicPass->addBinding(new ParameterBinder(QStringLiteral("diffuse"), QStringLiteral("kd"), ParameterBinder::Uniform));
+    basicPass->addBinding(new ParameterMapper(QStringLiteral("diffuse"), QStringLiteral("kd"), ParameterMapper::Uniform));
 
     Parameter* ka = new Parameter(m_defaultTechnique, QStringLiteral("ambient"), Parameter::FloatVec3, QVector3D(0.2f, 0.2f, 0.2f));
     m_defaultTechnique->addParameter(ka);
-    basicPass->addBinding(new ParameterBinder(QStringLiteral("ambient"), QStringLiteral("ka"), ParameterBinder::Uniform));
+    basicPass->addBinding(new ParameterMapper(QStringLiteral("ambient"), QStringLiteral("ka"), ParameterMapper::Uniform));
 
 }
 
@@ -221,8 +221,8 @@ void Renderer::buildDefaultMaterial()
     // TO DO : We use only the uniform values of the defaultTechnique
     // We should look for values in Effect, Technique and Material and Material values have preference over Technique and Effect
     // And Technique values have preference over Effect
-    Q_FOREACH (ParameterBinder *binding, qobject_cast<RenderPass *>(m_defaultTechnique->renderPasses().first())->bindings()) {
-        if (binding->bindingType() == ParameterBinder::Uniform) {
+    Q_FOREACH (ParameterMapper *binding, qobject_cast<RenderPass *>(m_defaultTechnique->renderPasses().first())->bindings()) {
+        if (binding->bindingType() == ParameterMapper::Uniform) {
             Q_FOREACH (Parameter *param, m_defaultTechnique->parameters()) {
                 if (param->name() == binding->parameterName()) {
                     if (param->datatype() >= Parameter::Float && param->datatype() <= Parameter::FloatMat4)
diff --git a/src/render/backend/renderrenderpass.cpp b/src/render/backend/renderrenderpass.cpp
index 82accce8b..bedde6a0b 100644
--- a/src/render/backend/renderrenderpass.cpp
+++ b/src/render/backend/renderrenderpass.cpp
@@ -46,7 +46,7 @@
 #include <Qt3DCore/qchangearbiter.h>
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DCore/qabstractshader.h>
-#include <Qt3DRenderer/parameterbinder.h>
+#include <Qt3DRenderer/parametermapper.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -97,7 +97,7 @@ QAbstractShader *RenderRenderPass::shaderProgram() const
     return m_shader;
 }
 
-QList<ParameterBinder *> RenderRenderPass::bindings() const
+QList<ParameterMapper *> RenderRenderPass::bindings() const
 {
     return m_bindings;
 }
diff --git a/src/render/backend/renderrenderpass.h b/src/render/backend/renderrenderpass.h
index a05b910da..7ddbb2c01 100644
--- a/src/render/backend/renderrenderpass.h
+++ b/src/render/backend/renderrenderpass.h
@@ -51,7 +51,7 @@ namespace Qt3D {
 
 class RenderPass;
 class QAbstractShader;
-class ParameterBinder;
+class ParameterMapper;
 
 namespace Render {
 
@@ -66,13 +66,13 @@ public:
     void setPeer(RenderPass *peer);
     void sceneChangeEvent(const QSceneChangePtr &e);
     QAbstractShader *shaderProgram() const;
-    QList<ParameterBinder *> bindings() const;
+    QList<ParameterMapper *> bindings() const;
 
 private:
     Renderer *m_renderer;
     RenderPass *m_peer;
     QAbstractShader *m_shader;
-    QList<ParameterBinder *> m_bindings;
+    QList<ParameterMapper *> m_bindings;
 
 };
 
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index ba778a6fc..ec9474433 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -64,7 +64,7 @@
 #include "renderlogging.h"
 #include "renderpassmanager.h"
 #include "renderrenderpass.h"
-#include "parameterbinder.h"
+#include "parametermapper.h"
 #include "parameter.h"
 
 #include <Qt3DCore/entity.h>
@@ -396,8 +396,8 @@ void RenderView::setShaderAndUniforms(RenderCommand *command, RenderRenderPass *
         //        command->m_stateSet = qobject_cast<RenderPass*>(pass)->stateSet();
 
         // Builds the QUniformPack, sets shader standard uniforms and store attributes name / glname bindings
-        Q_FOREACH (ParameterBinder *binding, rPass->bindings()) {
-            if (binding->bindingType() == ParameterBinder::Uniform) {
+        Q_FOREACH (ParameterMapper *binding, rPass->bindings()) {
+            if (binding->bindingType() == ParameterMapper::Uniform) {
                 if (!parameters.contains(binding->parameterName())) {
                     qCCritical(Render::Backend) << Q_FUNC_INFO << "Trying to bind a Parameter that hasn't been defined " << binding->parameterName();
                 }
diff --git a/src/render/frontend/parameterbinder.cpp b/src/render/frontend/parametermapper.cpp
index c85b4ac28..63ea46868 100644
--- a/src/render/frontend/parameterbinder.cpp
+++ b/src/render/frontend/parametermapper.cpp
@@ -39,19 +39,19 @@
 **
 ****************************************************************************/
 
-#include "parameterbinder.h"
+#include "parametermapper.h"
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-ParameterBinder::ParameterBinder(QObject *parent)
+ParameterMapper::ParameterMapper(QObject *parent)
     : QObject(parent)
     , m_bindingType(Uniform)
 {
 }
 
-ParameterBinder::ParameterBinder(const QString &parameterName, const QString &shaderParameterName, ParameterBinder::Binding bindingType)
+ParameterMapper::ParameterMapper(const QString &parameterName, const QString &shaderParameterName, ParameterMapper::Binding bindingType)
     : QObject()
     , m_parameterName(parameterName)
     , m_shaderVariableName(shaderParameterName)
@@ -59,7 +59,7 @@ ParameterBinder::ParameterBinder(const QString &parameterName, const QString &sh
 {
 }
 
-void ParameterBinder::setParameterName(const QString &name)
+void ParameterMapper::setParameterName(const QString &name)
 {
     if (m_parameterName != name) {
         m_parameterName = name;
@@ -67,7 +67,7 @@ void ParameterBinder::setParameterName(const QString &name)
     }
 }
 
-void ParameterBinder::setShaderVariableName(const QString &name)
+void ParameterMapper::setShaderVariableName(const QString &name)
 {
     if (m_shaderVariableName != name) {
         m_shaderVariableName = name;
@@ -75,7 +75,7 @@ void ParameterBinder::setShaderVariableName(const QString &name)
     }
 }
 
-void ParameterBinder::setBindingType(ParameterBinder::Binding type)
+void ParameterMapper::setBindingType(ParameterMapper::Binding type)
 {
     if (m_bindingType != type) {
         m_bindingType = type;
@@ -83,17 +83,17 @@ void ParameterBinder::setBindingType(ParameterBinder::Binding type)
     }
 }
 
-QString ParameterBinder::parameterName() const
+QString ParameterMapper::parameterName() const
 {
     return m_parameterName;
 }
 
-QString ParameterBinder::shaderVariableName() const
+QString ParameterMapper::shaderVariableName() const
 {
     return m_shaderVariableName;
 }
 
-ParameterBinder::Binding ParameterBinder::bindingType() const
+ParameterMapper::Binding ParameterMapper::bindingType() const
 {
     return m_bindingType;
 }
diff --git a/src/render/frontend/parameterbinder.h b/src/render/frontend/parametermapper.h
index 87e041e7d..d93456fe6 100644
--- a/src/render/frontend/parameterbinder.h
+++ b/src/render/frontend/parametermapper.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DRENDERERSHARED_EXPORT ParameterBinder : public QObject
+class QT3DRENDERERSHARED_EXPORT ParameterMapper : public QObject
 {
     Q_OBJECT
     Q_ENUMS(Binding)
@@ -64,8 +64,8 @@ public:
         StandardUniform
     };
 
-    explicit ParameterBinder(QObject *parent = 0);
-    ParameterBinder(const QString &parameterName, const QString &shaderParameterName, ParameterBinder::Binding bindingType);
+    explicit ParameterMapper(QObject *parent = 0);
+    ParameterMapper(const QString &parameterName, const QString &shaderParameterName, ParameterMapper::Binding bindingType);
 
     void setParameterName(const QString &name);
     void setShaderVariableName(const QString &name);
diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri
index c1d17f298..59fd9383a 100644
--- a/src/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
@@ -25,8 +25,8 @@ HEADERS += \
     $$PWD/techniquecriterion.h \
     $$PWD/renderpasscriterion.h \
     $$PWD/parameter.h \
-    $$PWD/parameterbinder.h \
-    $$PWD/framegraph_p.h
+    $$PWD/framegraph_p.h \
+    $$PWD/parametermapper.h
 
 SOURCES += \
     $$PWD/material.cpp \
@@ -46,4 +46,4 @@ SOURCES += \
     $$PWD/techniquecriterion.cpp \
     $$PWD/renderpasscriterion.cpp \
     $$PWD/parameter.cpp \
-    $$PWD/parameterbinder.cpp
+    $$PWD/parametermapper.cpp
diff --git a/src/render/frontend/renderpass.cpp b/src/render/frontend/renderpass.cpp
index 41a3a1246..e7e601195 100644
--- a/src/render/frontend/renderpass.cpp
+++ b/src/render/frontend/renderpass.cpp
@@ -42,7 +42,7 @@
 #include "renderpass.h"
 #include "parameter.h"
 #include "renderpasscriterion.h"
-#include "parameterbinder.h"
+#include "parametermapper.h"
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
@@ -111,20 +111,20 @@ QList<RenderPassCriterion *> RenderPass::criteria() const
     return m_criteria;
 }
 
-void RenderPass::addBinding(ParameterBinder *binding)
+void RenderPass::addBinding(ParameterMapper *binding)
 {
     // TO DO: Notify QChangeArbiter
     if (!m_bindings.contains(binding))
         m_bindings.append(binding);
 }
 
-void RenderPass::removeBinding(ParameterBinder *binding)
+void RenderPass::removeBinding(ParameterMapper *binding)
 {
     // TO DO: Notify QChangeArbiter
     m_bindings.removeOne(binding);
 }
 
-QList<ParameterBinder *> RenderPass::bindings() const
+QList<ParameterMapper *> RenderPass::bindings() const
 {
     return m_bindings;
 }
diff --git a/src/render/frontend/renderpass.h b/src/render/frontend/renderpass.h
index 501ca8363..3fda64125 100644
--- a/src/render/frontend/renderpass.h
+++ b/src/render/frontend/renderpass.h
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 class Parameter;
-class ParameterBinder;
+class ParameterMapper;
 typedef QList<Parameter*> ParameterList;
 
 class QT3DRENDERERSHARED_EXPORT RenderPass : public QAbstractRenderPass
@@ -83,9 +83,9 @@ public:
     void removeCriterion(RenderPassCriterion *criterion);
     QList<RenderPassCriterion *> criteria() const;
 
-    void addBinding(ParameterBinder *binding);
-    void removeBinding(ParameterBinder *binding);
-    QList<ParameterBinder *> bindings() const;
+    void addBinding(ParameterMapper *binding);
+    void removeBinding(ParameterMapper *binding);
+    QList<ParameterMapper *> bindings() const;
 
 
 protected:
@@ -95,7 +95,7 @@ protected:
     // map Parameter names to GLSL names
     QHash<QString, QString> m_parameterNameDict;
     QList<RenderPassCriterion *> m_criteria;
-    QList<ParameterBinder *> m_bindings;
+    QList<ParameterMapper *> m_bindings;
 
     Render::DrawStateSet* m_stateSet;
 };