4 files changed, 11 insertions, 10 deletions
diff --git a/src/render/materialsystem/material_p.h b/src/render/materialsystem/material_p.h
index b415e2975..fe2707549 100644
--- a/src/render/materialsystem/material_p.h
+++ b/src/render/materialsystem/material_p.h
@@ -54,7 +54,7 @@
 #include <QVariant>
 
 #include <Qt3DRender/private/backendnode_p.h>
-#include <Qt3DRender/private/quniformvalue_p.h>
+#include <Qt3DRender/private/shaderparameterpack_p.h>
 #include <Qt3DRender/private/parameterpack_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp
index b13c0d5ae..2cd026422 100644
--- a/src/render/materialsystem/parameter.cpp
+++ b/src/render/materialsystem/parameter.cpp
@@ -68,7 +68,7 @@ void Parameter::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &ch
     const auto &data = typedChange->data;
     m_name = data.name;
     m_nameId = StringToInt::lookupId(m_name);
-    m_value = data.backendValue;
+    m_uniformValue = UniformValue::fromVariant(data.backendValue);
 }
 
 void Parameter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
@@ -80,7 +80,7 @@ void Parameter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
             m_name = propertyChange->value().toString();
             m_nameId = StringToInt::lookupId(m_name);
         } else if (propertyChange->propertyName() == QByteArrayLiteral("value")) {
-            m_value = propertyChange->value();
+            m_uniformValue = UniformValue::fromVariant(propertyChange->value());
         }
         markDirty(AbstractRenderer::AllDirty);
     }
@@ -93,14 +93,14 @@ QString Parameter::name() const
     return m_name;
 }
 
-QVariant Parameter::value() const
+int Parameter::nameId() const Q_DECL_NOTHROW
 {
-    return m_value;
+    return m_nameId;
 }
 
-int Parameter::nameId() const Q_DECL_NOTHROW
+UniformValue Parameter::uniformValue() const
 {
-    return m_nameId;
+    return m_uniformValue;
 }
 
 } // namespace Render
diff --git a/src/render/materialsystem/parameter_p.h b/src/render/materialsystem/parameter_p.h
index c5c94243d..c6861ca36 100644
--- a/src/render/materialsystem/parameter_p.h
+++ b/src/render/materialsystem/parameter_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <Qt3DRender/private/backendnode_p.h>
+#include <Qt3DRender/private/uniform_p.h>
 #include <QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -72,14 +73,14 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     QString name() const;
-    QVariant value() const;
     int nameId() const Q_DECL_NOTHROW;
+    UniformValue uniformValue() const;
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
 
     QString m_name;
-    QVariant m_value;
+    UniformValue m_uniformValue;
     int m_nameId;
 };
 
diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h
index 1382e287e..283e5a94c 100644
--- a/src/render/materialsystem/shader_p.h
+++ b/src/render/materialsystem/shader_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <Qt3DRender/private/backendnode_p.h>
-#include <Qt3DRender/private/quniformvalue_p.h>
+#include <Qt3DRender/private/shaderparameterpack_p.h>
 #include <Qt3DRender/private/shadervariables_p.h>
 #include <QMutex>
 #include <QVector>