Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_archer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_archer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_archer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged">
+<Entity parent="template_unit_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
@@ -12,10 +12,13 @@
       <MinRange>0.0</MinRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
+      <Delay>0</Delay>
       <Projectile>
         <Speed>75.0</Speed>
         <Gravity>39.81</Gravity>
         <Spread>3.0</Spread>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
@@ -25,8 +28,14 @@
       <wood>50</wood>
     </Resources>
   </Cost>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Archer</VisibleClasses>
     <GenericName>Cavalry Archer</GenericName>
+    <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
+    <Formations datatype="tokens">
+      special/formations/skirmish
+    </Formations>
   </Identity>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_axeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_axeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_axeman.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee">
+<Entity parent="template_unit_cavalry">
   <Attack>
     <Melee>
       <AttackName>Axe</AttackName>
@@ -20,9 +20,12 @@
       <metal>10</metal>
     </Resources>
   </Cost>
+  <Health>
+    <Max>160</Max>
+  </Health>
   <Identity>
     <GenericName>Cavalry Axeman</GenericName>
-    <VisibleClasses datatype="tokens">Axeman</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
   </Identity>
   <Loot>
     <wood>4</wood>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_javelineer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_javelineer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_javelineer.xml
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged">
+<Entity parent="template_unit_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
-        <Pierce>18.0</Pierce>
+        <Pierce>18</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>28.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
+      <Delay>0</Delay>
       <Projectile>
         <Speed>62.5</Speed>
         <Gravity>39.81</Gravity>
         <Spread>4.0</Spread>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
@@ -25,9 +28,15 @@
       <wood>50</wood>
     </Resources>
   </Cost>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <GenericName>Cavalry Javelineer</GenericName>
-    <VisibleClasses datatype="tokens">Javelineer</VisibleClasses>
+    <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
+    <Formations datatype="tokens">
+      special/formations/skirmish
+    </Formations>
   </Identity>
   <Sound>
     <SoundGroups>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry">
-  <Health>
-    <Max>160</Max>
-  </Health>
-  <Identity>
-    <GenericName>Melee Cavalry</GenericName>
-    <VisibleClasses datatype="tokens">Melee</VisibleClasses>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee">
-  <Attack>
-    <Melee>
-      <AttackName>Axe</AttackName>
-      <Damage>
-        <Hack>6.9</Hack>
-        <Pierce>0</Pierce>
-        <Crush>2.3</Crush>
-      </Damage>
-      <MaxRange>3.5</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
-    </Melee>
-  </Attack>
-  <Cost>
-    <Resources>
-      <wood>40</wood>
-      <metal>10</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <GenericName>Cavalry Axeman</GenericName>
-    <VisibleClasses datatype="tokens">Axeman</VisibleClasses>
-  </Identity>
-  <Loot>
-    <wood>4</wood>
-    <metal>1</metal>
-  </Loot>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>3</Hack>
-        <Pierce>2</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.2</WalkSpeed>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee">
-  <Attack>
-    <Melee>
-      <AttackName>Spear</AttackName>
-      <Damage>
-        <Hack>4</Hack>
-        <Pierce>3</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <Bonuses>
-        <BonusCavMelee>
-          <Classes>Cavalry</Classes>
-          <Multiplier>1.5</Multiplier>
-        </BonusCavMelee>
-      </Bonuses>
-      <MaxRange>4.5</MaxRange>
-      <PrepareTime>625</PrepareTime>
-      <RepeatTime>1250</RepeatTime>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Melee>
-  </Attack>
-  <Cost>
-    <Resources>
-      <wood>50</wood>
-    </Resources>
-  </Cost>
-  <Identity>
-    <GenericName>Cavalry Spearman</GenericName>
-    <Tooltip>Counters: 1.5× vs Cavalry.</Tooltip>
-    <VisibleClasses datatype="tokens">Spearman</VisibleClasses>
-  </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>4</Hack>
-        <Pierce>3</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <Sound>
-    <SoundGroups>
-      <attack_melee>attack/weapon/spear_attack.xml</attack_melee>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee">
-  <Attack>
-    <Melee>
-      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
-      <Damage>
-        <Hack>6.5</Hack>
-        <Pierce>0</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>3.5</MaxRange>
-      <PrepareTime>375</PrepareTime>
-      <RepeatTime>750</RepeatTime>
-      <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
-    </Melee>
-  </Attack>
-  <Cost>
-    <Resources>
-      <wood>40</wood>
-      <metal>10</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <GenericName>Cavalry Swordsman</GenericName>
-    <VisibleClasses datatype="tokens">Swordsman</VisibleClasses>
-  </Identity>
-  <Loot>
-    <wood>4</wood>
-    <metal>1</metal>
-  </Loot>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>4</Hack>
-        <Pierce>2</Pierce>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.2</WalkSpeed>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry">
-  <Attack>
-    <Ranged>
-      <Damage>
-        <Hack>0</Hack>
-        <Pierce>9.0</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>16.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <PrepareTime>1000</PrepareTime>
-      <RepeatTime>1500</RepeatTime>
-      <Delay>0</Delay>
-      <Projectile>
-        <Speed>75.0</Speed>
-        <Spread>3.0</Spread>
-        <Gravity>9.81</Gravity>
-        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="3"/>
-      </Projectile>
-    </Ranged>
-  </Attack>
-  <Health>
-    <Max>100</Max>
-  </Health>
-  <Identity>
-    <VisibleClasses datatype="tokens">Ranged</VisibleClasses>
-    <GenericName>Ranged Cavalry</GenericName>
-    <Formations datatype="tokens">
-      special/formations/skirmish
-    </Formations>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged">
-  <Attack>
-    <Ranged>
-      <AttackName>Bow</AttackName>
-      <Damage>
-        <Hack>0</Hack>
-        <Pierce>7.0</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>72.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <Projectile>
-        <Speed>75.0</Speed>
-        <Gravity>39.81</Gravity>
-        <Spread>3.0</Spread>
-      </Projectile>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <Resources>
-      <wood>50</wood>
-    </Resources>
-  </Cost>
-  <Identity>
-    <VisibleClasses datatype="tokens">Archer</VisibleClasses>
-    <GenericName>Cavalry Archer</GenericName>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged">
-  <Attack>
-    <Ranged>
-      <AttackName>Javelin</AttackName>
-      <Damage>
-        <Hack>0</Hack>
-        <Pierce>18.0</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>28.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <PrepareTime>750</PrepareTime>
-      <RepeatTime>1250</RepeatTime>
-      <Projectile>
-        <Speed>62.5</Speed>
-        <Gravity>39.81</Gravity>
-        <Spread>4.0</Spread>
-      </Projectile>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <Resources>
-      <wood>50</wood>
-    </Resources>
-  </Cost>
-  <Identity>
-    <GenericName>Cavalry Javelineer</GenericName>
-    <VisibleClasses datatype="tokens">Javelineer</VisibleClasses>
-  </Identity>
-  <Sound>
-    <SoundGroups>
-      <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
-      <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
-    </SoundGroups>
-  </Sound>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_spearman.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee">
+<Entity parent="template_unit_cavalry">
   <Attack>
     <Melee>
       <AttackName>Spear</AttackName>
@@ -25,10 +25,13 @@
       <wood>50</wood>
     </Resources>
   </Cost>
+  <Health>
+    <Max>160</Max>
+  </Health>
   <Identity>
     <GenericName>Cavalry Spearman</GenericName>
     <Tooltip>Counters: 1.5× vs Cavalry.</Tooltip>
-    <VisibleClasses datatype="tokens">Spearman</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
   </Identity>
   <Resistance>
     <Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_swordsman.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee">
+<Entity parent="template_unit_cavalry">
   <Attack>
     <Melee>
       <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
@@ -20,9 +20,12 @@
       <metal>10</metal>
     </Resources>
   </Cost>
+  <Health>
+    <Max>160</Max>
+  </Health>
   <Identity>
     <GenericName>Cavalry Swordsman</GenericName>
-    <VisibleClasses datatype="tokens">Swordsman</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
   </Identity>
   <Loot>
     <wood>4</wood>
Index: binaries/data/mods/public/simulation/templates/units/athen/cavalry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/cavalry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/cavalry_javelineer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_javelineer">
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
Index: binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="template_unit_cavalry_swordsman">
   <Attack>
     <Melee>
       <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
Index: binaries/data/mods/public/simulation/templates/units/brit/cavalry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit/cavalry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/brit/cavalry_javelineer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_javelineer">
   <Identity>
     <Civ>brit</Civ>
     <SelectionGroupName>units/brit/cavalry_javelineer_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/brit/cavalry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit/cavalry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/brit/cavalry_swordsman_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="template_unit_cavalry_swordsman">
   <Identity>
     <Civ>brit</Civ>
     <SelectionGroupName>units/brit/cavalry_swordsman_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/cart/cavalry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/cavalry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/cavalry_javelineer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_javelineer">
   <Identity>
     <Civ>cart</Civ>
     <SelectionGroupName>units/cart/cavalry_javelineer_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/cart/cavalry_spearman_ital_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/cavalry_spearman_ital_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/cavalry_spearman_ital_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="template_unit_cavalry_spearman">
   <Cost>
     <Resources>
       <food op="add">-25</food>
Index: binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_gaul_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_gaul_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_gaul_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="template_unit_cavalry_swordsman">
   <Cost>
     <Resources>
       <food op="add">-25</food>
Index: binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_iber_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_iber_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_iber_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="template_unit_cavalry_swordsman">
   <Attack>
     <Melee>
       <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
Index: binaries/data/mods/public/simulation/templates/units/gaul/cavalry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul/cavalry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul/cavalry_javelineer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_javelineer">
   <Identity>
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul/cavalry_javelineer_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/gaul/cavalry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul/cavalry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul/cavalry_swordsman_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="template_unit_cavalry_swordsman">
   <Identity>
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul/cavalry_swordsman_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/iber/cavalry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber/cavalry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/iber/cavalry_javelineer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_javelineer">
   <Identity>
     <Civ>iber</Civ>
     <SelectionGroupName>units/iber/cavalry_javelineer_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/iber/cavalry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber/cavalry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/iber/cavalry_spearman_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="template_unit_cavalry_spearman">
   <Identity>
     <Civ>iber</Civ>
     <SelectionGroupName>units/iber/cavalry_spearman_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_javelineer">
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
Index: binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_javelineer">
   <Cost>
     <Resources>
       <food op="add">-25</food>
Index: binaries/data/mods/public/simulation/templates/units/kush/cavalry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/cavalry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/cavalry_spearman_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="template_unit_cavalry_spearman">
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
Index: binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_javelineer">
   <Cost>
     <Resources>
       <food op="add">-25</food>
Index: binaries/data/mods/public/simulation/templates/units/mace/cavalry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/cavalry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/mace/cavalry_spearman_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="template_unit_cavalry_spearman">
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
Index: binaries/data/mods/public/simulation/templates/units/maur/cavalry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/cavalry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/cavalry_javelineer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_javelineer">
   <Identity>
     <Civ>maur</Civ>
     <SelectionGroupName>units/maur/cavalry_javelineer_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/maur/cavalry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/cavalry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/cavalry_swordsman_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="template_unit_cavalry_swordsman">
   <Identity>
     <Civ>maur</Civ>
     <SelectionGroupName>units/maur/cavalry_swordsman_b</SelectionGroupName>
Index: binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_archer">
+<Entity parent="template_unit_cavalry_archer">
   <Identity>
     <Civ>pers</Civ>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
Index: binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_axeman">
+<Entity parent="template_unit_cavalry_axeman">
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
Index: binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_javelineer">
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
Index: binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="template_unit_cavalry_spearman">
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
Index: binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_archer">
+<Entity parent="template_unit_cavalry_archer">
   <Footprint>
     <Height>7.5</Height>
   </Footprint>
Index: binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_javelineer">
   <Cost>
     <Resources>
       <food op="add">-25</food>
Index: binaries/data/mods/public/simulation/templates/units/ptol/cavalry_spearman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/cavalry_spearman_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/cavalry_spearman_merc_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="template_unit_cavalry_spearman">
   <Cost>
     <Resources>
       <food op="add">-25</food>
Index: binaries/data/mods/public/simulation/templates/units/rome/cavalry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/cavalry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/cavalry_javelineer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_javelineer">
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
Index: binaries/data/mods/public/simulation/templates/units/rome/cavalry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/cavalry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/cavalry_spearman_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="template_unit_cavalry_spearman">
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
Index: binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_archer">
+<Entity parent="template_unit_cavalry_archer">
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
Index: binaries/data/mods/public/simulation/templates/units/sele/cavalry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele/cavalry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/sele/cavalry_javelineer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_javelineer">
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
Index: binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="template_unit_cavalry_spearman">
   <Cost>
     <Resources>
       <food op="add">-25</food>
Index: binaries/data/mods/public/simulation/templates/units/spart/cavalry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/cavalry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/spart/cavalry_javelineer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_javelineer">
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>
Index: binaries/data/mods/public/simulation/templates/units/spart/cavalry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart/cavalry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/spart/cavalry_spearman_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="template_unit_cavalry_spearman">
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>