diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json b/binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json
index 1af91f8ce0..065d07679b 100644
--- a/binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json
+++ b/binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json
@@ -11,7 +11,7 @@
 	"requirements": {
 		"entity": {
 			"class": "Town",
-			"number": 4
+			"number": 3
 		}
 	},
 	"requirementsTooltip": "Requires four Town Structures.",
diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json b/binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json
index 3774658a26..f68920df56 100644
--- a/binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json
+++ b/binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json
@@ -14,7 +14,7 @@
 	"requirements": {
 		"entity": {
 			"class": "Town",
-			"number": 4
+			"number": 3
 		}
 	},
 	"requirementsTooltip": "Requires four Town Structures.",
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
index 408da7c0cf..28a3291483 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
@@ -48,7 +48,7 @@
   <Identity>
     <GenericName>Artillery Tower</GenericName>
     <SelectionGroupName>template_structure_defensive_tower_artillery</SelectionGroupName>
-    <VisibleClasses datatype="tokens">City ArtilleryTower</VisibleClasses>
+    <VisibleClasses datatype="tokens">ArtilleryTower</VisibleClasses>
     <Icon>structures/tower_artillery.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
index 4d9eda5b83..342230e8be 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
@@ -46,7 +46,7 @@
   <Identity>
     <GenericName>Bolt Tower</GenericName>
     <SelectionGroupName>template_structure_defensive_tower_bolt</SelectionGroupName>
-    <VisibleClasses datatype="tokens">City BoltTower</VisibleClasses>
+    <VisibleClasses datatype="tokens">BoltTower</VisibleClasses>
     <Icon>structures/tower_bolt.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
index e7b9a1a195..b376c7f88b 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
@@ -28,7 +28,7 @@
     <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>
+    <VisibleClasses datatype="tokens">SentryTower</VisibleClasses>
     <Icon>structures/sentry_tower.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
index 60055d4038..747e6a2b16 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml
@@ -29,7 +29,7 @@
     <GenericName>Stone Tower</GenericName>
     <SelectionGroupName>template_structure_defensive_tower_stone</SelectionGroupName>
     <Tooltip>Garrison Infantry for additional arrows. Needs the “Murder Holes” technology to protect its foot.</Tooltip>
-    <VisibleClasses datatype="tokens">Town StoneTower</VisibleClasses>
+    <VisibleClasses datatype="tokens">StoneTower</VisibleClasses>
     <Icon>structures/defense_tower.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
index 4bc2f9fd73..9307b53aed 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -68,7 +68,7 @@
     <SelectionGroupName>template_structure_military_fortress</SelectionGroupName>
     <Tooltip>Territory root. Garrison Soldiers for additional arrows.</Tooltip>
     <Classes datatype="tokens">GarrisonFortress</Classes>
-    <VisibleClasses datatype="tokens">Defensive City Fortress</VisibleClasses>
+    <VisibleClasses datatype="tokens">Defensive Fortress</VisibleClasses>
     <Icon>structures/fortress.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>