diff --git a/javascript/MaterialXTest/codeExamples.spec.js b/javascript/MaterialXTest/codeExamples.spec.js
index 8cff44c3fe..ba95641500 100644
--- a/javascript/MaterialXTest/codeExamples.spec.js
+++ b/javascript/MaterialXTest/codeExamples.spec.js
@@ -92,29 +92,15 @@ describe('Code Examples', () =>
 
         // Traverse the document tree in depth-first order.
         const elements = doc.traverseTree();
-        let elementCount = 0;
-        let nodeCount = 0;
-        let fileCount = 0;
+        let imageCount = 0;
         for (let elem of elements)
         {
-            elementCount++;
-            // Display the filename of each image node.
             if (elem.isANode('image'))
             {
-                nodeCount++;
-                const input = elem.getInput('file');
-                if (input)
-                {
-                    fileCount++;
-                    const filename = input.getValueString();
-                    expect(elem.getName()).to.equal('image1');
-                    expect(filename).to.equal('greysphere_calibration.png');
-                }
+                imageCount++;
             }
         }
-        expect(elementCount).to.equal(21);
-        expect(nodeCount).to.equal(1);
-        expect(fileCount).to.equal(1);
+        expect(imageCount).to.greaterThan(0);
     });
 
     it('Building a MaterialX Document', async () =>
diff --git a/libraries/stdlib/genmsl/lib/mx_sampling.metal b/libraries/stdlib/genmsl/lib/mx_sampling.metal
index 293de244a6..85955f184c 100644
--- a/libraries/stdlib/genmsl/lib/mx_sampling.metal
+++ b/libraries/stdlib/genmsl/lib/mx_sampling.metal
@@ -25,7 +25,7 @@ vec2 mx_compute_sample_size_uv(vec2 uv, float filterSize, float filterOffset)
 // Compute a normal mapped to 0..1 space based on a set of input
 // samples using a Sobel filter.
 //
-vec3 mx_normal_from_samples_sobel(constant float S[9], float _scale)
+vec3 mx_normal_from_samples_sobel(float S[9], float _scale)
 {
     float nx = S[0] - S[2] + (2.0*S[3]) - (2.0*S[5]) + S[6] - S[8];
     float ny = S[0] + (2.0*S[1]) + S[2] - S[6] - (2.0*S[7]) - S[8];
diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_greysphere.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_greysphere.mtlx
index 92a1c34190..a5bba1b99c 100644
--- a/resources/Materials/Examples/StandardSurface/standard_surface_greysphere.mtlx
+++ b/resources/Materials/Examples/StandardSurface/standard_surface_greysphere.mtlx
@@ -1,11 +1,8 @@
 <?xml version="1.0"?>
 <materialx version="1.39" colorspace="lin_rec709">
   <standard_surface name="SR_greysphere" type="surfaceshader">
-    <input name="base" type="float" value="1.0" />
     <input name="base_color" type="color3" value="0.18, 0.18, 0.18" />
-    <input name="diffuse_roughness" type="float" value="0" />
     <input name="specular_roughness" type="float" value="0.7" />
-    <input name="specular_IOR" type="float" value="1.5" />
   </standard_surface>
   <surfacematerial name="Greysphere" type="material">
     <input name="surfaceshader" type="surfaceshader" nodename="SR_greysphere" />
diff --git a/resources/Materials/Examples/StandardSurface/standard_surface_greysphere_calibration.mtlx b/resources/Materials/Examples/StandardSurface/standard_surface_greysphere_calibration.mtlx
index 584f440cd4..b33bcd586f 100644
--- a/resources/Materials/Examples/StandardSurface/standard_surface_greysphere_calibration.mtlx
+++ b/resources/Materials/Examples/StandardSurface/standard_surface_greysphere_calibration.mtlx
@@ -17,11 +17,8 @@
     <output name="out1" type="color3" nodename="image1" />
   </nodegraph>
   <standard_surface name="SR_Greysphere_Calibration" type="surfaceshader">
-    <input name="base" type="float" value="1.0" />
     <input name="base_color" type="color3" nodegraph="NG_Greysphere_Calibration" output="out1" />
-    <input name="diffuse_roughness" type="float" value="0" />
     <input name="specular_roughness" type="float" value="0.7" />
-    <input name="specular_IOR" type="float" value="1.5" />
   </standard_surface>
   <surfacematerial name="Greysphere_Calibration" type="material">
     <input name="surfaceshader" type="surfaceshader" nodename="SR_Greysphere_Calibration" />
diff --git a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
index 11a128bbd0..7b1a7171ec 100644
--- a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
+++ b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
@@ -6,20 +6,20 @@
 #include <MaterialXGenGlsl/GlslShaderGenerator.h>
 
 #include <MaterialXGenGlsl/GlslSyntax.h>
-#include <MaterialXGenGlsl/Nodes/GeomColorNodeGlsl.h>
-#include <MaterialXGenGlsl/Nodes/GeomPropValueNodeGlsl.h>
 #include <MaterialXGenGlsl/Nodes/SurfaceNodeGlsl.h>
 #include <MaterialXGenGlsl/Nodes/UnlitSurfaceNodeGlsl.h>
 #include <MaterialXGenGlsl/Nodes/LightNodeGlsl.h>
 #include <MaterialXGenGlsl/Nodes/LightCompoundNodeGlsl.h>
 #include <MaterialXGenGlsl/Nodes/LightShaderNodeGlsl.h>
-#include <MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.h>
 #include <MaterialXGenGlsl/Nodes/LightSamplerNodeGlsl.h>
 #include <MaterialXGenGlsl/Nodes/NumLightsNodeGlsl.h>
-#include <MaterialXGenGlsl/Nodes/BlurNodeGlsl.h>
 
 #include <MaterialXGenShader/Nodes/MaterialNode.h>
+#include <MaterialXGenShader/Nodes/HwBlurNode.h>
 #include <MaterialXGenShader/Nodes/HwImageNode.h>
+#include <MaterialXGenShader/Nodes/HwGeomColorNode.h>
+#include <MaterialXGenShader/Nodes/HwGeomPropValueNode.h>
+#include <MaterialXGenShader/Nodes/HwHeightToNormalNode.h>
 #include <MaterialXGenShader/Nodes/HwTexCoordNode.h>
 #include <MaterialXGenShader/Nodes/HwTransformNode.h>
 #include <MaterialXGenShader/Nodes/HwPositionNode.h>
@@ -35,6 +35,7 @@ MATERIALX_NAMESPACE_BEGIN
 
 const string GlslShaderGenerator::TARGET = "genglsl";
 const string GlslShaderGenerator::VERSION = "400";
+const string GlslSamplingIncludeFilename = "stdlib/genglsl/lib/mx_sampling.glsl";
 
 //
 // GlslShaderGenerator methods
@@ -61,9 +62,9 @@ GlslShaderGenerator::GlslShaderGenerator() :
     registerImplementation("IM_texcoord_vector2_" + GlslShaderGenerator::TARGET, HwTexCoordNode::create);
     registerImplementation("IM_texcoord_vector3_" + GlslShaderGenerator::TARGET, HwTexCoordNode::create);
     // <!-- <geomcolor> -->
-    registerImplementation("IM_geomcolor_float_" + GlslShaderGenerator::TARGET, GeomColorNodeGlsl::create);
-    registerImplementation("IM_geomcolor_color3_" + GlslShaderGenerator::TARGET, GeomColorNodeGlsl::create);
-    registerImplementation("IM_geomcolor_color4_" + GlslShaderGenerator::TARGET, GeomColorNodeGlsl::create);
+    registerImplementation("IM_geomcolor_float_" + GlslShaderGenerator::TARGET, HwGeomColorNode::create);
+    registerImplementation("IM_geomcolor_color3_" + GlslShaderGenerator::TARGET, HwGeomColorNode::create);
+    registerImplementation("IM_geomcolor_color4_" + GlslShaderGenerator::TARGET, HwGeomColorNode::create);
     // <!-- <geompropvalue> -->
     elementNames = {
         "IM_geompropvalue_integer_" + GlslShaderGenerator::TARGET,
@@ -74,10 +75,10 @@ GlslShaderGenerator::GlslShaderGenerator() :
         "IM_geompropvalue_vector3_" + GlslShaderGenerator::TARGET,
         "IM_geompropvalue_vector4_" + GlslShaderGenerator::TARGET,
     };
-    registerImplementation(elementNames, GeomPropValueNodeGlsl::create);
-    registerImplementation("IM_geompropvalue_boolean_" + GlslShaderGenerator::TARGET, GeomPropValueNodeGlslAsUniform::create);
-    registerImplementation("IM_geompropvalue_string_" + GlslShaderGenerator::TARGET, GeomPropValueNodeGlslAsUniform::create);
-    registerImplementation("IM_geompropvalue_filename_" + GlslShaderGenerator::TARGET, GeomPropValueNodeGlslAsUniform::create);
+    registerImplementation(elementNames, HwGeomPropValueNode::create);
+    registerImplementation("IM_geompropvalue_boolean_" + GlslShaderGenerator::TARGET, HwGeomPropValueNodeAsUniform::create);
+    registerImplementation("IM_geompropvalue_string_" + GlslShaderGenerator::TARGET, HwGeomPropValueNodeAsUniform::create);
+    registerImplementation("IM_geompropvalue_filename_" + GlslShaderGenerator::TARGET, HwGeomPropValueNodeAsUniform::create);
 
     // <!-- <frame> -->
     registerImplementation("IM_frame_float_" + GlslShaderGenerator::TARGET, HwFrameNode::create);
@@ -99,7 +100,7 @@ GlslShaderGenerator::GlslShaderGenerator() :
     registerImplementation("IM_spot_light_" + GlslShaderGenerator::TARGET, LightShaderNodeGlsl::create);
 
     // <!-- <heighttonormal> -->
-    registerImplementation("IM_heighttonormal_vector3_" + GlslShaderGenerator::TARGET, HeightToNormalNodeGlsl::create);
+    registerImplementation("IM_heighttonormal_vector3_" + GlslShaderGenerator::TARGET, []() -> ShaderNodeImplPtr { return HwHeightToNormalNode::create(GlslSamplingIncludeFilename);});
 
     // <!-- <blur> -->
     elementNames = {
@@ -110,7 +111,7 @@ GlslShaderGenerator::GlslShaderGenerator() :
         "IM_blur_vector3_" + GlslShaderGenerator::TARGET,
         "IM_blur_vector4_" + GlslShaderGenerator::TARGET,
     };
-    registerImplementation(elementNames, BlurNodeGlsl::create);
+    registerImplementation(elementNames, []() -> ShaderNodeImplPtr { return HwBlurNode::create(GlslSamplingIncludeFilename);});
 
     // <!-- <ND_transformpoint> ->
     registerImplementation("IM_transformpoint_vector3_" + GlslShaderGenerator::TARGET, HwTransformPointNode::create);
diff --git a/source/MaterialXGenGlsl/Nodes/BlurNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/BlurNodeGlsl.cpp
deleted file mode 100644
index 9744e0d2dc..0000000000
--- a/source/MaterialXGenGlsl/Nodes/BlurNodeGlsl.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include <MaterialXGenGlsl/Nodes/BlurNodeGlsl.h>
-
-#include <MaterialXGenShader/GenContext.h>
-#include <MaterialXGenShader/ShaderNode.h>
-#include <MaterialXGenShader/ShaderStage.h>
-#include <MaterialXGenShader/ShaderGenerator.h>
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr BlurNodeGlsl::create()
-{
-    return std::make_shared<BlurNodeGlsl>();
-}
-
-void BlurNodeGlsl::emitSamplingFunctionDefinition(const ShaderNode& /*node*/, GenContext& context, ShaderStage& stage) const
-{
-    const ShaderGenerator& shadergen = context.getShaderGenerator();
-    shadergen.emitLibraryInclude("stdlib/genglsl/lib/mx_sampling.glsl", context, stage);
-    shadergen.emitLineBreak(stage);
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenGlsl/Nodes/BlurNodeGlsl.h b/source/MaterialXGenGlsl/Nodes/BlurNodeGlsl.h
deleted file mode 100644
index b96447cd60..0000000000
--- a/source/MaterialXGenGlsl/Nodes/BlurNodeGlsl.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_BLURNODEGLSL_H
-#define MATERIALX_BLURNODEGLSL_H
-
-#include <MaterialXGenGlsl/Export.h>
-
-#include <MaterialXGenShader/Nodes/BlurNode.h>
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// Blur node implementation for GLSL
-class MX_GENGLSL_API BlurNodeGlsl : public BlurNode
-{
-  public:
-    static ShaderNodeImplPtr create();
-    void emitSamplingFunctionDefinition(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenGlsl/Nodes/GeomColorNodeGlsl.h b/source/MaterialXGenGlsl/Nodes/GeomColorNodeGlsl.h
deleted file mode 100644
index 5525eb6f8e..0000000000
--- a/source/MaterialXGenGlsl/Nodes/GeomColorNodeGlsl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_GEOMCOLORNODEGLSL_H
-#define MATERIALX_GEOMCOLORNODEGLSL_H
-
-#include <MaterialXGenGlsl/GlslShaderGenerator.h>
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// GeomColor node implementation for GLSL
-class MX_GENGLSL_API GeomColorNodeGlsl : public GlslImplementation
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
-
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.cpp
deleted file mode 100644
index f65580b9e2..0000000000
--- a/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include <MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.h>
-#include <MaterialXGenGlsl/GlslShaderGenerator.h>
-
-#include <MaterialXGenShader/Shader.h>
-#include <MaterialXGenShader/GenContext.h>
-
-MATERIALX_NAMESPACE_BEGIN
-
-namespace
-{
-
-/// Name of filter function to call to compute normals from input samples
-const string filterFunctionName = "mx_normal_from_samples_sobel";
-
-/// Name of function to compute sample size in uv space. Takes uv, filter size, and filter offset
-/// as input, and return a 2 channel vector as output
-const string sampleSizeFunctionUV = "mx_compute_sample_size_uv";
-
-const unsigned int sampleCount = 9;
-const unsigned int filterWidth = 3;
-const float filterSize = 1.0;
-const float filterOffset = 0.0;
-
-} // anonymous namespace
-
-ShaderNodeImplPtr HeightToNormalNodeGlsl::create()
-{
-    return std::make_shared<HeightToNormalNodeGlsl>();
-}
-
-void HeightToNormalNodeGlsl::createVariables(const ShaderNode&, GenContext&, Shader&) const
-{
-    // Default filter kernels from ConvolutionNode are not used by this derived class.
-}
-
-void HeightToNormalNodeGlsl::computeSampleOffsetStrings(const string& sampleSizeName, const string& offsetTypeString,
-                                                        unsigned int, StringVec& offsetStrings) const
-{
-    // Build a 3x3 grid of samples that are offset by the provided sample size
-    for (int row = -1; row <= 1; row++)
-    {
-        for (int col = -1; col <= 1; col++)
-        {
-            offsetStrings.push_back(" + " + sampleSizeName + " * " + offsetTypeString + "(" + std::to_string(float(col)) + "," + std::to_string(float(row)) + ")");
-        }
-    }
-}
-
-bool HeightToNormalNodeGlsl::acceptsInputType(TypeDesc type) const
-{
-    // Only support inputs which are float scalar
-    return (type == Type::FLOAT && type.isScalar());
-}
-
-void HeightToNormalNodeGlsl::emitFunctionDefinition(const ShaderNode&, GenContext& context, ShaderStage& stage) const
-{
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        // Emit sampling functions
-        const ShaderGenerator& shadergen = context.getShaderGenerator();
-        shadergen.emitLibraryInclude("stdlib/genglsl/lib/mx_sampling.glsl", context, stage);
-        shadergen.emitLineBreak(stage);
-    }
-}
-
-void HeightToNormalNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        const ShaderGenerator& shadergen = context.getShaderGenerator();
-
-        const ShaderInput* inInput = node.getInput("in");
-        const ShaderInput* scaleInput = node.getInput("scale");
-
-        if (!inInput || !scaleInput)
-        {
-            throw ExceptionShaderGenError("Node '" + node.getName() + "' is not a valid heighttonormal node");
-        }
-
-        // Create the input "samples". This means to emit the calls to
-        // compute the sames and return a set of strings containaing
-        // the variables to assign to the sample grid.
-        //
-        StringVec sampleStrings;
-        emitInputSamplesUV(node, sampleCount, filterWidth,
-                           filterSize, filterOffset, sampleSizeFunctionUV,
-                           context, stage, sampleStrings);
-
-        const ShaderOutput* output = node.getOutput();
-
-        // Emit code to evaluate samples.
-        //
-        string sampleName(output->getVariable() + "_samples");
-        shadergen.emitLine("float " + sampleName + "[" + std::to_string(sampleCount) + "]", stage);
-        for (unsigned int i = 0; i < sampleCount; i++)
-        {
-            shadergen.emitLine(sampleName + "[" + std::to_string(i) + "] = " + sampleStrings[i], stage);
-        }
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(output, true, false, context, stage);
-        shadergen.emitString(" = " + filterFunctionName, stage);
-        shadergen.emitString("(" + sampleName + ", ", stage);
-        shadergen.emitInput(scaleInput, context, stage);
-        shadergen.emitString(")", stage);
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-const string& HeightToNormalNodeGlsl::getTarget() const
-{
-    return GlslShaderGenerator::TARGET;
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenMsl/MslShaderGenerator.cpp b/source/MaterialXGenMsl/MslShaderGenerator.cpp
index 2830d54801..8de6d1c17d 100644
--- a/source/MaterialXGenMsl/MslShaderGenerator.cpp
+++ b/source/MaterialXGenMsl/MslShaderGenerator.cpp
@@ -6,20 +6,20 @@
 #include <MaterialXGenMsl/MslShaderGenerator.h>
 
 #include <MaterialXGenMsl/MslSyntax.h>
-#include <MaterialXGenMsl/Nodes/GeomColorNodeMsl.h>
-#include <MaterialXGenMsl/Nodes/GeomPropValueNodeMsl.h>
 #include <MaterialXGenMsl/Nodes/SurfaceNodeMsl.h>
 #include <MaterialXGenMsl/Nodes/UnlitSurfaceNodeMsl.h>
 #include <MaterialXGenMsl/Nodes/LightNodeMsl.h>
 #include <MaterialXGenMsl/Nodes/LightCompoundNodeMsl.h>
 #include <MaterialXGenMsl/Nodes/LightShaderNodeMsl.h>
-#include <MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.h>
 #include <MaterialXGenMsl/Nodes/LightSamplerNodeMsl.h>
 #include <MaterialXGenMsl/Nodes/NumLightsNodeMsl.h>
-#include <MaterialXGenMsl/Nodes/BlurNodeMsl.h>
 
 #include <MaterialXGenShader/Nodes/MaterialNode.h>
+#include <MaterialXGenShader/Nodes/HwBlurNode.h>
 #include <MaterialXGenShader/Nodes/HwImageNode.h>
+#include <MaterialXGenShader/Nodes/HwGeomColorNode.h>
+#include <MaterialXGenShader/Nodes/HwGeomPropValueNode.h>
+#include <MaterialXGenShader/Nodes/HwHeightToNormalNode.h>
 #include <MaterialXGenShader/Nodes/HwTexCoordNode.h>
 #include <MaterialXGenShader/Nodes/HwTransformNode.h>
 #include <MaterialXGenShader/Nodes/HwPositionNode.h>
@@ -39,6 +39,7 @@ MATERIALX_NAMESPACE_BEGIN
 
 const string MslShaderGenerator::TARGET = "genmsl";
 const string MslShaderGenerator::VERSION = "2.3";
+const string MslSamplingIncludeFilename = "stdlib/genmsl/lib/mx_sampling.metal";
 
 //
 // MslShaderGenerator methods
@@ -65,9 +66,9 @@ MslShaderGenerator::MslShaderGenerator() :
     registerImplementation("IM_texcoord_vector2_" + MslShaderGenerator::TARGET, HwTexCoordNode::create);
     registerImplementation("IM_texcoord_vector3_" + MslShaderGenerator::TARGET, HwTexCoordNode::create);
     // <!-- <geomcolor> -->
-    registerImplementation("IM_geomcolor_float_" + MslShaderGenerator::TARGET, GeomColorNodeMsl::create);
-    registerImplementation("IM_geomcolor_color3_" + MslShaderGenerator::TARGET, GeomColorNodeMsl::create);
-    registerImplementation("IM_geomcolor_color4_" + MslShaderGenerator::TARGET, GeomColorNodeMsl::create);
+    registerImplementation("IM_geomcolor_float_" + MslShaderGenerator::TARGET, HwGeomColorNode::create);
+    registerImplementation("IM_geomcolor_color3_" + MslShaderGenerator::TARGET, HwGeomColorNode::create);
+    registerImplementation("IM_geomcolor_color4_" + MslShaderGenerator::TARGET, HwGeomColorNode::create);
     // <!-- <geompropvalue> -->
     elementNames = {
         "IM_geompropvalue_integer_" + MslShaderGenerator::TARGET,
@@ -78,10 +79,10 @@ MslShaderGenerator::MslShaderGenerator() :
         "IM_geompropvalue_vector3_" + MslShaderGenerator::TARGET,
         "IM_geompropvalue_vector4_" + MslShaderGenerator::TARGET,
     };
-    registerImplementation(elementNames, GeomPropValueNodeMsl::create);
-    registerImplementation("IM_geompropvalue_boolean_" + MslShaderGenerator::TARGET, GeomPropValueNodeMslAsUniform::create);
-    registerImplementation("IM_geompropvalue_string_" + MslShaderGenerator::TARGET, GeomPropValueNodeMslAsUniform::create);
-    registerImplementation("IM_geompropvalue_filename_" + MslShaderGenerator::TARGET, GeomPropValueNodeMslAsUniform::create);
+    registerImplementation(elementNames, HwGeomPropValueNode::create);
+    registerImplementation("IM_geompropvalue_boolean_" + MslShaderGenerator::TARGET, HwGeomPropValueNodeAsUniform::create);
+    registerImplementation("IM_geompropvalue_string_" + MslShaderGenerator::TARGET, HwGeomPropValueNodeAsUniform::create);
+    registerImplementation("IM_geompropvalue_filename_" + MslShaderGenerator::TARGET, HwGeomPropValueNodeAsUniform::create);
 
 
     // <!-- <frame> -->
@@ -104,7 +105,7 @@ MslShaderGenerator::MslShaderGenerator() :
     registerImplementation("IM_spot_light_" + MslShaderGenerator::TARGET, LightShaderNodeMsl::create);
 
     // <!-- <heighttonormal> -->
-    registerImplementation("IM_heighttonormal_vector3_" + MslShaderGenerator::TARGET, HeightToNormalNodeMsl::create);
+    registerImplementation("IM_heighttonormal_vector3_" + MslShaderGenerator::TARGET, []() -> ShaderNodeImplPtr { return HwHeightToNormalNode::create(MslSamplingIncludeFilename);});
 
     // <!-- <blur> -->
     elementNames = {
@@ -115,7 +116,7 @@ MslShaderGenerator::MslShaderGenerator() :
         "IM_blur_vector3_" + MslShaderGenerator::TARGET,
         "IM_blur_vector4_" + MslShaderGenerator::TARGET,
     };
-    registerImplementation(elementNames, BlurNodeMsl::create);
+    registerImplementation(elementNames, []() -> ShaderNodeImplPtr { return HwBlurNode::create(MslSamplingIncludeFilename);});
 
     // <!-- <ND_transformpoint> ->
     registerImplementation("IM_transformpoint_vector3_" + MslShaderGenerator::TARGET, HwTransformPointNode::create);
diff --git a/source/MaterialXGenMsl/Nodes/BlurNodeMsl.h b/source/MaterialXGenMsl/Nodes/BlurNodeMsl.h
deleted file mode 100644
index 2838e83d5a..0000000000
--- a/source/MaterialXGenMsl/Nodes/BlurNodeMsl.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_BLURNODEMSL_H
-#define MATERIALX_BLURNODEMSL_H
-
-#include <MaterialXGenMsl/Export.h>
-
-#include <MaterialXGenShader/Nodes/BlurNode.h>
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// Blur node implementation for MSL
-class MX_GENMSL_API BlurNodeMsl : public BlurNode
-{
-  public:
-    static ShaderNodeImplPtr create();
-    void emitSamplingFunctionDefinition(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenMsl/Nodes/GeomColorNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/GeomColorNodeMsl.cpp
deleted file mode 100644
index 3845e2ae76..0000000000
--- a/source/MaterialXGenMsl/Nodes/GeomColorNodeMsl.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include <MaterialXGenMsl/Nodes/GeomColorNodeMsl.h>
-
-#include <MaterialXGenShader/Shader.h>
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr GeomColorNodeMsl::create()
-{
-    return std::make_shared<GeomColorNodeMsl>();
-}
-
-void GeomColorNodeMsl::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
-{
-    const ShaderInput* indexInput = node.getInput(INDEX);
-    const string index = indexInput ? indexInput->getValue()->getValueString() : "0";
-
-    ShaderStage& vs = shader.getStage(Stage::VERTEX);
-    ShaderStage& ps = shader.getStage(Stage::PIXEL);
-    addStageInput(HW::VERTEX_INPUTS, Type::COLOR4, HW::T_IN_COLOR + "_" + index, vs);
-    addStageConnector(HW::VERTEX_DATA, Type::COLOR4, HW::T_COLOR + "_" + index, vs, ps);
-}
-
-void GeomColorNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    const MslShaderGenerator& shadergen = static_cast<const MslShaderGenerator&>(context.getShaderGenerator());
-
-    const ShaderOutput* output = node.getOutput();
-    const ShaderInput* indexInput = node.getInput(INDEX);
-    string index = indexInput ? indexInput->getValue()->getValueString() : "0";
-    string variable = HW::T_COLOR + "_" + index;
-
-    DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
-    {
-        VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        ShaderPort* color = vertexData[variable];
-        if (!color->isEmitted())
-        {
-            color->setEmitted();
-            shadergen.emitLine(prefix + color->getVariable() + " = " + HW::T_IN_COLOR + "_" + index, stage);
-        }
-    }
-
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        string suffix = "";
-        if (output->getType() == Type::FLOAT)
-        {
-            suffix = ".r";
-        }
-        else if (output->getType() == Type::COLOR3)
-        {
-            suffix = ".rgb";
-        }
-        VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        ShaderPort* color = vertexData[variable];
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-        shadergen.emitString(" = " + prefix + color->getVariable() + suffix, stage);
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenMsl/Nodes/GeomPropValueNodeMsl.cpp b/source/MaterialXGenMsl/Nodes/GeomPropValueNodeMsl.cpp
deleted file mode 100644
index 2775c06f09..0000000000
--- a/source/MaterialXGenMsl/Nodes/GeomPropValueNodeMsl.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#include <MaterialXGenMsl/Nodes/GeomPropValueNodeMsl.h>
-
-#include <MaterialXGenShader/Shader.h>
-
-MATERIALX_NAMESPACE_BEGIN
-
-ShaderNodeImplPtr GeomPropValueNodeMsl::create()
-{
-    return std::make_shared<GeomPropValueNodeMsl>();
-}
-
-void GeomPropValueNodeMsl::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
-{
-    const ShaderInput* geomPropInput = node.getInput(GEOMPROP);
-    if (!geomPropInput || !geomPropInput->getValue())
-    {
-        throw ExceptionShaderGenError("No 'geomprop' parameter found on geompropvalue node '" + node.getName() + "'. Don't know what property to bind");
-    }
-    const string geomProp = geomPropInput->getValue()->getValueString();
-    const ShaderOutput* output = node.getOutput();
-
-    ShaderStage& vs = shader.getStage(Stage::VERTEX);
-    ShaderStage& ps = shader.getStage(Stage::PIXEL);
-
-    addStageInput(HW::VERTEX_INPUTS, output->getType(), HW::T_IN_GEOMPROP + "_" + geomProp, vs);
-    addStageConnector(HW::VERTEX_DATA, output->getType(), HW::T_IN_GEOMPROP + "_" + geomProp, vs, ps);
-}
-
-void GeomPropValueNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    const MslShaderGenerator& shadergen = static_cast<const MslShaderGenerator&>(context.getShaderGenerator());
-
-    const ShaderInput* geomPropInput = node.getInput(GEOMPROP);
-    if (!geomPropInput)
-    {
-        throw ExceptionShaderGenError("No 'geomprop' parameter found on geompropvalue node '" + node.getName() + "'. Don't know what property to bind");
-    }
-    const string geomname = geomPropInput->getValue()->getValueString();
-    const string variable = HW::T_IN_GEOMPROP + "_" + geomname;
-
-    DEFINE_SHADER_STAGE(stage, Stage::VERTEX)
-    {
-        VariableBlock& vertexData = stage.getOutputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        ShaderPort* geomprop = vertexData[variable];
-        if (!geomprop->isEmitted())
-        {
-            shadergen.emitLine(prefix + geomprop->getVariable() + " = " + HW::T_IN_GEOMPROP + "_" + geomname, stage);
-            geomprop->setEmitted();
-        }
-    }
-
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        VariableBlock& vertexData = stage.getInputBlock(HW::VERTEX_DATA);
-        const string prefix = shadergen.getVertexDataPrefix(vertexData);
-        ShaderPort* geomprop = vertexData[variable];
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-        shadergen.emitString(" = " + prefix + geomprop->getVariable(), stage);
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-ShaderNodeImplPtr GeomPropValueNodeMslAsUniform::create()
-{
-    return std::make_shared<GeomPropValueNodeMslAsUniform>();
-}
-
-void GeomPropValueNodeMslAsUniform::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
-{
-    const ShaderInput* geomPropInput = node.getInput(GEOMPROP);
-    if (!geomPropInput || !geomPropInput->getValue())
-    {
-        throw ExceptionShaderGenError("No 'geomprop' parameter found on geompropvalue node '" + node.getName() + "'. Don't know what property to bind");
-    }
-    const string geomProp = geomPropInput->getValue()->getValueString();
-    ShaderStage& ps = shader.getStage(Stage::PIXEL);
-    ShaderPort* uniform = addStageUniform(HW::PRIVATE_UNIFORMS, node.getOutput()->getType(), HW::T_GEOMPROP + "_" + geomProp, ps);
-    uniform->setPath(geomPropInput->getPath());
-}
-
-void GeomPropValueNodeMslAsUniform::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
-{
-    DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
-    {
-        const ShaderGenerator& shadergen = context.getShaderGenerator();
-        const ShaderInput* geomPropInput = node.getInput(GEOMPROP);
-        if (!geomPropInput)
-        {
-            throw ExceptionShaderGenError("No 'geomprop' parameter found on geompropvalue node '" + node.getName() + "'. Don't know what property to bind");
-        }
-        const string attrName = geomPropInput->getValue()->getValueString();
-        shadergen.emitLineBegin(stage);
-        shadergen.emitOutput(node.getOutput(), true, false, context, stage);
-        shadergen.emitString(" = " + HW::T_GEOMPROP + "_" + attrName, stage);
-        shadergen.emitLineEnd(stage);
-    }
-}
-
-MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenMsl/Nodes/GeomPropValueNodeMsl.h b/source/MaterialXGenMsl/Nodes/GeomPropValueNodeMsl.h
deleted file mode 100644
index df6e540241..0000000000
--- a/source/MaterialXGenMsl/Nodes/GeomPropValueNodeMsl.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_GEOMPROPVALUENODEMSL_H
-#define MATERIALX_GEOMPROPVALUENODEMSL_H
-
-#include <MaterialXGenMsl/MslShaderGenerator.h>
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// GeomPropValue node implementation for MSL
-class MX_GENMSL_API GeomPropValueNodeMsl : public MslImplementation
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
-
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-
-    bool isEditable(const ShaderInput& /*input*/) const override { return false; }
-};
-
-/// GeomPropValue node non-implementation for MSL
-class MX_GENMSL_API GeomPropValueNodeMslAsUniform : public MslImplementation
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-    void createVariables(const ShaderNode& node, GenContext& context, Shader& shader) const override;
-
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.h b/source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.h
deleted file mode 100644
index 02ff1f7456..0000000000
--- a/source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Copyright Contributors to the MaterialX Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#ifndef MATERIALX_HEIGHTTONORMALNODEMSL_H
-#define MATERIALX_HEIGHTTONORMALNODEMSL_H
-
-#include <MaterialXGenMsl/Export.h>
-
-#include <MaterialXGenShader/Nodes/ConvolutionNode.h>
-
-MATERIALX_NAMESPACE_BEGIN
-
-/// HeightToNormal node implementation for MSL
-class MX_GENMSL_API HeightToNormalNodeMsl : public ConvolutionNode
-{
-  public:
-    static ShaderNodeImplPtr create();
-
-    void createVariables(const ShaderNode&, GenContext&, Shader& shader) const override;
-
-    void emitFunctionDefinition(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-    void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
-
-    const string& getTarget() const override;
-
-  protected:
-    /// Return if given type is an acceptable input
-    bool acceptsInputType(TypeDesc type) const override;
-
-    /// Compute offset strings for sampling
-    void computeSampleOffsetStrings(const string& sampleSizeName, const string& offsetTypeString,
-                                    unsigned int filterWidth, StringVec& offsetStrings) const override;
-};
-
-MATERIALX_NAMESPACE_END
-
-#endif
diff --git a/source/MaterialXGenMsl/Nodes/BlurNodeMsl.cpp b/source/MaterialXGenShader/Nodes/HwBlurNode.cpp
similarity index 50%
rename from source/MaterialXGenMsl/Nodes/BlurNodeMsl.cpp
rename to source/MaterialXGenShader/Nodes/HwBlurNode.cpp
index 7e050e3417..fd104c859f 100644
--- a/source/MaterialXGenMsl/Nodes/BlurNodeMsl.cpp
+++ b/source/MaterialXGenShader/Nodes/HwBlurNode.cpp
@@ -3,24 +3,23 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include <MaterialXGenMsl/Nodes/BlurNodeMsl.h>
+#include <MaterialXGenShader/Nodes/HwBlurNode.h>
 
 #include <MaterialXGenShader/GenContext.h>
-#include <MaterialXGenShader/ShaderNode.h>
 #include <MaterialXGenShader/ShaderStage.h>
 #include <MaterialXGenShader/ShaderGenerator.h>
 
 MATERIALX_NAMESPACE_BEGIN
 
-ShaderNodeImplPtr BlurNodeMsl::create()
+ShaderNodeImplPtr HwBlurNode::create(const string& samplingIncludeFilename)
 {
-    return std::make_shared<BlurNodeMsl>();
+    return std::make_shared<HwBlurNode>(samplingIncludeFilename);
 }
 
-void BlurNodeMsl::emitSamplingFunctionDefinition(const ShaderNode& /*node*/, GenContext& context, ShaderStage& stage) const
+void HwBlurNode::emitSamplingFunctionDefinition(const ShaderNode& /*node*/, GenContext& context, ShaderStage& stage) const
 {
     const ShaderGenerator& shadergen = context.getShaderGenerator();
-    shadergen.emitLibraryInclude("stdlib/genmsl/lib/mx_sampling.metal", context, stage);
+    shadergen.emitLibraryInclude(_samplingIncludeFilename, context, stage);
     shadergen.emitLineBreak(stage);
 }
 
diff --git a/source/MaterialXGenShader/Nodes/HwBlurNode.h b/source/MaterialXGenShader/Nodes/HwBlurNode.h
new file mode 100644
index 0000000000..ddd35767bb
--- /dev/null
+++ b/source/MaterialXGenShader/Nodes/HwBlurNode.h
@@ -0,0 +1,31 @@
+//
+// Copyright Contributors to the MaterialX Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef MATERIALX_HWBLURNODE_H
+#define MATERIALX_HWBLURNODE_H
+
+#include <MaterialXGenShader/HwShaderGenerator.h>
+
+#include <MaterialXGenShader/Nodes/BlurNode.h>
+
+MATERIALX_NAMESPACE_BEGIN
+
+/// Blur node implementation for Hw shader languages
+class MX_GENSHADER_API HwBlurNode : public BlurNode
+{
+  public:
+    HwBlurNode(const string& samplingIncludeFilename) : _samplingIncludeFilename(samplingIncludeFilename) {}
+    virtual ~HwBlurNode() {}
+
+    static  ShaderNodeImplPtr create(const string& samplingIncludeFilename);
+
+    void emitSamplingFunctionDefinition(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
+  private:
+    string _samplingIncludeFilename;
+};
+
+MATERIALX_NAMESPACE_END
+
+#endif
diff --git a/source/MaterialXGenGlsl/Nodes/GeomColorNodeGlsl.cpp b/source/MaterialXGenShader/Nodes/HwGeomColorNode.cpp
similarity index 79%
rename from source/MaterialXGenGlsl/Nodes/GeomColorNodeGlsl.cpp
rename to source/MaterialXGenShader/Nodes/HwGeomColorNode.cpp
index 7e24331f93..0e86f415a6 100644
--- a/source/MaterialXGenGlsl/Nodes/GeomColorNodeGlsl.cpp
+++ b/source/MaterialXGenShader/Nodes/HwGeomColorNode.cpp
@@ -3,18 +3,19 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include <MaterialXGenGlsl/Nodes/GeomColorNodeGlsl.h>
+#include <MaterialXGenShader/Nodes/HwGeomColorNode.h>
 
 #include <MaterialXGenShader/Shader.h>
+#include <MaterialXGenShader/HwShaderGenerator.h>
 
 MATERIALX_NAMESPACE_BEGIN
 
-ShaderNodeImplPtr GeomColorNodeGlsl::create()
+ShaderNodeImplPtr HwGeomColorNode::create()
 {
-    return std::make_shared<GeomColorNodeGlsl>();
+    return std::make_shared<HwGeomColorNode>();
 }
 
-void GeomColorNodeGlsl::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
+void HwGeomColorNode::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
 {
     const ShaderInput* indexInput = node.getInput(INDEX);
     const string index = indexInput ? indexInput->getValue()->getValueString() : "0";
@@ -25,9 +26,9 @@ void GeomColorNodeGlsl::createVariables(const ShaderNode& node, GenContext&, Sha
     addStageConnector(HW::VERTEX_DATA, Type::COLOR4, HW::T_COLOR + "_" + index, vs, ps);
 }
 
-void GeomColorNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+void HwGeomColorNode::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
 {
-    const GlslShaderGenerator& shadergen = static_cast<const GlslShaderGenerator&>(context.getShaderGenerator());
+    const HwShaderGenerator& shadergen = static_cast<const HwShaderGenerator&>(context.getShaderGenerator());
 
     const ShaderOutput* output = node.getOutput();
     const ShaderInput* indexInput = node.getInput(INDEX);
diff --git a/source/MaterialXGenMsl/Nodes/GeomColorNodeMsl.h b/source/MaterialXGenShader/Nodes/HwGeomColorNode.h
similarity index 63%
rename from source/MaterialXGenMsl/Nodes/GeomColorNodeMsl.h
rename to source/MaterialXGenShader/Nodes/HwGeomColorNode.h
index b67a14ed07..314a6c8916 100644
--- a/source/MaterialXGenMsl/Nodes/GeomColorNodeMsl.h
+++ b/source/MaterialXGenShader/Nodes/HwGeomColorNode.h
@@ -3,15 +3,15 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#ifndef MATERIALX_GEOMCOLORNODEMSL_H
-#define MATERIALX_GEOMCOLORNODEMSL_H
+#ifndef MATERIALX_HWGEOMCOLORNODE_H
+#define MATERIALX_HWGEOMCOLORNODE_H
 
-#include <MaterialXGenMsl/MslShaderGenerator.h>
+#include <MaterialXGenShader/HwShaderGenerator.h>
 
 MATERIALX_NAMESPACE_BEGIN
 
-/// GeomColor node implementation for MSL
-class MX_GENMSL_API GeomColorNodeMsl : public MslImplementation
+/// GeomColor node implementation for Hw shader languages
+class MX_GENSHADER_API HwGeomColorNode : public HwImplementation
 {
   public:
     static ShaderNodeImplPtr create();
diff --git a/source/MaterialXGenGlsl/Nodes/GeomPropValueNodeGlsl.cpp b/source/MaterialXGenShader/Nodes/HwGeomPropValueNode.cpp
similarity index 80%
rename from source/MaterialXGenGlsl/Nodes/GeomPropValueNodeGlsl.cpp
rename to source/MaterialXGenShader/Nodes/HwGeomPropValueNode.cpp
index 3d17da5db4..facd0a224c 100644
--- a/source/MaterialXGenGlsl/Nodes/GeomPropValueNodeGlsl.cpp
+++ b/source/MaterialXGenShader/Nodes/HwGeomPropValueNode.cpp
@@ -3,18 +3,19 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include <MaterialXGenGlsl/Nodes/GeomPropValueNodeGlsl.h>
+#include <MaterialXGenShader/Nodes/HwGeomPropValueNode.h>
 
+#include <MaterialXGenShader/HwShaderGenerator.h>
 #include <MaterialXGenShader/Shader.h>
 
 MATERIALX_NAMESPACE_BEGIN
 
-ShaderNodeImplPtr GeomPropValueNodeGlsl::create()
+ShaderNodeImplPtr HwGeomPropValueNode::create()
 {
-    return std::make_shared<GeomPropValueNodeGlsl>();
+    return std::make_shared<HwGeomPropValueNode>();
 }
 
-void GeomPropValueNodeGlsl::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
+void HwGeomPropValueNode::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
 {
     const ShaderInput* geomPropInput = node.getInput(GEOMPROP);
     if (!geomPropInput || !geomPropInput->getValue())
@@ -31,9 +32,9 @@ void GeomPropValueNodeGlsl::createVariables(const ShaderNode& node, GenContext&,
     addStageConnector(HW::VERTEX_DATA, output->getType(), HW::T_IN_GEOMPROP + "_" + geomProp, vs, ps);
 }
 
-void GeomPropValueNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+void HwGeomPropValueNode::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
 {
-    const GlslShaderGenerator& shadergen = static_cast<const GlslShaderGenerator&>(context.getShaderGenerator());
+    const HwShaderGenerator& shadergen = static_cast<const HwShaderGenerator&>(context.getShaderGenerator());
 
     const ShaderInput* geomPropInput = node.getInput(GEOMPROP);
     if (!geomPropInput)
@@ -67,12 +68,12 @@ void GeomPropValueNodeGlsl::emitFunctionCall(const ShaderNode& node, GenContext&
     }
 }
 
-ShaderNodeImplPtr GeomPropValueNodeGlslAsUniform::create()
+ShaderNodeImplPtr HwGeomPropValueNodeAsUniform::create()
 {
-    return std::make_shared<GeomPropValueNodeGlslAsUniform>();
+    return std::make_shared<HwGeomPropValueNodeAsUniform>();
 }
 
-void GeomPropValueNodeGlslAsUniform::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
+void HwGeomPropValueNodeAsUniform::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
 {
     const ShaderInput* geomPropInput = node.getInput(GEOMPROP);
     if (!geomPropInput || !geomPropInput->getValue())
@@ -85,7 +86,7 @@ void GeomPropValueNodeGlslAsUniform::createVariables(const ShaderNode& node, Gen
     uniform->setPath(geomPropInput->getPath());
 }
 
-void GeomPropValueNodeGlslAsUniform::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+void HwGeomPropValueNodeAsUniform::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
 {
     DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
     {
diff --git a/source/MaterialXGenGlsl/Nodes/GeomPropValueNodeGlsl.h b/source/MaterialXGenShader/Nodes/HwGeomPropValueNode.h
similarity index 65%
rename from source/MaterialXGenGlsl/Nodes/GeomPropValueNodeGlsl.h
rename to source/MaterialXGenShader/Nodes/HwGeomPropValueNode.h
index 20fac2bd05..deb940f4e9 100644
--- a/source/MaterialXGenGlsl/Nodes/GeomPropValueNodeGlsl.h
+++ b/source/MaterialXGenShader/Nodes/HwGeomPropValueNode.h
@@ -3,15 +3,15 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#ifndef MATERIALX_GEOMPROPVALUENODEGLSL_H
-#define MATERIALX_GEOMPROPVALUENODEGLSL_H
+#ifndef MATERIALX_HWGEOMPROPVALUENODE_H
+#define MATERIALX_HWGEOMPROPVALUENODE_H
 
-#include <MaterialXGenGlsl/GlslShaderGenerator.h>
+#include <MaterialXGenShader/HwShaderGenerator.h>
 
 MATERIALX_NAMESPACE_BEGIN
 
-/// GeomPropValue node implementation for GLSL
-class MX_GENGLSL_API GeomPropValueNodeGlsl : public GlslImplementation
+/// GeomPropValue node implementation for Hw shader languages
+class MX_GENSHADER_API HwGeomPropValueNode : public HwImplementation
 {
   public:
     static ShaderNodeImplPtr create();
@@ -23,8 +23,8 @@ class MX_GENGLSL_API GeomPropValueNodeGlsl : public GlslImplementation
     bool isEditable(const ShaderInput& /*input*/) const override { return false; }
 };
 
-/// GeomPropValue node non-implementation for GLSL
-class MX_GENGLSL_API GeomPropValueNodeGlslAsUniform : public GlslImplementation
+/// GeomPropValue node non-implementation for Hw shader languages
+class MX_GENSHADER_API HwGeomPropValueNodeAsUniform : public HwImplementation
 {
   public:
     static ShaderNodeImplPtr create();
diff --git a/source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.cpp b/source/MaterialXGenShader/Nodes/HwHeightToNormalNode.cpp
similarity index 78%
rename from source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.cpp
rename to source/MaterialXGenShader/Nodes/HwHeightToNormalNode.cpp
index ab467c89ea..ba77a9bc76 100644
--- a/source/MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.cpp
+++ b/source/MaterialXGenShader/Nodes/HwHeightToNormalNode.cpp
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include <MaterialXGenMsl/Nodes/HeightToNormalNodeMsl.h>
-#include <MaterialXGenMsl/MslShaderGenerator.h>
+#include <MaterialXGenShader/Nodes/HwHeightToNormalNode.h>
+#include <MaterialXGenShader/HwShaderGenerator.h>
 
 #include <MaterialXGenShader/Shader.h>
 #include <MaterialXGenShader/GenContext.h>
@@ -28,17 +28,17 @@ const float filterOffset = 0.0;
 
 } // namespace
 
-ShaderNodeImplPtr HeightToNormalNodeMsl::create()
+ShaderNodeImplPtr HwHeightToNormalNode::create(const string& samplingIncludeFilename)
 {
-    return std::make_shared<HeightToNormalNodeMsl>();
+    return std::make_shared<HwHeightToNormalNode>(samplingIncludeFilename);
 }
 
-void HeightToNormalNodeMsl::createVariables(const ShaderNode&, GenContext&, Shader&) const
+void HwHeightToNormalNode::createVariables(const ShaderNode&, GenContext&, Shader&) const
 {
     // Default filter kernels from ConvolutionNode are not used by this derived class.
 }
 
-void HeightToNormalNodeMsl::computeSampleOffsetStrings(const string& sampleSizeName, const string& offsetTypeString,
+void HwHeightToNormalNode::computeSampleOffsetStrings(const string& sampleSizeName, const string& offsetTypeString,
                                                        unsigned int, StringVec& offsetStrings) const
 {
     // Build a 3x3 grid of samples that are offset by the provided sample size
@@ -51,24 +51,24 @@ void HeightToNormalNodeMsl::computeSampleOffsetStrings(const string& sampleSizeN
     }
 }
 
-bool HeightToNormalNodeMsl::acceptsInputType(TypeDesc type) const
+bool HwHeightToNormalNode::acceptsInputType(TypeDesc type) const
 {
     // Only support inputs which are float scalar
     return (type == Type::FLOAT && type.isScalar());
 }
 
-void HeightToNormalNodeMsl::emitFunctionDefinition(const ShaderNode&, GenContext& context, ShaderStage& stage) const
+void HwHeightToNormalNode::emitFunctionDefinition(const ShaderNode&, GenContext& context, ShaderStage& stage) const
 {
     DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
     {
         // Emit sampling functions
         const ShaderGenerator& shadergen = context.getShaderGenerator();
-        shadergen.emitLibraryInclude("stdlib/genglsl/lib/mx_sampling.glsl", context, stage);
+        shadergen.emitLibraryInclude(_samplingIncludeFilename, context, stage);
         shadergen.emitLineBreak(stage);
     }
 }
 
-void HeightToNormalNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
+void HwHeightToNormalNode::emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const
 {
     DEFINE_SHADER_STAGE(stage, Stage::PIXEL)
     {
@@ -111,9 +111,5 @@ void HeightToNormalNodeMsl::emitFunctionCall(const ShaderNode& node, GenContext&
     }
 }
 
-const string& HeightToNormalNodeMsl::getTarget() const
-{
-    return MslShaderGenerator::TARGET;
-}
 
 MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.h b/source/MaterialXGenShader/Nodes/HwHeightToNormalNode.h
similarity index 62%
rename from source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.h
rename to source/MaterialXGenShader/Nodes/HwHeightToNormalNode.h
index 776f288c2b..e1f2412d4f 100644
--- a/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.h
+++ b/source/MaterialXGenShader/Nodes/HwHeightToNormalNode.h
@@ -3,28 +3,29 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#ifndef MATERIALX_HEIGHTTONORMALNODEGLSL_H
-#define MATERIALX_HEIGHTTONORMALNODEGLSL_H
+#ifndef MATERIALX_HWHEIGHTTONORMALNODE_H
+#define MATERIALX_HWHEIGHTTONORMALNODE_H
 
-#include <MaterialXGenGlsl/Export.h>
+#include <MaterialXGenShader/HwShaderGenerator.h>
 
 #include <MaterialXGenShader/Nodes/ConvolutionNode.h>
 
 MATERIALX_NAMESPACE_BEGIN
 
-/// HeightToNormal node implementation for GLSL
-class MX_GENGLSL_API HeightToNormalNodeGlsl : public ConvolutionNode
+/// HeightToNormal node implementation for Hw shader languages
+class MX_GENSHADER_API HwHeightToNormalNode : public ConvolutionNode
 {
   public:
-    static ShaderNodeImplPtr create();
+    HwHeightToNormalNode(const string& samplingIncludeFilename) : _samplingIncludeFilename(samplingIncludeFilename) {}
+    virtual ~HwHeightToNormalNode() {}
+
+    static ShaderNodeImplPtr create(const string& samplingIncludeFilename);
 
     void createVariables(const ShaderNode&, GenContext&, Shader& shader) const override;
 
     void emitFunctionDefinition(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
     void emitFunctionCall(const ShaderNode& node, GenContext& context, ShaderStage& stage) const override;
 
-    const string& getTarget() const override;
-
   protected:
     /// Return if given type is an acceptable input
     bool acceptsInputType(TypeDesc type) const override;
@@ -32,6 +33,9 @@ class MX_GENGLSL_API HeightToNormalNodeGlsl : public ConvolutionNode
     /// Compute offset strings for sampling
     void computeSampleOffsetStrings(const string& sampleSizeName, const string& offsetTypeString,
                                     unsigned int filterWidth, StringVec& offsetStrings) const override;
+
+  private:
+    const string _samplingIncludeFilename;
 };
 
 MATERIALX_NAMESPACE_END