Index: binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
+++ binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
@@ -6487,7 +6487,7 @@
 			<Actor seed="50226"/>
 		</Entity>
 		<Entity uid="1565">
-			<Template>structures/kush_workshop</Template>
+			<Template>structures/kush_arsenal</Template>
 			<Player>0</Player>
 			<Position x="1870.80994" z="1022.8097"/>
 			<Orientation y="-1.58281"/>
@@ -48403,7 +48403,7 @@
 			<Actor seed="16789"/>
 		</Entity>
 		<Entity uid="10982">
-			<Template>structures/kush_workshop</Template>
+			<Template>structures/kush_arsenal</Template>
 			<Player>0</Player>
 			<Position x="1639.4701" z="983.83307"/>
 			<Orientation y="4.71726"/>
@@ -66947,7 +66947,7 @@
 			<Actor seed="21608"/>
 		</Entity>
 		<Entity uid="13855">
-			<Template>structures/kush_workshop</Template>
+			<Template>structures/kush_arsenal</Template>
 			<Player>0</Player>
 			<Position x="1467.10071" z="985.0088"/>
 			<Orientation y="4.71726"/>
@@ -75144,7 +75144,7 @@
 			<Actor seed="55682"/>
 		</Entity>
 		<Entity uid="15113">
-			<Template>structures/kush_workshop</Template>
+			<Template>structures/kush_arsenal</Template>
 			<Player>0</Player>
 			<Position x="1310.02356" z="1622.11365"/>
 			<Orientation y="4.71726"/>
@@ -76159,7 +76159,7 @@
 			<Actor seed="21608"/>
 		</Entity>
 		<Entity uid="15275">
-			<Template>structures/kush_workshop</Template>
+			<Template>structures/kush_arsenal</Template>
 			<Player>0</Player>
 			<Position x="1431.18213" z="1722.30372"/>
 			<Orientation y="9.42074"/>
@@ -79303,7 +79303,7 @@
 			<Actor seed="16789"/>
 		</Entity>
 		<Entity uid="15774">
-			<Template>structures/kush_workshop</Template>
+			<Template>structures/kush_arsenal</Template>
 			<Player>0</Player>
 			<Position x="1383.14002" z="441.78531"/>
 			<Orientation y="9.42075"/>
@@ -88355,7 +88355,7 @@
 			<Actor seed="24308"/>
 		</Entity>
 		<Entity uid="17157">
-			<Template>structures/kush_workshop</Template>
+			<Template>structures/kush_arsenal</Template>
 			<Player>0</Player>
 			<Position x="1218.8506" z="1753.3495"/>
 			<Orientation y="4.71726"/>
Index: binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
@@ -12442,7 +12442,7 @@
 			<Actor seed="56502"/>
 		</Entity>
 		<Entity uid="2410">
-			<Template>structures/kush_workshop</Template>
+			<Template>structures/kush_arsenal</Template>
 			<Player>1</Player>
 			<Position x="528.18268" z="844.22889"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
@@ -7355,7 +7355,7 @@
 			<Actor seed="62126"/>
 		</Entity>
 		<Entity uid="1356">
-			<Template>structures/mace_workshop</Template>
+			<Template>structures/mace_arsenal</Template>
 			<Player>1</Player>
 			<Position x="672.49231" z="1323.17847"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -101323,7 +101323,7 @@
 			<Actor seed="27364"/>
 		</Entity>
 		<Entity uid="21129">
-			<Template>structures/kush_workshop</Template>
+			<Template>structures/kush_arsenal</Template>
 			<Player>2</Player>
 			<Position x="1598.93201" z="551.38727"/>
 			<Orientation y="4.13512"/>
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
@@ -1991,9 +1991,9 @@
 		return;
 	}
 
-	if (this.canBuild(gameState, "structures/{civ}_workshop") && !gameState.getOwnEntitiesByClass("Workshop", true).hasEntities())
+	if (this.canBuild(gameState, "structures/{civ}_arsenal") && !gameState.getOwnEntitiesByClass("Arsenal", true).hasEntities())
 	{
-		queues.militaryBuilding.addPlan(new PETRA.ConstructionPlan(gameState, "structures/{civ}_workshop", { "militaryBase": true }));
+		queues.militaryBuilding.addPlan(new PETRA.ConstructionPlan(gameState, "structures/{civ}_arsenal", { "militaryBase": true }));
 		return;
 	}
 
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
@@ -315,7 +315,7 @@
 	// obstructions.dumpIm(template.buildPlacementType() + "_obstructions.png");
 
 	let radius = 0;
-	if (template.hasClass("Fortress") || template.hasClass("Workshop") ||
+	if (template.hasClass("Fortress") || template.hasClass("Arsenal") ||
 		this.type == gameState.applyCiv("structures/{civ}_elephant_stables"))
 		radius = Math.floor((template.obstructionRadius().max + 8) / obstructions.cellSize);
 	else if (template.resourceDropsiteTypes() === undefined && !template.hasClass("House") &&
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
@@ -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, Arsenal, 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.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
Index: binaries/data/mods/public/simulation/data/auras/structures/arsenal_repair.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/structures/arsenal_repair.json
+++ binaries/data/mods/public/simulation/data/auras/structures/arsenal_repair.json
@@ -4,6 +4,6 @@
 	"modifications": [
 		{ "value": "Health/RegenRate", "add": 3 }
 	],
-	"auraName": "Workshop Repairs",
+	"auraName": "Arsenal Repairs",
 	"auraDescription": "Garrisoned Siege Engines +3 health regeneration rate."
 }
Index: binaries/data/mods/public/simulation/data/auras/structures/workshop_repair.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/structures/workshop_repair.json
+++ binaries/data/mods/public/simulation/data/auras/structures/workshop_repair.json
@@ -1,9 +0,0 @@
-{
-	"type": "garrisonedUnits",
-	"affects": ["Siege"],
-	"modifications": [
-		{ "value": "Health/RegenRate", "add": 3 }
-	],
-	"auraName": "Workshop Repairs",
-	"auraDescription": "Garrisoned Siege Engines +3 health regeneration rate."
-}
Index: binaries/data/mods/public/simulation/templates/skirmish/structures/default_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/structures/default_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/structures/default_arsenal.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
+<Entity parent="template_structure_military_arsenal">
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
   <ProductionQueue disable=""/>
   <SkirmishReplacer>
-    <general>structures/{civ}_workshop</general>
+    <general>structures/{civ}_arsenal</general>
   </SkirmishReplacer>
   <VisualActor>
     <Actor>structures/hellenes/workshop.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/skirmish/structures/default_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/skirmish/structures/default_workshop.xml
+++ binaries/data/mods/public/simulation/templates/skirmish/structures/default_workshop.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
-  <Identity>
-    <Civ>skirm</Civ>
-  </Identity>
-  <ProductionQueue disable=""/>
-  <SkirmishReplacer>
-    <general>structures/{civ}_workshop</general>
-  </SkirmishReplacer>
-  <VisualActor>
-    <Actor>structures/hellenes/workshop.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/athen_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_arsenal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
+<Entity parent="template_structure_military_arsenal">
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Hoplothēkē</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/athen_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_workshop.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
-  <Identity>
-    <Civ>athen</Civ>
-    <SpecificName>Hoplothēkē</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/hellenes/workshop.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/brit_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_arsenal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
+<Entity parent="template_structure_military_arsenal">
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Miletucerdon</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/brit_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_workshop.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
-  <Identity>
-    <Civ>brit</Civ>
-    <SpecificName>Miletucerdon</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/britons/workshop.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/cart_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_arsenal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
+<Entity parent="template_structure_military_arsenal">
   <Identity>
     <Civ>cart</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/cart_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_workshop.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
-  <Identity>
-    <Civ>cart</Civ>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/carthaginians/workshop.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_arsenal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
+<Entity parent="template_structure_military_arsenal">
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Miletucerdon</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_workshop.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
-  <Identity>
-    <Civ>gaul</Civ>
-    <SpecificName>Miletucerdon</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/gauls/workshop.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/iber_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_arsenal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
+<Entity parent="template_structure_military_arsenal">
   <Identity>
     <Civ>iber</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/iber_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_workshop.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
-  <Identity>
-    <Civ>iber</Civ>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/iberians/workshop.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/kush_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_arsenal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
+<Entity parent="template_structure_military_arsenal">
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>Pr-ỉwn n ms</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/kush_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_workshop.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
-  <Identity>
-    <Civ>kush</Civ>
-    <SpecificName>Pr-ỉwn n ms</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/kushites/workshop.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/mace_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_arsenal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
+<Entity parent="template_structure_military_arsenal">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Hoplothēkē</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/mace_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_workshop.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
-  <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Hoplothēkē</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/hellenes/workshop.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/maur_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_arsenal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
+<Entity parent="template_structure_military_arsenal">
   <Identity>
     <Civ>maur</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/maur_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_workshop.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
-  <Identity>
-    <Civ>maur</Civ>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/mauryas/workshop.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/pers_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_arsenal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
+<Entity parent="template_structure_military_arsenal">
   <Identity>
     <Civ>pers</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/pers_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_workshop.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
-  <Identity>
-    <Civ>pers</Civ>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/persians/workshop.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_arsenal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
+<Entity parent="template_structure_military_arsenal">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Hoplothēkē</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_workshop.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
-  <Identity>
-    <Civ>ptol</Civ>
-    <SpecificName>Hoplothēkē</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/ptolemies/workshop.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/rome_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_arsenal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
+<Entity parent="template_structure_military_arsenal">
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Ballistārium</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/rome_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_workshop.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
-  <Identity>
-    <Civ>rome</Civ>
-    <SpecificName>Ballistārium</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/romans/workshop.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/sele_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_arsenal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
+<Entity parent="template_structure_military_arsenal">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Hoplothēkē</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/sele_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_workshop.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
-  <Identity>
-    <Civ>sele</Civ>
-    <SpecificName>Hoplothēkē</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/seleucids/workshop.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/spart_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_arsenal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
+<Entity parent="template_structure_military_arsenal">
   <Identity>
     <Civ>spart</Civ>
     <SpecificName>Hoplothēkē</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/spart_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_workshop.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_workshop.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_workshop">
-  <Identity>
-    <Civ>spart</Civ>
-    <SpecificName>Hoplothēkē</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/spartans/workshop.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Auras datatype="tokens">
-    structures/workshop_repair
+    structures/arsenal_repair
   </Auras>
   <Cost>
     <BuildTime>200</BuildTime>
@@ -22,12 +22,12 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <GenericName>Siege Workshop</GenericName>
-    <SelectionGroupName>template_structure_military_workshop</SelectionGroupName>
+    <GenericName>Arsenal</GenericName>
+    <SelectionGroupName>template_structure_military_arsenal</SelectionGroupName>
+    <Tooltip>Construct Siege Engines and research Siege Engine technologies.</Tooltip>
+    <VisibleClasses datatype="tokens">City Arsenal</VisibleClasses>
     <Icon>structures/siege_workshop.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
-    <Tooltip>Construct Siege Engines and research Siege Engine technologies.</Tooltip>
-    <VisibleClasses datatype="tokens">City Workshop</VisibleClasses>
   </Identity>
   <Loot>
     <wood>60</wood>
@@ -38,11 +38,11 @@
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}_siege_ballista_packed
       units/{civ}_siege_scorpio_packed
+      units/{civ}_siege_polybolos_packed
       units/{civ}_siege_oxybeles_packed
       units/{civ}_siege_lithobolos_packed
-      units/{civ}_siege_polybolos_packed
+      units/{civ}_siege_ballista_packed
       units/{civ}_siege_ram
       units/{civ}_siege_tower
     </Entities>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military">
-  <Auras datatype="tokens">
-    structures/workshop_repair
-  </Auras>
-  <Cost>
-    <BuildTime>200</BuildTime>
-    <Resources>
-      <wood>300</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="30.0" depth="30.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>2</Max>
-    <List datatype="tokens">Siege</List>
-  </GarrisonHolder>
-  <Health>
-    <Max>2000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <GenericName>Siege Workshop</GenericName>
-    <SelectionGroupName>template_structure_military_workshop</SelectionGroupName>
-    <Icon>structures/siege_workshop.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
-    <Tooltip>Construct Siege Engines and research Siege Engine technologies.</Tooltip>
-    <VisibleClasses datatype="tokens">City Workshop</VisibleClasses>
-  </Identity>
-  <Loot>
-    <wood>60</wood>
-  </Loot>
-  <Obstruction>
-    <Static width="29.0" depth="29.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_siege_ballista_packed
-      units/{civ}_siege_scorpio_packed
-      units/{civ}_siege_oxybeles_packed
-      units/{civ}_siege_lithobolos_packed
-      units/{civ}_siege_polybolos_packed
-      units/{civ}_siege_ram
-      units/{civ}_siege_tower
-    </Entities>
-    <Technologies datatype="tokens">
-      siege_attack
-      siege_armor
-      siege_cost_metal
-      siege_cost_wood
-      siege_bolt_accuracy
-    </Technologies>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <constructed>interface/complete/building/complete_barracks.xml</constructed>
-      <select>interface/select/building/sel_barracks.xml</select>
-    </SoundGroups>
-  </Sound>
-  <TerritoryInfluence>
-    <Radius>38</Radius>
-  </TerritoryInfluence>
-  <VisualActor>
-    <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -42,7 +42,7 @@
       structures/{civ}_market
       structures/{civ}_defense_tower
       structures/{civ}_wallset_stone
-      structures/{civ}_workshop
+      structures/{civ}_arsenal
       structures/{civ}_fortress
       structures/{civ}_wonder
     </Entities>