diff --git a/assets/voxygen/voxel/armor/belt/belt_dark.vox b/assets/voxygen/voxel/armor/belt/dark.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/belt/belt_dark.vox
rename to assets/voxygen/voxel/armor/belt/dark.vox
diff --git a/assets/voxygen/voxel/armor/hand/hand_left.vox b/assets/voxygen/voxel/armor/hand/default_left.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/hand_left.vox
rename to assets/voxygen/voxel/armor/hand/default_left.vox
diff --git a/assets/voxygen/voxel/armor/hand/hand_right.vox b/assets/voxygen/voxel/armor/hand/default_right.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/hand/hand_right.vox
rename to assets/voxygen/voxel/armor/hand/default_right.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/shoulder_l_brown.vox b/assets/voxygen/voxel/armor/shoulder/brown_left.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/shoulder_l_brown.vox
rename to assets/voxygen/voxel/armor/shoulder/brown_left.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/shoulder_r_brown.vox b/assets/voxygen/voxel/armor/shoulder/brown_right.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/shoulder_r_brown.vox
rename to assets/voxygen/voxel/armor/shoulder/brown_right.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/shoulder_l_chain.vox b/assets/voxygen/voxel/armor/shoulder/chain_left.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/shoulder_l_chain.vox
rename to assets/voxygen/voxel/armor/shoulder/chain_left.vox
diff --git a/assets/voxygen/voxel/armor/shoulder/shoulder_r_chain.vox b/assets/voxygen/voxel/armor/shoulder/chain_right.vox
similarity index 100%
rename from assets/voxygen/voxel/armor/shoulder/shoulder_r_chain.vox
rename to assets/voxygen/voxel/armor/shoulder/chain_right.vox
diff --git a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
index 242b226d06..77bec882e9 100644
--- a/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
@@ -2,84 +2,84 @@
     (Human, Male): (
         offset: (-7.0, -4.0, -6.0),
         belt: [
-            Some(("armor.belt.belt_dark", (0, 0, 0))),
+            Some(("armor.belt.dark", (0, 0, 0))),
             Some(("armor.belt.cloth_turq", (0, 0, 0))),
         ]
     ),
     (Human, Female): (
         offset: (-7.0, -4.0, -6.0),
         belt: [
-            Some(("armor.belt.belt_dark", (0, 0, 0))),
+            Some(("armor.belt.dark", (0, 0, 0))),
             Some(("armor.belt.cloth_turq", (0, 0, 0))),
         ]
     ),
     (Orc, Male): (
         offset: (-8.0, -5.0, -6.75),
         belt: [
-            Some(("armor.belt.belt_dark", (0, 0, 0))),
+            Some(("armor.belt.dark", (0, 0, 0))),
             Some(("armor.belt.cloth_turq", (0, 0, 0))),
         ]
     ),	
     (Orc, Female): (
         offset: (-8.0, -4.0, -6.0),
         belt: [
-            Some(("armor.belt.belt_dark", (0, 0, 0))),
+            Some(("armor.belt.dark", (0, 0, 0))),
             Some(("armor.belt.cloth_turq", (0, 0, 0))),
         ]
     ),
     (Elf, Male): (
         offset: (-8.0, -4.0, -6.0),
         belt: [
-            Some(("armor.belt.belt_dark", (0, 0, 0))),
+            Some(("armor.belt.dark", (0, 0, 0))),
             Some(("armor.belt.cloth_turq", (0, 0, 0))),
         ]
     ),	
     (Elf, Female): (
         offset: (-8.0, -4.0, -6.0),
         belt: [
-            Some(("armor.belt.belt_dark", (0, 0, 0))),
+            Some(("armor.belt.dark", (0, 0, 0))),
             Some(("armor.belt.cloth_turq", (0, 0, 0))),
         ]
     ),
     (Dwarf, Male): (
         offset: (-6.0, -4.5, -6.0),
         belt: [
-            Some(("armor.belt.belt_dark", (0, 0, 0))),
+            Some(("armor.belt.dark", (0, 0, 0))),
             Some(("armor.belt.cloth_turq", (0, 0, 0))),
         ]
     ),	
     (Dwarf, Female): (
         offset: (-6.0, -4.5, -6.0),
         belt: [
-            Some(("armor.belt.belt_dark", (0, 0, 0))),
+            Some(("armor.belt.dark", (0, 0, 0))),
             Some(("armor.belt.cloth_turq", (0, 0, 0))),
         ]
     ),
     (Undead, Male): (
         offset: (-5.0, -4.0, -6.75),
         belt: [
-            Some(("armor.belt.belt_dark", (0, 0, 0))),
+            Some(("armor.belt.dark", (0, 0, 0))),
             Some(("armor.belt.cloth_turq", (0, 0, 0))),
         ]
     ),	
     (Undead, Female): (
         offset: (-5.0, -4.0, -6.75),
         belt: [
-            Some(("armor.belt.belt_dark", (0, 0, 0))),
+            Some(("armor.belt.dark", (0, 0, 0))),
             Some(("armor.belt.cloth_turq", (0, 0, 0))),
         ]
     ),
     (Danari, Male): (
         offset: (-9.0, -4.0, -7.5),
         belt: [
-            Some(("armor.belt.belt_dark", (0, 0, 0))),
+            Some(("armor.belt.dark", (0, 0, 0))),
             Some(("armor.belt.cloth_turq", (0, 0, 0))),
         ]
     ),	
     (Danari, Female): (
         offset: (-9.0, -4.0, -7.5),
         belt: [
-            Some(("armor.belt.belt_dark", (0, 0, 0))),
+            Some(("armor.belt.dark", (0, 0, 0))),
             Some(("armor.belt.cloth_turq", (0, 0, 0))),
         ]
     ),
diff --git a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
index 39ba1ae454..05b9ba0993 100644
--- a/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
@@ -6,8 +6,8 @@
             Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
             Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
             Some(("armor.hand.dark-0", (0, 0, 0))),
-            Some(("armor.hand.hand_left", (0, 0, 0))),
-            Some(("armor.hand.hand_right", (0, 0, 0))),
+            Some(("armor.hand.default_left", (0, 0, 0))),
+            Some(("armor.hand.default_right", (0, 0, 0))),
         ]
     ),
     (Human, Female): (
@@ -16,8 +16,8 @@
             Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
             Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
             Some(("armor.hand.dark-0", (0, 0, 0))),
-            Some(("armor.hand.hand_left", (0, 0, 0))),
-            Some(("armor.hand.hand_right", (0, 0, 0))),
+            Some(("armor.hand.default_left", (0, 0, 0))),
+            Some(("armor.hand.default_right", (0, 0, 0))),
         ]
     ),
     (Orc, Male): (
@@ -26,8 +26,8 @@
             Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
             Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
             Some(("armor.hand.dark-0", (0, 0, 0))),
-            Some(("armor.hand.hand_left", (0, 0, 0))),
-            Some(("armor.hand.hand_right", (0, 0, 0))),
+            Some(("armor.hand.default_left", (0, 0, 0))),
+            Some(("armor.hand.default_right", (0, 0, 0))),
         ]
     ),	
     (Orc, Female): (
@@ -36,8 +36,8 @@
             Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
             Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
             Some(("armor.hand.dark-0", (0, 0, 0))),
-            Some(("armor.hand.hand_left", (0, 0, 0))),
-            Some(("armor.hand.hand_right", (0, 0, 0))),
+            Some(("armor.hand.default_left", (0, 0, 0))),
+            Some(("armor.hand.default_right", (0, 0, 0))),
         ]
     ),
     (Elf, Male): (
@@ -46,8 +46,8 @@
             Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
             Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
             Some(("armor.hand.dark-0", (0, 0, 0))),
-            Some(("armor.hand.hand_left", (0, 0, 0))),
-            Some(("armor.hand.hand_right", (0, 0, 0))),
+            Some(("armor.hand.default_left", (0, 0, 0))),
+            Some(("armor.hand.default_right", (0, 0, 0))),
         ]
     ),	
     (Elf, Female): (
@@ -56,8 +56,8 @@
             Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
             Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
             Some(("armor.hand.dark-0", (0, 0, 0))),
-            Some(("armor.hand.hand_left", (0, 0, 0))),
-            Some(("armor.hand.hand_right", (0, 0, 0))),
+            Some(("armor.hand.default_left", (0, 0, 0))),
+            Some(("armor.hand.default_right", (0, 0, 0))),
         ]
     ),
     (Dwarf, Male): (
@@ -66,8 +66,8 @@
             Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
             Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
             Some(("armor.hand.dark-0", (0, 0, 0))),
-            Some(("armor.hand.hand_left", (0, 0, 0))),
-            Some(("armor.hand.hand_right", (0, 0, 0))),
+            Some(("armor.hand.default_left", (0, 0, 0))),
+            Some(("armor.hand.default_right", (0, 0, 0))),
         ]
     ),	
     (Dwarf, Female): (
@@ -76,8 +76,8 @@
             Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
             Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
             Some(("armor.hand.dark-0", (0, 0, 0))),
-            Some(("armor.hand.hand_left", (0, 0, 0))),
-            Some(("armor.hand.hand_right", (0, 0, 0))),
+            Some(("armor.hand.default_left", (0, 0, 0))),
+            Some(("armor.hand.default_right", (0, 0, 0))),
         ]
     ),
     (Undead, Male): (
@@ -86,8 +86,8 @@
             Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
             Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
             Some(("armor.hand.dark-0", (0, 0, 0))),
-            Some(("armor.hand.hand_left", (0, 0, 0))),
-            Some(("armor.hand.hand_right", (0, 0, 0))),
+            Some(("armor.hand.default_left", (0, 0, 0))),
+            Some(("armor.hand.default_right", (0, 0, 0))),
         ]
     ),	
     (Undead, Female): (
@@ -96,8 +96,8 @@
             Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
             Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
             Some(("armor.hand.dark-0", (0, 0, 0))),
-            Some(("armor.hand.hand_left", (0, 0, 0))),
-            Some(("armor.hand.hand_right", (0, 0, 0))),
+            Some(("armor.hand.default_left", (0, 0, 0))),
+            Some(("armor.hand.default_right", (0, 0, 0))),
         ]
     ),
     (Danari, Male): (
@@ -106,8 +106,8 @@
             Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
             Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
             Some(("armor.hand.dark-0", (0, 0, 0))),
-            Some(("armor.hand.hand_left", (0, 0, 0))),
-            Some(("armor.hand.hand_right", (0, 0, 0))),
+            Some(("armor.hand.default_left", (0, 0, 0))),
+            Some(("armor.hand.default_right", (0, 0, 0))),
         ]
     ),	
     (Danari, Female): (
@@ -116,8 +116,8 @@
             Some(("armor.hand.cloth_basic_left", (0, 0, 0))),
             Some(("armor.hand.cloth_basic_right", (0, 0, 0))),
             Some(("armor.hand.dark-0", (0, 0, 0))),
-            Some(("armor.hand.hand_left", (0, 0, 0))),
-            Some(("armor.hand.hand_right", (0, 0, 0))),
+            Some(("armor.hand.default_left", (0, 0, 0))),
+            Some(("armor.hand.default_right", (0, 0, 0))),
         ]
     ),
     // More here
diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
index 580afb1dbb..852d064230 100644
--- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
+++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
@@ -3,100 +3,109 @@
     (Human, Male): (
         offset: (-7.0, -4.0, -6.0),
         shoulder: [
-            Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
+            Some(("armor.shoulder.brown_left", (0, 0, 0))),
+            Some(("armor.shoulder.chain_left", (0, 0, 0))),
+            Some(("armor.shoulder.brown_right", (0, 0, 0))),
+            Some(("armor.shoulder.chain_right", (0, 0, 0))),
         ]
     ),
     (Human, Female): (
         offset: (-7.0, -4.0, -6.0),
         shoulder: [
-            Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
+            Some(("armor.shoulder.brown_left", (0, 0, 0))),
+            Some(("armor.shoulder.chain_left", (0, 0, 0))),
+            Some(("armor.shoulder.brown_right", (0, 0, 0))),
+            Some(("armor.shoulder.chain_right", (0, 0, 0))),
         ]
     ),
     (Orc, Male): (
         offset: (-8.0, -5.0, -6.75),
         shoulder: [
-            Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
+            Some(("armor.shoulder.brown_left", (0, 0, 0))),
+            Some(("armor.shoulder.chain_left", (0, 0, 0))),
+            Some(("armor.shoulder.brown_right", (0, 0, 0))),
+            Some(("armor.shoulder.chain_right", (0, 0, 0))),
         ]
     ),	
     (Orc, Female): (
         offset: (-8.0, -4.0, -6.0),
         shoulder: [
-            Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
+            Some(("armor.shoulder.brown_left", (0, 0, 0))),
+            Some(("armor.shoulder.chain_left", (0, 0, 0))),
+            Some(("armor.shoulder.brown_right", (0, 0, 0))),
+            Some(("armor.shoulder.chain_right", (0, 0, 0))),
         ]
     ),
     (Elf, Male): (
         offset: (-8.0, -4.0, -6.0),
         shoulder: [
-            Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
+            Some(("armor.shoulder.brown_left", (0, 0, 0))),
+            Some(("armor.shoulder.chain_left", (0, 0, 0))),
+            Some(("armor.shoulder.brown_right", (0, 0, 0))),
+            Some(("armor.shoulder.chain_right", (0, 0, 0))),
         ]
     ),	
     (Elf, Female): (
         offset: (-8.0, -4.0, -6.0),
         shoulder: [
-            Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
+            Some(("armor.shoulder.brown_left", (0, 0, 0))),
+            Some(("armor.shoulder.chain_left", (0, 0, 0))),
+            Some(("armor.shoulder.brown_right", (0, 0, 0))),
+            Some(("armor.shoulder.chain_right", (0, 0, 0))),
         ]
     ),
     (Dwarf, Male): (
         offset: (-6.0, -4.5, -6.0),
         shoulder: [
-            Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
+            Some(("armor.shoulder.brown_left", (0, 0, 0))),
+            Some(("armor.shoulder.chain_left", (0, 0, 0))),
+            Some(("armor.shoulder.brown_right", (0, 0, 0))),
+            Some(("armor.shoulder.chain_right", (0, 0, 0))),
         ]
     ),	
     (Dwarf, Female): (
         offset: (-6.0, -4.5, -6.0),
         shoulder: [
-            Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
+            Some(("armor.shoulder.brown_left", (0, 0, 0))),
+            Some(("armor.shoulder.chain_left", (0, 0, 0))),
+            Some(("armor.shoulder.brown_right", (0, 0, 0))),
+            Some(("armor.shoulder.chain_right", (0, 0, 0))),
         ]
     ),
     (Undead, Male): (
         offset: (-5.0, -4.0, -6.75),
         shoulder: [
-            Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
+            Some(("armor.shoulder.brown_left", (0, 0, 0))),
+            Some(("armor.shoulder.chain_left", (0, 0, 0))),
+            Some(("armor.shoulder.brown_right", (0, 0, 0))),
+            Some(("armor.shoulder.chain_right", (0, 0, 0))),
         ]
     ),	
     (Undead, Female): (
         offset: (-5.0, -4.0, -6.75),
         shoulder: [
-            Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
+            Some(("armor.shoulder.brown_left", (0, 0, 0))),
+            Some(("armor.shoulder.chain_left", (0, 0, 0))),
+            Some(("armor.shoulder.brown_right", (0, 0, 0))),
+            Some(("armor.shoulder.chain_right", (0, 0, 0))),
+        ]
+    ),	
+    (Danari, Male): (
+        offset: (-9.0, -4.0, -7.5),
+        shoulder: [
+            Some(("armor.shoulder.brown_left", (0, 0, 0))),
+            Some(("armor.shoulder.chain_left", (0, 0, 0))),
+            Some(("armor.shoulder.brown_right", (0, 0, 0))),
+            Some(("armor.shoulder.chain_right", (0, 0, 0))),
         ]
     ),	
     (Danari, Female): (
         offset: (-9.0, -4.0, -7.5),
         shoulder: [
-            Some(("armor.shoulder.shoulder_l_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_l_chain", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_brown", (0, 0, 0))),
-            Some(("armor.shoulder.shoulder_r_chain", (0, 0, 0))),
+            Some(("armor.shoulder.brown_left", (0, 0, 0))),
+            Some(("armor.shoulder.chain_left", (0, 0, 0))),
+            Some(("armor.shoulder.brown_right", (0, 0, 0))),
+            Some(("armor.shoulder.chain_right", (0, 0, 0))),
         ]
     ),
     // More here
diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs
index cd862e51ef..94ae64f548 100644
--- a/voxygen/src/scene/figure/load.rs
+++ b/voxygen/src/scene/figure/load.rs
@@ -236,7 +236,7 @@ pub fn mesh_belt(belt: Belt) -> Mesh<FigurePipeline> {
     load_mesh(
         match belt {
             //Belt::Default => "figure/body/belt_male",
-            Belt::Dark => "armor.belt.belt_dark",
+            Belt::Dark => "armor.belt.dark",
         },
         Vec3::new(-4.0, -3.5, 2.0),
     )
@@ -277,8 +277,8 @@ pub fn mesh_left_hand(
 ) -> Mesh<FigurePipeline> {
     let hand_segment = color_segment(
         graceful_load_mat_segment(match hand {
-            Hand::Bare => "armor.hand.hand_left",
-            Hand::Dark => "armor.hand.hand_left",
+            Hand::Bare => "armor.hand.default_left",
+            Hand::Dark => "armor.hand.default_left",
         }),
         race.skin_color(skin),
         race.hair_color(hair_color),
@@ -297,8 +297,8 @@ pub fn mesh_right_hand(
 ) -> Mesh<FigurePipeline> {
     let hand_segment = color_segment(
         graceful_load_mat_segment(match hand {
-            Hand::Bare => "armor.hand.hand_right",
-            Hand::Dark => "armor.hand.hand_right",
+            Hand::Bare => "armor.hand.default_right",
+            Hand::Dark => "armor.hand.default_right",
         }),
         race.skin_color(skin),
         race.hair_color(hair_color),
@@ -379,7 +379,7 @@ pub fn mesh_left_shoulder(
     let shoulder_segment = color_segment(
         graceful_load_mat_segment(match shoulder {
             Shoulder::None => return Mesh::new(),
-            Shoulder::Brown1 => "armor.shoulder.shoulder_l_brown",
+            Shoulder::Brown1 => "armor.shoulder.brown_left",
         }),
         race.skin_color(skin),
         race.hair_color(hair_color),
@@ -399,7 +399,7 @@ pub fn mesh_right_shoulder(
     let shoulder_segment = color_segment(
         graceful_load_mat_segment(match shoulder {
             Shoulder::None => return Mesh::new(),
-            Shoulder::Brown1 => "armor.shoulder.shoulder_r_brown",
+            Shoulder::Brown1 => "armor.shoulder.brown_right",
         }),
         race.skin_color(skin),
         race.hair_color(hair_color),