Index: binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_m.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_m.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_a_m.xml
@@ -2,10 +2,10 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" file="quadraped/base_horse_swordsman.xml" name="Base">
+    <variant frequency="1" file="quadraped/base_horse_swordsman.xml" name="Axeman Horse">
       <mesh>skeletal/horse.dae</mesh>
       <props>
-        <prop actor="units/persians/cavalry_swordsman_a_r.xml" attachpoint="rider"/>
+        <prop actor="units/persians/cavalry_axeman_a_r.xml" attachpoint="rider"/>
         <prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
         <prop actor="props/horse/cav_rein_swordsman_shield.xml" attachpoint="head"/>
       </props>
@@ -43,7 +43,7 @@
     <variant name="gather_meat">
       <props>
         <prop actor="" attachpoint="rider"/>
-        <prop actor="units/persians/cavalry_swordsman_a_r.xml" attachpoint="rider_R"/>
+        <prop actor="units/persians/cavalry_axeman_a_r.xml" attachpoint="rider_R"/>
       </props>
     </variant>
   </group>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_m.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_m.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_b_m.xml
@@ -2,10 +2,10 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" file="quadraped/base_horse_swordsman.xml" name="Base">
+    <variant frequency="1" file="quadraped/base_horse_swordsman.xml" name="Axeman Horse">
       <mesh>skeletal/horse.dae</mesh>
       <props>
-        <prop actor="units/persians/cavalry_swordsman_b_r.xml" attachpoint="rider"/>
+        <prop actor="units/persians/cavalry_axeman_b_r.xml" attachpoint="rider"/>
         <prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
         <prop actor="props/horse/cav_rein_swordsman.xml" attachpoint="head"/>
       </props>
@@ -37,7 +37,7 @@
     <variant name="gather_meat">
       <props>
         <prop actor="" attachpoint="rider"/>
-        <prop actor="units/persians/cavalry_swordsman_b_r.xml" attachpoint="rider_R"/>
+        <prop actor="units/persians/cavalry_axeman_b_r.xml" attachpoint="rider_R"/>
       </props>
     </variant>
   </group>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_m.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_m.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_axeman_e_m.xml
@@ -2,10 +2,10 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" file="quadraped/base_horse_swordsman.xml" name="Swordsman Horse">
+    <variant frequency="1" file="quadraped/base_horse_swordsman.xml" name="Axeman Horse">
       <mesh>skeletal/horse.dae</mesh>
       <props>
-        <prop actor="units/persians/cavalry_swordsman_e_r.xml" attachpoint="rider"/>
+        <prop actor="units/persians/cavalry_axeman_e_r.xml" attachpoint="rider"/>
         <prop actor="props/horse/cav_front_armor_iron.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
         <prop actor="props/horse/cav_rein_swordsman_shield.xml" attachpoint="head"/>
@@ -44,7 +44,7 @@
     <variant name="gather_meat">
       <props>
         <prop actor="" attachpoint="rider"/>
-        <prop actor="units/persians/cavalry_swordsman_e_r.xml" attachpoint="rider_R"/>
+        <prop actor="units/persians/cavalry_axeman_e_r.xml" attachpoint="rider_R"/>
       </props>
     </variant>
   </group>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_m.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_m.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_m.xml
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" file="quadraped/base_horse_swordsman.xml" name="Base">
-      <mesh>skeletal/horse.dae</mesh>
-      <props>
-        <prop actor="units/persians/cavalry_swordsman_a_r.xml" attachpoint="rider"/>
-        <prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
-        <prop actor="props/horse/cav_rein_swordsman_shield.xml" attachpoint="head"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant name="horse-texture-1">
-      <textures><texture file="skeletal/horse_pers_csw_a_1.dds" name="baseTex"/></textures>
-    </variant>
-    <variant name="horse-texture-2">
-      <textures><texture file="skeletal/horse_pers_csw_a_2.dds" name="baseTex"/></textures>
-    </variant>
-    <variant name="horse-texture-3">
-      <textures><texture file="skeletal/horse_pers_csw_a_3.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="horse-color-black">
-      <color>46 46 46</color>
-    </variant>
-    <variant frequency="1" name="horse-color-biege">
-      <color>247 213 111</color>
-    </variant>
-    <variant frequency="1" name="horse-color-gray">
-      <color>253 253 253</color>
-    </variant>
-    <variant frequency="1" name="horse-color-brown">
-      <color>211 123 44</color>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant name="gather_meat">
-      <props>
-        <prop actor="" attachpoint="rider"/>
-        <prop actor="units/persians/cavalry_swordsman_a_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>objectcolor.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_r.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_r.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_r.xml
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base">
-      <mesh>skeletal/new/m_pants.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/pers_kidaris_loose_yellow.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/pers_pelta_e_reverse.xml" attachpoint="back"/>
-        <prop actor="props/units/weapons/axe_sagaris.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_arm"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Rider-Texture-1">
-      <textures>
-        <texture file="skeletal/pers_csw_a_01.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Rider-Texture-2">
-      <textures>
-        <texture file="skeletal/pers_csw_a_02.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant file="biped/base_cavalry_swordsman_shield_relax.xml"/>
-    <variant file="biped/rider/carry_meat.xml"/>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/rider/promotion_shield.xml" />
-    <variant file="biped/rider/attack_slaughter_shield_pers.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/rider/death_shield_a.xml"/>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_m.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_m.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_m.xml
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" file="quadraped/base_horse_swordsman.xml" name="Base">
-      <mesh>skeletal/horse.dae</mesh>
-      <props>
-        <prop actor="units/persians/cavalry_swordsman_b_r.xml" attachpoint="rider"/>
-        <prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
-        <prop actor="props/horse/cav_rein_swordsman.xml" attachpoint="head"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="horse-texture-1">
-      <textures><texture file="skeletal/horse_pers_csw_b.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="horse-color-black">
-      <color>41 41 41</color>
-    </variant>
-    <variant frequency="1" name="horse-color-biege">
-      <color>247 213 111</color>
-    </variant>
-    <variant frequency="1" name="horse-color-gray">
-      <color>253 253 253</color>
-    </variant>
-    <variant frequency="1" name="horse-color-brown">
-      <color>211 123 44</color>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant name="gather_meat">
-      <props>
-        <prop actor="" attachpoint="rider"/>
-        <prop actor="units/persians/cavalry_swordsman_b_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>objectcolor.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_r.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_r.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_r.xml
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base">
-      <mesh>skeletal/new/m_tunic_short.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/head_pers_b.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/axe_sagaris.xml" attachpoint="weapon_R"/>
-      </props>
-      <textures>
-        <texture file="skeletal/pers_csw_b_1.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant file="biped/base_cavalry_swordsman_relax.xml"/>
-    <variant file="biped/rider/carry_meat.xml"/>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/rider/promotion.xml" />
-    <variant file="biped/rider/attack_slaughter_pers.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/rider/death.xml"/>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_m.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_m.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_m.xml
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" file="quadraped/base_horse_swordsman.xml" name="Swordsman Horse">
-      <mesh>skeletal/horse.dae</mesh>
-      <props>
-        <prop actor="units/persians/cavalry_swordsman_e_r.xml" attachpoint="rider"/>
-        <prop actor="props/horse/cav_front_armor_iron.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_blanket_pers.xml" attachpoint="root"/>
-        <prop actor="props/horse/cav_rein_swordsman_shield.xml" attachpoint="head"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="2" name="horse-texture-1">
-      <textures><texture file="skeletal/horse_pers_csw_e_1.dds" name="baseTex"/></textures>
-    </variant>
-    <variant frequency="2" name="horse-texture-2">
-      <textures><texture file="skeletal/horse_pers_csw_e_2.dds" name="baseTex"/></textures>
-    </variant>
-    <variant frequency="1" name="horse-texture-3">
-      <textures><texture file="skeletal/horse_pers_csw_e_3.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="horse-color-black">
-      <color>41 41 41</color>
-    </variant>
-    <variant frequency="1" name="horse-color-biege">
-      <color>247 213 111</color>
-    </variant>
-    <variant frequency="1" name="horse-color-gray">
-      <color>253 253 253</color>
-    </variant>
-    <variant frequency="1" name="horse-color-brown">
-      <color>211 123 44</color>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-    <variant name="gather_meat">
-      <props>
-        <prop actor="" attachpoint="rider"/>
-        <prop actor="units/persians/cavalry_swordsman_e_r.xml" attachpoint="rider_R"/>
-      </props>
-    </variant>
-  </group>
-  <material>objectcolor.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_r.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_r.xml
+++ binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_r.xml
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="Base">
-      <mesh>skeletal/new/m_pants.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/pers_conical_plume.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/axe_sagaris.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/pers_back_curved_iron.xml" attachpoint="back"/>
-        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield_arm"/>
-      </props>
-      <textures>
-        <texture file="skeletal/pers_su1_anusiya_iron.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant file="biped/base_cavalry_swordsman_shield_relax.xml"/>
-    <variant file="biped/rider/carry_meat.xml"/>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/rider/promotion_shield.xml" />
-    <variant file="biped/rider/attack_slaughter_shield_pers.xml"/>
-    <variant file="biped/gather_meat.xml"/>
-    <variant file="biped/rider/death_shield_a.xml"/>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
Index: binaries/data/mods/public/maps/random/wild_lake.js
===================================================================
--- binaries/data/mods/public/maps/random/wild_lake.js
+++ binaries/data/mods/public/maps/random/wild_lake.js
@@ -159,7 +159,7 @@
 	"generic/desert": [
 		{ "Template" : "structures/ptol_mercenary_camp" },
 		{ "Template" : "units/pers_infantry_javelinist_b", "Count" : 4 },
-		{ "Template" : "units/pers_cavalry_swordsman_e", "Count" : 3 },
+		{ "Template" : "units/pers_cavalry_axeman_e", "Count" : 3 },
 		{ "Template" : "units/pers_infantry_archer_a", "Count" : 4 },
 		{ "Template" : "units/pers_champion_infantry", "Count" : 3 }
 	],
Index: binaries/data/mods/public/maps/scenarios/Cinema_Demo.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Cinema_Demo.xml
+++ binaries/data/mods/public/maps/scenarios/Cinema_Demo.xml
@@ -13930,84 +13930,84 @@
 			<Actor seed="18748"/>
 		</Entity>
 		<Entity uid="2664">
-			<Template>units/pers_cavalry_swordsman_e_trireme</Template>
+			<Template>units/pers_cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="481.81464" z="763.59058"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="54934"/>
 		</Entity>
 		<Entity uid="2665">
-			<Template>units/pers_cavalry_swordsman_e_trireme</Template>
+			<Template>units/pers_cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="483.34513" z="765.07258"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="54578"/>
 		</Entity>
 		<Entity uid="2666">
-			<Template>units/pers_cavalry_swordsman_e_trireme</Template>
+			<Template>units/pers_cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="486.4203" z="767.69532"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="9434"/>
 		</Entity>
 		<Entity uid="2667">
-			<Template>units/pers_cavalry_swordsman_e_trireme</Template>
+			<Template>units/pers_cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="488.17246" z="769.46735"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="25294"/>
 		</Entity>
 		<Entity uid="2668">
-			<Template>units/pers_cavalry_swordsman_e_trireme</Template>
+			<Template>units/pers_cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="489.94776" z="770.995"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="29712"/>
 		</Entity>
 		<Entity uid="2669">
-			<Template>units/pers_cavalry_swordsman_e_trireme</Template>
+			<Template>units/pers_cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="479.98011" z="761.7444"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="26956"/>
 		</Entity>
 		<Entity uid="2670">
-			<Template>units/pers_cavalry_swordsman_e_trireme</Template>
+			<Template>units/pers_cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="476.9784" z="766.21137"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61296"/>
 		</Entity>
 		<Entity uid="2671">
-			<Template>units/pers_cavalry_swordsman_e_trireme</Template>
+			<Template>units/pers_cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="479.32117" z="768.23316"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="2270"/>
 		</Entity>
 		<Entity uid="2672">
-			<Template>units/pers_cavalry_swordsman_e_trireme</Template>
+			<Template>units/pers_cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="481.32911" z="769.84137"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="41194"/>
 		</Entity>
 		<Entity uid="2673">
-			<Template>units/pers_cavalry_swordsman_e_trireme</Template>
+			<Template>units/pers_cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="482.79792" z="771.34314"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="62498"/>
 		</Entity>
 		<Entity uid="2674">
-			<Template>units/pers_cavalry_swordsman_e_trireme</Template>
+			<Template>units/pers_cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="484.55158" z="773.16181"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="53060"/>
 		</Entity>
 		<Entity uid="2675">
-			<Template>units/pers_cavalry_swordsman_e_trireme</Template>
+			<Template>units/pers_cavalry_axeman_e_trireme</Template>
 			<Player>1</Player>
 			<Position x="486.70212" z="775.2884"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml
@@ -7280,91 +7280,91 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1370">
-			<Template>units/pers_cavalry_swordsman_b</Template>
+			<Template>units/pers_cavalry_axeman_b</Template>
 			<Player>1</Player>
 			<Position x="639.31586" z="754.63233"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1371">
-			<Template>units/pers_cavalry_swordsman_b</Template>
+			<Template>units/pers_cavalry_axeman_b</Template>
 			<Player>1</Player>
 			<Position x="640.99915" z="756.84461"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1372">
-			<Template>units/pers_cavalry_swordsman_b</Template>
+			<Template>units/pers_cavalry_axeman_b</Template>
 			<Player>1</Player>
 			<Position x="642.23908" z="758.92017"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1373">
-			<Template>units/pers_cavalry_swordsman_b</Template>
+			<Template>units/pers_cavalry_axeman_b</Template>
 			<Player>1</Player>
 			<Position x="644.33497" z="760.62684"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1374">
-			<Template>units/pers_cavalry_swordsman_b</Template>
+			<Template>units/pers_cavalry_axeman_b</Template>
 			<Player>1</Player>
 			<Position x="647.00898" z="762.04487"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1375">
-			<Template>units/pers_cavalry_swordsman_a</Template>
+			<Template>units/pers_cavalry_axeman_a</Template>
 			<Player>1</Player>
 			<Position x="643.46277" z="750.97602"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1376">
-			<Template>units/pers_cavalry_swordsman_a</Template>
+			<Template>units/pers_cavalry_axeman_a</Template>
 			<Player>1</Player>
 			<Position x="646.02076" z="753.6504"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1377">
-			<Template>units/pers_cavalry_swordsman_a</Template>
+			<Template>units/pers_cavalry_axeman_a</Template>
 			<Player>1</Player>
 			<Position x="647.7483" z="755.52857"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1378">
-			<Template>units/pers_cavalry_swordsman_a</Template>
+			<Template>units/pers_cavalry_axeman_a</Template>
 			<Player>1</Player>
 			<Position x="649.07544" z="756.64045"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1379">
-			<Template>units/pers_cavalry_swordsman_a</Template>
+			<Template>units/pers_cavalry_axeman_a</Template>
 			<Player>1</Player>
 			<Position x="650.09028" z="757.9784"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1380">
-			<Template>units/pers_cavalry_swordsman_e</Template>
+			<Template>units/pers_cavalry_axeman_e</Template>
 			<Player>1</Player>
 			<Position x="648.11896" z="746.7212"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1381">
-			<Template>units/pers_cavalry_swordsman_e</Template>
+			<Template>units/pers_cavalry_axeman_e</Template>
 			<Player>1</Player>
 			<Position x="650.4726" z="749.1308"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1382">
-			<Template>units/pers_cavalry_swordsman_e</Template>
+			<Template>units/pers_cavalry_axeman_e</Template>
 			<Player>1</Player>
 			<Position x="651.79535" z="751.72907"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1383">
-			<Template>units/pers_cavalry_swordsman_e</Template>
+			<Template>units/pers_cavalry_axeman_e</Template>
 			<Player>1</Player>
 			<Position x="653.72999" z="753.2616"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1384">
-			<Template>units/pers_cavalry_swordsman_e</Template>
+			<Template>units/pers_cavalry_axeman_e</Template>
 			<Player>1</Player>
 			<Position x="655.01111" z="755.12879"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Serengeti.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Serengeti.xml
+++ binaries/data/mods/public/maps/scenarios/Serengeti.xml
@@ -15349,7 +15349,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="3159">
-			<Template>units/pers_cavalry_swordsman_b</Template>
+			<Template>units/pers_cavalry_axeman_b</Template>
 			<Player>4</Player>
 			<Position x="631.8053" z="580.53321"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Siwa Oasis.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Siwa Oasis.xml
+++ binaries/data/mods/public/maps/scenarios/Siwa Oasis.xml
@@ -14973,19 +14973,19 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="2912">
-			<Template>units/pers_cavalry_swordsman_b</Template>
+			<Template>units/pers_cavalry_axeman_b</Template>
 			<Player>3</Player>
 			<Position x="219.02482" z="475.45804"/>
 			<Orientation y="-2.35103"/>
 		</Entity>
 		<Entity uid="2913">
-			<Template>units/pers_cavalry_swordsman_a</Template>
+			<Template>units/pers_cavalry_axeman_a</Template>
 			<Player>3</Player>
 			<Position x="215.29712" z="478.74363"/>
 			<Orientation y="-2.46537"/>
 		</Entity>
 		<Entity uid="2914">
-			<Template>units/pers_cavalry_swordsman_e</Template>
+			<Template>units/pers_cavalry_axeman_e</Template>
 			<Player>3</Player>
 			<Position x="212.28721" z="482.2183"/>
 			<Orientation y="-2.36059"/>
Index: binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- binaries/data/mods/public/simulation/components/Identity.js
+++ binaries/data/mods/public/simulation/components/Identity.js
@@ -62,7 +62,7 @@
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Archer, Barracks, Blacksmith, BoltShooter, Camel, Catapult, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Corral, DefenseTower, Dock, Dog, Economic, Elephant, ElephantStables, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelin, Maceman, Market, Mechanical, Melee, Mercenary, Military, Outpost, Pike, Ram, Ranged, Relic, Resource, SentryTower, Ship, Shipyard, Siege, SiegeTower, Slave, Sling, Soldier, Spear, Stables, Storehouse, Support, Sword, Temple, Town, Trader, Village, Warship, Wonder, Worker, Workshop'>" +
+		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Archer, Axeman, Barracks, Blacksmith, BoltShooter, Camel, Catapult, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Corral, DefenseTower, Dock, Dog, Economic, Elephant, ElephantStables, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelin, Maceman, Market, Mechanical, Melee, Mercenary, Military, Outpost, Pike, Ram, Ranged, Relic, Resource, SentryTower, Ship, Shipyard, Siege, SiegeTower, Slave, Sling, Soldier, Spear, Stables, Storehouse, Support, Sword, Temple, Town, Trader, Village, Warship, Wonder, Worker, Workshop'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
Index: binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -48,6 +48,7 @@
       units/{civ}_infantry_javelinist_b
       units/{civ}_infantry_slinger_b
       units/{civ}_infantry_archer_b
+      units/{civ}_cavalry_axeman_b
       units/{civ}_cavalry_swordsman_b
       units/{civ}_cavalry_spearman_b
       units/{civ}_cavalry_javelinist_b
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
@@ -11,7 +11,6 @@
       <Crush>0.0</Crush>
       <MaxRange>3.5</MaxRange>
       <PrepareTime>375</PrepareTime>
-      <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_cavalry_melee">
+  <Armour>
+    <Hack>3</Hack>
+    <Pierce>2</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>6.9</Hack>
+      <Pierce>0</Pierce>
+      <Crush>2.3</Crush>
+      <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>30</wood>
+      <metal>20</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <VisibleClasses datatype="tokens">Axeman</VisibleClasses>
+    <GenericName>Cavalry Axeman</GenericName>
+  </Identity>
+  <Loot>
+    <wood>0</wood>
+    <metal>5</metal>
+  </Loot>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.3</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.3</Speed>
+    </Run>
+  </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
@@ -8,7 +8,8 @@
     <Melee>
       <Hack>6.5</Hack>
       <Pierce>0</Pierce>
-      <Crush>0.0</Crush>
+      <Crush>0</Crush>
+      <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Siege</PreferredClasses>
     </Melee>
   </Attack>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry">
+  <Armour>
+    <Pierce op="add">2</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>13.8</Hack>
+      <Pierce>0</Pierce>
+      <Crush>4.6</Crush>
+      <MaxRange>3.5</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>75</wood>
+      <metal>125</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>300</Max>
+  </Health>
+  <Identity>
+    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
+    <GenericName>Champion Cavalry Axeman</GenericName>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.3</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.3</Speed>
+    </Run>
+  </UnitMotion>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry">
+  <Armour>
+    <Hack op="add">2</Hack>
+    <Pierce op="add">3</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>12</Hack>
+      <Pierce>0</Pierce>
+      <Crush>4</Crush>
+      <MaxRange>3.5</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>75</wood>
+      <metal>100</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>200</Max>
+  </Health>
+  <Identity>
+    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
+    <GenericName>Champion Infantry Axeman</GenericName>
+    <Formations datatype="tokens">
+      special/formations/testudo
+    </Formations>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.5</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.5</Speed>
+    </Run>
+  </UnitMotion>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry">
+  <Armour>
+    <Pierce op="add">1</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+     <Hack>27.6</Hack>
+     <Pierce>0</Pierce>
+     <Crush>9.2</Crush>
+     <MaxRange>3.5</MaxRange>
+     <PrepareTime>500</PrepareTime>
+     <RepeatTime>1000</RepeatTime>
+     <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood op="add">-50</wood>
+      <metal op="add">50</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
+    <GenericName>Hero Cavalry Axeman</GenericName>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.0</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.0</Speed>
+    </Run>
+  </UnitMotion>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry">
+  <Armour>
+    <Hack op="add">3</Hack>
+    <Pierce op="add">4</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>24</Hack>
+      <Pierce>0</Pierce>
+      <Crush>8</Crush>
+      <MaxRange>3.5</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood op="add">-50</wood>
+      <metal op="add">50</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
+    <GenericName>Hero Infantry Axeman</GenericName>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.1</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.1</Speed>
+    </Run>
+  </UnitMotion>
+  <Vision>
+    <Range>80</Range>
+  </Vision>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_melee">
+  <Armour>
+    <Hack>4</Hack>
+    <Pierce>5</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Hack>6</Hack>
+      <Pierce>0</Pierce>
+      <Crush>2</Crush>
+      <MaxRange>2</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>40</wood>
+      <metal>10</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <VisibleClasses datatype="tokens">Axeman</VisibleClasses>
+    <GenericName>Infantry Axeman</GenericName>
+  </Identity>
+  <Loot>
+    <metal>5</metal>
+  </Loot>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.1</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.1</Speed>
+    </Run>
+  </UnitMotion>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
@@ -1,29 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Armour>
-    <Hack op="add">-1</Hack>
-    <Pierce op="add">-1</Pierce>
-  </Armour>
-  <Attack>
-    <Melee>
-      <Bonuses>
-        <Bonus1>
-          <Classes>Champion</Classes>
-          <Multiplier>1.3</Multiplier>
-        </Bonus1>
-        <Bonus2>
-          <Classes>Hero</Classes>
-          <Multiplier>1.3</Multiplier>
-        </Bonus2>
-      </Bonuses>
-    </Melee>
-  </Attack>
+<Entity parent="template_unit_champion_infantry_axeman">
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Meroitic Temple Guard</GenericName>
     <SpecificName>rs ‘Iprmk</SpecificName>
-    <Tooltip>Armor-piercing Axes: Counters 1.3x vs. Champions and Heroes.</Tooltip>
-    <VisibleClasses datatype="tokens">Axe</VisibleClasses>
     <Classes datatype="tokens">ApedemakGuard</Classes>
     <Icon>units/kush_champion_apedemak.png</Icon>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_b">
+<Entity parent="units/pers_cavalry_axeman_b">
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
-    <Entity>units/pers_cavalry_swordsman_e</Entity>
+    <Entity>units/pers_cavalry_axeman_e</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_a_m.xml</Actor>
+    <Actor>units/persians/cavalry_axeman_a_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a_trireme.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_a">
+<Entity parent="units/pers_cavalry_axeman_a">
   <Identity>
     <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
   </Identity>
   <Promotion>
-    <Entity>units/pers_cavalry_swordsman_e_trireme</Entity>
+    <Entity>units/pers_cavalry_axeman_e_trireme</Entity>
   </Promotion>
 </Entity>
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,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="template_unit_cavalry_melee_axeman">
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
-    <SelectionGroupName>units/pers_cavalry_swordsman_b</SelectionGroupName>
+    <SelectionGroupName>units/pers_cavalry_axeman_b</SelectionGroupName>
     <GenericName>Hyrcanian Cavalry</GenericName>
     <SpecificName>Varkaniya Asabara</SpecificName>
-    <Icon>units/pers_cavalry_swordsman.png</Icon>
+    <Icon>units/pers_cavalry_axeman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
-    <Entity>units/pers_cavalry_swordsman_a</Entity>
+    <Entity>units/pers_cavalry_axeman_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_b_m.xml</Actor>
+    <Actor>units/persians/cavalry_axeman_b_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b_trireme.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_b">
+<Entity parent="units/pers_cavalry_axeman_b">
   <Identity>
     <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
   </Identity>
   <Promotion>
-    <Entity>units/pers_cavalry_swordsman_a_trireme</Entity>
+    <Entity>units/pers_cavalry_axeman_a_trireme</Entity>
   </Promotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_a">
+<Entity parent="units/pers_cavalry_axeman_a">
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_e_m.xml</Actor>
+    <Actor>units/persians/cavalry_axeman_e_m.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_e">
+<Entity parent="units/pers_cavalry_axeman_e">
   <Identity>
     <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/pers_cavalry_swordsman_e</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_a_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_a">
-  <Identity>
-    <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/pers_cavalry_swordsman_e_trireme</Entity>
-  </Promotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
-  <Identity>
-    <Civ>pers</Civ>
-    <Lang>persian</Lang>
-    <SelectionGroupName>units/pers_cavalry_swordsman_b</SelectionGroupName>
-    <GenericName>Hyrcanian Cavalry</GenericName>
-    <SpecificName>Varkaniya Asabara</SpecificName>
-    <Icon>units/pers_cavalry_swordsman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/pers_cavalry_swordsman_a</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_b_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_b">
-  <Identity>
-    <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/pers_cavalry_swordsman_a_trireme</Entity>
-  </Promotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_e_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_e">
-  <Identity>
-    <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
-  </Identity>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml
@@ -14,7 +14,7 @@
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/pers_cavalry_swordsman_b_trireme
+      units/pers_cavalry_axeman_b_trireme
       units/pers_cavalry_javelinist_b_trireme
     </Entities>
     <TechCostMultiplier>