Index: binaries/data/mods/public/simulation/templates/structures/athen_dock.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_dock.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_dock.xml
@@ -16,10 +16,6 @@
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_infantry_marine_archer_b
-      units/{civ}_champion_marine
-    </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/athenians/dock.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/athen_champion_infantry_swordsman.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_champion_infantry_swordsman.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_swordsman">
+  <Identity>
+    <Civ>athen</Civ>
+    <GenericName>Athenian Marine</GenericName>
+    <Icon>units/athen_champion_marine.png</Icon>
+    <Lang>greek</Lang>
+    <RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>
+    <SpecificName>Epibátēs Athēnaîos</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>units/athenians/champion_unit_marine.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Athenian Marine</GenericName>
-    <SpecificName>Epibátēs Athēnaîos</SpecificName>
-    <Icon>units/athen_champion_marine.png</Icon>
-    <RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>
-  </Identity>
-  <VisualActor>
-    <Actor>units/athenians/champion_unit_marine.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_archer_a.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_archer_a.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/athen_infantry_archer_b">
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/athen_infantry_archer_e</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/athenians/infantry_archer_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_archer_b.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_archer_b.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_ranged_archer">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/athen_gymnasion
+      structures/athen_theatron
+      structures/athen_prytaneion
+      structures/athen_royal_stoa
+      structures/{civ}_wonder
+    </Entities>
+  </Builder>
+  <Cost>
+    <Resources>
+      <food op="add">-25</food>
+      <metal op="add">25</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>athen</Civ>
+    <GenericName>Cretan Mercenary Archer</GenericName>
+    <Icon>units/hele_infantry_archer.png</Icon>
+    <Lang>greek</Lang>
+    <RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>
+    <SelectionGroupName>units/athen_infantry_marine_archer_b</SelectionGroupName>
+    <SpecificName>Toxótēs Krētikós</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+  </Identity>
+  <Promotion>
+    <Entity>units/athen_infantry_archer_a</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/athenians/infantry_archer_b.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_archer_e.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_archer_e.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/athen_infantry_archer_a">
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/athenians/infantry_archer_e.xml</Actor>
+  </VisualActor>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_a.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/athen_infantry_marine_archer_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/athen_infantry_marine_archer_e</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/athenians/infantry_archer_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/athen_gymnasion
-      structures/athen_theatron
-      structures/athen_prytaneion
-      structures/athen_royal_stoa
-      structures/{civ}_wonder
-    </Entities>
-  </Builder>
-  <Cost>
-    <Resources>
-      <food op="add">-25</food>
-      <metal op="add">25</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>athen</Civ>
-    <Lang>greek</Lang>
-    <SelectionGroupName>units/athen_infantry_marine_archer_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
-    <GenericName>Cretan Mercenary Archer</GenericName>
-    <SpecificName>Toxótēs Krētikós</SpecificName>
-    <Icon>units/hele_infantry_archer.png</Icon>
-    <RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/athen_infantry_marine_archer_a</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/athenians/infantry_archer_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_e.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/athen_infantry_marine_archer_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/athenians/infantry_archer_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml
@@ -9,8 +9,8 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/athen_infantry_marine_archer_b
-      units/athen_champion_marine
+      units/athen_infantry_archer_b
+      units/athen_champion_infantry_swordsman
     </Entities>
     <TechCostMultiplier>
       <food>1.0</food>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_javelinist_b_trireme">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/pers_cavalry_javelinist_e_trireme</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_javelinist_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b_trireme.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelinist">
-  <Cost>
-    <BuildTime op="add">3</BuildTime>
-  </Cost>
-  <Identity>
-    <Civ>pers</Civ>
-    <SelectionGroupName>units/pers_cavalry_javelinist_b</SelectionGroupName>
-    <GenericName>Median Light Cavalry</GenericName>
-    <SpecificName>Mada Asabara</SpecificName>
-    <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
-    <Icon>units/pers_cavalry_javelinist.png</Icon>
-  </Identity>
-  <Promotion>
-    <Entity>units/pers_cavalry_javelinist_a_trireme</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_javelinist_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_javelinist_a_trireme">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/persians/cavalry_javelinist_e.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
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_b_trireme">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/pers_cavalry_swordsman_e_trireme</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_a.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
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
-  <Cost>
-    <BuildTime op="add">3</BuildTime>
-  </Cost>
-  <Identity>
-    <Civ>pers</Civ>
-    <SelectionGroupName>units/pers_cavalry_swordsman_b</SelectionGroupName>
-    <GenericName>Hyrcanian Cavalry</GenericName>
-    <SpecificName>Varkaniya Asabara</SpecificName>
-    <Icon>units/pers_cavalry_swordsman.png</Icon>
-    <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/pers_cavalry_swordsman_a_trireme</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_b.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
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/pers_cavalry_swordsman_a_trireme">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/persians/cavalry_swordsman_e.xml</Actor>
-  </VisualActor>
-</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
@@ -7,14 +7,15 @@
   <Identity>
     <Civ>pers</Civ>
     <GenericName>Phoenician Trireme</GenericName>
-    <SpecificName>Vazarka Hamaraniyanava</SpecificName>
     <Icon>units/pers_ship_trireme.png</Icon>
+    <RequiredTechnology>persians/special_equine_transports</RequiredTechnology>
+    <SpecificName>Vazarka Hamaraniyanava</SpecificName>
   </Identity>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/pers_cavalry_swordsman_b_trireme
-      units/pers_cavalry_javelinist_b_trireme
+      units/pers_cavalry_swordsman_b
+      units/pers_cavalry_javelinist_b
     </Entities>
     <TechCostMultiplier>
       <food>1.0</food>