diff --git a/binaries/data/mods/public/maps/random/wild_lake.js b/binaries/data/mods/public/maps/random/wild_lake.js
index 83c427b445..de62f5cf7a 100644
--- a/binaries/data/mods/public/maps/random/wild_lake.js
+++ b/binaries/data/mods/public/maps/random/wild_lake.js
@@ -159,7 +159,7 @@ var mercenaryCampGuards = {
 	"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 }
 	],
diff --git a/binaries/data/mods/public/maps/scenarios/cinema_demo.xml b/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
index ed8d153f1f..67a83037c2 100644
--- a/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
+++ b/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7c66b45c0c1f683b0b4221aee951ac171d9840df12e57559bbd153e28137b93
-size 427341
+oid sha256:a4735efbf0bfbe8bd00531c82f09294ca46e548557afd2106eb16c3c5f5cc2b7
+size 427305
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml b/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
index 779cfa42e6..95c1d34c04 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e51ee734026825e7ca61e34552cadc9ec9a29bb1114dab7d2ca23d40620aa34f
-size 262770
+oid sha256:bd19bec904d25f6de941f1b78eac3f05130671fc7895410538782f19d76113dc
+size 262725
diff --git a/binaries/data/mods/public/maps/scenarios/serengeti.xml b/binaries/data/mods/public/maps/scenarios/serengeti.xml
index 293b594a47..a61f8cfe98 100644
--- a/binaries/data/mods/public/maps/scenarios/serengeti.xml
+++ b/binaries/data/mods/public/maps/scenarios/serengeti.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6da2c488bd6c4e0af3541ec0e8365b1ad2f27dc0ac3728171b8c4473aa8f261
-size 503921
+oid sha256:faf01245ca82927145f5dc4df124b53eb8ce2791fc3c29a05cbecf61f11360f8
+size 503918
diff --git a/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml b/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml
index b1535db793..a189818479 100644
--- a/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml
+++ b/binaries/data/mods/public/maps/scenarios/siwa_oasis.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdb18a3fc268bd805656fbaecdc0291248cfaa92802bb4d47cc565372d1bedb5
-size 495639
+oid sha256:ef36e1899274b3281c2d0f1ac3f79b031990056fcdab2c4d0fabc4fca242225d
+size 495630
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
index 44b3ed4af2..770465965f 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ b/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
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
index cb4504f904..27787b9741 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
+++ b/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
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
new file mode 100644
index 0000000000..14e759cd4f
--- /dev/null
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
new file mode 100644
index 0000000000..b76e871de7
--- /dev/null
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
new file mode 100644
index 0000000000..22d3f2a2f9
--- /dev/null
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
new file mode 100644
index 0000000000..aef991ff8c
--- /dev/null
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
new file mode 100644
index 0000000000..2bb1fa464a
--- /dev/null
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
new file mode 100644
index 0000000000..dfb72cc053
--- /dev/null
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml b/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
index eb39ca2c3c..e189c5fb18 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a.xml
similarity index 68%
rename from binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a.xml
rename to binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a.xml
index 6a2f9ee68f..5cdb17dbc6 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a_trireme.xml
similarity index 62%
rename from binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml
rename to binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_a_trireme.xml
index 65d6b276b3..ea8535039e 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b.xml
similarity index 70%
rename from binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml
rename to binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b.xml
index 7c28b43a40..d31ba15875 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b_trireme.xml
similarity index 62%
rename from binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml
rename to binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_b_trireme.xml
index 942c447914..0eabee1e9d 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e.xml
similarity index 81%
rename from binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e.xml
rename to binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e.xml
index 1a26caa07b..6564bd6a47 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e.xml
@@ -1,5 +1,5 @@
 <?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>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e_trireme.xml
similarity index 76%
rename from binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml
rename to binaries/data/mods/public/simulation/templates/units/pers_cavalry_axeman_e_trireme.xml
index 6cb619025f..75627a9406 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml
index ae39044a9f..b2e59710cd 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_ship_trireme.xml
+++ b/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>