Index: binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -30,7 +30,7 @@
   <Identity>
     <GenericName>Hero</GenericName>
     <Classes datatype="tokens">Organic Human</Classes>
-    <VisibleClasses datatype="tokens">Hero Soldier</VisibleClasses>
+    <VisibleClasses datatype="tokens">Hero</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
@@ -55,7 +55,13 @@
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/sword.xml</attack>
-      <death>actor/human/death/death.xml</death>
+      <death>actor/human/death/{gender}_death.xml</death>
+      <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
+      <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
+      <order_attack>voice/{lang}/civ/civ_{gender}_attack.xml</order_attack>
+      <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
+      <order_repair>voice/{lang}/civ/civ_{gender}_repair.xml</order_repair>
+      <order_garrison>voice/{lang}/civ/civ_{gender}_garrison.xml</order_garrison>
     </SoundGroups>
   </Sound>
   <TrainingRestrictions>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
@@ -22,7 +22,7 @@
   </Health>
   <Identity>
     <GenericName>Hero Cavalry</GenericName>
-    <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
+    <VisibleClasses datatype="tokens">Cavalry Soldier</VisibleClasses>
     <Formations datatype="tokens">
       formations/wedge
     </Formations>
@@ -32,14 +32,8 @@
   </Position>
   <Sound>
     <SoundGroups>
-      <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{gender}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
-      <order_garrison>voice/{lang}/civ/civ_{gender}_garrison.xml</order_garrison>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
-      <attack>attack/weapon/sword.xml</attack>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -32,7 +32,7 @@
     <Max>2000</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Elephant Melee</VisibleClasses>
+    <VisibleClasses datatype="tokens">Elephant Melee Soldier</VisibleClasses>
   </Identity>
   <Sound>
     <SoundGroups>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
@@ -21,22 +21,14 @@
     <Max>1000</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Infantry</VisibleClasses>
+    <VisibleClasses datatype="tokens">Infantry Soldier</VisibleClasses>
     <GenericName>Hero</GenericName>
   </Identity>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
-      <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{gender}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{gender}_repair.xml</order_repair>
-      <order_garrison>voice/{lang}/civ/civ_{gender}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
-      <attack>attack/weapon/sword.xml</attack>
-      <death>actor/human/death/{gender}_death.xml</death>
     </SoundGroups>
   </Sound>
 </Entity>