diff --git a/components/shader/shadermanager.cpp b/components/shader/shadermanager.cpp
index c2126275f..10f2de819 100644
--- a/components/shader/shadermanager.cpp
+++ b/components/shader/shadermanager.cpp
@@ -58,7 +58,7 @@ namespace Shader
         return true;
     }
 
-    bool parseIncludes(boost::filesystem::path shaderPath, std::string& source, const std::string& shaderTemplate)
+    bool parseIncludes(boost::filesystem::path shaderPath, std::string& source, const std::string& templateName)
     {
         Misc::StringUtils::replaceAll(source, "\r\n", "\n");
 
@@ -70,13 +70,13 @@ namespace Shader
             size_t start = source.find('"', foundPos);
             if (start == std::string::npos || start == source.size()-1)
             {
-                Log(Debug::Error) << "Shader " << shaderTemplate << " error: Invalid #include";
+                Log(Debug::Error) << "Shader " << templateName << " error: Invalid #include";
                 return false;
             }
             size_t end = source.find('"', start+1);
             if (end == std::string::npos)
             {
-                Log(Debug::Error) << "Shader " << shaderTemplate << " error: Invalid #include";
+                Log(Debug::Error) << "Shader " << templateName << " error: Invalid #include";
                 return false;
             }
             std::string includeFilename = source.substr(start+1, end-(start+1));
@@ -85,7 +85,7 @@ namespace Shader
             includeFstream.open(includePath);
             if (includeFstream.fail())
             {
-                Log(Debug::Error) << "Shader " << shaderTemplate << " error: Failed to open include " << includePath.string();
+                Log(Debug::Error) << "Shader " << templateName << " error: Failed to open include " << includePath.string();
                 return false;
             }
 
@@ -120,14 +120,14 @@ namespace Shader
 
             if (includedFiles.insert(includePath).second == false)
             {
-                Log(Debug::Error) << "Shader " << shaderTemplate << " error: Detected cyclic #includes";
+                Log(Debug::Error) << "Shader " << templateName << " error: Detected cyclic #includes";
                 return false;
             }
         }
         return true;
     }
 
-    bool parseFors(std::string& source, const std::string& shaderTemplate)
+    bool parseFors(std::string& source, const std::string& templateName)
     {
         const char escapeCharacter = '$';
         size_t foundPos = 0;
@@ -136,13 +136,13 @@ namespace Shader
             size_t endPos = source.find_first_of(" \n\r()[].;,", foundPos);
             if (endPos == std::string::npos)
             {
-                Log(Debug::Error) << "Shader " << shaderTemplate << " error: Unexpected EOF";
+                Log(Debug::Error) << "Shader " << templateName << " error: Unexpected EOF";
                 return false;
             }
             std::string command = source.substr(foundPos + 1, endPos - (foundPos + 1));
             if (command != "foreach")
             {
-                Log(Debug::Error) << "Shader " << shaderTemplate << " error: Unknown shader directive: $" << command;
+                Log(Debug::Error) << "Shader " << templateName << " error: Unknown shader directive: $" << command;
                 return false;
             }
 
@@ -150,7 +150,7 @@ namespace Shader
             size_t iterNameEnd = source.find_first_of(" \n\r()[].;,", iterNameStart);
             if (iterNameEnd == std::string::npos)
             {
-                Log(Debug::Error) << "Shader " << shaderTemplate << " error: Unexpected EOF";
+                Log(Debug::Error) << "Shader " << templateName << " error: Unexpected EOF";
                 return false;
             }
             std::string iteratorName = "$" + source.substr(iterNameStart, iterNameEnd - iterNameStart);
@@ -159,7 +159,7 @@ namespace Shader
             size_t listEnd = source.find_first_of("\n\r", listStart);
             if (listEnd == std::string::npos)
             {
-                Log(Debug::Error) << "Shader " << shaderTemplate << " error: Unexpected EOF";
+                Log(Debug::Error) << "Shader " << templateName << " error: Unexpected EOF";
                 return false;
             }
             std::string list = source.substr(listStart, listEnd - listStart);
@@ -171,7 +171,7 @@ namespace Shader
             size_t contentEnd = source.find("$endforeach", contentStart);
             if (contentEnd == std::string::npos)
             {
-                Log(Debug::Error) << "Shader " << shaderTemplate << " error: Unexpected EOF";
+                Log(Debug::Error) << "Shader " << templateName << " error: Unexpected EOF";
                 return false;
             }
             std::string content = source.substr(contentStart, contentEnd - contentStart);
@@ -211,7 +211,7 @@ namespace Shader
     }
 
     bool parseDefines(std::string& source, const ShaderManager::DefineMap& defines,
-        const ShaderManager::DefineMap& globalDefines, const std::string& shaderTemplate)
+        const ShaderManager::DefineMap& globalDefines, const std::string& templateName)
     {
         const char escapeCharacter = '@';
         size_t foundPos = 0;
@@ -221,7 +221,7 @@ namespace Shader
             size_t endPos = source.find_first_of(" \n\r()[].;,", foundPos);
             if (endPos == std::string::npos)
             {
-                Log(Debug::Error) << "Shader " << shaderTemplate << " error: Unexpected EOF";
+                Log(Debug::Error) << "Shader " << templateName << " error: Unexpected EOF";
                 return false;
             }
             std::string define = source.substr(foundPos+1, endPos - (foundPos+1));
@@ -234,7 +234,7 @@ namespace Shader
                 size_t iterNameEnd = source.find_first_of(" \n\r()[].;,", iterNameStart);
                 if (iterNameEnd == std::string::npos)
                 {
-                    Log(Debug::Error) << "Shader " << shaderTemplate << " error: Unexpected EOF";
+                    Log(Debug::Error) << "Shader " << templateName << " error: Unexpected EOF";
                     return false;
                 }
                 forIterators.push_back(source.substr(iterNameStart, iterNameEnd - iterNameStart));
@@ -244,7 +244,7 @@ namespace Shader
                 source.replace(foundPos, 1, "$");
                 if (forIterators.empty())
                 {
-                    Log(Debug::Error) << "Shader " << shaderTemplate << " error: endforeach without foreach";
+                    Log(Debug::Error) << "Shader " << templateName << " error: endforeach without foreach";
                     return false;
                 }
                 else
@@ -264,22 +264,22 @@ namespace Shader
             }
             else
             {
-                Log(Debug::Error) << "Shader " << shaderTemplate << " error: Undefined " << define;
+                Log(Debug::Error) << "Shader " << templateName << " error: Undefined " << define;
                 return false;
             }
         }
         return true;
     }
 
-    osg::ref_ptr<osg::Shader> ShaderManager::getShader(const std::string &shaderTemplate, const ShaderManager::DefineMap &defines, osg::Shader::Type shaderType)
+    osg::ref_ptr<osg::Shader> ShaderManager::getShader(const std::string &templateName, const ShaderManager::DefineMap &defines, osg::Shader::Type shaderType)
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
 
         // read the template if we haven't already
-        TemplateMap::iterator templateIt = mShaderTemplates.find(shaderTemplate);
+        TemplateMap::iterator templateIt = mShaderTemplates.find(templateName);
         if (templateIt == mShaderTemplates.end())
         {
-            boost::filesystem::path p = (boost::filesystem::path(mPath) / shaderTemplate);
+            boost::filesystem::path p = (boost::filesystem::path(mPath) / templateName);
             boost::filesystem::ifstream stream;
             stream.open(p);
             if (stream.fail())
@@ -293,20 +293,20 @@ namespace Shader
             // parse includes
             std::string source = buffer.str();
             if (!addLineDirectivesAfterConditionalBlocks(source)
-                    || !parseIncludes(boost::filesystem::path(mPath), source, shaderTemplate))
+                    || !parseIncludes(boost::filesystem::path(mPath), source, templateName))
                 return nullptr;
 
-            templateIt = mShaderTemplates.insert(std::make_pair(shaderTemplate, source)).first;
+            templateIt = mShaderTemplates.insert(std::make_pair(templateName, source)).first;
         }
 
-        ShaderMap::iterator shaderIt = mShaders.find(std::make_pair(shaderTemplate, defines));
+        ShaderMap::iterator shaderIt = mShaders.find(std::make_pair(templateName, defines));
         if (shaderIt == mShaders.end())
         {
             std::string shaderSource = templateIt->second;
-            if (!parseDefines(shaderSource, defines, mGlobalDefines, shaderTemplate) || !parseFors(shaderSource, shaderTemplate))
+            if (!parseDefines(shaderSource, defines, mGlobalDefines, templateName) || !parseFors(shaderSource, templateName))
             {
                 // Add to the cache anyway to avoid logging the same error over and over.
-                mShaders.insert(std::make_pair(std::make_pair(shaderTemplate, defines), nullptr));
+                mShaders.insert(std::make_pair(std::make_pair(templateName, defines), nullptr));
                 return nullptr;
             }
 
@@ -316,7 +316,7 @@ namespace Shader
             static unsigned int counter = 0;
             shader->setName(std::to_string(counter++));
 
-            shaderIt = mShaders.insert(std::make_pair(std::make_pair(shaderTemplate, defines), shader)).first;
+            shaderIt = mShaders.insert(std::make_pair(std::make_pair(templateName, defines), shader)).first;
         }
         return shaderIt->second;
     }
diff --git a/components/shader/shadermanager.hpp b/components/shader/shadermanager.hpp
index 05775edb6..dbe989476 100644
--- a/components/shader/shadermanager.hpp
+++ b/components/shader/shadermanager.hpp
@@ -30,7 +30,7 @@ namespace Shader
         /// @param shaderType The type of shader (usually vertex or fragment shader).
         /// @note May return nullptr on failure.
         /// @note Thread safe.
-        osg::ref_ptr<osg::Shader> getShader(const std::string& shaderTemplate, const DefineMap& defines, osg::Shader::Type shaderType);
+        osg::ref_ptr<osg::Shader> getShader(const std::string& templateName, const DefineMap& defines, osg::Shader::Type shaderType);
 
         osg::ref_ptr<osg::Program> getProgram(osg::ref_ptr<osg::Shader> vertexShader, osg::ref_ptr<osg::Shader> fragmentShader);