Index: binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
+++ binaries/data/mods/public/simulation/templates/campaigns/campaign_city_minor_test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Attack>
     <Ranged>
       <Damage>
Index: binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
+++ binaries/data/mods/public/simulation/templates/campaigns/campaign_city_test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Attack>
     <Ranged>
       <Damage>
Index: binaries/data/mods/public/simulation/templates/skirmish/structures/default_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/structures/default_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/structures/default_civil_centre.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/athen_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_civil_centre.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_hele_cc</SpawnEntityOnDeath>
   </Health>
Index: binaries/data/mods/public/simulation/templates/structures/brit_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_civil_centre.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Footprint replace="">
     <Circle radius="15.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/brit_crannog.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_crannog.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_crannog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <BuildRestrictions>
     <Territory>own ally neutral</Territory>
     <PlacementType>shore</PlacementType>
Index: binaries/data/mods/public/simulation/templates/structures/cart_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_civil_centre.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_kart_cc</SpawnEntityOnDeath>
   </Health>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_civil_centre.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Footprint>
     <Square width="28.0" depth="28.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/iber_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_civil_centre.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_iber_cc</SpawnEntityOnDeath>
   </Health>
Index: binaries/data/mods/public/simulation/templates/structures/kush_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_civil_centre.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Footprint>
     <Square width="32.0" depth="32"/>
     <Height>10.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/mace_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_civil_centre.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_hele_cc</SpawnEntityOnDeath>
   </Health>
Index: binaries/data/mods/public/simulation/templates/structures/maur_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_civil_centre.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Footprint>
     <Square width="40.0" depth="34.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/pers_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_civil_centre.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_pers_cc</SpawnEntityOnDeath>
   </Health>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Footprint>
     <Square width="41" depth="33"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre_military_colony">
+<Entity parent="template_structure_civic_center_colony">
   <Footprint>
     <Square width="40.0" depth="40.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/rome_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_civil_centre.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Footprint>
     <Square width="40.0" depth="40.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/sele_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_civil_centre.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Agorā́</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre_military_colony">
+<Entity parent="template_structure_civic_center_colony">
   <Footprint>
     <Square width="31.0" depth="31.0"/>
     <Height>8.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/spart_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_civil_centre.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <Health>
     <SpawnEntityOnDeath>decay|rubble/rubble_hele_cc</SpawnEntityOnDeath>
   </Health>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_center_colony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_center_colony.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_center_colony.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
+<Entity parent="template_structure_civic_center">
   <BuildingAI>
     <DefaultArrowCount>1</DefaultArrowCount>
   </BuildingAI>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic">
-  <AlertRaiser>
-    <List datatype="tokens">FemaleCitizen</List>
-    <RaiseAlertRange>140</RaiseAlertRange>
-    <EndOfAlertRange>190</EndOfAlertRange>
-    <SearchRange>100</SearchRange>
-  </AlertRaiser>
-  <Armour>
-    <Hack op="add">5</Hack>
-    <Pierce op="add">5</Pierce>
-    <Foundation>
-      <Hack>5</Hack>
-      <Pierce>15</Pierce>
-      <Crush>3</Crush>
-    </Foundation>
-  </Armour>
-  <Attack>
-    <Ranged>
-      <Damage>
-        <Hack>0.0</Hack>
-        <Pierce>12.0</Pierce>
-        <Crush>0.0</Crush>
-      </Damage>
-      <MaxRange>72.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <PrepareTime>1200</PrepareTime>
-      <RepeatTime>2000</RepeatTime>
-      <Delay>0</Delay>
-      <Projectile>
-        <Speed>75.0</Speed>
-        <Spread>1.5</Spread>
-        <Gravity>9.81</Gravity>
-        <LaunchPoint y="3"/>
-      </Projectile>
-      <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>3</DefaultArrowCount>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-  </BuildingAI>
-  <BuildRestrictions>
-    <Territory>own neutral</Territory>
-    <Category>CivilCentre</Category>
-    <Distance>
-      <FromClass>CivilCentre</FromClass>
-      <MinDistance>200</MinDistance>
-    </Distance>
-  </BuildRestrictions>
-  <Capturable>
-    <CapturePoints>2500</CapturePoints>
-    <RegenRate>5.0</RegenRate>
-  </Capturable>
-  <Cost>
-    <PopulationBonus>20</PopulationBonus>
-    <BuildTime>500</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>500</wood>
-      <stone>500</stone>
-      <metal>500</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="32.0" depth="32.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>20</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry Cavalry</List>
-    <BuffHeal>1</BuffHeal>
-    <LoadingRange>1</LoadingRange>
-  </GarrisonHolder>
-  <Health>
-    <Max>3000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <GenericName>Civic Center</GenericName>
-    <Tooltip>Build to acquire large tracts of territory. Train citizens.</Tooltip>
-    <Classes datatype="tokens">Defensive CivCentre</Classes>
-    <VisibleClasses datatype="tokens">CivilCentre</VisibleClasses>
-    <Icon>structures/civic_centre.png</Icon>
-  </Identity>
-  <Loot>
-    <xp>200</xp>
-    <food>0</food>
-    <wood>200</wood>
-    <stone>200</stone>
-    <metal>200</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="30.0" depth="30.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_support_female_citizen
-    </Entities>
-    <Technologies datatype="tokens">
-      phase_town_{civ}
-      phase_city_{civ}
-      unlock_spies
-      spy_counter
-    </Technologies>
-  </ProductionQueue>
-  <ResourceDropsite>
-    <Types>food wood stone metal</Types>
-    <Sharable>true</Sharable>
-  </ResourceDropsite>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_civ_center.xml</select>
-      <constructed>interface/complete/building/complete_civ_center.xml</constructed>
-      <alert_raise>interface/alarm/alarm_alert_0.xml</alert_raise>
-      <alert_end>interface/alarm/alarm_alert_1.xml</alert_end>
-    </SoundGroups>
-  </Sound>
-  <TerritoryInfluence>
-    <Root>true</Root>
-    <Radius>140</Radius>
-    <Weight>10000</Weight>
-  </TerritoryInfluence>
-  <Vision>
-    <Range>90</Range>
-  </Vision>
-  <VisualActor>
-    <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_civil_centre">
-  <BuildingAI>
-    <DefaultArrowCount>1</DefaultArrowCount>
-  </BuildingAI>
-  <BuildRestrictions>
-    <Territory>own neutral</Territory>
-    <Category>Colony</Category>
-    <Distance>
-      <FromClass>CivilCentre</FromClass>
-      <MinDistance>120</MinDistance>
-    </Distance>
-  </BuildRestrictions>
-  <Cost>
-    <BuildTime>300</BuildTime>
-    <Resources>
-      <wood>200</wood>
-      <stone>200</stone>
-      <metal>200</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <Max>2000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <GenericName>Military Colony</GenericName>
-    <Classes datatype="tokens">Colony</Classes>
-    <Icon>structures/military_settlement.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Obstruction>
-    <Static width="23.0" depth="23.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      -phase_town_{civ}
-      -phase_city_{civ}
-      upgrade_rank_advanced_mercenary
-    </Technologies>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_gymnasium.xml</select>
-      <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
-    </SoundGroups>
-  </Sound>
-  <TerritoryDecay>
-    <DecayRate>1</DecayRate>
-  </TerritoryDecay>
-  <TerritoryInfluence>
-    <Radius>80</Radius>
-  </TerritoryInfluence>
-</Entity>