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: Archer, Barracks, Blacksmith, BoltShooter, Camel, Catapult, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Corral, DefenseTower, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelin, Maceman, Market, Mechanical, Melee, Mercenary, Military, Outpost, Pike, Ram, Range, Ranged, Relic, Resource, SentryTower, Ship, Shipyard, Siege, SiegeTower, Slave, Sling, Soldier, Spear, Stable, Storehouse, Support, Sword, Temple, Town, Trader, 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, Barracks, Blacksmith, BoltShooter, Camel, Catapult, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Corral, DefenseTower, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelin, Maceman, Market, Melee, Mercenary, Military, Outpost, Pike, Ram, Range, Ranged, Relic, Resource, SentryTower, Ship, Shipyard, Siege, SiegeTower, Slave, Sling, Soldier, Spear, Stable, Storehouse, Support, Sword, Temple, Town, Trader, Village, Warship, Wonder, Worker, Workshop'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/mace_catafalque.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/mace_catafalque.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/mace_catafalque.json
@@ -1,10 +1,9 @@
 {
 	"type": "global",
-	"affects": ["Human", "Mechanical", "Structure"],
+	"affects": ["Human", "Siege", "Ship", "Structure"],
 	"modifications": [
 		{ "value": "Looter/Resource/food", "add": 5 },
 		{ "value": "Looter/Resource/wood", "add": 5 }
-
 	],
 	"auraName": "Sacker of Cities",
 	"auraDescription": "During the First Macedonian War, Philip and his troops sacked Thermum, the religious and political center of Aetolia.\nHumans, Siege Engines, Ships, and Structures gain +5 food and wood loot."
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_brennus.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_brennus.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_brennus.json
@@ -1,7 +1,7 @@
 {
 	"type": "range",
 	"radius": 60,
-	"affects": ["Human", "Mechanical"],
+	"affects": ["Human", "Siege", "Ship"],
 	"modifications": [
 		{ "value": "Looter/Resource/metal", "add": 15 }
 	],
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/hero_garrison.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/hero_garrison.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/hero_garrison.json
@@ -1,6 +1,6 @@
 {
 	"type": "garrison",
-	"affects": ["Structure", "Mechanical"],
+	"affects": ["Structure", "Siege"],
 	"modifications": [
 		{ "value": "Capturable/GarrisonRegenRate", "add": 2 }
 	],
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_righteous.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_righteous.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_righteous.json
@@ -1,7 +1,7 @@
 {
 	"type": "range",
 	"radius": 80,
-	"affects": ["Structure", "Mechanical"],
+	"affects": ["Structure", "Ship", "Siege"],
 	"affectedPlayers": ["Enemy"],
 	"modifications": [
 		{ "value": "Health/Max", "multiply": 0.8 }
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
@@ -33,7 +33,7 @@
   <Identity>
     <GenericName>Ship</GenericName>
     <Formations disable=""/>
-    <VisibleClasses datatype="tokens">Mechanical Ship</VisibleClasses>
+    <VisibleClasses datatype="tokens">Ship</VisibleClasses>
   </Identity>
   <Loot>
     <xp>60</xp>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml
@@ -22,7 +22,7 @@
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Mechanical Siege</VisibleClasses>
+    <VisibleClasses datatype="tokens">Siege</VisibleClasses>
     <GenericName>Siege</GenericName>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>