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/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
@@ -34,10 +34,12 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_spearman_b
       units/{civ}_infantry_pikeman_b
+      units/{civ}_infantry_axeman_b
       units/{civ}_infantry_swordsman_b
       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_structure_military_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@@ -35,6 +35,7 @@
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
+      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_axeman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_cavalry_melee">
+  <Armour>
+    <Hack>3</Hack>
+    <Pierce>2</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>6.9</Hack>
+        <Crush>2.3</Crush>
+      </Damage>
+      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>40</wood>
+      <metal>10</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <VisibleClasses datatype="tokens">Axeman</VisibleClasses>
+    <GenericName>Cavalry Axeman</GenericName>
+  </Identity>
+  <Loot>
+    <wood>4</wood>
+    <metal>1</metal>
+  </Loot>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.2</WalkSpeed>
+  </UnitMotion>
+</Entity>
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,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_cavalry">
+  <Armour>
+    <Pierce op="add">2</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>13.8</Hack>
+        <Pierce>0</Pierce>
+        <Crush>4.6</Crush>
+      </Damage>
+      <MaxRange>3.5</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>100</wood>
+      <metal>100</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.2</WalkSpeed>
+  </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,36 @@
+<?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>
+      <Damage>
+        <Hack>12</Hack>
+        <Pierce>0</Pierce>
+        <Crush>4</Crush>
+      </Damage>
+      <MaxRange>3.5</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>100</wood>
+      <metal>75</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max>200</Max>
+  </Health>
+  <Identity>
+    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
+    <GenericName>Champion Axeman</GenericName>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.4</WalkSpeed>
+  </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,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry">
+  <Armour>
+    <Pierce op="add">1</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>27.6</Hack>
+        <Pierce>0</Pierce>
+        <Crush>9.2</Crush>
+      </Damage>
+     <MaxRange>3.5</MaxRange>
+     <PrepareTime>500</PrepareTime>
+     <RepeatTime>1000</RepeatTime>
+     <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Identity>
+    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
+    <GenericName>Hero Cavalry Axeman</GenericName>
+  </Identity>
+</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,30 @@
+<?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>
+      <Damage>
+        <Hack>24</Hack>
+        <Pierce>0</Pierce>
+        <Crush>8</Crush>
+      </Damage>
+      <MaxRange>3.5</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Identity>
+    <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
+    <GenericName>Hero Axeman</GenericName>
+  </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.05</WalkSpeed>
+  </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,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_melee">
+  <Armour>
+    <Hack>4</Hack>
+    <Pierce>5</Pierce>
+  </Armour>
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>6</Hack>
+        <Crush>2</Crush>
+      </Damage>
+      <PreferredClasses datatype="tokens">Siege</PreferredClasses>
+    </Melee>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>40</wood>
+      <metal>10</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <VisibleClasses datatype="tokens">Axeman</VisibleClasses>
+    <GenericName>Axeman</GenericName>
+  </Identity>
+  <Loot>
+    <wood>4</wood>
+    <metal>1</metal>
+  </Loot>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.05</WalkSpeed>
+  </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,26 +1,10 @@
 <?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 Hero</Classes>
-          <Multiplier>1.3</Multiplier>
-        </Bonus1>
-      </Bonuses>
-    </Melee>
-  </Attack>
+<Entity parent="template_unit_champion_infantry_axeman">
   <Identity>
     <Civ>kush</Civ>
-    <Classes datatype="tokens">ApedemakGuard</Classes>
-    <VisibleClasses datatype="tokens">-Swordsman Axeman</VisibleClasses>
     <GenericName>Meroitic Temple Guard</GenericName>
     <SpecificName>rs ʿIprmk</SpecificName>
-    <Tooltip>Armor-piercing Axes: Counters 1.3x vs. Champions and Heroes.</Tooltip>
+    <Classes datatype="tokens">ApedemakGuard</Classes>
     <Icon>units/kush_champion_apedemak.png</Icon>
   </Identity>
   <VisualActor>
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,10 +1,10 @@
 <?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>
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,16 +1,16 @@
 <?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>Asabāra Varkaniya</SpecificName>
     <Icon>units/pers_cavalry_swordsman.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>
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>Asabāra Varkaniya</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>