Index: binaries/data/mods/public/maps/random/hellas_biomes.json
===================================================================
--- binaries/data/mods/public/maps/random/hellas_biomes.json
+++ binaries/data/mods/public/maps/random/hellas_biomes.json
@@ -167,7 +167,7 @@
 			},
 			"athen": {
 				"temple": "structures/athen_temple",
-				"oxybeles": "units/athen_mechanical_siege_oxybeles_unpacked"
+				"oxybeles": "units/athen_siege_oxybeles_unpacked"
 			}
 		},
 		"actors": {
Index: binaries/data/mods/public/maps/random/jebel_barkal.js
===================================================================
--- binaries/data/mods/public/maps/random/jebel_barkal.js
+++ binaries/data/mods/public/maps/random/jebel_barkal.js
@@ -92,7 +92,7 @@
 	"units/kush_champion_infantry_amun",
 	"units/kush_champion_infantry_apedemak"
 ];
-const oPtolSiege = ["units/ptol_mechanical_siege_lithobolos_unpacked", "units/ptol_mechanical_siege_polybolos_unpacked"];
+const oPtolSiege = ["units/ptol_siege_lithobolos_unpacked", "units/ptol_siege_polybolos_unpacked"];
 const oTriggerPointCityPath = "trigger/trigger_point_A";
 const oTriggerPointAttackerPatrol = "trigger/trigger_point_B";
 
Index: binaries/data/mods/public/maps/scenarios/Pathfinding_demo.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Pathfinding_demo.xml
+++ binaries/data/mods/public/maps/scenarios/Pathfinding_demo.xml
@@ -703,7 +703,7 @@
 			<Actor seed="31151"/>
 		</Entity>
 		<Entity uid="140">
-			<Template>units/rome_mechanical_siege_ballista_packed</Template>
+			<Template>units/rome_siege_ballista_packed</Template>
 			<Player>1</Player>
 			<Position x="273.1745" z="243.61445"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Pathfinding_terrain_demo.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Pathfinding_terrain_demo.xml
+++ binaries/data/mods/public/maps/scenarios/Pathfinding_terrain_demo.xml
@@ -84,7 +84,7 @@
 			<Orientation y="2.3562"/>
 		</Entity>
 		<Entity uid="13">
-			<Template>units/athen_mechanical_siege_lithobolos_packed</Template>
+			<Template>units/athen_siege_lithobolos_packed</Template>
 			<Player>1</Player>
 			<Position x="326.233" z="280.563"/>
 			<Orientation y="2.3562"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
@@ -22110,14 +22110,14 @@
 			<Actor seed="13074"/>
 		</Entity>
 		<Entity uid="3886">
-			<Template>units/brit_mechanical_siege_ram</Template>
+			<Template>units/brit_siege_ram</Template>
 			<Player>1</Player>
 			<Position x="581.03827" z="371.1916"/>
 			<Orientation y="-1.90758"/>
 			<Actor seed="28802"/>
 		</Entity>
 		<Entity uid="3887">
-			<Template>units/brit_mechanical_siege_ram</Template>
+			<Template>units/brit_siege_ram</Template>
 			<Player>1</Player>
 			<Position x="532.02436" z="361.88801"/>
 			<Orientation y="0.83231"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Gauls.xml
@@ -22157,14 +22157,14 @@
 			<Actor seed="13074"/>
 		</Entity>
 		<Entity uid="3886">
-			<Template>units/gaul_mechanical_siege_ram</Template>
+			<Template>units/gaul_siege_ram</Template>
 			<Player>1</Player>
 			<Position x="576.58124" z="368.19791"/>
 			<Orientation y="-1.90758"/>
 			<Actor seed="28802"/>
 		</Entity>
 		<Entity uid="3887">
-			<Template>units/gaul_mechanical_siege_ram</Template>
+			<Template>units/gaul_siege_ram</Template>
 			<Player>1</Player>
 			<Position x="532.02436" z="361.88801"/>
 			<Orientation y="0.83231"/>
@@ -22654,4 +22654,4 @@
 		</Entity>
 	</Entities>
 	<Paths/>
-</Scenario>
\ No newline at end of file
+</Scenario>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Iberians.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Iberians.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Iberians.xml
@@ -529,19 +529,19 @@
 			<Orientation y="-2.22417"/>
 		</Entity>
 		<Entity uid="85">
-			<Template>units/iber_mechanical_siege_ram</Template>
+			<Template>units/iber_siege_ram</Template>
 			<Player>1</Player>
 			<Position x="462.53983" z="203.08097"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="86">
-			<Template>units/iber_mechanical_siege_ram</Template>
+			<Template>units/iber_siege_ram</Template>
 			<Player>1</Player>
 			<Position x="456.41767" z="197.58635"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="87">
-			<Template>units/iber_mechanical_siege_ram</Template>
+			<Template>units/iber_siege_ram</Template>
 			<Player>1</Player>
 			<Position x="450.26139" z="191.00417"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Kushites.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Kushites.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Kushites.xml
@@ -12832,7 +12832,7 @@
 			<Actor seed="14664"/>
 		</Entity>
 		<Entity uid="2467">
-			<Template>units/kush_mechanical_siege_tower</Template>
+			<Template>units/kush_siege_tower</Template>
 			<Player>1</Player>
 			<Position x="406.90735" z="403.27741"/>
 			<Orientation y="2.41691"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Macedonians.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Macedonians.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Macedonians.xml
@@ -4738,28 +4738,28 @@
 			<Actor seed="56866"/>
 		</Entity>
 		<Entity uid="927">
-			<Template>units/mace_mechanical_siege_tower</Template>
+			<Template>units/mace_siege_tower</Template>
 			<Player>1</Player>
 			<Position x="707.73383" z="1311.80274"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="15794"/>
 		</Entity>
 		<Entity uid="928">
-			<Template>units/mace_mechanical_siege_oxybeles_packed</Template>
+			<Template>units/mace_siege_oxybeles_packed</Template>
 			<Player>1</Player>
 			<Position x="698.77997" z="1302.84424"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="1218"/>
 		</Entity>
 		<Entity uid="929">
-			<Template>units/mace_mechanical_siege_lithobolos_packed</Template>
+			<Template>units/mace_siege_lithobolos_packed</Template>
 			<Player>1</Player>
 			<Position x="690.83301" z="1296.40247"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="6174"/>
 		</Entity>
 		<Entity uid="930">
-			<Template>units/mace_mechanical_siege_ram</Template>
+			<Template>units/mace_siege_ram</Template>
 			<Player>1</Player>
 			<Position x="680.95813" z="1290.58387"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml
@@ -14008,35 +14008,35 @@
 			<Actor seed="39620"/>
 		</Entity>
 		<Entity uid="5615">
-			<Template>units/ptol_mechanical_siege_lithobolos_unpacked</Template>
+			<Template>units/ptol_siege_lithobolos_unpacked</Template>
 			<Player>1</Player>
 			<Position x="206.18715" z="533.44214"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="45762"/>
 		</Entity>
 		<Entity uid="5616">
-			<Template>units/ptol_mechanical_siege_lithobolos_unpacked</Template>
+			<Template>units/ptol_siege_lithobolos_unpacked</Template>
 			<Player>1</Player>
 			<Position x="212.09563" z="538.60975"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="36242"/>
 		</Entity>
 		<Entity uid="5617">
-			<Template>units/ptol_mechanical_siege_polybolos_unpacked</Template>
+			<Template>units/ptol_siege_polybolos_unpacked</Template>
 			<Player>1</Player>
 			<Position x="201.59018" z="527.36316"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="29282"/>
 		</Entity>
 		<Entity uid="5618">
-			<Template>units/ptol_mechanical_siege_polybolos_unpacked</Template>
+			<Template>units/ptol_siege_polybolos_unpacked</Template>
 			<Player>1</Player>
 			<Position x="197.86117" z="523.70496"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="42038"/>
 		</Entity>
 		<Entity uid="5619">
-			<Template>units/ptol_mechanical_siege_tower</Template>
+			<Template>units/ptol_siege_tower</Template>
 			<Player>1</Player>
 			<Position x="183.72426" z="514.46515"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml
@@ -10856,14 +10856,14 @@
 			<Actor seed="49118"/>
 		</Entity>
 		<Entity uid="2612">
-			<Template>units/sele_mechanical_siege_lithobolos_packed</Template>
+			<Template>units/sele_siege_lithobolos_packed</Template>
 			<Player>1</Player>
 			<Position x="433.34781" z="184.13592"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39878"/>
 		</Entity>
 		<Entity uid="2613">
-			<Template>units/sele_mechanical_siege_tower</Template>
+			<Template>units/sele_siege_tower</Template>
 			<Player>1</Player>
 			<Position x="462.19516" z="224.94977"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/tutorials/Introductory_Tutorial.js
===================================================================
--- binaries/data/mods/public/maps/tutorials/Introductory_Tutorial.js
+++ binaries/data/mods/public/maps/tutorials/Introductory_Tutorial.js
@@ -345,7 +345,7 @@
 		},
 		"OnTrainingQueued": function(msg)
 		{
-			if (msg.unitTemplate == "units/spart_mechanical_siege_ram")
+			if (msg.unitTemplate == "units/spart_siege_ram")
 				++this.ramCount;
 			if (this.IsDone())
 			{
Index: binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/units/default_ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_fortress.xml
@@ -19,12 +19,12 @@
       units/{civ}_hero_demetrius
       units/{civ}_champion_infantry_a
       units/{civ}_champion_cavalry
-      -units/{civ}_mechanical_siege_ballista_packed
-      -units/{civ}_mechanical_siege_scorpio_packed
-      -units/{civ}_mechanical_siege_oxybeles_packed
-      -units/{civ}_mechanical_siege_lithobolos_packed
-      -units/{civ}_mechanical_siege_ram
-      -units/{civ}_mechanical_siege_tower
+      -units/{civ}_siege_ballista_packed
+      -units/{civ}_siege_scorpio_packed
+      -units/{civ}_siege_oxybeles_packed
+      -units/{civ}_siege_lithobolos_packed
+      -units/{civ}_siege_ram
+      -units/{civ}_siege_tower
     </Entities>
     <Technologies datatype="tokens">
       successors/upgrade_mace_silvershields
Index: binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_fortress.xml
@@ -13,12 +13,12 @@
       units/{civ}_champion_infantry
       units/{civ}_champion_maiden
       units/{civ}_champion_chariot
-      -units/{civ}_mechanical_siege_ballista_packed
-      -units/{civ}_mechanical_siege_scorpio_packed
-      -units/{civ}_mechanical_siege_oxybeles_packed
-      -units/{civ}_mechanical_siege_lithobolos_packed
-      -units/{civ}_mechanical_siege_ram
-      -units/{civ}_mechanical_siege_tower
+      -units/{civ}_siege_ballista_packed
+      -units/{civ}_siege_scorpio_packed
+      -units/{civ}_siege_oxybeles_packed
+      -units/{civ}_siege_lithobolos_packed
+      -units/{civ}_siege_ram
+      -units/{civ}_siege_tower
     </Entities>
     <Technologies datatype="tokens">
       attack_soldiers_will
Index: binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
@@ -95,12 +95,12 @@
       units/{civ}_infantry_spearman_a
       units/{civ}_infantry_javelinist_b
       units/{civ}_cavalry_spearman_b
-      units/{civ}_mechanical_siege_ballista_packed
-      units/{civ}_mechanical_siege_scorpio_packed
-      units/{civ}_mechanical_siege_oxybeles_packed
-      units/{civ}_mechanical_siege_lithobolos_packed
-      units/{civ}_mechanical_siege_ram
-      units/{civ}_mechanical_siege_tower
+      units/{civ}_siege_ballista_packed
+      units/{civ}_siege_scorpio_packed
+      units/{civ}_siege_oxybeles_packed
+      units/{civ}_siege_lithobolos_packed
+      units/{civ}_siege_ram
+      units/{civ}_siege_tower
     </Entities>
   </ProductionQueue>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -85,13 +85,13 @@
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}_mechanical_siege_ballista_packed
-      units/{civ}_mechanical_siege_scorpio_packed
-      units/{civ}_mechanical_siege_oxybeles_packed
-      units/{civ}_mechanical_siege_lithobolos_packed
-      units/{civ}_mechanical_siege_polybolos_packed
-      units/{civ}_mechanical_siege_ram
-      units/{civ}_mechanical_siege_tower
+      units/{civ}_siege_ballista_packed
+      units/{civ}_siege_scorpio_packed
+      units/{civ}_siege_oxybeles_packed
+      units/{civ}_siege_lithobolos_packed
+      units/{civ}_siege_polybolos_packed
+      units/{civ}_siege_ram
+      units/{civ}_siege_tower
     </Entities>
     <Technologies datatype="tokens">
       attack_soldiers_will
Index: binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
@@ -37,13 +37,13 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}_mechanical_siege_ballista_packed
-      units/{civ}_mechanical_siege_scorpio_packed
-      units/{civ}_mechanical_siege_oxybeles_packed
-      units/{civ}_mechanical_siege_lithobolos_packed
-      units/{civ}_mechanical_siege_polybolos_packed
-      units/{civ}_mechanical_siege_ram
-      units/{civ}_mechanical_siege_tower
+      units/{civ}_siege_ballista_packed
+      units/{civ}_siege_scorpio_packed
+      units/{civ}_siege_oxybeles_packed
+      units/{civ}_siege_lithobolos_packed
+      units/{civ}_siege_polybolos_packed
+      units/{civ}_siege_ram
+      units/{civ}_siege_tower
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_mechanical.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit">
-  <Decay>
-    <DelayTime>0.0</DelayTime>
-    <SinkRate>0.0</SinkRate>
-    <SinkAccel>2.0</SinkAccel>
-  </Decay>
-  <Health>
-    <Unhealable>true</Unhealable>
-  </Health>
-  <Identity>
-    <GenericName>Mechanical</GenericName>
-    <VisibleClasses datatype="tokens">Mechanical</VisibleClasses>
-  </Identity>
-  <Loot>
-    <xp>60</xp>
-    <food>0</food>
-    <wood>50</wood>
-    <stone>0</stone>
-    <metal>25</metal>
-  </Loot>
-  <Repairable>
-    <RepairTimeRatio>4.0</RepairTimeRatio>
-  </Repairable>
-  <UnitMotion>
-    <RunMultiplier>1</RunMultiplier>
-  </UnitMotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical">
+<Entity parent="template_unit">
   <Armour>
     <Hack>5</Hack>
     <Pierce>10</Pierce>
@@ -27,18 +27,29 @@
     <MaxSpawnDistance>10</MaxSpawnDistance>
   </Footprint>
   <Health>
+    <Unhealable>true</Unhealable>
     <Max>200</Max>
   </Health>
   <Identity>
     <GenericName>Ship</GenericName>
     <Formations disable=""/>
-    <VisibleClasses datatype="tokens">Ship</VisibleClasses>
+    <VisibleClasses datatype="tokens">Mechanical Ship</VisibleClasses>
   </Identity>
+  <Loot>
+    <xp>60</xp>
+    <food>0</food>
+    <wood>50</wood>
+    <stone>0</stone>
+    <metal>25</metal>
+  </Loot>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
     <TurnRate>3.0</TurnRate>
   </Position>
+  <Repairable>
+    <RepairTimeRatio>4.0</RepairTimeRatio>
+  </Repairable>
   <ResourceGatherer>
     <MaxDistance>4.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship">
+<Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship">
+<Entity parent="template_unit_ship">
   <Attack>
     <Melee>
       <Hack>10.0</Hack>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship">
+<Entity parent="template_unit_ship">
   <Armour>
     <Hack>2</Hack>
     <Pierce>5</Pierce>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship">
+<Entity parent="template_unit_ship">
   <Armour>
     <Hack>2</Hack>
     <Pierce>5</Pierce>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship">
+<Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship">
+<Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical">
+<Entity parent="template_unit">
   <Armour>
     <Hack>1</Hack>
     <Pierce>50</Pierce>
@@ -13,14 +13,32 @@
   <Cost>
     <Population>3</Population>
   </Cost>
+  <Decay>
+    <DelayTime>0.0</DelayTime>
+    <SinkRate>0.0</SinkRate>
+    <SinkAccel>2.0</SinkAccel>
+  </Decay>
+  <Health>
+    <Unhealable>true</Unhealable>
+  </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Siege</VisibleClasses>
+    <VisibleClasses datatype="tokens">Mechanical Siege</VisibleClasses>
     <GenericName>Siege</GenericName>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
+  <Loot>
+    <xp>60</xp>
+    <food>0</food>
+    <wood>50</wood>
+    <stone>0</stone>
+    <metal>25</metal>
+  </Loot>
   <Position>
     <Anchor>pitch-roll</Anchor>
   </Position>
+  <Repairable>
+    <RepairTimeRatio>4.0</RepairTimeRatio>
+  </Repairable>
   <Sound>
     <SoundGroups>
       <select>attack/siege/siege_select.xml</select>
@@ -38,5 +56,6 @@
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
+    <RunMultiplier>1</RunMultiplier>
   </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege">
+<Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege">
+<Entity parent="template_unit_siege">
   <Attack>
     <Melee>
       <Hack>0.0</Hack>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege">
+<Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege">
+<Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
Index: binaries/data/mods/public/simulation/templates/units/athen_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_bireme">
+<Entity parent="template_unit_ship_bireme">
   <Identity>
     <Civ>athen</Civ>
     <GenericName>Penteconter</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/athen_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_ship_fishing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_fishing">
+<Entity parent="template_unit_ship_fishing">
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/athen_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_ship_merchant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
+<Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="8.0" depth="24.0"/>
     <Height>8.0</Height>
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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Triḗrēs Athēnaía</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/athen_siege_lithobolos_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_siege_lithobolos_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_siege_lithobolos_packed.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager">
+<Entity parent="template_unit_siege_stonethrower">
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Lithobólos</SpecificName>
-    <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
+    <Icon>units/hele_siege_lithobolos_packed.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/athen_mechanical_siege_lithobolos_unpacked</Entity>
+    <Entity>units/athen_siege_lithobolos_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/athen_siege_lithobolos_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_siege_lithobolos_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_siege_lithobolos_unpacked.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_mechanical_siege_lithobolos_packed">
+<Entity parent="units/athen_siege_lithobolos_packed">
   <Identity>
-    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
+    <Icon>units/hele_siege_lithobolos.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/mace_mechanical_siege_lithobolos_packed</Entity>
+    <Entity>units/athen_siege_lithobolos_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
Index: binaries/data/mods/public/simulation/templates/units/athen_siege_oxybeles_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_siege_oxybeles_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_siege_oxybeles_packed.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista">
+<Entity parent="template_unit_siege_boltshooter">
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Oxybelḗs</SpecificName>
-    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
+    <Icon>units/hele_siege_oxybeles_packed.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/athen_mechanical_siege_oxybeles_unpacked</Entity>
+    <Entity>units/athen_siege_oxybeles_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/athen_siege_oxybeles_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_siege_oxybeles_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_siege_oxybeles_unpacked.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/spart_mechanical_siege_oxybeles_packed">
+<Entity parent="units/athen_siege_oxybeles_packed">
   <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
+    <Icon>units/hele_siege_oxybeles.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/spart_mechanical_siege_oxybeles_packed</Entity>
+    <Entity>units/athen_siege_oxybeles_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
Index: binaries/data/mods/public/simulation/templates/units/brit_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_ship_fishing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_fishing">
+<Entity parent="template_unit_ship_fishing">
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Manea</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/brit_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_ship_merchant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
+<Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="12.0" depth="24.0"/>
     <Height>6.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/brit_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/units/brit_siege_ram.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/brit_siege_ram.xml
+++ binaries/data/mods/public/simulation/templates/units/brit_siege_ram.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ram">
+<Entity parent="template_unit_siege_ram">
   <Footprint replace="">
     <Square width="6.75" depth="10.0"/>
     <Height>3.0</Height>
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Reithe</SpecificName>
-    <Icon>units/celt_mechanical_siege_ram.png</Icon>
+    <Icon>units/celt_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/siege_ram.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/cart_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_bireme">
+<Entity parent="template_unit_ship_bireme">
   <Footprint>
     <Square width="8.0" depth="31.0"/>
     <Height>10.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/cart_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_ship_fishing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_fishing">
+<Entity parent="template_unit_ship_fishing">
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Noon-Mašōt</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/cart_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_ship_merchant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
+<Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="8.0" depth="24.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/cart_ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_ship_quinquereme.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_ship_quinquereme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_quinquereme">
+<Entity parent="template_unit_ship_quinquereme">
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Quinquereme</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/cart_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Identity>
     <Civ>cart</Civ>
     <GenericName>Trireme</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/cart_siege_ballista_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_siege_ballista_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_siege_ballista_packed.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager">
+<Entity parent="template_unit_siege_stonethrower">
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Ballista</SpecificName>
-    <Icon>units/cart_mechanical_siege_ballista_packed.png</Icon>
+    <Icon>units/cart_siege_ballista_packed.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/cart_mechanical_siege_ballista_unpacked</Entity>
+    <Entity>units/cart_siege_ballista_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/cart_siege_ballista_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_siege_ballista_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_siege_ballista_unpacked.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/cart_mechanical_siege_ballista_packed">
+<Entity parent="units/cart_siege_ballista_packed">
   <Identity>
-    <Icon>units/cart_mechanical_siege_ballista.png</Icon>
+    <Icon>units/cart_siege_ballista.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/cart_mechanical_siege_ballista_packed</Entity>
+    <Entity>units/cart_siege_ballista_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
Index: binaries/data/mods/public/simulation/templates/units/cart_siege_oxybeles_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_siege_oxybeles_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_siege_oxybeles_packed.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista">
+<Entity parent="template_unit_siege_boltshooter">
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Oxybelḗs</SpecificName>
-    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
+    <Icon>units/hele_siege_oxybeles_packed.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/cart_mechanical_siege_oxybeles_unpacked</Entity>
+    <Entity>units/cart_siege_oxybeles_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/cart_siege_oxybeles_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_siege_oxybeles_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_siege_oxybeles_unpacked.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/cart_mechanical_siege_oxybeles_packed">
+<Entity parent="units/cart_siege_oxybeles_packed">
   <Identity>
-    <Icon>units/cart_mechanical_siege_oxybeles.png</Icon>
+    <Icon>units/cart_siege_oxybeles.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/cart_mechanical_siege_oxybeles_packed</Entity>
+    <Entity>units/cart_siege_oxybeles_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
Index: binaries/data/mods/public/simulation/templates/units/gaul_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul_ship_fishing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_fishing">
+<Entity parent="template_unit_ship_fishing">
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Lembus</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/gaul_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul_ship_merchant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
+<Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="12.0" depth="24.0"/>
     <Height>6.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/gaul_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul_ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/units/gaul_siege_ram.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/gaul_siege_ram.xml
+++ binaries/data/mods/public/simulation/templates/units/gaul_siege_ram.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ram">
+<Entity parent="template_unit_siege_ram">
   <Footprint replace="">
     <Square width="6.75" depth="10.0"/>
     <Height>3.0</Height>
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Reithe</SpecificName>
-    <Icon>units/celt_mechanical_siege_ram.png</Icon>
+    <Icon>units/celt_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/celts/siege_ram.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/iber_ship_fire.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_ship_fire.xml
+++ binaries/data/mods/public/simulation/templates/units/iber_ship_fire.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_fire">
+<Entity parent="template_unit_ship_fire">
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Iberian Fire Ship</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/iber_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/units/iber_ship_fishing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_fishing">
+<Entity parent="template_unit_ship_fishing">
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Arrantza Ontzi</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/iber_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/units/iber_ship_merchant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
+<Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="8.0" depth="24.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/iber_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/iber_ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/units/iber_siege_ram.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/iber_siege_ram.xml
+++ binaries/data/mods/public/simulation/templates/units/iber_siege_ram.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ram">
+<Entity parent="template_unit_siege_ram">
   <Footprint replace="">
     <Square width="6.75" depth="9.0"/>
     <Height>3.0</Height>
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Ahariburu</SpecificName>
-    <Icon>units/iber_mechanical_siege_ram.png</Icon>
+    <Icon>units/iber_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/iberians/siege_ram.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/kush_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_bireme">
+<Entity parent="template_unit_ship_bireme">
   <Identity>
     <Civ>kush</Civ>
     <Icon>units/ptol_ship_bireme.png</Icon>
Index: binaries/data/mods/public/simulation/templates/units/kush_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_ship_fishing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_fishing">
+<Entity parent="template_unit_ship_fishing">
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Fishing Boat</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/kush_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_ship_merchant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
+<Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="8.0" depth="24.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Cost>
     <Resources>
       <wood op="add">50</wood>
Index: binaries/data/mods/public/simulation/templates/units/kush_siege_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_siege_tower.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_siege_tower.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_tower">
+<Entity parent="template_unit_siege_tower">
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Kushite Siege Tower</GenericName>
     <SpecificName>iwn n ms</SpecificName>
-    <Icon>units/hele_mechanical_siege_tower.png</Icon>
+    <Icon>units/hele_siege_tower.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/siege_tower.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/mace_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_bireme">
+<Entity parent="template_unit_ship_bireme">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Hemiolos</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/mace_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_ship_fishing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_fishing">
+<Entity parent="template_unit_ship_fishing">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/mace_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_ship_merchant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
+<Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="8.0" depth="24.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/mace_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Triḗrēs Athēnaía</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/mace_siege_lithobolos_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_siege_lithobolos_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_siege_lithobolos_packed.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager">
+<Entity parent="template_unit_siege_stonethrower">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Lithobólos</SpecificName>
-    <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
+    <Icon>units/hele_siege_lithobolos_packed.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/mace_mechanical_siege_lithobolos_unpacked</Entity>
+    <Entity>units/mace_siege_lithobolos_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/mace_siege_lithobolos_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_siege_lithobolos_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_siege_lithobolos_unpacked.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/sele_mechanical_siege_lithobolos_packed">
+<Entity parent="units/mace_siege_lithobolos_packed">
   <Identity>
-    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
+    <Icon>units/hele_siege_lithobolos.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/sele_mechanical_siege_lithobolos_packed</Entity>
+    <Entity>units/mace_siege_lithobolos_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
Index: binaries/data/mods/public/simulation/templates/units/mace_siege_oxybeles_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_siege_oxybeles_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_siege_oxybeles_packed.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista">
+<Entity parent="template_unit_siege_boltshooter">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Oxybelḗs</SpecificName>
-    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
+    <Icon>units/hele_siege_oxybeles_packed.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/mace_mechanical_siege_oxybeles_unpacked</Entity>
+    <Entity>units/mace_siege_oxybeles_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/mace_siege_oxybeles_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_siege_oxybeles_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_siege_oxybeles_unpacked.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_mechanical_siege_oxybeles_packed">
+<Entity parent="units/mace_siege_oxybeles_packed">
   <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
+    <Icon>units/hele_siege_oxybeles.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/mace_mechanical_siege_oxybeles_packed</Entity>
+    <Entity>units/mace_siege_oxybeles_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
Index: binaries/data/mods/public/simulation/templates/units/mace_siege_ram.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_siege_ram.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_siege_ram.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ram">
+<Entity parent="template_unit_siege_ram">
   <Footprint replace="">
     <Square width="8.0" depth="12.0"/>
     <Height>3.0</Height>
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Poliorkitikós Kriós</SpecificName>
-    <Icon>units/mace_mechanical_siege_ram.png</Icon>
+    <Icon>units/mace_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/siege_ram.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/mace_siege_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_siege_tower.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_siege_tower.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_tower">
+<Entity parent="template_unit_siege_tower">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Helépolis</SpecificName>
-    <Icon>units/hele_mechanical_siege_tower.png</Icon>
+    <Icon>units/hele_siege_tower.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/hellenes/siege_tower.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/maur_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_bireme">
+<Entity parent="template_unit_ship_bireme">
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Yudhpot</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/maur_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_ship_fishing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_fishing">
+<Entity parent="template_unit_ship_fishing">
   <Footprint>
     <Square width="7.0" depth="17.0"/>
     <Height>4.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/maur_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_ship_merchant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
+<Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="12.0" depth="28.0"/>
     <Height>6.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/units/maur_siege_ram.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur_siege_ram.xml
+++ binaries/data/mods/public/simulation/templates/units/maur_siege_ram.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ram">
+<Entity parent="template_unit_siege_ram">
   <Footprint replace="">
     <Square width="8.0" depth="12.0"/>
     <Height>3.0</Height>
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
-    <Icon>units/maur_mechanical_siege_ram.png</Icon>
+    <Icon>units/maur_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/mauryas/siege_ram.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/noldor_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/noldor_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/noldor_ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_bireme">
+<Entity parent="template_unit_ship_bireme">
   <Footprint>
     <Square width="8.0" depth="28.0"/>
     <Height>10.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/pers_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_bireme">
+<Entity parent="template_unit_ship_bireme">
   <Footprint>
     <Square width="7.0" depth="37.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/pers_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_ship_fishing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_fishing">
+<Entity parent="template_unit_ship_fishing">
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
Index: binaries/data/mods/public/simulation/templates/units/pers_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_ship_merchant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
+<Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="6.0" depth="25.0"/>
     <Height>8.0</Height>
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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Footprint>
     <Square width="9.0" depth="42.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/pers_siege_ram.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/pers_siege_ram.xml
+++ binaries/data/mods/public/simulation/templates/units/pers_siege_ram.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ram">
+<Entity parent="template_unit_siege_ram">
   <Attack>
     <Melee>
       <Crush op="mul">1.2</Crush>
@@ -17,7 +17,7 @@
     <Lang>persian</Lang>
     <GenericName>Assyrian Siege Ram</GenericName>
     <SpecificName>Athuriya Hamaranakuba</SpecificName>
-    <Icon>units/pers_mechanical_siege_ram.png</Icon>
+    <Icon>units/pers_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/persians/siege_ram.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_quinquereme">
+<Entity parent="template_unit_ship_quinquereme">
   <Cost>
     <Population>5</Population>
     <BuildTime>60</BuildTime>
Index: binaries/data/mods/public/simulation/templates/units/ptol_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_bireme">
+<Entity parent="template_unit_ship_bireme">
   <Identity>
     <Civ>ptol</Civ>
     <GenericName>Bireme</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/ptol_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_ship_fishing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_fishing">
+<Entity parent="template_unit_ship_fishing">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/ptol_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_ship_merchant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
+<Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="8.0" depth="24.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/ptol_ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_ship_quinquereme.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_ship_quinquereme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_quinquereme">
+<Entity parent="template_unit_ship_quinquereme">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Octḗrēs</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/ptol_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Pentḗrēs</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/ptol_siege_lithobolos_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_siege_lithobolos_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_siege_lithobolos_packed.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager">
+<Entity parent="template_unit_siege_stonethrower">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Lithobólos</SpecificName>
-    <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
+    <Icon>units/hele_siege_lithobolos_packed.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/ptol_mechanical_siege_lithobolos_unpacked</Entity>
+    <Entity>units/ptol_siege_lithobolos_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/ptol_siege_lithobolos_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_siege_lithobolos_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_siege_lithobolos_unpacked.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_mechanical_siege_lithobolos_packed">
+<Entity parent="units/ptol_siege_lithobolos_packed">
   <Identity>
-    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
+    <Icon>units/hele_siege_lithobolos.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/ptol_mechanical_siege_lithobolos_packed</Entity>
+    <Entity>units/ptol_siege_lithobolos_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
Index: binaries/data/mods/public/simulation/templates/units/ptol_siege_polybolos_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_siege_polybolos_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_siege_polybolos_packed.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista">
+<Entity parent="template_unit_siege_boltshooter">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Polybolos</SpecificName>
-    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
+    <Icon>units/hele_siege_oxybeles_packed.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/ptol_mechanical_siege_polybolos_unpacked</Entity>
+    <Entity>units/ptol_siege_polybolos_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/ptol_siege_polybolos_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_siege_polybolos_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_siege_polybolos_unpacked.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_mechanical_siege_polybolos_packed">
+<Entity parent="units/ptol_siege_polybolos_packed">
   <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
+    <Icon>units/hele_siege_oxybeles.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/ptol_mechanical_siege_polybolos_packed</Entity>
+    <Entity>units/ptol_siege_polybolos_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
Index: binaries/data/mods/public/simulation/templates/units/ptol_siege_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_siege_tower.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_siege_tower.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_tower">
+<Entity parent="template_unit_siege_tower">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Helépolis</SpecificName>
-    <Icon>units/hele_mechanical_siege_tower.png</Icon>
+    <Icon>units/hele_siege_tower.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/ptolemies/siege_tower.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/rome_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_bireme">
+<Entity parent="template_unit_ship_bireme">
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Liburna</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/rome_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_ship_fishing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_fishing">
+<Entity parent="template_unit_ship_fishing">
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Navicula Piscatoria</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/rome_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_ship_merchant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
+<Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="12.0" depth="24.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/rome_ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_ship_quinquereme.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_ship_quinquereme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_quinquereme">
+<Entity parent="template_unit_ship_quinquereme">
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Quinqueremis Romana</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/rome_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Footprint>
     <Square width="10.0" depth="43.0"/>
   </Footprint>
Index: binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_packed.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager">
+<Entity parent="template_unit_siege_stonethrower">
   <Attack>
     <Ranged>
       <Pierce op="mul">1.1</Pierce>
@@ -18,10 +18,10 @@
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Ballista</SpecificName>
-    <Icon>units/rome_mechanical_siege_ballista_packed.png</Icon>
+    <Icon>units/rome_siege_ballista_packed.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/rome_mechanical_siege_ballista_unpacked</Entity>
+    <Entity>units/rome_siege_ballista_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_unpacked.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_mechanical_siege_ballista_packed">
+<Entity parent="units/rome_siege_ballista_packed">
   <Identity>
-    <Icon>units/rome_mechanical_siege_ballista.png</Icon>
+    <Icon>units/rome_siege_ballista.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/rome_mechanical_siege_ballista_packed</Entity>
+    <Entity>units/rome_siege_ballista_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/units/rome_siege_onager.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_siege_onager.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_siege_onager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager">
+<Entity parent="template_unit_siege_stonethrower">
   <Attack>
     <Ranged>
       <MaxRange>76</MaxRange>
Index: binaries/data/mods/public/simulation/templates/units/rome_siege_ram.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_siege_ram.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_siege_ram.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ram">
+<Entity parent="template_unit_siege_ram">
   <Attack>
     <Melee>
       <Crush op="mul">1.2</Crush>
@@ -12,7 +12,7 @@
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Aries</SpecificName>
-    <Icon>units/rome_mechanical_siege_ram.png</Icon>
+    <Icon>units/rome_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/romans/siege_ram.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_packed.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista">
+<Entity parent="template_unit_siege_boltshooter">
   <Attack>
     <Ranged>
       <Pierce op="mul">1.2</Pierce>
@@ -14,10 +14,10 @@
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Scorpio</SpecificName>
-    <Icon>units/rome_mechanical_siege_scorpio_packed.png</Icon>
+    <Icon>units/rome_siege_scorpio_packed.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/rome_mechanical_siege_scorpio_unpacked</Entity>
+    <Entity>units/rome_siege_scorpio_unpacked</Entity>
     <State>packed</State>
     <Time>5000</Time>
   </Pack>
Index: binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_unpacked.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_mechanical_siege_scorpio_packed">
+<Entity parent="units/rome_siege_scorpio_packed">
   <Identity>
-    <Icon>units/rome_mechanical_siege_scorpio.png</Icon>
+    <Icon>units/rome_siege_scorpio.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/rome_mechanical_siege_scorpio_packed</Entity>
+    <Entity>units/rome_siege_scorpio_packed</Entity>
     <State>unpacked</State>
     <Time>5000</Time>
   </Pack>
Index: binaries/data/mods/public/simulation/templates/units/sele_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_bireme">
+<Entity parent="template_unit_ship_bireme">
   <Identity>
     <Civ>sele</Civ>
     <GenericName>Bireme</GenericName>
Index: binaries/data/mods/public/simulation/templates/units/sele_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_ship_fishing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_fishing">
+<Entity parent="template_unit_ship_fishing">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/sele_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_ship_merchant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
+<Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="8.0" depth="24.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/sele_ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_ship_quinquereme.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_ship_quinquereme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_quinquereme">
+<Entity parent="template_unit_ship_quinquereme">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Pentères</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/sele_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Seleukidó̱n Triērēs</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/sele_siege_lithobolos_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_siege_lithobolos_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_siege_lithobolos_packed.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager">
+<Entity parent="template_unit_siege_stonethrower">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Lithobólos</SpecificName>
-    <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
+    <Icon>units/hele_siege_lithobolos_packed.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/sele_mechanical_siege_lithobolos_unpacked</Entity>
+    <Entity>units/sele_siege_lithobolos_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/sele_siege_lithobolos_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_siege_lithobolos_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_siege_lithobolos_unpacked.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/athen_mechanical_siege_lithobolos_packed">
+<Entity parent="units/sele_siege_lithobolos_packed">
   <Identity>
-    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
+    <Icon>units/hele_siege_lithobolos.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/athen_mechanical_siege_lithobolos_packed</Entity>
+    <Entity>units/sele_siege_lithobolos_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
Index: binaries/data/mods/public/simulation/templates/units/sele_siege_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_siege_tower.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_siege_tower.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_tower">
+<Entity parent="template_unit_siege_tower">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Helépolis</SpecificName>
-    <Icon>units/hele_mechanical_siege_tower.png</Icon>
+    <Icon>units/hele_siege_tower.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/seleucids/siege_tower.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/spart_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_ship_bireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_bireme">
+<Entity parent="template_unit_ship_bireme">
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Pentēkóntoros</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/spart_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_ship_fishing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_fishing">
+<Entity parent="template_unit_ship_fishing">
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Ploîon Halieutikón</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/spart_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_ship_merchant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_merchant">
+<Entity parent="template_unit_ship_merchant">
   <Footprint>
     <Square width="8.0" depth="24.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/spart_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_ship_trireme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_trireme">
+<Entity parent="template_unit_ship_trireme">
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Triḗrēs Athēnaía</SpecificName>
Index: binaries/data/mods/public/simulation/templates/units/spart_siege_oxybeles_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_siege_oxybeles_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_siege_oxybeles_packed.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista">
+<Entity parent="template_unit_siege_boltshooter">
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Oxybelḗs</SpecificName>
-    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
+    <Icon>units/hele_siege_oxybeles_packed.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/spart_mechanical_siege_oxybeles_unpacked</Entity>
+    <Entity>units/spart_siege_oxybeles_unpacked</Entity>
     <State>packed</State>
   </Pack>
   <VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/spart_siege_oxybeles_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_siege_oxybeles_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_siege_oxybeles_unpacked.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/athen_mechanical_siege_oxybeles_packed">
+<Entity parent="units/spart_siege_oxybeles_packed">
   <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
+    <Icon>units/hele_siege_oxybeles.png</Icon>
   </Identity>
   <Pack>
-    <Entity>units/athen_mechanical_siege_oxybeles_packed</Entity>
+    <Entity>units/spart_siege_oxybeles_packed</Entity>
     <State>unpacked</State>
   </Pack>
   <UnitMotion>
Index: binaries/data/mods/public/simulation/templates/units/spart_siege_ram.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_siege_ram.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_siege_ram.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ram">
+<Entity parent="template_unit_siege_ram">
   <Footprint replace="">
     <Square width="8.0" depth="12.0"/>
     <Height>3.0</Height>
@@ -7,7 +7,7 @@
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Poliorkitikós Kriós</SpecificName>
-    <Icon>units/spart_mechanical_siege_ram.png</Icon>
+    <Icon>units/spart_siege_ram.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/spartans/siege_ram.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
+++ binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege">
+<Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
       <Hack>50.0</Hack>
@@ -33,7 +33,7 @@
   <Identity>
     <GenericName>Fire Raiser</GenericName>
     <SpecificName>Pyrobolos</SpecificName>
-    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
+    <Icon>units/hele_siege_lithobolos.png</Icon>
   </Identity>
   <Vision>
     <Range>60</Range>
Index: binaries/data/mods/public/simulation/templates/units/viking_longship.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/viking_longship.xml
+++ binaries/data/mods/public/simulation/templates/units/viking_longship.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_ship_bireme">
+<Entity parent="template_unit_ship_bireme">
   <Identity>
     <SpecificName>Longship</SpecificName>
     <Icon>units/viking_longship.png</Icon>