Index: binaries/data/mods/public/simulation/ai/petra/attackManager.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/attackManager.js
+++ binaries/data/mods/public/simulation/ai/petra/attackManager.js
@@ -475,7 +475,7 @@
 				continue;
 			let enemyDefense = 0;
 			for (let ent of gameState.getEnemyStructures(i).values())
-				if (ent.hasClass("Tower") || ent.hasClass("Fortress"))
+				if (ent.hasClass("Tower") || ent.hasClass("WallTower") || ent.hasClass("Fortress"))
 					enemyDefense++;
 			if (enemyDefense > 6)
 				veto[i] = true;
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("StoneTower") || target.hasClass("Market"))
 			targetNB = 4;
 		else if (target.hasClass("House") || target.hasClass("DropsiteWood"))
 			targetNB = 3;
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
@@ -27,8 +27,8 @@
 	this.targetNumWorkers = this.Config.Economy.targetNumWorkers;
 	this.supportRatio = this.Config.Economy.supportRatio;
 
-	this.fortStartTime = 180;	// sentry defense towers, will start at fortStartTime + towerLapseTime
-	this.towerStartTime = 0;	// stone defense towers, will start as soon as available
+	this.fortStartTime = 180;	// sentry towers, will start at fortStartTime + towerLapseTime
+	this.towerStartTime = 0;	// stone towers, will start as soon as available
 	this.towerLapseTime = this.Config.Military.towerLapseTime;
 	this.fortressStartTime = 0;	// will start as soon as available
 	this.fortressLapseTime = this.Config.Military.fortressLapseTime;
@@ -1881,10 +1881,10 @@
 
 	let numTowers = gameState.getOwnEntitiesByClass("StoneTower", 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, CivilCentre, Council, Embassy, Fortress, Gladiator, Hall, Hero, Juggernaut, Library, Lighthouse, Monument, Pillar, PyramidLarge, PyramidSmall, Stoa, TempleOfAmun, Theater, Tower, UniqueBuilding, WarDog, 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,12 +4,12 @@
 	"<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>" +
+			"<Apadana>1</Apadana>" +
 			"<Fortress>10</Fortress>" +
-			"<Wonder>1</Wonder>" +
 			"<Hero>1</Hero>" +
-			"<Apadana>1</Apadana>" +
 			"<Monument>5</Monument>" +
+			"<Tower>25</Tower>" +
+			"<Wonder>1</Wonder>" +
 		"</Limits>" +
 		"<LimitChangers>" +
 			"<Monument>" +
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: AfricanElephant, 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, IndianElephant, 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: AfricanElephant, Animal, Apadana, ArmyCamp, Ashoka, BarterMarket, Celt, CitizenSoldier, CivCentre, Colony, ConquestCritical, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FemaleCitizen, FishingBoat, ForestPlant, GarrisonFortress, Gates, Human, Iberian, Immortal, IndianElephant, Italian, Juggernaut, Kennel, Lighthouse, LongWall, MercenaryCamp, Naval, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Unit, WallTower.'>" +
 			"<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, Fortress, 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, StoneTower, 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
@@ -6,12 +6,12 @@
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "architecture.png",
 	"researchTime": 40,
-	"tooltip": "Increases armor of defensive towers by 2 levels.",
+	"tooltip": "Towers +2 armor.",
 	"modifications": [
 		{ "value": "Armour/Hack", "add": 2 },
 		{ "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
@@ -6,10 +6,10 @@
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "crenelations.png",
 	"researchTime": 40,
-	"tooltip": "Install crenellations and murder holes to have 40% more arrows fired per garrisoned soldier.",
+	"tooltip": "Sentry and Stone Towers +40% more arrows per garrisoned Soldier.",
 	"modifications": [
 		{ "value": "BuildingAI/GarrisonArrowMultiplier", "multiply": 1.4 }
 	],
-	"affects": ["DefenseTower"],
+	"affects": ["SentryTower", "StoneTower"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/tower_decay.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/tower_decay.json
+++ binaries/data/mods/public/simulation/data/technologies/tower_decay.json
@@ -6,7 +6,7 @@
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "blocks_three.png",
 	"researchTime": 40,
-	"tooltip": "Outposts -50% territory decay rate.",
+	"tooltip": "Outposts −50% territory decay rate.",
 	"modifications": [
 		{ "value": "TerritoryDecay/DecayRate", "multiply": 0.5 }
 	],
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
@@ -6,10 +6,10 @@
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "murder_holes.png",
 	"researchTime": 40,
-	"tooltip": "Removes defensive towers' minimum range.",
+	"tooltip": "Sentry and Stone Towers have 0 minimum attack range.",
 	"modifications": [
 		{ "value": "Attack/Ranged/MinRange", "replace": 0 }
 	],
-	"affects": ["DefenseTower"],
+	"affects": ["SentryTower", "StoneTower"],
 	"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
@@ -6,11 +6,11 @@
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "arrow.png",
 	"researchTime": 40,
-	"tooltip": "Increases defensive towers' maximum range by 8 meters.",
+	"tooltip": "Sentry and Stone Towers +8 attack range.",
 	"modifications": [
 		{ "value": "Attack/Ranged/MaxRange", "add": 8 },
 		{ "value": "Vision/Range","add": 8 }
 	],
-	"affects": ["DefenseTower"],
+	"affects": ["SentryTower", "StoneTower"],
 	"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
@@ -14,10 +14,10 @@
 	"requirementsTooltip": "Unlocked in Village Phase.",
 	"icon": "helmet_corinthian_bronze.png",
 	"researchTime": 40,
-	"tooltip": "Post sentries to add one arrow to defensive towers.",
+	"tooltip": "Sentry and Stone Towers +1 default arrow count.",
 	"modifications": [
 		{ "value": "BuildingAI/DefaultArrowCount", "add": 1 }
 	],
-	"affects": ["DefenseTower"],
+	"affects": ["SentryTower", "StoneTower"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
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/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
@@ -85,10 +85,10 @@
   </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>
     <SelectionGroupName>template_structure_civic_civil_centre</SelectionGroupName>
+    <Tooltip>Build to acquire large tracts of territory. Train citizens.</Tooltip>
+    <Classes datatype="tokens">CivCentre</Classes>
+    <VisibleClasses datatype="tokens">Defensive CivilCentre</VisibleClasses>
     <Icon>structures/civic_centre.png</Icon>
   </Identity>
   <Loot>
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
@@ -12,7 +12,7 @@
   </Armour>
   <Identity>
     <GenericName>Defensive Structure</GenericName>
-    <Classes datatype="tokens">Defensive</Classes>
+    <VisibleClasses datatype="tokens">Defensive</VisibleClasses>
   </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
@@ -31,9 +31,9 @@
     <GarrisonArrowClasses>Infantry</GarrisonArrowClasses>
   </BuildingAI>
   <BuildRestrictions>
-    <Category>DefenseTower</Category>
+    <Category>Tower</Category>
     <Distance>
-      <FromClass>DefenseTower</FromClass>
+      <FromClass>Tower</FromClass>
       <MinDistance>60</MinDistance>
     </Distance>
   </BuildRestrictions>
@@ -49,11 +49,8 @@
     <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>
-  </ProductionQueue>
   <Sound>
     <SoundGroups>
       <constructed>interface/complete/building/complete_tower.xml</constructed>
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
@@ -56,9 +56,7 @@
   <Identity>
     <GenericName>Artillery Tower</GenericName>
     <SelectionGroupName>template_structure_defensive_tower_artillery</SelectionGroupName>
-    <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>
+    <VisibleClasses datatype="tokens">City ArtilleryTower</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
@@ -55,9 +55,7 @@
   <Identity>
     <GenericName>Bolt Tower</GenericName>
     <SelectionGroupName>template_structure_defensive_tower_bolt</SelectionGroupName>
-    <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>
+    <VisibleClasses datatype="tokens">City BoltTower</VisibleClasses>
     <Icon>structures/tower_bolt.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
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
@@ -50,8 +50,8 @@
   <Identity>
     <GenericName>Outpost</GenericName>
     <SelectionGroupName>template_structure_defensive_tower_outpost</SelectionGroupName>
-    <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>
+    <Tooltip>Build in own or neutral territory. Slowly converts to Gaia while in neutral territory.</Tooltip>
+    <VisibleClasses datatype="tokens">Village -Tower 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
@@ -34,10 +34,9 @@
   <Identity>
     <GenericName>Sentry Tower</GenericName>
     <SelectionGroupName>template_structure_defensive_tower_sentry</SelectionGroupName>
+    <Tooltip>Garrison Infantry for additional arrows. Needs the “Murder Holes” technology to protect its foot.</Tooltip>
+    <VisibleClasses datatype="tokens">Village SentryTower</VisibleClasses>
     <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>
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
@@ -30,9 +30,8 @@
   <Identity>
     <GenericName>Defense Tower</GenericName>
     <SelectionGroupName>template_structure_defensive_tower_stone</SelectionGroupName>
-    <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>
+    <Tooltip>Garrison Infantry for additional arrows. Needs the “Murder Holes” technology to protect its foot.</Tooltip>
+    <VisibleClasses datatype="tokens">Town StoneTower</VisibleClasses>
     <Icon>structures/defense_tower.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
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
@@ -53,8 +53,8 @@
   <Identity>
     <GenericName>Wall Turret</GenericName>
     <SelectionGroupName>template_structure_defensive_wall_tower</SelectionGroupName>
-    <Tooltip>Shoots arrows. Garrison to defend a city wall against attackers.</Tooltip>
-    <Classes datatype="tokens">Tower</Classes>
+    <Tooltip>Garrison Infantry for additional arrows. Needs the “Murder Holes” technology to protect its foot.</Tooltip>
+    <Classes datatype="tokens">WallTower</Classes>
     <Icon>structures/tower.png</Icon>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -69,13 +69,13 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <Classes datatype="tokens">Defensive Fortress GarrisonFortress</Classes>
-    <VisibleClasses datatype="tokens">City</VisibleClasses>
     <GenericName>Fortress</GenericName>
     <SelectionGroupName>template_structure_military_fortress</SelectionGroupName>
+    <Tooltip>Train Champions and Heroes and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
+    <Classes datatype="tokens">GarrisonFortress</Classes>
+    <VisibleClasses datatype="tokens">Defensive Fortress City</VisibleClasses>
     <Icon>structures/fortress.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
-    <Tooltip>Train Champions and Heroes and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Loot>
     <xp>100</xp>