diff --git a/contrib/adsk/libraries/adsklib/adsklib_defs.mtlx b/contrib/adsk/libraries/adsklib/adsklib_defs.mtlx
index 822c759c19..0c497b29b0 100644
--- a/contrib/adsk/libraries/adsklib/adsklib_defs.mtlx
+++ b/contrib/adsk/libraries/adsklib/adsklib_defs.mtlx
@@ -10,75 +10,75 @@
   <nodedef name="ND_adsk_bitmap_color3" node="bitmap" nodegroup="texture2d" version="1.0.1" isdefaultversion="true" namespace="adsk">
     <input name="file" type="filename" />
     <!--  inputs with unit -->
-    <input name="realworld_offset" type="vector2" unittype="distance" />
-    <input name="realworld_scale" type="vector2" unittype="distance"/>
+    <input name="realworld_offset" type="vector2" unittype="distance" value="0.0, 0.0" />
+    <input name="realworld_scale" type="vector2" unittype="distance" value="1.0, 1.0" />
     <!--  inputs without unit -->
     <input name="uv_offset" type="vector2" value="0.0, 0.0" />
     <input name="uv_scale" type="vector2" value="1.0, 1.0" />
     <!-- wAngle - rotation -->
-    <input name="rotation_angle" type="float" value="0" />
+    <input name="rotation_angle" type="float" value="0" uisoftmin="0" uisoftmax="360.0" />
     <!-- rgbamount -->
-    <input name="rgbamount" type="float" value="1.0" />
+    <input name="rgbamount" type="float" value="1.0" uimin="0.0" uimax="1.0" />
     <!-- invert -->
     <input name="invert" type="boolean" value="false" />
     <input name="uaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode U" uniform="true" />
     <input name="vaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode V" uniform="true" />
-    <input name="uv_index" type="integer" value="0" />
+    <input name="uv_index" type="integer" value="0" uimin="0" uisoftmax="10" />
     <output name="out" type="color3"/>
   </nodedef>
 
   <nodedef name="ND_adsk_bitmap_color4" node="bitmap" nodegroup="texture2d" version="1.0.1" isdefaultversion="true" namespace="adsk">
     <input name="file" type="filename" />
     <!--  inputs with unit -->
-    <input name="realworld_offset" type="vector2" unittype="distance" />
-    <input name="realworld_scale" type="vector2" unittype="distance"/>
+    <input name="realworld_offset" type="vector2" unittype="distance" value="0.0, 0.0" />
+    <input name="realworld_scale" type="vector2" unittype="distance" value="1.0, 1.0" />
     <!--  inputs without unit -->
     <input name="uv_offset" type="vector2" value="0.0, 0.0" />
     <input name="uv_scale" type="vector2" value="1.0, 1.0" />
     <!-- wAngle - rotation -->
-    <input name="rotation_angle" type="float" value="0" />
+    <input name="rotation_angle" type="float" value="0" uisoftmin="0" uisoftmax="360.0" />
     <!-- rgbamount -->
-    <input name="rgbamount" type="float" value="1.0" />
+    <input name="rgbamount" type="float" value="1.0" uimin="0.0" uimax="1.0" />
     <!-- invert -->
     <input name="invert" type="boolean" value="false" />
     <input name="uaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode U" uniform="true" />
     <input name="vaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode V" uniform="true" />
-    <input name="uv_index" type="integer" value="0" />
+    <input name="uv_index" type="integer" value="0" uimin="0" uisoftmax="10" />
     <output name="out" type="color4"/>
   </nodedef>
   
   <nodedef name="ND_adsk_bitmap_float" node="bitmap" nodegroup="texture2d" version="1.0.1" isdefaultversion="true" namespace="adsk">
     <input name="file" type="filename" />
     <!--  inputs with unit -->
-    <input name="realworld_offset" type="vector2" unittype="distance" />
-    <input name="realworld_scale" type="vector2" unittype="distance"/>
+    <input name="realworld_offset" type="vector2" unittype="distance" value="0.0, 0.0" />
+    <input name="realworld_scale" type="vector2" unittype="distance" value="1.0, 1.0" />
     <!--  inputs without unit -->
     <input name="uv_offset" type="vector2" value="0.0, 0.0" />
     <input name="uv_scale" type="vector2" value="1.0, 1.0" />
     <!-- wAngle - rotation -->
-    <input name="rotation_angle" type="float" value="0" />
+    <input name="rotation_angle" type="float" value="0" uisoftmin="0" uisoftmax="360.0" />
     <!-- rgbamount -->
-    <input name="rgbamount" type="float" value="1.0" />
+    <input name="rgbamount" type="float" value="1.0" uimin="0.0" uimax="1.0" />
     <!-- invert -->
     <input name="invert" type="boolean" value="false" />
     <input name="uaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode U" uniform="true" />
     <input name="vaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode V" uniform="true" />
-    <input name="uv_index" type="integer" value="0" />
+    <input name="uv_index" type="integer" value="0" uimin="0" uisoftmax="10" />
     <output name="out" type="float" />
   </nodedef>
 
   <nodedef name="ND_adsk_bitmap_remap_float" node="bitmap_remap" nodegroup="texture2d" version="1.0.1" isdefaultversion="true" namespace="adsk">
     <input name="file" type="filename" />
     <!--  inputs with unit -->
-    <input name="realworld_offset" type="vector2" unittype="distance" />
-    <input name="realworld_scale" type="vector2" unittype="distance"/>
+    <input name="realworld_offset" type="vector2" unittype="distance" value="0.0, 0.0" />
+    <input name="realworld_scale" type="vector2" unittype="distance" value="1.0, 1.0" />
     <!--  inputs without unit -->
     <input name="uv_offset" type="vector2" value="0.0, 0.0" />
     <input name="uv_scale" type="vector2" value="1.0, 1.0" />
     <!-- wAngle - rotation -->
-    <input name="rotation_angle" type="float" value="0" />
+    <input name="rotation_angle" type="float" value="0" uisoftmin="0" uisoftmax="360.0" />
     <!-- rgbamount -->
-    <input name="rgbamount" type="float" value="1.0" />
+    <input name="rgbamount" type="float" value="1.0" uimin="0.0" uimax="1.0" />
     <!-- invert -->
     <input name="invert" type="boolean" value="false" />
     <!-- remap -->
@@ -86,7 +86,7 @@
     <input name="outhigh" type="float" value="1.0" />
     <input name="uaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode U" uniform="true" />
     <input name="vaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode V" uniform="true" />
-    <input name="uv_index" type="integer" value="0" />
+    <input name="uv_index" type="integer" value="0" uimin="0" uisoftmax="10" />
     <output name="out" type="float" />
   </nodedef>
 
@@ -94,33 +94,33 @@
   <nodedef name="ND_adsk_normal_map" node="normal_map" nodegroup="texture2d" version="1.0.1" isdefaultversion="true" namespace="adsk">
     <input name="file" type="filename" />
     <!--  inputs with unit -->
-    <input name="realworld_offset" type="vector2" unittype="distance" />
-    <input name="realworld_scale" type="vector2" unittype="distance" />
+    <input name="realworld_offset" type="vector2" unittype="distance" value="0.0, 0.0" />
+    <input name="realworld_scale" type="vector2" unittype="distance" value="1.0, 1.0" />
     <!--  inputs without unit -->
     <input name="uv_offset" type="vector2" value="0.0, 0.0" />
     <input name="uv_scale" type="vector2" value="1.0, 1.0" />
     <!-- wAngle - rotation -->
-    <input name="rotation_angle" type="float" value="0" unittype="angle" />
+    <input name="rotation_angle" type="float" value="0" unittype="angle" uisoftmin="0" uisoftmax="360.0" />
     <!-- normal scale -->
     <input name="normal_scale" type="float" value="1.0" />
     <input name="uaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode U" uniform="true" />
     <input name="vaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode V" uniform="true" />
-    <input name="uv_index" type="integer" value="0" />
+    <input name="uv_index" type="integer" value="0" uimin="0" uisoftmax="10" />
     <output name="out" type="vector3" />
   </nodedef>
 
   <!-- <adsk_height_map> -->
   <nodedef name="ND_adsk_height_map" node="height_map" nodegroup="texture2d" version="1.0.1" isdefaultversion="true" namespace="adsk">
     <input name="file" type="filename" />
-    <input name="realworld_offset" type="vector2" unittype="distance" />
-    <input name="realworld_scale" type="vector2" unittype="distance" />
+    <input name="realworld_offset" type="vector2" unittype="distance" value="0.0, 0.0" />
+    <input name="realworld_scale" type="vector2" unittype="distance" value="1.0, 1.0" />
     <input name="uv_offset" type="vector2" value="0.0, 0.0" />
     <input name="uv_scale" type="vector2" value="1.0, 1.0" />
-    <input name="rotation_angle" type="float" value="0" unittype="angle" />
-    <input name="depth" type="float" unittype="distance" />
+    <input name="rotation_angle" type="float" value="0" unittype="angle" uisoftmin="0" uisoftmax="360.0" />
+    <input name="depth" type="float" unittype="distance" value="1.0" uisoftmin="0.0" uisoftmax="1.0" />
     <input name="uaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode U" uniform="true" />
     <input name="vaddressmode" type="string" value="periodic" enum="constant,clamp,periodic,mirror" uiname="Address Mode V" uniform="true" />
-    <input name="uv_index" type="integer" value="0" />
+    <input name="uv_index" type="integer" value="0" uimin="0" uisoftmax="10" />
     <output name="out" type="vector3" />
   </nodedef>
   
@@ -131,9 +131,9 @@
   <nodedef name="ND_adsk_metal" node="metal" version="1.0.1" isdefaultversion="true" namespace="adsk">
     <input name="metal_f0" type="color3" value="1, 1, 1" />
     <input name="surface_albedo" type="color3" value="1, 1, 1" />
-    <input name="surface_roughness" type="float" value="0" />
-    <input name="surface_anisotropy" type="float" value="0" />
-    <input name="surface_rotation" type="float" value="0" />
+    <input name="surface_roughness" type="float" value="0" uimin="0.0" uimax="1.0" />
+    <input name="surface_anisotropy" type="float" value="0" uimin="0.0" uimax="1.0" />
+    <input name="surface_rotation" type="float" value="0" uimin="0.0" uimax="180.0" />
     <input name="surface_normal" type="vector3" value="1, 1, 1" defaultgeomprop="Nworld"/>
     <input name="surface_cutout" type="color3" value="1, 1, 1" />
     <output name="out" type="surfaceshader" />
@@ -144,15 +144,15 @@
     <input name="surface_cutout" type="color3" value="1, 1, 1" />
     <input name="surface_albedo" type="color3" value="1, 1, 1" />
     <input name="opaque_albedo" type="color3" value="1, 1, 1" />
-    <input name="surface_roughness" type="float" value="0" />
-    <input name="surface_anisotropy" type="float" value="0" />
-    <input name="surface_rotation" type="float" value="0" />
+    <input name="surface_roughness" type="float" value="0" uimin="0.0" uimax="1.0" />
+    <input name="surface_anisotropy" type="float" value="0" uimin="0.0" uimax="1.0" />
+    <input name="surface_rotation" type="float" value="0" uimin="0.0" uimax="180.0" />
     <input name="opaque_f0" type="float" value="1" />
     <input name="opaque_translucency" type="boolean" value="false" />
     <input name="opaque_mfp_modifier" type="color3" value="1, 1, 1" />
-    <input name="opaque_mfp" type="float" value="1" unittype="distance" />
+    <input name="opaque_mfp" type="float" value="1" unittype="distance" uimin="0.0" uisoftmax="100.0" />
     <input name="opaque_emission" type="boolean" value="false" />
-    <input name="opaque_luminance" type="float" value="1.0" />
+    <input name="opaque_luminance" type="float" value="1.0" uimin="0.0" uisoftmax="1500.0" />
     <input name="opaque_luminance_modifier" type="color3" value="1.0, 1.0, 1.0" />
     <output name="out" type="surfaceshader" />
   </nodedef>
@@ -161,12 +161,12 @@
     <input name="surface_normal" type="vector3" value="1, 1, 1" defaultgeomprop="Nworld"/>
     <input name="surface_cutout" type="color3" value="1, 1, 1" />
     <input name="surface_albedo" type="color3" value="1, 1, 1" />
-    <input name="surface_roughness" type="float" value="0" />
-    <input name="surface_anisotropy" type="float" value="0" />
-    <input name="surface_rotation" type="float" value="0" />
-    <input name="transparent_ior" type="float" value="1" />
+    <input name="surface_roughness" type="float" value="0" uimin="0.0" uimax="1.0" />
+    <input name="surface_anisotropy" type="float" value="0" uimin="0.0" uimax="1.0" />
+    <input name="surface_rotation" type="float" value="0" uimin="0.0" uimax="180.0" />
+    <input name="transparent_ior" type="float" value="1" uimin="0.0" uisoftmax="3.0" />
     <input name="transparent_color" type="color3" value="1, 1, 1" />
-    <input name="transparent_distance" type="float" value="1" />
+    <input name="transparent_distance" type="float" value="1" unittype="distance" uimin="0.0" uisoftmax="100.0" />
     <output name="out" type="surfaceshader" />
   </nodedef>
 
@@ -174,14 +174,14 @@
     <input name="surface_normal" type="vector3" value="1, 1, 1" defaultgeomprop="Nworld"/>
     <input name="surface_cutout" type="color3" value="1, 1, 1" />
     <input name="surface_albedo" type="color3" value="1, 1, 1" />
-    <input name="surface_roughness" type="float" value="0" />
-    <input name="surface_anisotropy" type="float" value="0" />
-    <input name="surface_rotation" type="float" value="0" />
+    <input name="surface_roughness" type="float" value="0" uimin="0.0" uimax="1.0" />
+    <input name="surface_anisotropy" type="float" value="0" uimin="0.0" uimax="1.0" />
+    <input name="surface_rotation" type="float" value="0" uimin="0.0" uimax="180.0" />
     <input name="layered_normal" type="vector3" value="1, 1, 1" defaultgeomprop="Nworld"/>
     <input name="layered_f0" type="float" value="1" />
-    <input name="layered_roughness" type="float" value="0" />
-    <input name="layered_anisotropy" type="float" value="0" />
-    <input name="layered_rotation" type="float" value="0" />
+    <input name="layered_roughness" type="float" value="0" uimin="0.0" uimax="1.0" />
+    <input name="layered_anisotropy" type="float" value="0" uimin="0.0" uimax="1.0" />
+    <input name="layered_rotation" type="float" value="0" uimin="0.0" uimax="180.0" />
     <input name="layered_fraction" type="float" value="0.5" />
     <input name="layered_fraction_invert" type="boolean" value="false" />
     <input name="layered_diffuse" type="color3" value="1, 1, 1" />
@@ -193,11 +193,11 @@
     <input name="surface_albedo" type="color3" value="1, 1, 1" />
     <input name="surface_normal" type="vector3" value="1, 1, 1" defaultgeomprop="Nworld"/>
     <input name="surface_cutout" type="color3" value="1, 1, 1" />
-    <input name="surface_roughness" type="float" value="0" />
-    <input name="surface_anisotropy" type="float" value="0" />
-    <input name="surface_rotation" type="float" value="0" />
+    <input name="surface_roughness" type="float" value="0" uimin="0.0" uimax="1.0" />
+    <input name="surface_anisotropy" type="float" value="0" uimin="0.0" uimax="1.0" />
+    <input name="surface_rotation" type="float" value="0" uimin="0.0" uimax="180.0" />
     <input name="glazing_transmission_color" type="color3" value="1, 1, 1" />
-    <input name="glazing_transmission_roughness" type="float" value="0" />
+    <input name="glazing_transmission_roughness" type="float" value="0" uimin="0.0" uimax="1.0" />
     <input name="glazing_f0" type="color3" value="1,1,1" />
     <input name="glazing_backface_culling" type="boolean" value="true" />
     <output name="out" type="surfaceshader" />
diff --git a/contrib/adsk/libraries/adsklib/adsklib_ng.mtlx b/contrib/adsk/libraries/adsklib/adsklib_ng.mtlx
index 17dbd045e9..090f50a27e 100644
--- a/contrib/adsk/libraries/adsklib/adsklib_ng.mtlx
+++ b/contrib/adsk/libraries/adsklib/adsklib_ng.mtlx
@@ -428,7 +428,7 @@
     <!-- map values to standard surface -->
     <output name="out" type="surfaceshader" nodename="standard_surface0" />
     <standard_surface name="standard_surface0" type="surfaceshader" version="1.0.1">
-      <input name="normal" type="vector3" value="1, 1, 1" defaultgeomprop="Nobject" interfacename="surface_normal" />
+      <input name="normal" type="vector3" value="1, 1, 1" interfacename="surface_normal" />
       <input name="opacity" type="color3" value="1, 1, 1" interfacename="surface_cutout" />
       <input name="metalness" type="float" value="1" />
       <input name="base" type="float" value="1.0" />
@@ -532,7 +532,7 @@
     <!-- map values to standard surface -->
     <output name="out" type="surfaceshader" nodename="standard_surface0" />
     <standard_surface name="standard_surface0" type="surfaceshader" version="1.0.1">
-      <input name="normal" type="vector3" value="1, 1, 1" defaultgeomprop="Nobject" interfacename="surface_normal" />
+      <input name="normal" type="vector3" value="1, 1, 1" interfacename="surface_normal" />
       <input name="opacity" type="color3" value="1, 1, 1" interfacename="surface_cutout" />
       <input name="specular_color" type="color3" value="1, 1, 1" interfacename="surface_albedo" />
       <input name="specular_roughness" type="float" nodename="specular_roughness_value" />
@@ -596,7 +596,7 @@
     <!-- map values to standard surface -->
     <output name="out" type="surfaceshader" nodename="standard_surface0" />
     <standard_surface name="standard_surface0" type="surfaceshader" version="1.0.1">
-      <input name="normal" type="vector3" value="1, 1, 1" defaultgeomprop="Nobject" interfacename="surface_normal" />
+      <input name="normal" type="vector3" value="1, 1, 1" interfacename="surface_normal" />
       <input name="opacity" type="color3" value="1, 1, 1" interfacename="surface_cutout" />
       <input name="specular" type="float" value="1.0" />
       <input name="transmission" type="float" value="1.0" />
@@ -779,8 +779,8 @@
     <!-- map values to standard surface -->
     <output name="out" type="surfaceshader" nodename="standard_surface0" />
     <standard_surface name="standard_surface0" type="surfaceshader" version="1.0.1">
-      <input name="normal" type="vector3" value="1, 1, 1" defaultgeomprop="Nobject" interfacename="layered_normal" />
-      <input name="coat_normal" type="vector3" value="1, 1, 1" defaultgeomprop="Nobject" interfacename="surface_normal" />
+      <input name="normal" type="vector3" value="1, 1, 1" interfacename="layered_normal" />
+      <input name="coat_normal" type="vector3" value="1, 1, 1" interfacename="surface_normal" />
       <input name="opacity" type="color3" value="1, 1, 1" interfacename="surface_cutout" />
       <input name="coat" type="float" nodename="coat_value" />
       <input name="metalness" type="float" nodename="layered_fraction_value" />
@@ -936,7 +936,7 @@
     <!-- map values to standard surface -->
     <output name="out" type="surfaceshader" nodename="standard_surface0" />
     <standard_surface name="standard_surface0" type="surfaceshader" version="1.0.1">
-      <input name="normal" type="vector3" value="1, 1, 1" defaultgeomprop="Nobject" interfacename="surface_normal" />
+      <input name="normal" type="vector3" value="1, 1, 1" interfacename="surface_normal" />
       <input name="opacity" type="color3" nodename="opacity_value" />
       <input name="specular" type="float" value="1.0" />
       <input name="transmission" type="float" value="1.0" />
diff --git a/contrib/adsk/resources/Materials/TestSuite/_options.mtlx b/contrib/adsk/resources/Materials/TestSuite/_options.mtlx
index 71465afd3d..a4fdecab5e 100644
--- a/contrib/adsk/resources/Materials/TestSuite/_options.mtlx
+++ b/contrib/adsk/resources/Materials/TestSuite/_options.mtlx
@@ -12,17 +12,17 @@
   -->
 
   <!-- nodedefs for custom test settings -->
-  <nodedef name="ND_BakingSettings" node="baker" >
+  <nodedef name="ND_BakingSettings" node="baker">
     <input name="file" type="filename" />
-    <input name="uvmin" type="vector2"/>
-    <input name="uvmax" type="vector2"/>
+    <input name="uvmin" type="vector2" />
+    <input name="uvmax" type="vector2" />
     <input name="hdr" type="boolean" value="false" />
     <input name="resolution" type="integer" value="1024" />
   </nodedef>
 
-  <nodedef name="ND_WedgeRenderSettings" node="wedgerender" >
+  <nodedef name="ND_WedgeRenderSettings" node="wedgerender">
     <input name="file" type="filename" />
-    <input name="parameter" type="string"/>
+    <input name="parameter" type="string" />
     <input name="range" type="vector2" value="0.0, 1.0" />
     <input name="steps" type="integer" value="1.0" />
   </nodedef>
@@ -38,7 +38,7 @@
 
     <!-- Comma separated list of target" specifiers to indicate which
          code generators to use. -->
-    <input name="targets" type="string" value="genglsl,genosl,genmdl" />
+    <input name="targets" type="string" value="genglsl,genosl,genmdl,genmsl" />
 
     <!-- Check the count of number of implementations used for a given generator -->
     <input name="checkImplCount" type="boolean" value="true" />
@@ -117,7 +117,7 @@
     <!-- Bake rendering options: Currently only supports the genglsl_glsl400 shader generator -->
     <baker name="mapped_surfaceshader">
         <input name="file" type="filename" value="mapped_surfaceshader.mtlx" />
-        <input name="uvmin" type="vector2" value="0,0"/>
+      <input name="uvmin" type="vector2" value="0,0" />
         <input name="uvmax" type="vector2" value="1,1" />
         <input name="hdr" type="boolean" value="false" />
         <input name="resolution" type="integer" value="1024" />
@@ -125,70 +125,62 @@
 
     <baker name="normalmapped_surfaceshader">
         <input name="file" type="filename" value="normalmapped_surfaceshader.mtlx" />
-        <input name="uvmin" type="vector2" value="0,0"/>
-        <input name="uvmax" type="vector2" value="1,1" />
-        <input name="hdr" type="boolean" value="false" />
-        <input name="resolution" type="integer" value="1024" />
-    </baker>
-
-    <baker name="adsk_bitmap">
-        <input name="file" type="filename" value="adsk_bitmap.mtlx" />
-        <input name="uvmin" type="vector2" value="0,0"/>
+      <input name="uvmin" type="vector2" value="0,0" />
         <input name="uvmax" type="vector2" value="1,1" />
         <input name="hdr" type="boolean" value="false" />
         <input name="resolution" type="integer" value="1024" />
     </baker>
 
-    <baker name="adsk_glazing">
-        <input name="file" type="filename" value="adsk_glazing.mtlx" />
+    <baker name="adsk_metal">
+        <input name="file" type="filename" value="adsk_metal.mtlx" />
         <input name="uvmin" type="vector2" value="0,0"/>
         <input name="uvmax" type="vector2" value="1,1" />
         <input name="hdr" type="boolean" value="false" />
         <input name="resolution" type="integer" value="1024" />
     </baker>
 
-    <baker name="adsk_heightmap">
-        <input name="file" type="filename" value="adsk_heightmap.mtlx" />
+    <baker name="adsk_normalmap">
+        <input name="file" type="filename" value="adsk_normalmap.mtlx" />
         <input name="uvmin" type="vector2" value="0,0"/>
         <input name="uvmax" type="vector2" value="1,1" />
         <input name="hdr" type="boolean" value="false" />
         <input name="resolution" type="integer" value="1024" />
     </baker>
 
-    <baker name="adsk_layered">
-        <input name="file" type="filename" value="adsk_layered.mtlx" />
+    <baker name="adsk_opaque">
+        <input name="file" type="filename" value="adsk_opaque.mtlx" />
         <input name="uvmin" type="vector2" value="0,0"/>
         <input name="uvmax" type="vector2" value="1,1" />
         <input name="hdr" type="boolean" value="false" />
         <input name="resolution" type="integer" value="1024" />
     </baker>
 
-    <baker name="adsk_metal">
-        <input name="file" type="filename" value="adsk_metal.mtlx" />
+    <baker name="adsk_transparent">
+        <input name="file" type="filename" value="adsk_transparent.mtlx" />
         <input name="uvmin" type="vector2" value="0,0"/>
         <input name="uvmax" type="vector2" value="1,1" />
         <input name="hdr" type="boolean" value="false" />
         <input name="resolution" type="integer" value="1024" />
     </baker>
 
-    <baker name="adsk_normalmap">
-        <input name="file" type="filename" value="adsk_normalmap.mtlx" />
+    <baker name="adsk_glazing">
+        <input name="file" type="filename" value="adsk_glazing.mtlx" />
         <input name="uvmin" type="vector2" value="0,0"/>
         <input name="uvmax" type="vector2" value="1,1" />
         <input name="hdr" type="boolean" value="false" />
         <input name="resolution" type="integer" value="1024" />
     </baker>
 
-    <baker name="adsk_opaque">
-        <input name="file" type="filename" value="adsk_opaque.mtlx" />
+    <baker name="adsk_bitmap">
+        <input name="file" type="filename" value="adsk_bitmap.mtlx" />
         <input name="uvmin" type="vector2" value="0,0"/>
         <input name="uvmax" type="vector2" value="1,1" />
         <input name="hdr" type="boolean" value="false" />
         <input name="resolution" type="integer" value="1024" />
     </baker>
 
-    <baker name="adsk_transparent">
-        <input name="file" type="filename" value="adsk_transparent.mtlx" />
+    <baker name="adsk_heightmap">
+        <input name="file" type="filename" value="adsk_heightmap.mtlx" />
         <input name="uvmin" type="vector2" value="0,0"/>
         <input name="uvmax" type="vector2" value="1,1" />
         <input name="hdr" type="boolean" value="false" />