Index: ps/trunk/binaries/data/mods/public/audio/interface/complete/building/complete_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/interface/complete/building/complete_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/audio/interface/complete/building/complete_blacksmith.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no" ?>
-<SoundGroup>
-	<Distanceless>1</Distanceless>
-	<HeardBy>owner</HeardBy>
-	<Gain>1</Gain>
-	<Priority>30</Priority>
-	<ConeGain>1</ConeGain>
-	<Looping>0</Looping>
-	<RandOrder>1</RandOrder>
-	<RandGain>1</RandGain>
-	<RandPitch>1</RandPitch>
-	<Threshold>1</Threshold>
-	<Path>audio/interface/complete/building</Path>
-	<Sound>complete_blacksmith.ogg</Sound>
-</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/interface/complete/building/complete_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/interface/complete/building/complete_forge.xml
+++ ps/trunk/binaries/data/mods/public/audio/interface/complete/building/complete_forge.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<HeardBy>owner</HeardBy>
+	<Gain>1</Gain>
+	<Priority>30</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<RandPitch>1</RandPitch>
+	<Threshold>1</Threshold>
+	<Path>audio/interface/complete/building</Path>
+	<Sound>complete_forge.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/interface/select/building/sel_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/interface/select/building/sel_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/audio/interface/select/building/sel_blacksmith.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no" ?>
-<SoundGroup>
-	<Distanceless>1</Distanceless>
-	<Gain>1</Gain>
-	<Priority>70</Priority>
-	<ConeGain>1</ConeGain>
-	<Looping>0</Looping>
-	<RandOrder>1</RandOrder>
-	<RandGain>1</RandGain>
-	<RandPitch>1</RandPitch>
-	<Threshold>1</Threshold>
-	<Path>audio/interface/select/building</Path>
-	<Sound>sel_blacksmith.ogg</Sound>
-</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/audio/interface/select/building/sel_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/audio/interface/select/building/sel_forge.xml
+++ ps/trunk/binaries/data/mods/public/audio/interface/select/building/sel_forge.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Distanceless>1</Distanceless>
+	<Gain>1</Gain>
+	<Priority>70</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<RandPitch>1</RandPitch>
+	<Threshold>1</Threshold>
+	<Path>audio/interface/select/building</Path>
+	<Sound>sel_forge.ogg</Sound>
+</SoundGroup>
Index: ps/trunk/binaries/data/mods/public/gui/text/tips/blacksmith.txt
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/text/tips/blacksmith.txt
+++ ps/trunk/binaries/data/mods/public/gui/text/tips/blacksmith.txt
@@ -1,3 +0,0 @@
-BLACKSMITH
-Research structure for all factions.
-Research weapon and armor upgrades for your units.
Index: ps/trunk/binaries/data/mods/public/gui/text/tips/forge.txt
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/text/tips/forge.txt
+++ ps/trunk/binaries/data/mods/public/gui/text/tips/forge.txt
@@ -0,0 +1,3 @@
+FORGE
+Research structure for all factions.
+Research weapon and armor upgrades for your units.
Index: ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal.js
+++ ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal.js
@@ -71,7 +71,7 @@
 const oTower = g_MapSettings.Size >= 256 && getDifficulty() >= 3 ? "structures/kush_defense_tower" : "structures/kush_sentry_tower";
 const oHouse = "structures/kush_house";
 const oMarket = "structures/kush_market";
-const oBlacksmith = "structures/kush_blacksmith";
+const oForge = "structures/kush_forge";
 const oBlemmyeCamp = "structures/kush_blemmye_camp";
 const oNubaVillage = "structures/kush_nuba_village";
 const oCivicCenter = "structures/kush_civil_centre";
@@ -181,7 +181,7 @@
 const clRitualPlace = g_Map.createTileClass();
 const clPyramid = g_Map.createTileClass();
 const clHouse = g_Map.createTileClass();
-const clBlacksmith = g_Map.createTileClass();
+const clForge = g_Map.createTileClass();
 const clStable = g_Map.createTileClass();
 const clElephantStables = g_Map.createTileClass();
 const clCivicCenter = g_Map.createTileClass();
@@ -300,10 +300,10 @@
 		"painters": new TileClassPainter(clMarket)
 	},
 	{
-		"templateName": "uncapturable|" + oBlacksmith,
+		"templateName": "uncapturable|" + oForge,
 		"difficulty": "Very Easy",
-		"constraints": avoidClasses(clBlacksmith, 30),
-		"painters": new TileClassPainter(clBlacksmith)
+		"constraints": avoidClasses(clForge, 30),
+		"painters": new TileClassPainter(clForge)
 	},
 	{
 		"templateName": oNubaVillage,
@@ -1061,7 +1061,7 @@
 				clTower, 1,
 				clFortress, 1,
 				clHouse, 1,
-				clBlacksmith, 1,
+				clForge, 1,
 				clElephantStables, 1,
 				clStable, 1,
 				clCivicCenter, 1,
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/cinema_demo.xml
@@ -11492,7 +11492,7 @@
 			<Actor seed="33212"/>
 		</Entity>
 		<Entity uid="2222">
-			<Template>structures/pers_blacksmith</Template>
+			<Template>structures/pers_forge</Template>
 			<Player>1</Player>
 			<Position x="505.49479" z="776.6778"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/napata_reconstruction.xml
@@ -6480,7 +6480,7 @@
 			<Actor seed="28406"/>
 		</Entity>
 		<Entity uid="1564">
-			<Template>structures/kush_blacksmith</Template>
+			<Template>structures/kush_forge</Template>
 			<Player>0</Player>
 			<Position x="1879.08924" z="881.57355"/>
 			<Orientation y="-1.56971"/>
@@ -26136,7 +26136,7 @@
 			<Actor seed="16498"/>
 		</Entity>
 		<Entity uid="5597">
-			<Template>structures/kush_blacksmith</Template>
+			<Template>structures/kush_forge</Template>
 			<Player>0</Player>
 			<Position x="1888.36475" z="1123.94605"/>
 			<Orientation y="1.56301"/>
@@ -37425,7 +37425,7 @@
 			<Actor seed="36854"/>
 		</Entity>
 		<Entity uid="9278">
-			<Template>structures/kush_blacksmith</Template>
+			<Template>structures/kush_forge</Template>
 			<Player>0</Player>
 			<Position x="1459.85511" z="181.85972"/>
 			<Orientation y="-0.79494"/>
@@ -48066,7 +48066,7 @@
 			<Actor seed="35310"/>
 		</Entity>
 		<Entity uid="10930">
-			<Template>structures/kush_blacksmith</Template>
+			<Template>structures/kush_forge</Template>
 			<Player>0</Player>
 			<Position x="1512.1637" z="1033.27515"/>
 			<Orientation y="0.54491"/>
@@ -56790,7 +56790,7 @@
 			<Actor seed="39370"/>
 		</Entity>
 		<Entity uid="12248">
-			<Template>structures/kush_blacksmith</Template>
+			<Template>structures/kush_forge</Template>
 			<Player>0</Player>
 			<Position x="1818.32886" z="1573.25611"/>
 			<Orientation y="2.9477"/>
@@ -74078,7 +74078,7 @@
 			<Actor seed="62364"/>
 		</Entity>
 		<Entity uid="14946">
-			<Template>structures/kush_blacksmith</Template>
+			<Template>structures/kush_forge</Template>
 			<Player>0</Player>
 			<Position x="1209.87745" z="1482.97083"/>
 			<Orientation y="-0.12612"/>
@@ -75455,7 +75455,7 @@
 			<Actor seed="40256"/>
 		</Entity>
 		<Entity uid="15161">
-			<Template>structures/kush_blacksmith</Template>
+			<Template>structures/kush_forge</Template>
 			<Player>0</Player>
 			<Position x="1355.08655" z="1670.38001"/>
 			<Orientation y="0.54491"/>
@@ -79538,7 +79538,7 @@
 			<Actor seed="40168"/>
 		</Entity>
 		<Entity uid="15810">
-			<Template>structures/kush_blacksmith</Template>
+			<Template>structures/kush_forge</Template>
 			<Player>0</Player>
 			<Position x="1307.04444" z="389.86161"/>
 			<Orientation y="0.54491"/>
@@ -81903,7 +81903,7 @@
 			<Actor seed="11059"/>
 		</Entity>
 		<Entity uid="16180">
-			<Template>structures/kush_blacksmith</Template>
+			<Template>structures/kush_forge</Template>
 			<Player>0</Player>
 			<Position x="1335.5044" z="1963.06397"/>
 			<Orientation y="0.54491"/>
@@ -82759,7 +82759,7 @@
 			<Actor seed="6134"/>
 		</Entity>
 		<Entity uid="16310">
-			<Template>structures/kush_blacksmith</Template>
+			<Template>structures/kush_forge</Template>
 			<Player>0</Player>
 			<Position x="1135.75135" z="854.30665"/>
 			<Orientation y="0.38517"/>
@@ -83152,7 +83152,7 @@
 			<Actor seed="6134"/>
 		</Entity>
 		<Entity uid="16369">
-			<Template>structures/kush_blacksmith</Template>
+			<Template>structures/kush_forge</Template>
 			<Player>0</Player>
 			<Position x="1218.89356" z="555.83893"/>
 			<Orientation y="0.32531"/>
@@ -84054,7 +84054,7 @@
 			<Actor seed="11059"/>
 		</Entity>
 		<Entity uid="16507">
-			<Template>structures/kush_blacksmith</Template>
+			<Template>structures/kush_forge</Template>
 			<Player>0</Player>
 			<Position x="1148.23511" z="662.38141"/>
 			<Orientation y="-0.3364"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_athenians.xml
@@ -4308,7 +4308,7 @@
 			<Orientation y="-1.68091"/>
 		</Entity>
 		<Entity uid="818">
-			<Template>structures/athen_blacksmith</Template>
+			<Template>structures/athen_forge</Template>
 			<Player>1</Player>
 			<Position x="562.5741" z="1422.41028"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_britons.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_britons.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_britons.xml
@@ -21753,7 +21753,7 @@
 			<Actor seed="4044"/>
 		</Entity>
 		<Entity uid="3833">
-			<Template>structures/brit_blacksmith</Template>
+			<Template>structures/brit_forge</Template>
 			<Player>1</Player>
 			<Position x="573.89905" z="540.38257"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
@@ -5670,7 +5670,7 @@
 			<Actor seed="6296"/>
 		</Entity>
 		<Entity uid="1083">
-			<Template>structures/cart_blacksmith</Template>
+			<Template>structures/cart_forge</Template>
 			<Player>1</Player>
 			<Position x="387.71348" z="377.39087"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml
@@ -21786,7 +21786,7 @@
 			<Actor seed="4044"/>
 		</Entity>
 		<Entity uid="3833">
-			<Template>structures/gaul_blacksmith</Template>
+			<Template>structures/gaul_forge</Template>
 			<Player>1</Player>
 			<Position x="573.89905" z="540.38257"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml
@@ -3442,7 +3442,7 @@
 			<Actor seed="630"/>
 		</Entity>
 		<Entity uid="740">
-			<Template>structures/iber_blacksmith</Template>
+			<Template>structures/iber_forge</Template>
 			<Player>1</Player>
 			<Position x="519.97565" z="273.01981"/>
 			<Orientation y="-1.66796"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
@@ -4192,7 +4192,7 @@
 			<Actor seed="26536"/>
 		</Entity>
 		<Entity uid="849">
-			<Template>structures/mace_blacksmith</Template>
+			<Template>structures/mace_forge</Template>
 			<Player>1</Player>
 			<Position x="678.39917" z="1369.68433"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_persians.xml
@@ -8493,7 +8493,7 @@
 			<Actor seed="40808"/>
 		</Entity>
 		<Entity uid="1672">
-			<Template>structures/pers_blacksmith</Template>
+			<Template>structures/pers_forge</Template>
 			<Player>1</Player>
 			<Position x="595.89002" z="739.82984"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
@@ -10912,7 +10912,7 @@
 			<Actor seed="11596"/>
 		</Entity>
 		<Entity uid="1854">
-			<Template>structures/ptol_blacksmith</Template>
+			<Template>structures/ptol_forge</Template>
 			<Player>1</Player>
 			<Position x="489.73798" z="762.154"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
@@ -14484,7 +14484,7 @@
 			<Actor seed="41042"/>
 		</Entity>
 		<Entity uid="5683">
-			<Template>structures/ptol_blacksmith</Template>
+			<Template>structures/ptol_forge</Template>
 			<Player>1</Player>
 			<Position x="340.0319" z="655.78418"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_romans.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_romans.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_romans.xml
@@ -10734,7 +10734,7 @@
 			<Actor seed="34000"/>
 		</Entity>
 		<Entity uid="2394">
-			<Template>structures/rome_blacksmith</Template>
+			<Template>structures/rome_forge</Template>
 			<Player>1</Player>
 			<Position x="524.47553" z="200.45376"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml
@@ -11329,7 +11329,7 @@
 			<Actor seed="24692"/>
 		</Entity>
 		<Entity uid="2681">
-			<Template>structures/sele_blacksmith</Template>
+			<Template>structures/sele_forge</Template>
 			<Player>1</Player>
 			<Position x="572.14948" z="191.03045"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_spartans.xml
@@ -4187,7 +4187,7 @@
 			<Actor seed="26492"/>
 		</Entity>
 		<Entity uid="844">
-			<Template>structures/spart_blacksmith</Template>
+			<Template>structures/spart_forge</Template>
 			<Player>1</Player>
 			<Position x="586.01679" z="1357.97498"/>
 			<Orientation y="2.38872"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -25005,7 +25005,7 @@
 			<Actor seed="35086"/>
 		</Entity>
 		<Entity uid="5772">
-			<Template>structures/rome_blacksmith</Template>
+			<Template>structures/rome_forge</Template>
 			<Player>6</Player>
 			<Position x="399.61554" z="1309.13111"/>
 			<Orientation y="4.69097"/>
@@ -30741,7 +30741,7 @@
 			<Actor seed="55876"/>
 		</Entity>
 		<Entity uid="7069">
-			<Template>structures/cart_blacksmith</Template>
+			<Template>structures/cart_forge</Template>
 			<Player>3</Player>
 			<Position x="154.33619" z="707.21283"/>
 			<Orientation y="1.42351"/>
@@ -35328,7 +35328,7 @@
 			<Actor seed="15408"/>
 		</Entity>
 		<Entity uid="8233">
-			<Template>structures/sele_blacksmith</Template>
+			<Template>structures/sele_forge</Template>
 			<Player>1</Player>
 			<Position x="709.03455" z="1625.16846"/>
 			<Orientation y="-0.80773"/>
@@ -53594,7 +53594,7 @@
 			<Actor seed="55262"/>
 		</Entity>
 		<Entity uid="11937">
-			<Template>structures/pers_blacksmith</Template>
+			<Template>structures/pers_forge</Template>
 			<Player>4</Player>
 			<Position x="1705.82483" z="1578.16688"/>
 			<Orientation y="4.57708"/>
@@ -62623,7 +62623,7 @@
 			<Actor seed="28252"/>
 		</Entity>
 		<Entity uid="13971">
-			<Template>structures/maur_blacksmith</Template>
+			<Template>structures/maur_forge</Template>
 			<Player>0</Player>
 			<Position x="1933.72706" z="704.24006"/>
 			<Orientation y="-0.76601"/>
@@ -99538,7 +99538,7 @@
 			<Actor seed="25962"/>
 		</Entity>
 		<Entity uid="20830">
-			<Template>structures/ptol_blacksmith</Template>
+			<Template>structures/ptol_forge</Template>
 			<Player>5</Player>
 			<Position x="1263.54004" z="958.30445"/>
 			<Orientation y="5.19628"/>
@@ -103796,7 +103796,7 @@
 			<Actor seed="472"/>
 		</Entity>
 		<Entity uid="21737">
-			<Template>structures/kush_blacksmith</Template>
+			<Template>structures/kush_forge</Template>
 			<Player>2</Player>
 			<Position x="1644.28187" z="529.5777"/>
 			<Orientation y="4.13192"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/skirmish_demo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/skirmish_demo.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/skirmish_demo.xml
@@ -2881,7 +2881,7 @@
 			<Actor seed="25465"/>
 		</Entity>
 		<Entity uid="852">
-			<Template>skirmish/structures/default_blacksmith</Template>
+			<Template>skirmish/structures/default_forge</Template>
 			<Player>1</Player>
 			<Position x="355.91092" z="365.64512"/>
 			<Orientation y="2.31347"/>
Index: ps/trunk/binaries/data/mods/public/maps/tutorials/introductory_tutorial.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/tutorials/introductory_tutorial.js
+++ ps/trunk/binaries/data/mods/public/maps/tutorials/introductory_tutorial.js
@@ -271,10 +271,10 @@
 		}
 	},
 	{
-		"instructions": markForTranslation("Build a Blacksmith and research the Infantry Training technology (sword icon) to improve infantry hack attack."),
+		"instructions": markForTranslation("Build a Forge and research the Infantry Training technology (sword icon) to improve infantry hack attack."),
 		"OnResearchQueued": function(msg)
 		{
-			if (msg.technologyTemplate && TriggerHelper.EntityMatchesClassList(msg.researcherEntity, "Blacksmith"))
+			if (msg.technologyTemplate && TriggerHelper.EntityMatchesClassList(msg.researcherEntity, "Forge"))
 				this.NextGoal();
 		}
 	},
Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
+++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
@@ -1454,8 +1454,8 @@
 		// do not loose time destroying buildings which do not help enemy's defense and can be easily captured later
 		if (this.target.hasDefensiveFire())
 		{
-			targetClassesUnit.avoid = targetClassesUnit.avoid.concat("House", "Storehouse", "Farmstead", "Field", "Blacksmith");
-			targetClassesSiege.avoid = targetClassesSiege.avoid.concat("House", "Storehouse", "Farmstead", "Field", "Blacksmith");
+			targetClassesUnit.avoid = targetClassesUnit.avoid.concat("House", "Storehouse", "Farmstead", "Field", "Forge");
+			targetClassesSiege.avoid = targetClassesSiege.avoid.concat("House", "Storehouse", "Farmstead", "Field", "Forge");
 		}
 
 		if (this.unitCollUpdateArray === undefined || !this.unitCollUpdateArray.length)
Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/config.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/ai/petra/config.js
+++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/config.js
@@ -18,7 +18,7 @@
 		"fortressLapseTime": 390,	// Time to wait between building 2 fortresses
 		"popForBarracks1": 25,
 		"popForBarracks2": 95,
-		"popForBlacksmith": 65,
+		"popForForge": 65,
 		"numSentryTowers": 1
 	};
 
@@ -260,7 +260,7 @@
 		this.popScaling = Math.sqrt(maxPop / 300);
 		this.Military.popForBarracks1 = Math.min(Math.max(Math.floor(this.Military.popForBarracks1 * this.popScaling), 12), Math.floor(maxPop/5));
 		this.Military.popForBarracks2 = Math.min(Math.max(Math.floor(this.Military.popForBarracks2 * this.popScaling), 45), Math.floor(maxPop*2/3));
-		this.Military.popForBlacksmith = Math.min(Math.max(Math.floor(this.Military.popForBlacksmith * this.popScaling), 30), Math.floor(maxPop/2));
+		this.Military.popForForge = Math.min(Math.max(Math.floor(this.Military.popForForge * this.popScaling), 30), Math.floor(maxPop/2));
 		this.Economy.popPhase2 = Math.min(Math.max(Math.floor(this.Economy.popPhase2 * this.popScaling), 20), Math.floor(maxPop/2));
 		this.Economy.workPhase3 = Math.min(Math.max(Math.floor(this.Economy.workPhase3 * this.popScaling), 40), Math.floor(maxPop*2/3));
 		this.Economy.workPhase4 = Math.min(Math.max(Math.floor(this.Economy.workPhase4 * this.popScaling), 45), Math.floor(maxPop*2/3));
Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/headquarters.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/ai/petra/headquarters.js
+++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/headquarters.js
@@ -570,10 +570,10 @@
 					queue = "economicBuilding";
 					break;
 				}
-				if (!gameState.getOwnEntitiesByClass("Blacksmith", true).hasEntities() &&
-				    this.canBuild(gameState, "structures/{civ}_blacksmith"))
+				if (!gameState.getOwnEntitiesByClass("Forge", true).hasEntities() &&
+				    this.canBuild(gameState, "structures/{civ}_forge"))
 				{
-					plan = new PETRA.ConstructionPlan(gameState, "structures/{civ}_blacksmith", { "phaseUp": true });
+					plan = new PETRA.ConstructionPlan(gameState, "structures/{civ}_forge", { "phaseUp": true });
 					queue = "militaryBuilding";
 					break;
 				}
@@ -1896,17 +1896,17 @@
 	}
 };
 
-PETRA.HQ.prototype.buildBlacksmith = function(gameState, queues)
+PETRA.HQ.prototype.buildForge = function(gameState, queues)
 {
-	if (this.getAccountedPopulation(gameState) < this.Config.Military.popForBlacksmith ||
-		queues.militaryBuilding.hasQueuedUnits() || gameState.getOwnEntitiesByClass("Blacksmith", true).length)
+	if (this.getAccountedPopulation(gameState) < this.Config.Military.popForForge ||
+		queues.militaryBuilding.hasQueuedUnits() || gameState.getOwnEntitiesByClass("Forge", true).length)
 		return;
-	// Build a market before the blacksmith.
+	// Build a Market before the Forge.
 	if (!gameState.getOwnEntitiesByClass("Market", true).hasEntities())
 		return;
 
-	if (this.canBuild(gameState, "structures/{civ}_blacksmith"))
-		queues.militaryBuilding.addPlan(new PETRA.ConstructionPlan(gameState, "structures/{civ}_blacksmith"));
+	if (this.canBuild(gameState, "structures/{civ}_forge"))
+		queues.militaryBuilding.addPlan(new PETRA.ConstructionPlan(gameState, "structures/{civ}_forge"));
 };
 
 /**
@@ -2734,7 +2734,7 @@
 
 		if (!this.saveResources)
 		{
-			this.buildBlacksmith(gameState, queues);
+			this.buildForge(gameState, queues);
 			this.buildTemple(gameState, queues);
 		}
 
Index: ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
+++ ps/trunk/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: Amphitheater, Archer, ArmyCamp, Arsenal, ArtilleryTower, Axeman, Barracks, Bireme, Blacksmith, BoltShooter, BoltTower, Bribable, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Clubman, Colony, Corral, Council, Crossbowman, Defensive, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, FishingBoat, Fortress, Gate, Gladiator, Gymnasium, Hall, Healer, Hero, House, Infantry, IshtarGate, Javelineer, Library, Lighthouse, Maceman, Melee, Market, Mercenary, Military, Monument, Naval, Outpost, Palace, Palisade, Pikeman, Pillar, Pyramid, Quinquereme, Ram, Range, Ranged, Relic, Resource, RotaryMill, SentryTower, Ship, Shipyard, Siege, SiegeTower, SiegeWall, Slave, Slinger, Soldier, Spearman, Stable, Stoa, StoneThrower, StoneTower, Storehouse, Support, Swordsman, Syssiton, Temple, TempleOfAmun, TempleOfApedemak, TempleOfMars, TempleOfVesta, Theater, Tower, Town, Trade, Trader, Trireme, TriumphalArch, Village, Wall, Warship, Wonder, Worker.'>" +
+		"<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: Amphitheater, Archer, ArmyCamp, Arsenal, ArtilleryTower, Axeman, Barracks, Bireme, BoltShooter, BoltTower, Bribable, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Clubman, Colony, Corral, Council, Crossbowman, Defensive, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, FishingBoat, Forge, Fortress, Gate, Gladiator, Gymnasium, Hall, Healer, Hero, House, Infantry, IshtarGate, Javelineer, Library, Lighthouse, Maceman, Melee, Market, Mercenary, Military, Monument, Naval, Outpost, Palace, Palisade, Pikeman, Pillar, Pyramid, Quinquereme, Ram, Range, Ranged, Relic, Resource, RotaryMill, SentryTower, Ship, Shipyard, Siege, SiegeTower, SiegeWall, Slave, Slinger, Soldier, Spearman, Stable, Stoa, StoneThrower, StoneTower, Storehouse, Support, Swordsman, Syssiton, Temple, TempleOfAmun, TempleOfApedemak, TempleOfMars, TempleOfVesta, Theater, Tower, Town, Trade, Trader, Trireme, TriumphalArch, Village, Wall, Warship, Wonder, Worker.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/gaul_player_teambonus.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/gaul_player_teambonus.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/teambonuses/gaul_player_teambonus.json
@@ -1,6 +1,6 @@
 {
 	"type": "global",
-	"affects": ["Blacksmith"],
+	"affects": ["Forge"],
 	"affectedPlayers": ["ExclusiveMutualAlly"],
 	"modifications": [
 		{ "value": "ProductionQueue/TechCostMultiplier/food", "multiply": 0.85 },
@@ -10,5 +10,5 @@
 		{ "value": "ProductionQueue/TechCostMultiplier/time", "multiply": 0.85 }
 	],
 	"auraName": "Products from Gaul",
-	"auraDescription": "Blacksmiths −15% technology resource costs and research time."
+	"auraDescription": "Forges −15% technology resource costs and research time."
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json
@@ -88,7 +88,7 @@
 		{
 			"Name": "Products from Gaul",
 			"History": "The Gauls produced and exported swords and scabbards, woolen and leather products, and other arms.",
-			"Description": "Blacksmiths −15% technology resource costs and research time."
+			"Description": "Forges −15% technology resource costs and research time."
 		}
 	],
 	"Structures": [],
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_blacksmith.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_blacksmith">
-  <Identity>
-    <Civ>skirm</Civ>
-  </Identity>
-  <SkirmishReplacer>
-    <general>structures/{civ}_blacksmith</general>
-  </SkirmishReplacer>
-  <VisualActor>
-    <Actor>structures/hellenes/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/structures/default_forge.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_forge">
+  <Identity>
+    <Civ>skirm</Civ>
+  </Identity>
+  <SkirmishReplacer>
+    <general>structures/{civ}_forge</general>
+  </SkirmishReplacer>
+  <VisualActor>
+    <Actor>structures/hellenes/blacksmith.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_blacksmith.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_blacksmith">
-  <Identity>
-    <Civ>athen</Civ>
-    <SpecificName>Chalkeōn</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/hellenes/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_forge.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_forge">
+  <Identity>
+    <Civ>athen</Civ>
+    <SpecificName>Chalkeōn</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/hellenes/blacksmith.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_blacksmith.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_blacksmith">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
-  <Identity>
-    <Civ>brit</Civ>
-    <SpecificName>Gobanion</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/britons/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit_forge.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_forge">
+  <Cost>
+    <PopulationBonus>2</PopulationBonus>
+  </Cost>
+  <Identity>
+    <Civ>brit</Civ>
+    <SpecificName>Gobanion</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/britons/blacksmith.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_blacksmith.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_blacksmith">
-  <Identity>
-    <Civ>cart</Civ>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/carthaginians/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_forge.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_forge">
+  <Identity>
+    <Civ>cart</Civ>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/carthaginians/blacksmith.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_blacksmith.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_blacksmith">
-  <Cost>
-    <PopulationBonus>2</PopulationBonus>
-  </Cost>
-  <Identity>
-    <Civ>gaul</Civ>
-    <SpecificName>Gobanion</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/gauls/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul_forge.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_forge">
+  <Cost>
+    <PopulationBonus>2</PopulationBonus>
+  </Cost>
+  <Identity>
+    <Civ>gaul</Civ>
+    <SpecificName>Gobanion</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/gauls/blacksmith.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_blacksmith.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_blacksmith">
-  <Identity>
-    <Civ>iber</Civ>
-    <SpecificName>Harotz</SpecificName>
-  </Identity>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      attack_steel_working
-    </Technologies>
-  </ProductionQueue>
-  <VisualActor>
-    <Actor>structures/iberians/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber_forge.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_forge">
+  <Identity>
+    <Civ>iber</Civ>
+    <SpecificName>Harotz</SpecificName>
+  </Identity>
+  <ProductionQueue>
+    <Technologies datatype="tokens">
+      attack_steel_working
+    </Technologies>
+  </ProductionQueue>
+  <VisualActor>
+    <Actor>structures/iberians/blacksmith.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_blacksmith.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_blacksmith">
-  <Identity>
-    <Civ>kush</Civ>
-    <SpecificName>hmw hʿy n rȝ-ʿ</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/kushites/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_forge.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_forge">
+  <Identity>
+    <Civ>kush</Civ>
+    <SpecificName>hmw hʿy n rȝ-ʿ</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/kushites/blacksmith.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_blacksmith.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_blacksmith">
-  <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Chalkeōn</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/hellenes/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_forge.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_forge">
+  <Identity>
+    <Civ>mace</Civ>
+    <SpecificName>Chalkeōn</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/hellenes/blacksmith.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_blacksmith.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_blacksmith">
-  <Identity>
-    <Civ>maur</Civ>
-    <SpecificName>Lohakāra</SpecificName>
-  </Identity>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      attack_steel_working
-    </Technologies>
-  </ProductionQueue>
-  <VisualActor>
-    <Actor>structures/mauryas/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_forge.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_forge">
+  <Identity>
+    <Civ>maur</Civ>
+    <SpecificName>Lohakāra</SpecificName>
+  </Identity>
+  <ProductionQueue>
+    <Technologies datatype="tokens">
+      attack_steel_working
+    </Technologies>
+  </ProductionQueue>
+  <VisualActor>
+    <Actor>structures/mauryas/blacksmith.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_blacksmith.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_blacksmith">
-  <Identity>
-    <Civ>pers</Civ>
-    <SpecificName>Arštišta</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/persians/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_forge.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_forge">
+  <Identity>
+    <Civ>pers</Civ>
+    <SpecificName>Arštišta</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/persians/blacksmith.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_blacksmith.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_blacksmith">
-  <Identity>
-    <Civ>ptol</Civ>
-    <SpecificName>Chalkeōn</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/ptolemies/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol_forge.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_forge">
+  <Identity>
+    <Civ>ptol</Civ>
+    <SpecificName>Chalkeōn</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/ptolemies/blacksmith.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_blacksmith.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_blacksmith">
-  <Identity>
-    <Civ>rome</Civ>
-    <SpecificName>Armāmentārium</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/romans/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_forge.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_forge">
+  <Identity>
+    <Civ>rome</Civ>
+    <SpecificName>Armāmentārium</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/romans/blacksmith.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_blacksmith.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_blacksmith">
-  <Identity>
-    <Civ>sele</Civ>
-    <SpecificName>Chalkeōn</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/seleucids/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele_forge.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_forge">
+  <Identity>
+    <Civ>sele</Civ>
+    <SpecificName>Chalkeōn</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/seleucids/blacksmith.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_blacksmith.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_blacksmith">
-  <Identity>
-    <Civ>spart</Civ>
-    <SpecificName>Chalkeōn</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/spartans/blacksmith.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_forge.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_forge">
+  <Identity>
+    <Civ>spart</Civ>
+    <SpecificName>Chalkeōn</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/spartans/blacksmith.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military">
-  <Cost>
-    <BuildTime>120</BuildTime>
-    <Resources>
-      <wood>200</wood>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="22.0" depth="22.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>1</Max>
-    <List datatype="tokens">Infantry Healer</List>
-  </GarrisonHolder>
-  <Health>
-    <Max>2000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <GenericName>Blacksmith</GenericName>
-    <SelectionGroupName>template_structure_military_blacksmith</SelectionGroupName>
-    <Tooltip>Research attack and armor technologies.</Tooltip>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
-    <VisibleClasses datatype="tokens">Town Blacksmith</VisibleClasses>
-    <Icon>structures/blacksmith.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Loot>
-    <wood>40</wood>
-  </Loot>
-  <Obstruction>
-    <Static width="17.0" depth="17.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      attack_infantry_melee_01
-      attack_infantry_melee_02
-      attack_infantry_ranged_01
-      attack_infantry_ranged_02
-      attack_cavalry_melee_01
-      attack_cavalry_melee_02
-      attack_cavalry_ranged_01
-      attack_cavalry_ranged_02
-      armor_infantry_01
-      armor_infantry_02
-      armor_cav_01
-      armor_cav_02
-      armor_hero_01
-    </Technologies>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_blacksmith.xml</select>
-      <constructed>interface/complete/building/complete_blacksmith.xml</constructed>
-    </SoundGroups>
-  </Sound>
-  <TerritoryInfluence>
-    <Radius>38</Radius>
-    <Weight>30000</Weight>
-  </TerritoryInfluence>
-  <Vision>
-    <Range>32</Range>
-  </Vision>
-  <VisualActor>
-    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military">
+  <Cost>
+    <BuildTime>120</BuildTime>
+    <Resources>
+      <wood>200</wood>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="22.0" depth="22.0"/>
+    <Height>12.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>1</Max>
+    <List datatype="tokens">Infantry Healer</List>
+  </GarrisonHolder>
+  <Health>
+    <Max>2000</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <GenericName>Forge</GenericName>
+    <SelectionGroupName>template_structure_military_forge</SelectionGroupName>
+    <Tooltip>Research attack and armor technologies.</Tooltip>
+    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">Town Forge</VisibleClasses>
+    <Icon>structures/blacksmith.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+  </Identity>
+  <Loot>
+    <wood>40</wood>
+  </Loot>
+  <Obstruction>
+    <Static width="17.0" depth="17.0"/>
+  </Obstruction>
+  <ProductionQueue>
+    <Technologies datatype="tokens">
+      attack_infantry_melee_01
+      attack_infantry_melee_02
+      attack_infantry_ranged_01
+      attack_infantry_ranged_02
+      attack_cavalry_melee_01
+      attack_cavalry_melee_02
+      attack_cavalry_ranged_01
+      attack_cavalry_ranged_02
+      armor_infantry_01
+      armor_infantry_02
+      armor_cav_01
+      armor_cav_02
+      armor_hero_01
+    </Technologies>
+  </ProductionQueue>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_forge.xml</select>
+      <constructed>interface/complete/building/complete_forge.xml</constructed>
+    </SoundGroups>
+  </Sound>
+  <TerritoryInfluence>
+    <Radius>38</Radius>
+    <Weight>30000</Weight>
+  </TerritoryInfluence>
+  <Vision>
+    <Range>32</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -37,7 +37,7 @@
       structures/{civ}_sentry_tower
       structures/{civ}_dock
       structures/{civ}_barracks
-      structures/{civ}_blacksmith
+      structures/{civ}_forge
       structures/{civ}_temple
       structures/{civ}_market
       structures/{civ}_defense_tower
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -39,7 +39,7 @@
       structures/{civ}_sentry_tower
       structures/{civ}_dock
       structures/{civ}_barracks
-      structures/{civ}_blacksmith
+      structures/{civ}_forge
       structures/{civ}_temple
       structures/{civ}_market
       structures/{civ}_defense_tower
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -16,7 +16,7 @@
       structures/{civ}_sentry_tower
       structures/{civ}_dock
       structures/{civ}_barracks
-      structures/{civ}_blacksmith
+      structures/{civ}_forge
       structures/{civ}_temple
       structures/{civ}_market
       structures/{civ}_defense_tower