Index: binaries/data/mods/public/simulation/ai/petra/baseManager.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/baseManager.js
+++ binaries/data/mods/public/simulation/ai/petra/baseManager.js
@@ -801,7 +801,7 @@
 		    target.getMetadata(PlayerID, "phaseUp") == true)
 			targetNB = 7;
 		else if (target.hasClass("Barracks") || target.hasClass("Range") || target.hasClass("Stable") ||
-		         target.hasClass("DefenseTower") || target.hasClass("Market"))
+		         target.hasClass("Tower") || target.hasClass("Market"))
 			targetNB = 4;
 		else if (target.hasClass("House") || target.hasClass("DropsiteWood"))
 			targetNB = 3;
Index: binaries/data/mods/public/simulation/ai/petra/config.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/config.js
+++ binaries/data/mods/public/simulation/ai/petra/config.js
@@ -19,7 +19,7 @@
 		"popForBarracks1": 25,
 		"popForBarracks2": 95,
 		"popForBlacksmith": 65,
-		"numSentryTowers": 1
+		"numSmallTowers": 1
 	};
 
 	// Define damage type importance factors here.
@@ -178,24 +178,24 @@
 	{
 		this.Economy.supportRatio = 0.5;
 		this.Economy.provisionFields = 1;
-		this.Military.numSentryTowers = this.personality.defensive > this.personalityCut.strong ? 1 : 0;
+		this.Military.numSmallTowers = this.personality.defensive > this.personalityCut.strong ? 1 : 0;
 	}
 	else if (this.difficulty < 3)
 	{
 		this.Economy.supportRatio = 0.4;
 		this.Economy.provisionFields = 1;
-		this.Military.numSentryTowers = this.personality.defensive > this.personalityCut.strong ? 1 : 0;
+		this.Military.numSmallTowers = this.personality.defensive > this.personalityCut.strong ? 1 : 0;
 	}
 	else
 	{
 		if (this.difficulty == 3)
-			this.Military.numSentryTowers = 1;
+			this.Military.numSmallTowers = 1;
 		else
-			this.Military.numSentryTowers = 2;
+			this.Military.numSmallTowers = 2;
 		if (this.personality.defensive > this.personalityCut.strong)
-			++this.Military.numSentryTowers;
+			++this.Military.numSmallTowers;
 		else if (this.personality.defensive < this.personalityCut.weak)
-			--this.Military.numSentryTowers;
+			--this.Military.numSmallTowers;
 
 		if (this.personality.aggressive > this.personalityCut.strong)
 		{
Index: binaries/data/mods/public/simulation/ai/petra/headquarters.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/headquarters.js
+++ binaries/data/mods/public/simulation/ai/petra/headquarters.js
@@ -1864,11 +1864,11 @@
 		}
 	}
 
-	if (this.Config.Military.numSentryTowers && this.currentPhase < 2 && this.canBuild(gameState, "structures/{civ}_sentry_tower"))
+	if (this.Config.Military.numSmallTowers && this.currentPhase < 2 && this.canBuild(gameState, "structures/{civ}_sentry_tower"))
 	{
 		let numTowers = gameState.getOwnEntitiesByClass("Tower", true).length;	// we count all towers, including wall towers
 		let towerLapseTime = this.saveResource ? (1 + 0.5*numTowers) * this.towerLapseTime : this.towerLapseTime;
-		if (numTowers < this.Config.Military.numSentryTowers && gameState.ai.elapsedTime > towerLapseTime + this.fortStartTime)
+		if (numTowers < this.Config.Military.numSmallTowers && gameState.ai.elapsedTime > towerLapseTime + this.fortStartTime)
 		{
 			this.fortStartTime = gameState.ai.elapsedTime;
 			queues.defenseBuilding.addPlan(new PETRA.ConstructionPlan(gameState, "structures/{civ}_sentry_tower"));
@@ -1879,12 +1879,12 @@
 	if (this.currentPhase < 2 || !this.canBuild(gameState, "structures/{civ}_defense_tower"))
 		return;
 
-	let numTowers = gameState.getOwnEntitiesByClass("StoneTower", true).length;
+	let numTowers = gameState.getOwnEntitiesByClass("LargeTower", true).length;
 	let towerLapseTime = this.saveResource ? (1 + numTowers) * this.towerLapseTime : this.towerLapseTime;
-	if ((!numTowers || gameState.ai.elapsedTime > (1 + 0.1*numTowers)*towerLapseTime + this.towerStartTime) &&
+	if ((!numTowers || gameState.ai.elapsedTime > (1 + 0.1 * numTowers)*towerLapseTime + this.towerStartTime) &&
 		numTowers < 2 * this.numActiveBases() + 3 + this.extraTowers &&
 		numTowers < Math.floor(gameState.getPopulation() / 8) &&
-		gameState.getOwnFoundationsByClass("DefenseTower").length < 3)
+		gameState.getOwnFoundationsByClass("Tower").length < 3)
 	{
 		this.towerStartTime = gameState.ai.elapsedTime;
 		if (numTowers > 2 * this.numActiveBases() + 3)
Index: binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
+++ binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
@@ -152,7 +152,7 @@
 			}
 			return false;
 		}
-		else if (template.hasClass("DefenseTower") || template.hasClass("Fortress") || template.hasClass("ArmyCamp"))
+		else if (template.hasClass("Tower") || template.hasClass("Fortress") || template.hasClass("ArmyCamp"))
 		{
 			let pos = HQ.findDefensiveLocation(gameState, template);
 			if (pos)
Index: binaries/data/mods/public/simulation/components/BuildRestrictions.js
===================================================================
--- binaries/data/mods/public/simulation/components/BuildRestrictions.js
+++ binaries/data/mods/public/simulation/components/BuildRestrictions.js
@@ -32,7 +32,7 @@
 			"</oneOrMore>" +
 		"</list>" +
 	"</element>" +
-	"<element name='Category' a:help='Specifies the category of this building, for satisfying special constraints. Choices include: Apadana, ArmyCamp, Barracks, CivilCentre, Colony, Council, DefenseTower, Dock, Embassy, Farmstead, Fence, Field, Fortress, Hall, House, Kennel, Library, Market, Monument, Outpost, Pillar, Resource, Special, Stoa, Storehouse, Temple, Theater, UniqueBuilding, Wall, Wonder'>" +
+	"<element name='Category' a:help='Specifies the category of this building, for satisfying special constraints. Choices include: Apadana, ArmyCamp, Barracks, CivilCentre, Colony, Council, Dock, Embassy, Farmstead, Fence, Field, Fortress, Hall, House, Kennel, Library, Market, Monument, Outpost, Pillar, Resource, Special, Stoa, Storehouse, Temple, Theater, Tower, UniqueBuilding, Wall, Wonder'>" +
 		"<text/>" +
 	"</element>" +
 	"<optional>" +
Index: binaries/data/mods/public/simulation/components/EntityLimits.js
===================================================================
--- binaries/data/mods/public/simulation/components/EntityLimits.js
+++ binaries/data/mods/public/simulation/components/EntityLimits.js
@@ -4,7 +4,7 @@
 	"<a:help>Specifies per category limits on number of entities (buildings or units) that can be created for each player</a:help>" +
 	"<a:example>" +
 		"<Limits>" +
-			"<DefenseTower>25</DefenseTower>" +
+			"<Tower>30</Tower>" +
 			"<Fortress>10</Fortress>" +
 			"<Wonder>1</Wonder>" +
 			"<Hero>1</Hero>" +
Index: binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- binaries/data/mods/public/simulation/components/Identity.js
+++ binaries/data/mods/public/simulation/components/Identity.js
@@ -57,7 +57,7 @@
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: Animal, Apadana, ArmyCamp, Ashoka, BarterMarket, Celt, CitizenSoldier, CivCentre, Colony, ConquestCritical, Defensive, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FemaleCitizen, FishingBoat, ForestPlant, Fortress, GarrisonFortress, GarrisonTower, Gates, Human, Iberian, Immortal, Italian, Juggernaut, Kennel, Lighthouse, LongWall, MercenaryCamp, Naval, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Tower, Unit.'>" +
+		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: Animal, Apadana, ArmyCamp, Ashoka, BarterMarket, Celt, CitizenSoldier, CivCentre, Colony, ConquestCritical, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FemaleCitizen, FishingBoat, ForestPlant, Fortress, GarrisonFortress, Gates, Human, Iberian, Immortal, Italian, Juggernaut, Kennel, Lighthouse, LongWall, MercenaryCamp, Naval, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Unit.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
@@ -65,7 +65,7 @@
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Archer, Axeman, Barracks, Bireme, Blacksmith, BoltShooter, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Clubman, Corral, Crossbowman, DefenseTower, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelinist, Maceman, Melee, Market, Mercenary, Military, Outpost, Pikeman, Quadrireme, Quinquereme, Ram, Range, Ranged, Relic, Resource, SentryTower, Ship, Shipyard, Siege, SiegeTower, Slave, Slinger, Soldier, Spearman, Stable, StoneThrower, Storehouse, Support, Swordsman, Temple, Town, Trader, Trireme, Village, Warship, Wonder, Worker, Workshop.'>" +
+		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Archer, ArtilleryTower, Axeman, Barracks, Bireme, Blacksmith, BoltShooter, BoltTower, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Clubman, Corral, Crossbowman, Defensive, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelinist, LargeTower, Maceman, Melee, Market, Mercenary, Military, Outpost, Pikeman, Quadrireme, Quinquereme, Ram, Range, Ranged, Relic, Resource, Ship, Shipyard, Siege, SiegeTower, Slave, Slinger, SmallTower, Soldier, Spearman, Stable, StoneThrower, Storehouse, Support, Swordsman, Temple, Tower, Town, Trader, Trireme, Village, Warship, Wonder, Worker, Workshop.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
Index: binaries/data/mods/public/simulation/data/technologies/tower_armour.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/tower_armour.json
+++ binaries/data/mods/public/simulation/data/technologies/tower_armour.json
@@ -12,6 +12,6 @@
 		{ "value": "Armour/Pierce", "add": 2 },
 		{ "value": "Armour/Crush", "add": 2 }
 	],
-	"affects": ["DefenseTower"],
+	"affects": ["Tower"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/tower_crenellations.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/tower_crenellations.json
+++ binaries/data/mods/public/simulation/data/technologies/tower_crenellations.json
@@ -10,6 +10,6 @@
 	"modifications": [
 		{ "value": "BuildingAI/GarrisonArrowMultiplier", "multiply": 1.4 }
 	],
-	"affects": ["DefenseTower"],
+	"affects": ["LargeTower", "SmallTower"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/tower_murderholes.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/tower_murderholes.json
+++ binaries/data/mods/public/simulation/data/technologies/tower_murderholes.json
@@ -10,6 +10,6 @@
 	"modifications": [
 		{ "value": "Attack/Ranged/MinRange", "replace": 0 }
 	],
-	"affects": ["DefenseTower"],
+	"affects": ["Tower"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/tower_range.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/tower_range.json
+++ binaries/data/mods/public/simulation/data/technologies/tower_range.json
@@ -11,6 +11,6 @@
 		{ "value": "Attack/Ranged/MaxRange", "add": 8 },
 		{ "value": "Vision/Range","add": 8 }
 	],
-	"affects": ["DefenseTower"],
+	"affects": ["Tower"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/tower_watch.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/tower_watch.json
+++ binaries/data/mods/public/simulation/data/technologies/tower_watch.json
@@ -18,6 +18,6 @@
 	"modifications": [
 		{ "value": "BuildingAI/DefaultArrowCount", "add": 1 }
 	],
-	"affects": ["DefenseTower"],
+	"affects": ["LargeTower", "SmallTower"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/templates/skirmish/structures/default_defense_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/structures/default_defense_tower.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/structures/default_defense_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Footprint replace=""><!-- use iberian footprint -->
     <Circle radius="8.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/skirmish/structures/default_sentry_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/structures/default_sentry_tower.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/structures/default_sentry_tower.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/special/player/player.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/player/player.xml
+++ binaries/data/mods/public/simulation/templates/special/player/player.xml
@@ -16,7 +16,7 @@
   <EntityLimits>
     <Limits>
       <CivilCentre>1</CivilCentre>
-      <DefenseTower>30</DefenseTower>
+      <Tower>30</Tower>
       <Fortress>10</Fortress>
       <Wonder>1</Wonder>
       <Hero>1</Hero>
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_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Footprint>
     <Square width="10.0" depth="10.5"/>
     <Height>15.0</Height>
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_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Pyrgidion</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_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Footprint replace="">
     <Circle radius="6.0"/>
     <Height>10.0</Height>
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_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Uxelon</SpecificName>
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_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>18.0</Height>
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_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Identity>
     <Civ>cart</Civ>
   </Identity>
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_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>15.0</Height>
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_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Uxelon</SpecificName>
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_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Attack>
     <Ranged>
       <MinRange>12.0</MinRange>
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_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Identity>
     <Civ>iber</Civ>
   </Identity>
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_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>tsmt ‘3</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_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>tsmt</SpecificName>
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_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Footprint>
     <Square width="10.0" depth="10.5"/>
     <Height>15.0</Height>
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_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Pyrgidion</SpecificName>
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_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Udarka</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_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Identity>
     <Civ>maur</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/maur_tower_double.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_tower_double.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_tower_double.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Loot>
     <wood>0</wood>
     <stone>40</stone>
Index: binaries/data/mods/public/simulation/templates/structures/palisades_fort.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/palisades_fort.xml
+++ binaries/data/mods/public/simulation/templates/structures/palisades_fort.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Capturable disable=""/>
   <Footprint>
     <Square width="9.5" depth="8.5"/>
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_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Pāyaud</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_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Identity>
     <Civ>pers</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/pers_tower_babylon.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_tower_babylon.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_tower_babylon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Pāyaud</SpecificName>
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_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>18.0</Height>
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_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Pyrgidion</SpecificName>
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_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Footprint>
     <Square width="10.0" depth="10.0"/>
     <Height>15.0</Height>
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_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Turris Līgnea</SpecificName>
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_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Footprint>
     <Square width="10.0" depth="10.5"/>
     <Height>15.0</Height>
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_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Pyrgidion</SpecificName>
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_defensive_tower_stone">
+<Entity parent="template_structure_defensive_tower_large">
   <Footprint>
     <Square width="10.0" depth="10.5"/>
     <Height>15.0</Height>
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_defensive_tower_sentry">
+<Entity parent="template_structure_defensive_tower_small">
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Pyrgidion</SpecificName>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive.xml
@@ -11,8 +11,8 @@
     </Foundation>
   </Armour>
   <Identity>
+    <VisibleClasses datatype="tokens">Defensive</VisibleClasses>
     <GenericName>Defensive Structure</GenericName>
-    <Classes datatype="tokens">Defensive</Classes>
   </Identity>
   <Loot>
     <xp>100</xp>
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
@@ -30,9 +30,9 @@
     <GarrisonArrowClasses>Infantry</GarrisonArrowClasses>
   </BuildingAI>
   <BuildRestrictions>
-    <Category>DefenseTower</Category>
+    <Category>Tower</Category>
     <Distance>
-      <FromClass>DefenseTower</FromClass>
+      <FromClass>Tower</FromClass>
       <MinDistance>60</MinDistance>
     </Distance>
   </BuildRestrictions>
@@ -48,7 +48,7 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Classes datatype="tokens">Tower</Classes>
+    <VisibleClasses datatype="tokens">Tower</VisibleClasses>
   </Identity>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
@@ -54,10 +54,9 @@
     <Max>1400</Max>
   </Health>
   <Identity>
+    <VisibleClasses datatype="tokens">City ArtilleryTower</VisibleClasses>
     <GenericName>Artillery Tower</GenericName>
     <Tooltip>Catapults stones. Needs the murder holes tech to protect its foot.</Tooltip>
-    <Classes datatype="tokens">GarrisonTower</Classes>
-    <VisibleClasses datatype="tokens">City DefenseTower StoneTower</VisibleClasses>
     <Icon>structures/tower_artillery.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
@@ -53,10 +53,9 @@
     <Max>1400</Max>
   </Health>
   <Identity>
+    <VisibleClasses datatype="tokens">City BoltTower</VisibleClasses>
     <GenericName>Bolt Tower</GenericName>
     <Tooltip>Shoots bolts. Faster reaction time against raiding units than the artillery tower, weak to all siege weapons and mass melee. Needs the murder holes tech to protect its foot.</Tooltip>
-    <Classes datatype="tokens">GarrisonTower</Classes>
-    <VisibleClasses datatype="tokens">City DefenseTower StoneTower</VisibleClasses>
     <Icon>structures/tower_bolt.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_large.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_large.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_large.xml
@@ -28,11 +28,10 @@
     <Max>1000</Max>
   </Health>
   <Identity>
-    <GenericName>Defense Tower</GenericName>
+    <VisibleClasses datatype="tokens">Town LargeTower</VisibleClasses>
+    <GenericName>Large 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>
+    <Icon>structures/tower_large.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
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
@@ -48,9 +48,9 @@
     <Max>800</Max>
   </Health>
   <Identity>
+    <VisibleClasses datatype="tokens">Village -Tower Outpost</VisibleClasses>
     <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>
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,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_tower">
-  <Armour>
-    <Hack op="add">-5</Hack>
-    <Pierce op="add">-5</Pierce>
-    <Crush op="add">-2</Crush>
-  </Armour>
-  <Attack>
-    <Ranged>
-      <Damage>
-        <Pierce>9</Pierce>
-      </Damage>
-      <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>
-      <Variant>upgrading</Variant>
-      <Time>100</Time>
-    </Tower>
-  </Upgrade>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_small.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_small.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_small.xml
@@ -32,10 +32,9 @@
     <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>
+    <VisibleClasses datatype="tokens">Village SmallTower</VisibleClasses>
+    <GenericName>Small Tower</GenericName>
+    <Icon>structures/tower_sentry.png</Icon>
     <Tooltip>Shoots arrows. Garrison to provide extra defence. Needs the murder holes tech to protect its foot. Upgradeable to stone tower.</Tooltip>
   </Identity>
   <Loot>
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,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_defensive_tower">
-  <Attack>
-    <Ranged>
-      <Damage>
-        <Pierce>12</Pierce>
-      </Damage>
-      <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>