diff --git a/libraries/bxdf/usd_preview_surface.mtlx b/libraries/bxdf/usd_preview_surface.mtlx
index f3879a4617..62600842cc 100644
--- a/libraries/bxdf/usd_preview_surface.mtlx
+++ b/libraries/bxdf/usd_preview_surface.mtlx
@@ -364,17 +364,17 @@
     <output name="out" type="boolean" nodename="primvar" />
   </nodegraph>
   <nodegraph name="IMP_UsdPrimvarReader_string" nodedef="ND_UsdPrimvarReader_string">
-    <geompropvalue name="primvar" type="string">
+    <geompropvalueuniform name="primvar" type="string">
       <input name="geomprop" type="string" interfacename="varname" />
       <input name="default" type="string" interfacename="fallback" />
-    </geompropvalue>
+    </geompropvalueuniform>
     <output name="out" type="string" nodename="primvar" uniform="true" />
   </nodegraph>
   <nodegraph name="IMP_UsdPrimvarReader_filename" nodedef="ND_UsdPrimvarReader_filename">
-    <geompropvalue name="primvar" type="string">
+    <geompropvalueuniform name="primvar" type="filename">
       <input name="geomprop" type="string" interfacename="varname" />
       <input name="default" type="filename" interfacename="fallback" />
-    </geompropvalue>
+    </geompropvalueuniform>
     <output name="out" type="filename" nodename="primvar" uniform="true" />
   </nodegraph>
   <nodegraph name="IMP_UsdPrimvarReader_float" nodedef="ND_UsdPrimvarReader_float">
diff --git a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
index 6fc5f3dfb8..1ba84b8083 100644
--- a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
+++ b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
@@ -174,8 +174,8 @@
   <implementation name="IM_geompropvalue_vector4_genmdl" nodedef="ND_geompropvalue_vector4" sourcecode="materialx::stdlib_{{MDL_VERSION_SUFFIX}}::mx_geompropvalue_vector4(mxp_geomprop:{{geomprop}}, mxp_default:{{default}})" target="genmdl" />
 
   <!-- <geompropvalueuniform> -->
-  <implementation name="IM_geompropvalueuniform_string_genmdl" nodedef="ND_geompropvalueuniform_string" sourcecode="materialx::stdlib_{{MDL_VERSION_SUFFIX}}::mx_geompropvalue_string(mxp_geomprop:{{geomprop}}, mxp_default:{{default}})" target="genmdl" />
-  <implementation name="IM_geompropvalueuniform_filename_genmdl" nodedef="ND_geompropvalueuniform_filename" sourcecode="materialx::stdlib_{{MDL_VERSION_SUFFIX}}::mx_geompropvalue_string(mxp_geomprop:{{geomprop}}, mxp_default:{{default}})" target="genmdl" />
+  <implementation name="IM_geompropvalue_string_genmdl" nodedef="ND_geompropvalueuniform_string" sourcecode="materialx::stdlib_{{MDL_VERSION_SUFFIX}}::mx_geompropvalue_string(mxp_geomprop:{{geomprop}}, mxp_default:{{default}})" target="genmdl" />
+  <implementation name="IM_geompropvalue_filename_genmdl" nodedef="ND_geompropvalueuniform_filename" sourcecode="materialx::stdlib_{{MDL_VERSION_SUFFIX}}::mx_geompropvalue_string(mxp_geomprop:{{geomprop}}, mxp_default:{{default}})" target="genmdl" />
 
   <!-- ======================================================================== -->
   <!-- Application nodes                                                        -->
diff --git a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
index c8141e066d..ac4ea4e0b2 100644
--- a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
+++ b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx
@@ -85,7 +85,7 @@
   <implementation name="IM_geompropvalue_vector4_genmsl" nodedef="ND_geompropvalue_vector4" function="mx_geompropvalue_vector4" target="genmsl" />
 
   <!-- <geompropvalueuniform> -->
-  <implementation name="IM_geompropvalue_string_genmsl" nodedef="ND_geompropvalueuniform_string" function="mx_geompropvalueuniform_string" target="genmsl" />
+  <implementation name="IM_geompropvalue_string_genmsl" nodedef="ND_geompropvalueuniform_string" function="mx_geompropvalue_string" target="genmsl" />
   <implementation name="IM_geompropvalue_filename_genmsl" nodedef="ND_geompropvalueuniform_filename" function="mx_geompropvalue_string" target="genmsl" />
 
   <!-- ======================================================================== -->
diff --git a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
index 8c06ab6668..3c4c5c4a6e 100644
--- a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
+++ b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
@@ -174,8 +174,8 @@
   <implementation name="IM_geompropvalue_vector4_genosl" nodedef="ND_geompropvalue_vector4" file="mx_geompropvalue_vector4.osl" function="mx_geompropvalue_vector4" target="genosl" />
 
   <!-- <geompropvalueuniform> -->
-  <implementation name="IM_geompropvalueuniform_string_genosl" nodedef="ND_geompropvalueuniform_string" file="mx_geompropvalueuniform_string.osl" function="mx_geompropvalueuniform_string" target="genosl" />
-  <implementation name="IM_geompropvalueuniform_filename_genosl" nodedef="ND_geompropvalueuniform_filename" file="mx_geompropvalueuniform_filename.osl" function="mx_geompropvalueuniform_filename" target="genosl" />
+  <implementation name="IM_geompropvalue_string_genosl" nodedef="ND_geompropvalueuniform_string" file="mx_geompropvalue_string.osl" function="mx_geompropvalue_string" target="genosl" />
+  <implementation name="IM_geompropvalue_filename_genosl" nodedef="ND_geompropvalueuniform_filename" file="mx_geompropvalue_string.osl" function="mx_geompropvalue_string" target="genosl" />
 
   <!-- ======================================================================== -->
   <!-- Application nodes                                                        -->
diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index 4fdcf36b2e..7d26d66639 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -1347,7 +1347,7 @@
     <output name="out" type="string" default="" uniform="true" />
   </nodedef>
   <nodedef name="ND_geompropvalueuniform_filename" node="geompropvalueuniform" nodegroup="geometric">
-    <input name="geomprop" type="filename" value="" uniform="true" />
+    <input name="geomprop" type="string" value="" uniform="true" />
     <input name="default" type="filename" value="" uniform="true" />
     <output name="out" type="filename" default="" uniform="true" />
   </nodedef>
diff --git a/resources/Materials/TestSuite/stdlib/geometric/geompropvalue.mtlx b/resources/Materials/TestSuite/stdlib/geometric/geompropvalue.mtlx
index 82d3ad5bb0..109a5e0546 100644
--- a/resources/Materials/TestSuite/stdlib/geometric/geompropvalue.mtlx
+++ b/resources/Materials/TestSuite/stdlib/geometric/geompropvalue.mtlx
@@ -22,13 +22,13 @@
   <geompropvalue name="geompropvalue_boolean" type="boolean">
     <input name="geomprop" type="string" value="geompropvalue_bool" />
   </geompropvalue>
-  <output name="geompropvalue_string_out" type="color3" nodename="swizzle1" />
+  <output name="geompropvalueuniform_string_out" type="color3" nodename="swizzle1" />
   <constant name="swizzle1" type="color3">
     <input name="value" type="color3" value="0.5, 0.5, 0.5" />
   </constant>
-  <geompropvalue name="geompropvalue_string" type="string">
-    <input name="geomprop" type="string" value="geompropvalue_string" />
-  </geompropvalue>
+  <geompropvalueuniform name="geompropvalueuniform_string" type="string">
+    <input name="geomprop" type="string" value="geompropvalueuniform_string" />
+  </geompropvalueuniform>
   <output name="geompropvalue_float_out" type="float" nodename="geompropvalue_float" />
   <geompropvalue name="geompropvalue_float" type="float">
     <input name="geomprop" type="string" value="geompropvalue_float" />