4 files changed, 11 insertions, 11 deletions
diff --git a/softwarecontext/context.cpp b/softwarecontext/context.cpp
index 26b7dc4678..f1911ac310 100644
--- a/softwarecontext/context.cpp
+++ b/softwarecontext/context.cpp
@@ -145,7 +145,7 @@ QSGGlyphNode *Context::createGlyphNode(QSGRenderContext */*rc*/, bool /*preferNa
     return new GlyphNode();
 }
 
-QSGNinePatchNode *Context::createQStyleNode()
+QSGNinePatchNode *Context::createNinePatchNode()
 {
     return new NinePatchNode();
 }
diff --git a/softwarecontext/context.h b/softwarecontext/context.h
index 8f42b2d13c..4ec7eb9e39 100644
--- a/softwarecontext/context.h
+++ b/softwarecontext/context.h
@@ -83,7 +83,7 @@ public:
     virtual QSGRectangleNode *createRectangleNode();
     virtual QSGImageNode *createImageNode();
     virtual QSGGlyphNode *createGlyphNode(QSGRenderContext *rc, bool preferNativeGlyphNode);
-    virtual QSGNinePatchNode *createQStyleNode();
+    virtual QSGNinePatchNode *createNinePatchNode();
     virtual QSGLayer *createLayer(QSGRenderContext *renderContext);
 
 private:
diff --git a/softwarecontext/softwarelayer.cpp b/softwarecontext/softwarelayer.cpp
index 68cb91e756..de757c11fd 100644
--- a/softwarecontext/softwarelayer.cpp
+++ b/softwarecontext/softwarelayer.cpp
@@ -23,7 +23,7 @@
 
 SoftwareLayer::SoftwareLayer(QSGRenderContext *renderContext)
     : m_item(0)
-    , m_shaderEffectNode(0)
+    , m_shaderSourceNode(0)
     , m_context(renderContext)
     , m_renderer(0)
     , m_device_pixel_ratio(1)
@@ -87,9 +87,9 @@ void SoftwareLayer::setItem(QSGNode *item)
     markDirtyTexture();
 }
 
-void SoftwareLayer::setShaderEffectNode(QSGNode *node)
+void SoftwareLayer::setShaderSourceNode(QSGNode *node)
 {
-    m_shaderEffectNode = node;
+    m_shaderSourceNode = node;
 }
 
 void SoftwareLayer::setRect(const QRectF &rect)
@@ -119,8 +119,8 @@ void SoftwareLayer::scheduleUpdate()
     m_grab = true;
     if (m_dirtyTexture) {
         emit updateRequested();
-        if (m_shaderEffectNode)
-            m_shaderEffectNode->markDirty(QSGNode::DirtyMaterial);
+        if (m_shaderSourceNode)
+            m_shaderSourceNode->markDirty(QSGNode::DirtyMaterial);
     }
 }
 
@@ -164,8 +164,8 @@ void SoftwareLayer::markDirtyTexture()
     m_dirtyTexture = true;
     if (m_live || m_grab) {
         emit updateRequested();
-        if (m_shaderEffectNode)
-            m_shaderEffectNode->markDirty(QSGNode::DirtyMaterial);
+        if (m_shaderSourceNode)
+            m_shaderSourceNode->markDirty(QSGNode::DirtyMaterial);
     }
 }
 
diff --git a/softwarecontext/softwarelayer.h b/softwarecontext/softwarelayer.h
index f611b0f897..45f4dea55c 100644
--- a/softwarecontext/softwarelayer.h
+++ b/softwarecontext/softwarelayer.h
@@ -51,7 +51,7 @@ public:
     // QSGLayer interface
 public:
     virtual void setItem(QSGNode *item);
-    virtual void setShaderEffectNode(QSGNode *node);
+    virtual void setShaderSourceNode(QSGNode *node);
     virtual void setRect(const QRectF &rect);
     virtual void setSize(const QSize &size);
     virtual void scheduleUpdate();
@@ -70,7 +70,7 @@ private:
     void grab();
 
     QSGNode *m_item;
-    QSGNode *m_shaderEffectNode;
+    QSGNode *m_shaderSourceNode;
     QSGRenderContext *m_context;
     SoftwareContext::PixmapRenderer *m_renderer;
     QRectF m_rect;