diff --git a/motoman_mh5_support/CHANGELOG.rst b/motoman_mh5_support/CHANGELOG.rst
index e69b9360..0b8b4505 100644
--- a/motoman_mh5_support/CHANGELOG.rst
+++ b/motoman_mh5_support/CHANGELOG.rst
@@ -5,7 +5,7 @@ Changelog for package motoman_mh5_support
 0.3.6 (UNRELEASED)
 ------------------
 ** Added support for MH5 SHORT and LONG variants
-* Each variant has unique launch, test, urdf, and mesh files. Only config/joint_names is shared.
+* Each variant has unique launch, test, urdf, and (L & U) mesh files. Config/joint_names and remaining mesh files are shared.
 * Fixed collision meshes
 * Fixed tab/spacing in all code
 * Renamed links & joints to ros-i convention
diff --git a/motoman_mh5_support/meshes/mh5l/collision/link_3_u.stl b/motoman_mh5_support/meshes/mh5_old_variants/collision/link_3_u.stl
similarity index 100%
rename from motoman_mh5_support/meshes/mh5l/collision/link_3_u.stl
rename to motoman_mh5_support/meshes/mh5_old_variants/collision/link_3_u.stl
diff --git a/motoman_mh5_support/meshes/mh5l/visual/link_3_u.stl b/motoman_mh5_support/meshes/mh5_old_variants/visual/link_3_u.stl
similarity index 100%
rename from motoman_mh5_support/meshes/mh5l/visual/link_3_u.stl
rename to motoman_mh5_support/meshes/mh5_old_variants/visual/link_3_u.stl
diff --git a/motoman_mh5_support/meshes/mh5l/collision/base_link.stl b/motoman_mh5_support/meshes/mh5l/collision/base_link.stl
deleted file mode 100644
index 72f6fcf0..00000000
Binary files a/motoman_mh5_support/meshes/mh5l/collision/base_link.stl and /dev/null differ
diff --git a/motoman_mh5_support/meshes/mh5l/collision/link_1_s.stl b/motoman_mh5_support/meshes/mh5l/collision/link_1_s.stl
deleted file mode 100644
index a02ab490..00000000
Binary files a/motoman_mh5_support/meshes/mh5l/collision/link_1_s.stl and /dev/null differ
diff --git a/motoman_mh5_support/meshes/mh5l/collision/link_5_b.stl b/motoman_mh5_support/meshes/mh5l/collision/link_5_b.stl
deleted file mode 100644
index 520b2a0e..00000000
Binary files a/motoman_mh5_support/meshes/mh5l/collision/link_5_b.stl and /dev/null differ
diff --git a/motoman_mh5_support/meshes/mh5l/collision/link_6_t.stl b/motoman_mh5_support/meshes/mh5l/collision/link_6_t.stl
deleted file mode 100644
index 4ede1e24..00000000
Binary files a/motoman_mh5_support/meshes/mh5l/collision/link_6_t.stl and /dev/null differ
diff --git a/motoman_mh5_support/meshes/mh5l/visual/base_link.stl b/motoman_mh5_support/meshes/mh5l/visual/base_link.stl
deleted file mode 100644
index 51e7786a..00000000
Binary files a/motoman_mh5_support/meshes/mh5l/visual/base_link.stl and /dev/null differ
diff --git a/motoman_mh5_support/meshes/mh5l/visual/link_1_s.stl b/motoman_mh5_support/meshes/mh5l/visual/link_1_s.stl
deleted file mode 100644
index bb72f6ef..00000000
Binary files a/motoman_mh5_support/meshes/mh5l/visual/link_1_s.stl and /dev/null differ
diff --git a/motoman_mh5_support/meshes/mh5l/visual/link_5_b.stl b/motoman_mh5_support/meshes/mh5l/visual/link_5_b.stl
deleted file mode 100644
index 7ecbdca2..00000000
Binary files a/motoman_mh5_support/meshes/mh5l/visual/link_5_b.stl and /dev/null differ
diff --git a/motoman_mh5_support/meshes/mh5l/visual/link_6_t.stl b/motoman_mh5_support/meshes/mh5l/visual/link_6_t.stl
deleted file mode 100644
index 12a32b0a..00000000
Binary files a/motoman_mh5_support/meshes/mh5l/visual/link_6_t.stl and /dev/null differ
diff --git a/motoman_mh5_support/urdf/mh5_macro.xacro b/motoman_mh5_support/urdf/mh5_macro.xacro
index 14faeebe..2a994791 100644
--- a/motoman_mh5_support/urdf/mh5_macro.xacro
+++ b/motoman_mh5_support/urdf/mh5_macro.xacro
@@ -58,6 +58,7 @@
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
           <mesh filename="package://motoman_mh5_support/meshes/mh5/visual/link_3_u.stl"/>
+          <!-- <mesh filename="package://motoman_mh5_support/meshes/mh5_old_variants/visual/link_3_u.stl"/> --><!-- Uncomment & switch with above to use alternative U-link. -->
         </geometry>
         <material name="yaskawa_white"/>
       </visual>
@@ -65,6 +66,7 @@
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
           <mesh filename="package://motoman_mh5_support/meshes/mh5/collision/link_3_u.stl" />
+          <!-- <mesh filename="package://motoman_mh5_support/meshes/mh5_old_variants/collision/link_3_u.stl" /> --><!-- Uncomment & switch with above to use alternative U-link. -->
         </geometry>
       </collision>
     </link>
diff --git a/motoman_mh5_support/urdf/mh5l_macro.xacro b/motoman_mh5_support/urdf/mh5l_macro.xacro
index 9c10f221..756f69d7 100644
--- a/motoman_mh5_support/urdf/mh5l_macro.xacro
+++ b/motoman_mh5_support/urdf/mh5l_macro.xacro
@@ -12,14 +12,14 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://motoman_mh5_support/meshes/mh5l/visual/base_link.stl" />
+          <mesh filename="package://motoman_mh5_support/meshes/mh5/visual/base_link.stl" />
         </geometry>
         <material name="yaskawa_white"/>
       </visual>
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://motoman_mh5_support/meshes/mh5l/collision/base_link.stl" />
+          <mesh filename="package://motoman_mh5_support/meshes/mh5/collision/base_link.stl" />
         </geometry>
       </collision>
     </link>
@@ -27,14 +27,14 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://motoman_mh5_support/meshes/mh5l/visual/link_1_s.stl"/>
+          <mesh filename="package://motoman_mh5_support/meshes/mh5/visual/link_1_s.stl"/>
         </geometry>
         <material name="yaskawa_white"/>
       </visual>
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://motoman_mh5_support/meshes/mh5l/collision/link_1_s.stl" />
+          <mesh filename="package://motoman_mh5_support/meshes/mh5/collision/link_1_s.stl" />
         </geometry>
       </collision>
     </link>
@@ -57,14 +57,14 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://motoman_mh5_support/meshes/mh5l/visual/link_3_u.stl"/>
+          <mesh filename="package://motoman_mh5_support/meshes/mh5/visual/link_3_u.stl"/>
         </geometry>
         <material name="yaskawa_white"/>
       </visual>
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://motoman_mh5_support/meshes/mh5l/collision/link_3_u.stl" />
+          <mesh filename="package://motoman_mh5_support/meshes/mh5/collision/link_3_u.stl" />
         </geometry>
       </collision>
     </link>
@@ -87,14 +87,14 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://motoman_mh5_support/meshes/mh5l/visual/link_5_b.stl"/>
+          <mesh filename="package://motoman_mh5_support/meshes/mh5/visual/link_5_b.stl"/>
         </geometry>
         <material name="yaskawa_white"/>
       </visual>
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://motoman_mh5_support/meshes/mh5l/collision/link_5_b.stl" />
+          <mesh filename="package://motoman_mh5_support/meshes/mh5/collision/link_5_b.stl" />
         </geometry>
       </collision>
     </link>
@@ -102,14 +102,14 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://motoman_mh5_support/meshes/mh5l/visual/link_6_t.stl" />
+          <mesh filename="package://motoman_mh5_support/meshes/mh5/visual/link_6_t.stl" />
         </geometry>
         <material name="yaskawa_white"/>
       </visual>
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://motoman_mh5_support/meshes/mh5l/collision/link_6_t.stl" />
+          <mesh filename="package://motoman_mh5_support/meshes/mh5/collision/link_6_t.stl" />
         </geometry>
       </collision>
     </link>