Index: binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
+<Entity parent="template_structure_defensive_wall">
   <Cost>
     <BuildTime>8</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
+<Entity parent="template_structure_defensive_wall">
   <Cost>
     <BuildTime>12</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_end.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_end.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_end.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
+<Entity parent="template_structure_defensive_wall">
   <Cost>
     <BuildTime>8</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_fort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_sentry">
+<Entity parent="template_structure_defensive_tower_sentry">
   <Capturable disable=""/>
   <Identity>
     <SpecificName>Palisade Fort</SpecificName>
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>25.0</Pierce>
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>25.0</Pierce>
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>25.0</Pierce>
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_outpost.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
+<Entity parent="template_structure_defensive_wall">
   <Cost>
     <BuildTime>18</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>25.0</Pierce>
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_straight.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_straight.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_straight.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
+<Entity parent="template_structure_defensive_wall">
   <Cost>
     <BuildTime>12</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
+<Entity parent="template_structure_defensive_wall">
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>25.0</Pierce>
Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
+<Entity parent="template_structure_defensive_wall">
   <Cost>
     <BuildTime>18</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
+<Entity parent="template_structure_defensive_wall">
   <Cost>
     <BuildTime>12</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml
+++ binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
+<Entity parent="template_structure_defensive_wall">
   <Cost>
     <BuildTime>12</BuildTime>
   </Cost>
Index: binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_stone">
+<Entity parent="template_structure_defensive_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.5"/>
     <Height>15.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_outpost">
+<Entity parent="template_structure_defensive_tower_outpost">
   <Identity>
     <Civ>athen</Civ>
     <GenericName>Greek Outpost</GenericName>
Index: binaries/data/mods/public/simulation/templates/structures/athen_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_sentry">
+<Entity parent="template_structure_defensive_tower_sentry">
   <Identity>
     <Civ>athen</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/athen_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Footprint>
     <Square width="39.0" depth="8.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/athen_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Footprint>
     <Square width="38.5" depth="7.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/athen_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Footprint>
     <Square width="26.0" depth="7.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/athen_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Footprint>
     <Square width="14.0" depth="7.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/athen_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_tower">
+<Entity parent="template_structure_defensive_wall_tower">
   <Footprint>
     <Square width="9.0" depth="9.0"/>
     <Height>15.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/baby_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/baby_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/baby_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_stone">
+<Entity parent="template_structure_defensive_tower_stone">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Pāyaud</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/brit_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_stone">
+<Entity parent="template_structure_defensive_tower_stone">
   <Footprint replace="">
     <Circle radius="6.0"/>
     <Height>10.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/brit_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_outpost">
+<Entity parent="template_structure_defensive_tower_outpost">
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Antosolicon</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/brit_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_sentry">
+<Entity parent="template_structure_defensive_tower_sentry">
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Uxelon</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/brit_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Footprint>
     <Square width="38.5" depth="9.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/brit_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Footprint>
     <Square width="38.5" depth="8.5"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/brit_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Footprint>
     <Square width="26.5" depth="8.5"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/brit_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Footprint>
     <Square width="14.5" depth="8.5"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/brit_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_tower">
+<Entity parent="template_structure_defensive_wall_tower">
   <Attack disable=""/>
   <Footprint>
     <Square width="10.0" depth="10.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_stone">
+<Entity parent="template_structure_defensive_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>18.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/cart_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_outpost">
+<Entity parent="template_structure_defensive_tower_outpost">
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Carthaginian Outpost</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/cart_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_sentry">
+<Entity parent="template_structure_defensive_tower_sentry">
   <Identity>
     <Civ>cart</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/cart_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Footprint>
     <Square width="46.0" depth="11.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/cart_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Footprint>
     <Square width="45.0" depth="11.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Footprint>
     <Square width="31.0" depth="11.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/cart_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Footprint>
     <Square width="17.0" depth="11.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/cart_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_tower">
+<Entity parent="template_structure_defensive_wall_tower">
   <Footprint>
     <Square width="14.0" depth="14.0"/>
     <Height>18.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_stone">
+<Entity parent="template_structure_defensive_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>15.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_outpost">
+<Entity parent="template_structure_defensive_tower_outpost">
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Antosolicon</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_sentry">
+<Entity parent="template_structure_defensive_tower_sentry">
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Uxelon</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Footprint>
     <Square width="38.5" depth="9.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Footprint>
     <Square width="38.5" depth="8.5"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Footprint>
     <Square width="26.5" depth="8.5"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Footprint>
     <Square width="14.5" depth="8.5"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_tower">
+<Entity parent="template_structure_defensive_wall_tower">
   <Attack disable=""/>
   <Footprint>
     <Square width="10.0" depth="10.0"/>
Index: binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_stone">
+<Entity parent="template_structure_defensive_tower_stone">
   <Attack>
     <Ranged>
       <MinRange>12.0</MinRange>
Index: binaries/data/mods/public/simulation/templates/structures/iber_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_outpost">
+<Entity parent="template_structure_defensive_tower_outpost">
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Iberian Outpost</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/iber_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_sentry">
+<Entity parent="template_structure_defensive_tower_sentry">
   <Identity>
     <Civ>iber</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/iber_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Footprint>
     <Square width="37.0" depth="9.5"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/iber_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Footprint>
     <Square width="37" depth="9"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/iber_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Footprint>
     <Square width="25" depth="9"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/iber_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Footprint>
     <Square width="13" depth="9"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/iber_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_tower">
+<Entity parent="template_structure_defensive_wall_tower">
   <Footprint replace="">
     <Circle radius="6.2"/>
     <Height>15.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/kush_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_stone">
+<Entity parent="template_structure_defensive_tower_stone">
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>tsmt ‘3</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/kush_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_outpost">
+<Entity parent="template_structure_defensive_tower_outpost">
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>trtr</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/kush_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_sentry">
+<Entity parent="template_structure_defensive_tower_sentry">
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>tsmt</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/kush_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Footprint>
     <Square width="42.0" depth="14.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/kush_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Footprint>
     <Square width="40" depth="10.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Footprint>
     <Square width="28.0" depth="10.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/kush_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Footprint>
     <Square width="16.0" depth="10.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/kush_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_tower">
+<Entity parent="template_structure_defensive_wall_tower">
   <Footprint>
     <Square width="12" depth="12"/>
     <Height>15.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_stone">
+<Entity parent="template_structure_defensive_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.5"/>
     <Height>15.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/mace_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_outpost">
+<Entity parent="template_structure_defensive_tower_outpost">
   <Identity>
     <Civ>mace</Civ>
     <GenericName>Greek Outpost</GenericName>
Index: binaries/data/mods/public/simulation/templates/structures/mace_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_sentry">
+<Entity parent="template_structure_defensive_tower_sentry">
   <Identity>
     <Civ>mace</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/mace_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Footprint>
     <Square width="39.0" depth="8.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/mace_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Footprint>
     <Square width="38.5" depth="7.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/mace_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Footprint>
     <Square width="26.0" depth="7.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/mace_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Footprint>
     <Square width="14.0" depth="7.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/mace_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_tower">
+<Entity parent="template_structure_defensive_wall_tower">
   <Footprint>
     <Square width="9.0" depth="9.0"/>
     <Height>15.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_stone">
+<Entity parent="template_structure_defensive_tower_stone">
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Udarka</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/maur_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_outpost">
+<Entity parent="template_structure_defensive_tower_outpost">
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Uparaksana</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/maur_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_sentry">
+<Entity parent="template_structure_defensive_tower_sentry">
   <Identity>
     <Civ>maur</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/maur_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Footprint>
     <Square width="38.5" depth="8.5"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Cost>
     <Resources>
       <stone>0</stone>
Index: binaries/data/mods/public/simulation/templates/structures/maur_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Cost>
     <Resources>
       <stone>0</stone>
Index: binaries/data/mods/public/simulation/templates/structures/maur_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Cost>
     <Resources>
       <stone>0</stone>
Index: binaries/data/mods/public/simulation/templates/structures/maur_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_tower">
+<Entity parent="template_structure_defensive_wall_tower">
   <Cost>
     <Resources>
       <stone>0</stone>
Index: binaries/data/mods/public/simulation/templates/structures/pers_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_stone">
+<Entity parent="template_structure_defensive_tower_stone">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Pāyaud</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/pers_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_outpost">
+<Entity parent="template_structure_defensive_tower_outpost">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Didebani</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/pers_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_sentry">
+<Entity parent="template_structure_defensive_tower_sentry">
   <Identity>
     <Civ>pers</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/pers_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Footprint>
     <Square width="38.5" depth="9.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/pers_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Footprint>
     <Square width="38.5" depth="9.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/pers_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Footprint>
     <Square width="26.0" depth="9.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/pers_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Footprint>
     <Square width="14.0" depth="8.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/pers_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_tower">
+<Entity parent="template_structure_defensive_wall_tower">
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>18.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_stone">
+<Entity parent="template_structure_defensive_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>18.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_outpost">
+<Entity parent="template_structure_defensive_tower_outpost">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>mktr-n-ḫt</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_sentry">
+<Entity parent="template_structure_defensive_tower_sentry">
   <Identity>
     <Civ>ptol</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Footprint>
     <Square width="42.0" depth="14.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Footprint>
     <Square width="40" depth="10.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Footprint>
     <Square width="28.0" depth="10.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Footprint>
     <Square width="16.0" depth="10.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_tower">
+<Entity parent="template_structure_defensive_wall_tower">
   <Footprint>
     <Square width="12" depth="12"/>
     <Height>15.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_stone">
+<Entity parent="template_structure_defensive_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>15.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/rome_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_outpost">
+<Entity parent="template_structure_defensive_tower_outpost">
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Vigilarium</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/rome_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_sentry">
+<Entity parent="template_structure_defensive_tower_sentry">
   <Identity>
     <Civ>rome</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Armour>
     <Hack>15.0</Hack>
     <Pierce>35.0</Pierce>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Armour>
     <Hack>15.0</Hack>
     <Pierce>35.0</Pierce>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Armour>
     <Hack>15.0</Hack>
     <Pierce>35.0</Pierce>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Armour>
     <Hack>15.0</Hack>
     <Pierce>35.0</Pierce>
Index: binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_tower">
+<Entity parent="template_structure_defensive_wall_tower">
   <Armour>
     <Hack>15.0</Hack>
     <Pierce>35.0</Pierce>
Index: binaries/data/mods/public/simulation/templates/structures/rome_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Footprint>
     <Square width="38.5" depth="8.5"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/rome_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Footprint>
     <Square width="38.5" depth="9.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/rome_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Footprint>
     <Square width="26.5" depth="9.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/rome_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Footprint>
     <Square width="14.5" depth="9.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/rome_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_tower">
+<Entity parent="template_structure_defensive_wall_tower">
   <Footprint>
     <Square width="12.5" depth="12.5"/>
     <Height>18.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_stone">
+<Entity parent="template_structure_defensive_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.5"/>
     <Height>15.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/sele_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_outpost">
+<Entity parent="template_structure_defensive_tower_outpost">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Prophylax</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/sele_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_sentry">
+<Entity parent="template_structure_defensive_tower_sentry">
   <Identity>
     <Civ>sele</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/sele_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Footprint>
     <Square width="39.0" depth="8.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/sele_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Footprint>
     <Square width="35.5" depth="7.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Footprint>
     <Square width="26.0" depth="7.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/sele_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Footprint>
     <Square width="14.0" depth="7.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/sele_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_tower">
+<Entity parent="template_structure_defensive_wall_tower">
   <Footprint>
     <Square width="9.0" depth="9.0"/>
     <Height>15.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_stone">
+<Entity parent="template_structure_defensive_tower_stone">
   <Footprint>
     <Square width="10.0" depth="10.5"/>
     <Height>15.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/spart_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_outpost.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_outpost">
+<Entity parent="template_structure_defensive_tower_outpost">
   <Identity>
     <Civ>spart</Civ>
     <GenericName>Greek Outpost</GenericName>
Index: binaries/data/mods/public/simulation/templates/structures/spart_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower_sentry">
+<Entity parent="template_structure_defensive_tower_sentry">
   <Identity>
     <Civ>spart</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/spart_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_gate">
+<Entity parent="template_structure_defensive_wall_gate">
   <Footprint>
     <Square width="39.0" depth="8.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/spart_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Footprint>
     <Square width="38.5" depth="7.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/spart_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_medium">
+<Entity parent="template_structure_defensive_wall_medium">
   <Footprint>
     <Square width="26.0" depth="7.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/spart_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_short">
+<Entity parent="template_structure_defensive_wall_short">
   <Footprint>
     <Square width="14.0" depth="7.0"/>
     <Height>9.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/spart_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_tower">
+<Entity parent="template_structure_defensive_wall_tower">
   <Footprint>
     <Square width="9.0" depth="9.0"/>
     <Height>15.0</Height>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense.xml
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure">
-  <Armour>
-    <Hack>25</Hack>
-    <Pierce>30</Pierce>
-    <Crush>3</Crush>
-    <Foundation>
-      <Hack>1.0</Hack>
-      <Pierce>5.0</Pierce>
-      <Crush>1.0</Crush>
-    </Foundation>
-  </Armour>
-  <Identity>
-    <GenericName>Defensive Structure</GenericName>
-    <Classes datatype="tokens">Defensive</Classes>
-  </Identity>
-  <Loot>
-    <xp>100</xp>
-  </Loot>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_tower.xml
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense">
-  <Attack>
-    <Ranged>
-      <Hack>0</Hack>
-      <Pierce>0</Pierce>
-      <Crush>0</Crush>
-      <ProjectileSpeed>75.0</ProjectileSpeed>
-      <Gravity>9.81</Gravity>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-      <Spread>1.5</Spread>
-      <Delay>0</Delay>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-      <RangeOverlay>
-        <LineTexture>outline_border.png</LineTexture>
-        <LineTextureMask>outline_border_mask.png</LineTextureMask>
-        <LineThickness>0.175</LineThickness>
-      </RangeOverlay>
-    </Ranged>
-  </Attack>
-  <BuildingAI>
-    <DefaultArrowCount>1</DefaultArrowCount>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-    <GarrisonArrowClasses>Infantry</GarrisonArrowClasses>
-  </BuildingAI>
-  <BuildRestrictions>
-    <Category>DefenseTower</Category>
-    <Distance>
-      <FromClass>DefenseTower</FromClass>
-      <MinDistance>60</MinDistance>
-    </Distance>
-  </BuildRestrictions>
-  <GarrisonHolder>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
-  </GarrisonHolder>
-  <Health>
-    <Max>1000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Classes datatype="tokens">Tower -ConquestCritical</Classes>
-  </Identity>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <constructed>interface/complete/building/complete_tower.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-      <select>interface/select/building/sel_tower.xml</select>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.6</BarHeight>
-    <HeightOffset>18.0</HeightOffset>
-  </StatusBars>
-  <Vision>
-    <Range>80</Range>
-  </Vision>
-  <VisualActor>
-    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_tower_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_tower_outpost.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_tower_outpost.xml
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower">
-  <Armour>
-    <Hack>5</Hack>
-    <Pierce>20</Pierce>
-    <Crush>1</Crush>
-    <Foundation>
-      <Hack>1</Hack>
-      <Pierce>5</Pierce>
-      <Crush>1</Crush>
-    </Foundation>
-  </Armour>
-  <Attack>
-    <Ranged>
-      <Pierce>16</Pierce>
-      <MaxRange>55</MaxRange>
-      <MinRange>13</MinRange>
-      <ElevationBonus>0</ElevationBonus>
-    </Ranged>
-  </Attack>
-  <BuildingAI>
-    <DefaultArrowCount>0</DefaultArrowCount>
-  </BuildingAI>
-  <BuildRestrictions>
-    <Category>Outpost</Category>
-    <Distance>
-      <FromClass>Outpost</FromClass>
-      <MinDistance>50</MinDistance>
-    </Distance>
-    <Territory>own neutral</Territory>
-  </BuildRestrictions>
-  <Cost>
-    <BuildTime>40</BuildTime>
-    <Resources>
-      <wood>80</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="9.0" depth="9.0"/>
-    <Height>15.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>1</Max>
-  </GarrisonHolder>
-  <Health>
-    <Max>800</Max>
-  </Health>
-  <Identity>
-    <GenericName>Outpost</GenericName>
-    <Tooltip>Build in neutral and own territories to scout areas of the map. Slowly converts to Gaia while in neutral territory.</Tooltip>
-    <VisibleClasses datatype="tokens">Village Outpost</VisibleClasses>
-    <Icon>structures/outpost.png</Icon>
-  </Identity>
-  <Loot>
-    <wood>8</wood>
-  </Loot>
-  <Obstruction>
-    <Static width="6.5" depth="6.5"/>
-  </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      tower_vision
-      tower_decay
-    </Technologies>
-  </ProductionQueue>
-  <TerritoryDecay>
-    <DecayRate>2</DecayRate>
-  </TerritoryDecay>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_outpost.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_tower_sentry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_tower_sentry.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_tower_sentry.xml
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower">
-  <Armour>
-    <Hack op="add">-5</Hack>
-    <Pierce op="add">-5</Pierce>
-    <Crush op="add">-2</Crush>
-  </Armour>
-  <Attack>
-    <Ranged>
-      <Pierce>9</Pierce>
-      <MaxRange>70</MaxRange>
-      <MinRange>10</MinRange>
-      <ElevationBonus>9</ElevationBonus>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <BuildTime>40</BuildTime>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="9.5" depth="8.5"/>
-    <Height>9.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>3</Max>
-  </GarrisonHolder>
-  <Health>
-    <Max>500</Max>
-  </Health>
-  <Identity>
-    <GenericName>Sentry Tower</GenericName>
-    <Icon>structures/sentry_tower.png</Icon>
-    <Classes datatype="tokens">GarrisonTower</Classes>
-    <VisibleClasses datatype="tokens">Village DefenseTower SentryTower</VisibleClasses>
-    <Tooltip>Shoots arrows. Garrison to provide extra defence. Needs the murder holes tech to protect its foot. Upgradeable to stone tower.</Tooltip>
-  </Identity>
-  <Loot>
-    <wood>20</wood>
-  </Loot>
-  <Obstruction>
-    <Static width="9.0" depth="7.5"/>
-  </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      tower_watch
-    </Technologies>
-  </ProductionQueue>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>16</Radius>
-    <Weight>30000</Weight>
-  </TerritoryInfluence>
-  <Upgrade>
-    <Tower>
-      <Entity>structures/{civ}_defense_tower</Entity>
-      <Tooltip>Reinforce with stone and upgrade to a defense tower.</Tooltip>
-      <RequiredTechnology>phase_town</RequiredTechnology>
-      <Cost>
-        <wood>50</wood>
-        <stone>100</stone>
-      </Cost>
-      <Time>100</Time>
-    </Tower>
-  </Upgrade>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_fort.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_tower_stone.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_tower_stone.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_tower_stone.xml
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower">
-  <Attack>
-    <Ranged>
-      <Pierce>12</Pierce>
-      <MaxRange>76</MaxRange>
-      <MinRange>10</MinRange>
-      <ElevationBonus>15</ElevationBonus>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <BuildTime>150</BuildTime>
-    <Resources>
-      <wood>100</wood>
-      <stone>100</stone>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="10.0" depth="10.0"/>
-    <Height>15.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>5</Max>
-  </GarrisonHolder>
-  <Health>
-    <Max>1000</Max>
-  </Health>
-  <Identity>
-    <GenericName>Defense Tower</GenericName>
-    <Tooltip>Shoots arrows. Garrison to provide extra defence. Needs the murder holes tech to protect its foot.</Tooltip>
-    <Classes datatype="tokens">GarrisonTower</Classes>
-    <VisibleClasses datatype="tokens">Town DefenseTower StoneTower</VisibleClasses>
-    <Icon>structures/defense_tower.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Loot>
-    <wood>0</wood>
-    <stone>20</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="7.0" depth="7.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      tower_watch
-      tower_crenellations
-      tower_range
-      tower_murderholes
-      tower_armour
-    </Technologies>
-  </ProductionQueue>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>32</Radius>
-    <Weight>30000</Weight>
-  </TerritoryInfluence>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense">
-  <BuildRestrictions>
-    <PlacementType>land-shore</PlacementType>
-    <Category>Wall</Category>
-  </BuildRestrictions>
-  <Capturable>
-    <CapturePoints>1200</CapturePoints>
-  </Capturable>
-  <Cost>
-    <BuildTime>25</BuildTime>
-    <Resources>
-      <stone>20</stone>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="6.0" depth="6.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <Health>
-    <Max>3000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Classes datatype="tokens">-ConquestCritical Defensive StoneWall</Classes>
-    <GenericName>Stone Wall</GenericName>
-    <Tooltip>Wall off your town for a stout defense.</Tooltip>
-    <Icon>structures/wall.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Loot>
-    <wood>0</wood>
-    <stone>15</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="6.0" depth="6.0"/>
-  </Obstruction>
-  <ProductionQueue disable=""/>
-  <RallyPoint disable=""/>
-  <Repairable>
-    <RepairTimeRatio>4.5</RepairTimeRatio>
-  </Repairable>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_wall.xml</select>
-      <constructed>interface/complete/building/complete_wall.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <TerritoryDecay>
-    <DecayRate>5.0</DecayRate>
-  </TerritoryDecay>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>20</Radius>
-    <Weight>65535</Weight>
-  </TerritoryInfluence>
-  <Vision>
-    <Range>20</Range>
-  </Vision>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
-  <Auras disable=""/>
-  <!-- We don't disable the Cost component, although gates cannot be built directly, as Cost/BuildTime is required to prevent instantaneous repair -->
-  <GarrisonHolder disable=""/>
-  <Gate>
-    <PassRange>20</PassRange>
-  </Gate>
-  <Health>
-    <Max op="mul">0.85</Max>
-  </Health>
-  <Identity>
-    <Classes datatype="tokens">Gates</Classes>
-    <GenericName>City Gate</GenericName>
-    <Icon>structures/gate.png</Icon>
-    <Tooltip>Allow units access through a city wall. Can be locked to prevent access.</Tooltip>
-  </Identity>
-  <Obstruction>
-    <Static disable=""/>
-    <Obstructions>
-      <Right width="5" depth="5" x="10" z="0"/>
-      <Left width="5" depth="5" x="-10" z="0"/>
-      <Door width="20.0" depth="6.5" x="0" z="0"/>
-    </Obstructions>
-  </Obstruction>
-  <RallyPoint disable=""/>
-  <Repairable>
-    <RepairTimeRatio op="mul">0.85</RepairTimeRatio>
-  </Repairable>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_gate.xml</select>
-      <constructed>interface/complete/building/complete_gate.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-      <gate_closing>actor/gate/stonegate_close.xml</gate_closing>
-      <gate_opening>actor/gate/stonegate_open.xml</gate_opening>
-      <gate_locked>interface/select/building/sel_gate.xml</gate_locked>
-      <gate_unlocked>interface/select/building/sel_gate.xml</gate_unlocked>
-    </SoundGroups>
-  </Sound>
-  <Upgrade disable=""/>
-  <VisualActor>
-    <FoundationActor>structures/fndn_wall_long.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
-  <Auras datatype="tokens">
-    structures/wall_garrisoned
-  </Auras>
-  <Cost>
-    <BuildTime>45</BuildTime>
-    <Resources>
-      <stone>28</stone>
-    </Resources>
-  </Cost>
-  <GarrisonHolder>
-    <Max>5</Max>
-    <List datatype="tokens">Ranged+Infantry</List>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
-    <VisibleGarrisonPoints>
-      <Archer1>
-        <X>0</X><Y>11.5</Y><Z>0</Z>
-      </Archer1>
-      <Archer2>
-        <X>8</X><Y>11.5</Y><Z>0</Z>
-      </Archer2>
-      <Archer3>
-        <X>-8</X><Y>11.5</Y><Z>0</Z>
-      </Archer3>
-      <Archer4>
-        <X>4</X><Y>11.5</Y><Z>0</Z>
-      </Archer4>
-      <Archer5>
-        <X>-4</X><Y>11.5</Y><Z>0</Z>
-      </Archer5>
-    </VisibleGarrisonPoints>
-  </GarrisonHolder>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_wall_long</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Classes datatype="tokens">LongWall</Classes>
-    <Tooltip>Long wall segments can be converted to gates.</Tooltip>
-  </Identity>
-  <RallyPoint/>
-  <Upgrade>
-    <Gate>
-      <Entity>structures/{civ}_wall_gate</Entity>
-      <Tooltip>This will allow you to let units circulate through your fortifications.</Tooltip>
-      <Cost>
-        <stone>60</stone>
-      </Cost>
-      <Time>10</Time>
-    </Gate>
-  </Upgrade>
-  <VisualActor>
-    <FoundationActor>structures/fndn_wall_long.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
-  <Auras datatype="tokens">
-    structures/wall_garrisoned
-  </Auras>
-  <Cost>
-    <BuildTime>30</BuildTime>
-    <Resources>
-      <stone>22</stone>
-    </Resources>
-  </Cost>
-  <GarrisonHolder>
-    <Max>3</Max>
-    <List datatype="tokens">Ranged+Infantry</List>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
-    <VisibleGarrisonPoints>
-      <Archer1>
-        <X>0</X><Y>11.5</Y><Z>0</Z>
-      </Archer1>
-      <Archer2>
-        <X>4</X><Y>11.5</Y><Z>0</Z>
-      </Archer2>
-      <Archer3>
-        <X>-4</X><Y>11.5</Y><Z>0</Z>
-      </Archer3>
-    </VisibleGarrisonPoints>
-  </GarrisonHolder>
-  <Health>
-    <Max>2000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_wall_medium</SpawnEntityOnDeath>
-  </Health>
-  <RallyPoint/>
-  <VisualActor>
-    <FoundationActor>structures/fndn_wall_medium.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_wall_short.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
-  <Cost>
-    <BuildTime>15</BuildTime>
-    <Resources>
-      <stone>15</stone>
-    </Resources>
-  </Cost>
-  <Health>
-    <Max>1000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_wall_short</SpawnEntityOnDeath>
-  </Health>
-  <VisualActor>
-    <FoundationActor>structures/fndn_wall_short.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense">
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>8.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>72.0</MaxRange>
-      <MinRange>12.0</MinRange>
-      <ProjectileSpeed>75.0</ProjectileSpeed>
-      <Gravity>9.81</Gravity>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-      <Spread>1.5</Spread>
-      <Delay>0</Delay>
-      <PreferredClasses datatype="tokens">Human</PreferredClasses>
-      <RangeOverlay>
-        <LineTexture>outline_border.png</LineTexture>
-        <LineTextureMask>outline_border_mask.png</LineTextureMask>
-        <LineThickness>0.175</LineThickness>
-      </RangeOverlay>
-    </Ranged>
-  </Attack>
-  <BuildingAI>
-    <DefaultArrowCount>0</DefaultArrowCount>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-    <GarrisonArrowClasses>Infantry</GarrisonArrowClasses>
-  </BuildingAI>
-  <BuildRestrictions>
-    <PlacementType>land-shore</PlacementType>
-    <Category>Wall</Category>
-  </BuildRestrictions>
-  <Capturable>
-    <CapturePoints>1200</CapturePoints>
-  </Capturable>
-  <Cost>
-    <BuildTime>80</BuildTime>
-    <Resources>
-      <stone>90</stone>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="6.0" depth="6.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>2</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
-  </GarrisonHolder>
-  <Health>
-    <Max>4000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_wall_tower</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <GenericName>Wall Turret</GenericName>
-    <Tooltip>Shoots arrows. Garrison to defend a city wall against attackers.</Tooltip>
-    <Classes datatype="tokens">-ConquestCritical StoneWall Tower</Classes>
-    <Icon>structures/tower.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Loot>
-    <wood>0</wood>
-    <stone>15</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="6.0" depth="6.0"/>
-    <ControlPersist/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Technologies datatype="tokens">
-      pair_walls_01
-    </Technologies>
-  </ProductionQueue>
-  <Repairable>
-    <RepairTimeRatio>4.5</RepairTimeRatio>
-  </Repairable>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_tower.xml</select>
-      <constructed>interface/complete/building/complete_tower.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>20.0</HeightOffset>
-  </StatusBars>
-  <TerritoryDecay>
-    <DecayRate>5.0</DecayRate>
-  </TerritoryDecay>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>20</Radius>
-    <Weight>65535</Weight>
-  </TerritoryInfluence>
-  <Vision>
-    <Range>60</Range>
-  </Vision>
-  <VisualActor>
-    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense">
+<Entity parent="template_structure_defensive">
   <Attack>
     <Ranged>
       <Hack>0</Hack>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower">
+<Entity parent="template_structure_defensive_tower">
   <Armour>
     <Hack>5</Hack>
     <Pierce>20</Pierce>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower">
+<Entity parent="template_structure_defensive_tower">
   <Armour>
     <Hack op="add">-5</Hack>
     <Pierce op="add">-5</Pierce>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_tower">
+<Entity parent="template_structure_defensive_tower">
   <Attack>
     <Ranged>
       <Pierce>12</Pierce>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense">
+<Entity parent="template_structure_defensive">
   <BuildRestrictions>
     <PlacementType>land-shore</PlacementType>
     <Category>Wall</Category>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_gate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall_long">
+<Entity parent="template_structure_defensive_wall_long">
   <Auras disable=""/>
   <!-- We don't disable the Cost component, although gates cannot be built directly, as Cost/BuildTime is required to prevent instantaneous repair -->
   <GarrisonHolder disable=""/>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_long.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
+<Entity parent="template_structure_defensive_wall">
   <Auras datatype="tokens">
     structures/wall_garrisoned
   </Auras>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_medium.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_medium.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
+<Entity parent="template_structure_defensive_wall">
   <Auras datatype="tokens">
     structures/wall_garrisoned
   </Auras>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_short.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_short.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_short.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense_wall">
+<Entity parent="template_structure_defensive_wall">
   <Cost>
     <BuildTime>15</BuildTime>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defense">
+<Entity parent="template_structure_defensive">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>