Index: ps/trunk/binaries/data/mods/public/maps/random/african_plains.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/african_plains.js
+++ ps/trunk/binaries/data/mods/public/maps/random/african_plains.js
@@ -19,7 +19,7 @@
 var oBerryBush = "gaia/flora_bush_berry";
 var oWildebeest = "gaia/fauna_wildebeest";
 var oZebra = "gaia/fauna_zebra";
-var oRhino = "gaia/fauna_rhino";
+var oRhino = "gaia/fauna_rhinoceros_white";
 var oLion = "gaia/fauna_lion";
 var oLioness = "gaia/fauna_lioness";
 var oHawk = "birds/buzzard";
@@ -28,7 +28,7 @@
 var oGazelle = "gaia/fauna_gazelle";
 var oElephant = "gaia/fauna_elephant_african_bush";
 var oElephant2 = "gaia/fauna_elephant_african_infant";
-var oCrocodile = "gaia/fauna_crocodile";
+var oCrocodile = "gaia/fauna_crocodile_nile";
 var oFish = "gaia/fish/generic";
 var oStoneSmall = "gaia/geology_stone_savanna_small";
 var oMetalLarge = "gaia/geology_metal_savanna_slabs";
Index: ps/trunk/binaries/data/mods/public/maps/random/botswanan_haven.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/botswanan_haven.js
+++ ps/trunk/binaries/data/mods/public/maps/random/botswanan_haven.js
@@ -19,8 +19,8 @@
 const oZebra = "gaia/fauna_zebra";
 const oWildebeest = "gaia/fauna_wildebeest";
 const oLion = "gaia/fauna_lion";
-const oRhino = "gaia/fauna_rhino";
-const oCrocodile = "gaia/fauna_crocodile";
+const oRhino = "gaia/fauna_rhinoceros_white";
+const oCrocodile = "gaia/fauna_crocodile_nile";
 const oElephant = "gaia/fauna_elephant_north_african";
 const oElephantInfant = "gaia/fauna_elephant_african_infant";
 const oLioness = "gaia/fauna_lioness";
Index: ps/trunk/binaries/data/mods/public/maps/random/elephantine.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/elephantine.js
+++ ps/trunk/binaries/data/mods/public/maps/random/elephantine.js
@@ -53,7 +53,7 @@
 ];
 const oBerryBush = "gaia/flora_bush_berry_desert";
 const oGazelle = "gaia/fauna_gazelle";
-const oRhino = "gaia/fauna_rhino";
+const oRhino = "gaia/fauna_rhinoceros_white";
 const oWarthog = "gaia/fauna_boar";
 const oGiraffe = "gaia/fauna_giraffe";
 const oGiraffeInfant = "gaia/fauna_giraffe_infant";
@@ -61,7 +61,7 @@
 const oElephantInfant = "gaia/fauna_elephant_african_infant";
 const oLion = "gaia/fauna_lion";
 const oLioness = "gaia/fauna_lioness";
-const oCrocodile = "gaia/fauna_crocodile";
+const oCrocodile = "gaia/fauna_crocodile_nile";
 const oFish = "gaia/fish/tilapia";
 const oHawk = "birds/buzzard";
 
Index: ps/trunk/binaries/data/mods/public/maps/random/hellas_biomes.json
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/hellas_biomes.json
+++ ps/trunk/binaries/data/mods/public/maps/random/hellas_biomes.json
@@ -163,7 +163,7 @@
 				"goat": "gaia/fauna_goat",
 				"hawk": "birds/buzzard",
 				"horse": "gaia/fauna_horse",
-				"pony": "gaia/fauna_pony"
+				"pony": "gaia/fauna_horse_pony"
 			},
 			"athen": {
 				"temple": "structures/athen_temple",
Index: ps/trunk/binaries/data/mods/public/maps/random/india.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/india.js
+++ ps/trunk/binaries/data/mods/public/maps/random/india.js
@@ -12,7 +12,7 @@
 const oBerryBush = "gaia/flora_bush_berry";
 const oRabbit = "gaia/fauna_rabbit";
 const oTiger = "gaia/fauna_tiger";
-const oCrocodile = "gaia/fauna_crocodile";
+const oCrocodile = "gaia/fauna_crocodile_nile";
 const oFish = "gaia/fish/generic";
 const oElephant = "gaia/fauna_elephant_asian";
 const oElephantInfant = "gaia/fauna_elephant_asian_infant";
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
@@ -53,13 +53,13 @@
 const oGiraffe = "gaia/fauna_giraffe";
 const oGiraffeInfant = "gaia/fauna_giraffe_infant";
 const oGazelle = "gaia/fauna_gazelle";
-const oRhino = "gaia/fauna_rhino";
+const oRhino = "gaia/fauna_rhinoceros_white";
 const oWarthog = "gaia/fauna_boar";
 const oElephant = "gaia/fauna_elephant_african_bush";
 const oElephantInfant = "gaia/fauna_elephant_african_infant";
 const oLion = "gaia/fauna_lion";
 const oLioness = "gaia/fauna_lioness";
-const oCrocodile = "gaia/fauna_crocodile";
+const oCrocodile = "gaia/fauna_crocodile_nile";
 const oFish = "gaia/fish/tilapia";
 const oHawk = "birds/buzzard";
 const oTempleApedemak = "structures/kush_temple";
Index: ps/trunk/binaries/data/mods/public/maps/random/ngorongoro.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/ngorongoro.js
+++ ps/trunk/binaries/data/mods/public/maps/random/ngorongoro.js
@@ -81,7 +81,7 @@
 
 function setBiomeEden()
 {
-	g_Gaia.mainHuntableAnimal = "gaia/fauna_rhino";
+	g_Gaia.mainHuntableAnimal = "gaia/fauna_rhinoceros_white";
 	g_Gaia.secondaryHuntableAnimal =  "gaia/fauna_elephant_african_bush";
 }
 
Index: ps/trunk/binaries/data/mods/public/maps/random/northern_lights.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/northern_lights.js
+++ ps/trunk/binaries/data/mods/public/maps/random/northern_lights.js
@@ -20,7 +20,7 @@
 const oMetalLarge = "gaia/geology_metal_alpine_slabs";
 const oFish = "gaia/fish/generic";
 const oWalrus = "gaia/fauna_walrus";
-const oArcticWolf = "gaia/fauna_arctic_wolf";
+const oArcticWolf = "gaia/fauna_wolf_arctic";
 
 const aIceberg = "actor|props/special/eyecandy/iceberg.xml";
 
Index: ps/trunk/binaries/data/mods/public/maps/random/polar_sea.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/polar_sea.js
+++ ps/trunk/binaries/data/mods/public/maps/random/polar_sea.js
@@ -12,7 +12,7 @@
 var tWater = "polar_ice_c";
 
 var oArcticFox = "gaia/fauna_fox_arctic";
-var oArcticWolf = "gaia/fauna_arctic_wolf_domestic";
+var oArcticWolf = "gaia/fauna_wolf_arctic_domestic";
 var oMuskox = "gaia/fauna_muskox";
 var oWalrus = "gaia/fauna_walrus";
 var oWhaleFin = "gaia/fauna_whale_fin";
Index: ps/trunk/binaries/data/mods/public/maps/random/polar_sea_triggers.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/polar_sea_triggers.js
+++ ps/trunk/binaries/data/mods/public/maps/random/polar_sea_triggers.js
@@ -1,6 +1,6 @@
 const debugLog = false;
 
-var attackerTemplate = "gaia/fauna_arctic_wolf_domestic";
+var attackerTemplate = "gaia/fauna_wolf_arctic_domestic";
 
 var minWaveSize = 1;
 var maxWaveSize = 3;
Index: ps/trunk/binaries/data/mods/public/maps/random/scythian_rivulet.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/scythian_rivulet.js
+++ ps/trunk/binaries/data/mods/public/maps/random/scythian_rivulet.js
@@ -22,7 +22,7 @@
 const oDeer = "gaia/fauna_deer";
 const oRabbit = "gaia/fauna_rabbit";
 const oWolf1 = "gaia/fauna_wolf";
-const oWolf2 = "gaia/fauna_arctic_wolf";
+const oWolf2 = "gaia/fauna_wolf_arctic";
 const oHawk = "birds/buzzard";
 const oFish = "gaia/fish/generic";
 const oStoneLarge = "gaia/geology_stonemine_alpine_quarry";
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
@@ -2865,42 +2865,42 @@
 			<Actor seed="18298"/>
 		</Entity>
 		<Entity uid="631">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="481.5492" z="249.00077"/>
 			<Orientation y="-1.90203"/>
 			<Actor seed="42530"/>
 		</Entity>
 		<Entity uid="632">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="768.06592" z="344.31568"/>
 			<Orientation y="0.94353"/>
 			<Actor seed="51038"/>
 		</Entity>
 		<Entity uid="633">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="435.29035" z="784.23432"/>
 			<Orientation y="-2.47251"/>
 			<Actor seed="32966"/>
 		</Entity>
 		<Entity uid="634">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="757.05604" z="762.76478"/>
 			<Orientation y="-1.92176"/>
 			<Actor seed="14618"/>
 		</Entity>
 		<Entity uid="635">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="405.6344" z="162.12418"/>
 			<Orientation y="-1.53827"/>
 			<Actor seed="12006"/>
 		</Entity>
 		<Entity uid="636">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="626.35969" z="173.64661"/>
 			<Orientation y="0.20365"/>
@@ -10616,49 +10616,49 @@
 			<Actor seed="53070"/>
 		</Entity>
 		<Entity uid="2027">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="967.32062" z="376.33417"/>
 			<Orientation y="0.34421"/>
 			<Actor seed="3036"/>
 		</Entity>
 		<Entity uid="2028">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="963.72815" z="391.84202"/>
 			<Orientation y="-4.31461"/>
 			<Actor seed="37596"/>
 		</Entity>
 		<Entity uid="2029">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="954.87269" z="394.84852"/>
 			<Orientation y="2.32996"/>
 			<Actor seed="60742"/>
 		</Entity>
 		<Entity uid="2030">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="227.88224" z="501.63047"/>
 			<Orientation y="-2.57908"/>
 			<Actor seed="21482"/>
 		</Entity>
 		<Entity uid="2031">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="219.62143" z="488.74695"/>
 			<Orientation y="0.62714"/>
 			<Actor seed="29644"/>
 		</Entity>
 		<Entity uid="2032">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="873.52259" z="346.02265"/>
 			<Orientation y="-2.7179"/>
 			<Actor seed="436"/>
 		</Entity>
 		<Entity uid="2033">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="871.21363" z="333.7211"/>
 			<Orientation y="1.16962"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
@@ -2320,56 +2320,56 @@
 			<Actor seed="60528"/>
 		</Entity>
 		<Entity uid="3300">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="173.82474" z="380.66419"/>
 			<Orientation y="-2.74631"/>
 			<Actor seed="24360"/>
 		</Entity>
 		<Entity uid="3301">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="164.91639" z="392.71305"/>
 			<Orientation y="-3.04001"/>
 			<Actor seed="22462"/>
 		</Entity>
 		<Entity uid="3302">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="203.7501" z="391.79853"/>
 			<Orientation y="-2.376"/>
 			<Actor seed="65421"/>
 		</Entity>
 		<Entity uid="3303">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="30.22277" z="443.91694"/>
 			<Orientation y="-0.09186"/>
 			<Actor seed="1622"/>
 		</Entity>
 		<Entity uid="3304">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="35.11583" z="444.68213"/>
 			<Orientation y="0.17986"/>
 			<Actor seed="24256"/>
 		</Entity>
 		<Entity uid="3305">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="43.36933" z="444.79087"/>
 			<Orientation y="0.07241"/>
 			<Actor seed="22788"/>
 		</Entity>
 		<Entity uid="3306">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="129.92035" z="500.98832"/>
 			<Orientation y="-0.03217"/>
 			<Actor seed="522"/>
 		</Entity>
 		<Entity uid="3307">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="152.18586" z="506.12443"/>
 			<Orientation y="0.26696"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
@@ -14632,14 +14632,14 @@
 			<Actor seed="15734"/>
 		</Entity>
 		<Entity uid="2357">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="281.57392" z="687.32337"/>
 			<Orientation y="-2.51017"/>
 			<Actor seed="54262"/>
 		</Entity>
 		<Entity uid="2358">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="526.83594" z="811.26185"/>
 			<Orientation y="0.56771"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml
@@ -1570,13 +1570,13 @@
 			<Orientation y="-4.01783"/>
 		</Entity>
 		<Entity uid="5142">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="137.20478" z="907.71442"/>
 			<Orientation y="-0.62938"/>
 		</Entity>
 		<Entity uid="5143">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="142.40766" z="909.67981"/>
 			<Orientation y="-2.56713"/>
@@ -41194,189 +41194,189 @@
 			<Actor seed="26364"/>
 		</Entity>
 		<Entity uid="12254">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="948.00251" z="1029.27552"/>
 			<Orientation y="2.27175"/>
 			<Actor seed="12062"/>
 		</Entity>
 		<Entity uid="12255">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="942.58454" z="1042.63697"/>
 			<Orientation y="-0.1305"/>
 			<Actor seed="11940"/>
 		</Entity>
 		<Entity uid="12256">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1399.01038" z="685.98932"/>
 			<Orientation y="-1.17515"/>
 			<Actor seed="38730"/>
 		</Entity>
 		<Entity uid="12257">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1403.62696" z="658.98707"/>
 			<Orientation y="-2.62262"/>
 			<Actor seed="6026"/>
 		</Entity>
 		<Entity uid="12258">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1404.50025" z="717.35615"/>
 			<Orientation y="-0.78364"/>
 			<Actor seed="6298"/>
 		</Entity>
 		<Entity uid="12259">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1419.83814" z="710.74488"/>
 			<Orientation y="-0.14852"/>
 			<Actor seed="65244"/>
 		</Entity>
 		<Entity uid="12260">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1293.74451" z="382.43424"/>
 			<Orientation y="-0.48961"/>
 			<Actor seed="49944"/>
 		</Entity>
 		<Entity uid="12261">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1301.70252" z="376.22107"/>
 			<Orientation y="0.07679"/>
 			<Actor seed="63298"/>
 		</Entity>
 		<Entity uid="12262">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1296.52674" z="367.17774"/>
 			<Orientation y="-2.1431"/>
 			<Actor seed="42628"/>
 		</Entity>
 		<Entity uid="12263">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1315.76368" z="354.3913"/>
 			<Orientation y="-2.00936"/>
 			<Actor seed="51806"/>
 		</Entity>
 		<Entity uid="12264">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="491.56055" z="471.47272"/>
 			<Orientation y="-2.3268"/>
 			<Actor seed="2896"/>
 		</Entity>
 		<Entity uid="12265">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="460.52183" z="524.65625"/>
 			<Orientation y="-0.81487"/>
 			<Actor seed="65250"/>
 		</Entity>
 		<Entity uid="12266">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="471.74567" z="534.85853"/>
 			<Orientation y="-0.77068"/>
 			<Actor seed="19794"/>
 		</Entity>
 		<Entity uid="12267">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="480.58271" z="538.88721"/>
 			<Orientation y="-0.4362"/>
 			<Actor seed="33126"/>
 		</Entity>
 		<Entity uid="12268">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="295.41172" z="483.02503"/>
 			<Orientation y="-0.90499"/>
 			<Actor seed="13918"/>
 		</Entity>
 		<Entity uid="12269">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="341.58375" z="358.16562"/>
 			<Orientation y="1.37432"/>
 			<Actor seed="38336"/>
 		</Entity>
 		<Entity uid="12270">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="294.287" z="271.5647"/>
 			<Orientation y="-0.21413"/>
 			<Actor seed="10020"/>
 		</Entity>
 		<Entity uid="12271">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="509.41678" z="135.03052"/>
 			<Orientation y="0.07364"/>
 			<Actor seed="25912"/>
 		</Entity>
 		<Entity uid="12272">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="504.12833" z="136.04572"/>
 			<Orientation y="-0.35029"/>
 			<Actor seed="20894"/>
 		</Entity>
 		<Entity uid="12273">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="480.51969" z="838.59089"/>
 			<Orientation y="-0.49593"/>
 			<Actor seed="41066"/>
 		</Entity>
 		<Entity uid="12274">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="491.33414" z="837.68409"/>
 			<Orientation y="-0.27671"/>
 			<Actor seed="57448"/>
 		</Entity>
 		<Entity uid="12275">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="514.89106" z="880.67927"/>
 			<Orientation y="-0.63637"/>
 			<Actor seed="57888"/>
 		</Entity>
 		<Entity uid="12276">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="519.95691" z="906.36194"/>
 			<Orientation y="-0.46248"/>
 			<Actor seed="17214"/>
 		</Entity>
 		<Entity uid="12277">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="546.6233" z="811.34137"/>
 			<Orientation y="2.45006"/>
 			<Actor seed="27380"/>
 		</Entity>
 		<Entity uid="12278">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="543.71772" z="799.25489"/>
 			<Orientation y="-3.0616"/>
 			<Actor seed="6408"/>
 		</Entity>
 		<Entity uid="12279">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="553.96833" z="679.34321"/>
 			<Orientation y="2.54593"/>
 			<Actor seed="3080"/>
 		</Entity>
 		<Entity uid="12280">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="549.94129" z="679.03785"/>
 			<Orientation y="-3.12497"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
@@ -2743,42 +2743,42 @@
 			<Actor seed="18298"/>
 		</Entity>
 		<Entity uid="631">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="343.14704" z="312.08628"/>
 			<Orientation y="-5.42127"/>
 			<Actor seed="42530"/>
 		</Entity>
 		<Entity uid="632">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="768.06592" z="344.31568"/>
 			<Orientation y="0.94353"/>
 			<Actor seed="51038"/>
 		</Entity>
 		<Entity uid="633">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="435.29035" z="784.23432"/>
 			<Orientation y="-2.47251"/>
 			<Actor seed="32966"/>
 		</Entity>
 		<Entity uid="634">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="757.05604" z="762.76478"/>
 			<Orientation y="-1.92176"/>
 			<Actor seed="14618"/>
 		</Entity>
 		<Entity uid="635">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="405.6344" z="162.12418"/>
 			<Orientation y="-1.53827"/>
 			<Actor seed="12006"/>
 		</Entity>
 		<Entity uid="636">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="626.35969" z="173.64661"/>
 			<Orientation y="0.20365"/>
@@ -10564,70 +10564,70 @@
 			<Actor seed="53070"/>
 		</Entity>
 		<Entity uid="2024">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="155.5174" z="542.30787"/>
 			<Orientation y="-1.49268"/>
 			<Actor seed="39038"/>
 		</Entity>
 		<Entity uid="2025">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="162.57621" z="549.00428"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="36046"/>
 		</Entity>
 		<Entity uid="2026">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="177.10352" z="555.64032"/>
 			<Orientation y="-0.91681"/>
 			<Actor seed="5968"/>
 		</Entity>
 		<Entity uid="2027">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="967.32062" z="376.33417"/>
 			<Orientation y="0.34421"/>
 			<Actor seed="3036"/>
 		</Entity>
 		<Entity uid="2028">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="963.72815" z="391.84202"/>
 			<Orientation y="-4.31461"/>
 			<Actor seed="37596"/>
 		</Entity>
 		<Entity uid="2029">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="954.87269" z="394.84852"/>
 			<Orientation y="2.32996"/>
 			<Actor seed="60742"/>
 		</Entity>
 		<Entity uid="2030">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="227.88224" z="501.63047"/>
 			<Orientation y="-2.57908"/>
 			<Actor seed="21482"/>
 		</Entity>
 		<Entity uid="2031">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="219.62143" z="488.74695"/>
 			<Orientation y="0.62714"/>
 			<Actor seed="29644"/>
 		</Entity>
 		<Entity uid="2032">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="873.52259" z="346.02265"/>
 			<Orientation y="-2.7179"/>
 			<Actor seed="436"/>
 		</Entity>
 		<Entity uid="2033">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="871.21363" z="333.7211"/>
 			<Orientation y="1.16962"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml
@@ -15149,210 +15149,210 @@
 			<Actor seed="44249"/>
 		</Entity>
 		<Entity uid="4228">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="1049.31788" z="1358.13721"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="38157"/>
 		</Entity>
 		<Entity uid="4229">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="1099.5088" z="1307.37476"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="17428"/>
 		</Entity>
 		<Entity uid="4230">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="1229.74537" z="1243.13147"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="32959"/>
 		</Entity>
 		<Entity uid="4231">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="1223.55042" z="1240.30103"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="29409"/>
 		</Entity>
 		<Entity uid="4232">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="1274.37806" z="1222.65943"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="15173"/>
 		</Entity>
 		<Entity uid="4233">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="1079.57557" z="1232.90186"/>
 			<Orientation y="-2.88569"/>
 			<Actor seed="13680"/>
 		</Entity>
 		<Entity uid="4234">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="1035.95813" z="1134.04944"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="56171"/>
 		</Entity>
 		<Entity uid="4235">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="1068.98462" z="1083.62867"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="16859"/>
 		</Entity>
 		<Entity uid="4236">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="995.10608" z="1016.53266"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="48398"/>
 		</Entity>
 		<Entity uid="4237">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="936.17109" z="981.36475"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="15962"/>
 		</Entity>
 		<Entity uid="4238">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="901.05079" z="1037.73133"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="41639"/>
 		</Entity>
 		<Entity uid="4239">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="887.50666" z="1064.93665"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="54118"/>
 		</Entity>
 		<Entity uid="4240">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="943.96998" z="1109.2627"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="57158"/>
 		</Entity>
 		<Entity uid="4241">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="972.77338" z="1111.99683"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="25478"/>
 		</Entity>
 		<Entity uid="4242">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="987.20685" z="916.64478"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39292"/>
 		</Entity>
 		<Entity uid="4243">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="412.76206" z="545.24646"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="34014"/>
 		</Entity>
 		<Entity uid="4244">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="393.43671" z="515.3736"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40835"/>
 		</Entity>
 		<Entity uid="4245">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="422.11365" z="473.25843"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="52751"/>
 		</Entity>
 		<Entity uid="4246">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="442.84208" z="489.45405"/>
 			<Orientation y="0.6666"/>
 			<Actor seed="26639"/>
 		</Entity>
 		<Entity uid="4247">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="495.08851" z="499.02015"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="50574"/>
 		</Entity>
 		<Entity uid="4248">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="525.47822" z="392.5662"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="50342"/>
 		</Entity>
 		<Entity uid="4249">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="391.96454" z="430.0261"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="2949"/>
 		</Entity>
 		<Entity uid="4250">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="440.69983" z="339.22834"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="24074"/>
 		</Entity>
 		<Entity uid="4251">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="314.78812" z="310.52875"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13256"/>
 		</Entity>
 		<Entity uid="4252">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="229.59797" z="292.14081"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39030"/>
 		</Entity>
 		<Entity uid="4253">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="183.4654" z="385.18879"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="38894"/>
 		</Entity>
 		<Entity uid="4254">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="312.21845" z="209.5528"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40182"/>
 		</Entity>
 		<Entity uid="4255">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="417.50895" z="167.63627"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21336"/>
 		</Entity>
 		<Entity uid="4256">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="464.53779" z="143.03846"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27279"/>
 		</Entity>
 		<Entity uid="4257">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="557.85523" z="132.8714"/>
 			<Orientation y="2.35621"/>
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
@@ -18733,7 +18733,7 @@
 			<Actor seed="50810"/>
 		</Entity>
 		<Entity uid="4474">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="815.86072" z="733.06366"/>
 			<Orientation y="4.1925"/>
@@ -36347,7 +36347,7 @@
 			<Actor seed="23148"/>
 		</Entity>
 		<Entity uid="8426">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1415.81775" z="1594.79847"/>
 			<Orientation y="5.57184"/>
@@ -40451,7 +40451,7 @@
 			<Actor seed="20956"/>
 		</Entity>
 		<Entity uid="9492">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="808.57892" z="740.0622"/>
 			<Orientation y="2.96006"/>
@@ -44791,7 +44791,7 @@
 			<Actor seed="52952"/>
 		</Entity>
 		<Entity uid="10331">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="812.13465" z="760.89942"/>
 			<Orientation y="1.81612"/>
@@ -45600,7 +45600,7 @@
 			<Actor seed="12986"/>
 		</Entity>
 		<Entity uid="10516">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="757.79523" z="742.40888"/>
 			<Orientation y="3.07451"/>
@@ -46087,7 +46087,7 @@
 			<Actor seed="1720"/>
 		</Entity>
 		<Entity uid="10599">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="838.13276" z="741.26954"/>
 			<Orientation y="3.133"/>
@@ -55802,7 +55802,7 @@
 			<Actor seed="58414"/>
 		</Entity>
 		<Entity uid="12324">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="826.14533" z="757.82209"/>
 			<Orientation y="2.35621"/>
@@ -55899,7 +55899,7 @@
 			<Actor seed="33488"/>
 		</Entity>
 		<Entity uid="12340">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="789.48108" z="781.79328"/>
 			<Orientation y="2.42731"/>
@@ -56088,7 +56088,7 @@
 			<Actor seed="19486"/>
 		</Entity>
 		<Entity uid="12371">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="883.59052" z="762.6183"/>
 			<Orientation y="1.94562"/>
@@ -77633,7 +77633,7 @@
 			<Actor seed="2838"/>
 		</Entity>
 		<Entity uid="16861">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1177.49549" z="893.47065"/>
 			<Orientation y="9.16022"/>
@@ -77694,7 +77694,7 @@
 			<Actor seed="2424"/>
 		</Entity>
 		<Entity uid="16872">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1169.0171" z="425.03174"/>
 			<Orientation y="2.35621"/>
@@ -78194,21 +78194,21 @@
 			<Actor seed="43566"/>
 		</Entity>
 		<Entity uid="16955">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="1173.31653" z="1397.42945"/>
 			<Orientation y="-2.70995"/>
 			<Actor seed="44436"/>
 		</Entity>
 		<Entity uid="16956">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="1160.87635" z="1393.79249"/>
 			<Orientation y="1.44683"/>
 			<Actor seed="47994"/>
 		</Entity>
 		<Entity uid="16957">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="1170.9375" z="1388.7555"/>
 			<Orientation y="-2.26084"/>
@@ -78756,14 +78756,14 @@
 			<Actor seed="50512"/>
 		</Entity>
 		<Entity uid="17046">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="1251.2732" z="1447.90223"/>
 			<Orientation y="-2.70995"/>
 			<Actor seed="44436"/>
 		</Entity>
 		<Entity uid="17047">
-			<Template>gaia/fauna_rhino</Template>
+			<Template>gaia/fauna_rhinoceros_white</Template>
 			<Player>0</Player>
 			<Position x="1242.38965" z="1439.349"/>
 			<Orientation y="-4.33994"/>
@@ -85974,14 +85974,14 @@
 			<Actor seed="26500"/>
 		</Entity>
 		<Entity uid="18254">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1098.0276" z="954.09516"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="11984"/>
 		</Entity>
 		<Entity uid="18255">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1076.33558" z="867.02295"/>
 			<Orientation y="0.58214"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
@@ -6126,7 +6126,7 @@
 			<Actor seed="46180"/>
 		</Entity>
 		<Entity uid="1229">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="113.12829" z="438.99152"/>
 			<Orientation y="2.35621"/>
@@ -12527,28 +12527,28 @@
 			<Actor seed="63986"/>
 		</Entity>
 		<Entity uid="2269">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="713.64795" z="271.31196"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="23068"/>
 		</Entity>
 		<Entity uid="2270">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="701.67237" z="267.95414"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="48172"/>
 		</Entity>
 		<Entity uid="2271">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="656.00062" z="415.5"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="62032"/>
 		</Entity>
 		<Entity uid="2272">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="654.59327" z="434.02393"/>
 			<Orientation y="2.35621"/>
@@ -12597,14 +12597,14 @@
 			<Actor seed="20456"/>
 		</Entity>
 		<Entity uid="2279">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="377.31434" z="40.58182"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39574"/>
 		</Entity>
 		<Entity uid="2280">
-			<Template>gaia/fauna_arctic_wolf</Template>
+			<Template>gaia/fauna_wolf_arctic</Template>
 			<Player>0</Player>
 			<Position x="378.75657" z="37.87172"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml
@@ -63661,672 +63661,672 @@
 			<Actor seed="4290"/>
 		</Entity>
 		<Entity uid="15119">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="324.66095" z="834.00544"/>
 			<Orientation y="0.92872"/>
 			<Actor seed="26802"/>
 		</Entity>
 		<Entity uid="15120">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="339.74418" z="839.34241"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="12218"/>
 		</Entity>
 		<Entity uid="15121">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="336.50431" z="833.04792"/>
 			<Orientation y="1.09412"/>
 			<Actor seed="51922"/>
 		</Entity>
 		<Entity uid="15122">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="174.84907" z="771.35724"/>
 			<Orientation y="1.70995"/>
 			<Actor seed="6108"/>
 		</Entity>
 		<Entity uid="15123">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="181.18931" z="770.34595"/>
 			<Orientation y="-2.957"/>
 			<Actor seed="35102"/>
 		</Entity>
 		<Entity uid="15124">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="187.39075" z="762.30958"/>
 			<Orientation y="0.7102"/>
 			<Actor seed="37400"/>
 		</Entity>
 		<Entity uid="15125">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="36.50522" z="826.81605"/>
 			<Orientation y="-2.36405"/>
 			<Actor seed="44876"/>
 		</Entity>
 		<Entity uid="15126">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="30.02997" z="819.39606"/>
 			<Orientation y="0.72577"/>
 			<Actor seed="17458"/>
 		</Entity>
 		<Entity uid="15127">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="27.78795" z="834.84296"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="33118"/>
 		</Entity>
 		<Entity uid="15128">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="234.84705" z="894.04511"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="4640"/>
 		</Entity>
 		<Entity uid="15129">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="236.7653" z="899.81812"/>
 			<Orientation y="0.83176"/>
 			<Actor seed="21346"/>
 		</Entity>
 		<Entity uid="15130">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="246.43168" z="904.87"/>
 			<Orientation y="-3.05394"/>
 			<Actor seed="53214"/>
 		</Entity>
 		<Entity uid="15131">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="225.61283" z="892.34662"/>
 			<Orientation y="0.1455"/>
 			<Actor seed="51454"/>
 		</Entity>
 		<Entity uid="15132">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="403.66221" z="933.6255"/>
 			<Orientation y="-2.32894"/>
 			<Actor seed="33734"/>
 		</Entity>
 		<Entity uid="15133">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="391.4336" z="928.40821"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="2904"/>
 		</Entity>
 		<Entity uid="15134">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="387.2906" z="934.82636"/>
 			<Orientation y="0.16982"/>
 			<Actor seed="52678"/>
 		</Entity>
 		<Entity uid="15135">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="394.56373" z="938.01484"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="30842"/>
 		</Entity>
 		<Entity uid="15136">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="598.0163" z="809.95484"/>
 			<Orientation y="1.64379"/>
 			<Actor seed="10812"/>
 		</Entity>
 		<Entity uid="15137">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="607.84076" z="825.06873"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="59320"/>
 		</Entity>
 		<Entity uid="15138">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="592.53541" z="824.64557"/>
 			<Orientation y="-2.2114"/>
 			<Actor seed="64984"/>
 		</Entity>
 		<Entity uid="15139">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="581.03412" z="815.15345"/>
 			<Orientation y="1.57081"/>
 			<Actor seed="64288"/>
 		</Entity>
 		<Entity uid="15140">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="788.26313" z="971.49897"/>
 			<Orientation y="-2.29587"/>
 			<Actor seed="16948"/>
 		</Entity>
 		<Entity uid="15141">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="778.19361" z="968.11908"/>
 			<Orientation y="-2.29993"/>
 			<Actor seed="13968"/>
 		</Entity>
 		<Entity uid="15142">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="764.04706" z="963.54957"/>
 			<Orientation y="1.75853"/>
 			<Actor seed="59802"/>
 		</Entity>
 		<Entity uid="15143">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="775.29358" z="957.08661"/>
 			<Orientation y="0.348"/>
 			<Actor seed="55678"/>
 		</Entity>
 		<Entity uid="15144">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="941.70917" z="1003.4784"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="17066"/>
 		</Entity>
 		<Entity uid="15145">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="944.36805" z="997.7049"/>
 			<Orientation y="2.44614"/>
 			<Actor seed="57606"/>
 		</Entity>
 		<Entity uid="15146">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="948.7002" z="1001.2801"/>
 			<Orientation y="-2.74186"/>
 			<Actor seed="27444"/>
 		</Entity>
 		<Entity uid="15147">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="936.68274" z="1000.47779"/>
 			<Orientation y="0.52701"/>
 			<Actor seed="17474"/>
 		</Entity>
 		<Entity uid="15148">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1089.84888" z="855.21576"/>
 			<Orientation y="2.97564"/>
 			<Actor seed="56366"/>
 		</Entity>
 		<Entity uid="15149">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1095.18323" z="837.1443"/>
 			<Orientation y="2.6565"/>
 			<Actor seed="36236"/>
 		</Entity>
 		<Entity uid="15150">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1098.83887" z="834.29242"/>
 			<Orientation y="0.63421"/>
 			<Actor seed="59120"/>
 		</Entity>
 		<Entity uid="15151">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1096.23877" z="853.13495"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="34730"/>
 		</Entity>
 		<Entity uid="15152">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1099.73658" z="847.62855"/>
 			<Orientation y="1.23011"/>
 			<Actor seed="16042"/>
 		</Entity>
 		<Entity uid="15153">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1216.32728" z="783.98865"/>
 			<Orientation y="-2.32334"/>
 			<Actor seed="61058"/>
 		</Entity>
 		<Entity uid="15154">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1211.0304" z="775.6789"/>
 			<Orientation y="-3.02462"/>
 			<Actor seed="65352"/>
 		</Entity>
 		<Entity uid="15155">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1208.25745" z="764.11005"/>
 			<Orientation y="-2.69257"/>
 			<Actor seed="3940"/>
 		</Entity>
 		<Entity uid="15156">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1205.87098" z="757.9217"/>
 			<Orientation y="2.07747"/>
 			<Actor seed="44458"/>
 		</Entity>
 		<Entity uid="15157">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1221.69214" z="793.32062"/>
 			<Orientation y="-1.2239"/>
 			<Actor seed="9574"/>
 		</Entity>
 		<Entity uid="15158">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1331.49183" z="967.8136"/>
 			<Orientation y="-1.77923"/>
 			<Actor seed="2926"/>
 		</Entity>
 		<Entity uid="15159">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1318.94459" z="962.72138"/>
 			<Orientation y="-2.14296"/>
 			<Actor seed="8962"/>
 		</Entity>
 		<Entity uid="15160">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1313.56458" z="942.64466"/>
 			<Orientation y="1.32651"/>
 			<Actor seed="60198"/>
 		</Entity>
 		<Entity uid="15161">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1319.22254" z="950.43323"/>
 			<Orientation y="0.38225"/>
 			<Actor seed="41586"/>
 		</Entity>
 		<Entity uid="15162">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1327.50013" z="956.57099"/>
 			<Orientation y="-1.53183"/>
 			<Actor seed="6224"/>
 		</Entity>
 		<Entity uid="15163">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1408.94446" z="913.27771"/>
 			<Orientation y="-2.4597"/>
 			<Actor seed="724"/>
 		</Entity>
 		<Entity uid="15164">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1387.2555" z="885.48902"/>
 			<Orientation y="-2.68416"/>
 			<Actor seed="32968"/>
 		</Entity>
 		<Entity uid="15165">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1382.05237" z="876.29371"/>
 			<Orientation y="0.99822"/>
 			<Actor seed="26822"/>
 		</Entity>
 		<Entity uid="15166">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1398.80921" z="897.66639"/>
 			<Orientation y="1.65769"/>
 			<Actor seed="48164"/>
 		</Entity>
 		<Entity uid="15167">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1412.16102" z="906.36585"/>
 			<Orientation y="1.82856"/>
 			<Actor seed="36186"/>
 		</Entity>
 		<Entity uid="15168">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1300.60279" z="751.07294"/>
 			<Orientation y="-2.59131"/>
 			<Actor seed="28594"/>
 		</Entity>
 		<Entity uid="15169">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1294.58558" z="739.08326"/>
 			<Orientation y="1.19164"/>
 			<Actor seed="7962"/>
 		</Entity>
 		<Entity uid="15170">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1255.41907" z="676.13733"/>
 			<Orientation y="-2.67435"/>
 			<Actor seed="33902"/>
 		</Entity>
 		<Entity uid="15171">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1241.50477" z="658.47083"/>
 			<Orientation y="0.9203"/>
 			<Actor seed="5414"/>
 		</Entity>
 		<Entity uid="15172">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1097.64393" z="601.91474"/>
 			<Orientation y="-2.38534"/>
 			<Actor seed="20172"/>
 		</Entity>
 		<Entity uid="15173">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1091.24512" z="594.4292"/>
 			<Orientation y="-2.72727"/>
 			<Actor seed="54490"/>
 		</Entity>
 		<Entity uid="15174">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1088.99903" z="586.37763"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="18060"/>
 		</Entity>
 		<Entity uid="15175">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1092.8943" z="581.9383"/>
 			<Orientation y="1.02991"/>
 			<Actor seed="36678"/>
 		</Entity>
 		<Entity uid="15176">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1103.94825" z="589.24097"/>
 			<Orientation y="-1.93766"/>
 			<Actor seed="24454"/>
 		</Entity>
 		<Entity uid="15177">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1037.48938" z="648.4488"/>
 			<Orientation y="-2.61042"/>
 			<Actor seed="58320"/>
 		</Entity>
 		<Entity uid="15178">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1031.15186" z="629.38886"/>
 			<Orientation y="2.25066"/>
 			<Actor seed="6834"/>
 		</Entity>
 		<Entity uid="15179">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1033.49598" z="626.44434"/>
 			<Orientation y="0.73707"/>
 			<Actor seed="49712"/>
 		</Entity>
 		<Entity uid="15180">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1034.26294" z="634.5052"/>
 			<Orientation y="-1.3071"/>
 			<Actor seed="41254"/>
 		</Entity>
 		<Entity uid="15181">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1025.3213" z="741.52991"/>
 			<Orientation y="-2.37537"/>
 			<Actor seed="54868"/>
 		</Entity>
 		<Entity uid="15182">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1022.68372" z="746.12238"/>
 			<Orientation y="0.15326"/>
 			<Actor seed="18820"/>
 		</Entity>
 		<Entity uid="15183">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1012.33143" z="782.60828"/>
 			<Orientation y="-2.13781"/>
 			<Actor seed="40230"/>
 		</Entity>
 		<Entity uid="15184">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1005.86225" z="795.98182"/>
 			<Orientation y="0.47294"/>
 			<Actor seed="27272"/>
 		</Entity>
 		<Entity uid="15185">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="968.17792" z="831.15607"/>
 			<Orientation y="-2.28045"/>
 			<Actor seed="47594"/>
 		</Entity>
 		<Entity uid="15186">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="955.94751" z="836.58838"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="62478"/>
 		</Entity>
 		<Entity uid="15187">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="915.75232" z="871.89283"/>
 			<Orientation y="-2.1385"/>
 			<Actor seed="24604"/>
 		</Entity>
 		<Entity uid="15188">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="904.19678" z="883.61017"/>
 			<Orientation y="-2.30953"/>
 			<Actor seed="37484"/>
 		</Entity>
 		<Entity uid="15189">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="820.86176" z="876.24079"/>
 			<Orientation y="-2.85116"/>
 			<Actor seed="50802"/>
 		</Entity>
 		<Entity uid="15190">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="828.22791" z="873.09235"/>
 			<Orientation y="1.28148"/>
 			<Actor seed="48726"/>
 		</Entity>
 		<Entity uid="15191">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="772.85633" z="810.78394"/>
 			<Orientation y="2.79984"/>
 			<Actor seed="48162"/>
 		</Entity>
 		<Entity uid="15192">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="780.79334" z="817.26111"/>
 			<Orientation y="-0.87174"/>
 			<Actor seed="44606"/>
 		</Entity>
 		<Entity uid="15193">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="782.40284" z="829.3437"/>
 			<Orientation y="0.68242"/>
 			<Actor seed="49612"/>
 		</Entity>
 		<Entity uid="15194">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="727.3907" z="754.8794"/>
 			<Orientation y="-2.2761"/>
 			<Actor seed="17502"/>
 		</Entity>
 		<Entity uid="15195">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="657.48987" z="709.32514"/>
 			<Orientation y="-1.80204"/>
 			<Actor seed="37968"/>
 		</Entity>
 		<Entity uid="15196">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="646.08283" z="700.75721"/>
 			<Orientation y="-3.07663"/>
 			<Actor seed="28508"/>
 		</Entity>
 		<Entity uid="15197">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="665.23743" z="713.6161"/>
 			<Orientation y="1.51989"/>
 			<Actor seed="2044"/>
 		</Entity>
 		<Entity uid="15198">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="572.18873" z="695.80408"/>
 			<Orientation y="1.4481"/>
 			<Actor seed="41394"/>
 		</Entity>
 		<Entity uid="15199">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="586.7588" z="697.3584"/>
 			<Orientation y="-2.5734"/>
 			<Actor seed="34600"/>
 		</Entity>
 		<Entity uid="15200">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="580.5088" z="689.57575"/>
 			<Orientation y="-0.45336"/>
 			<Actor seed="42716"/>
 		</Entity>
 		<Entity uid="15201">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="500.49631" z="652.17518"/>
 			<Orientation y="-2.72509"/>
 			<Actor seed="40924"/>
 		</Entity>
 		<Entity uid="15202">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="496.65098" z="639.98737"/>
 			<Orientation y="-2.87352"/>
 			<Actor seed="54120"/>
 		</Entity>
 		<Entity uid="15203">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="497.34122" z="634.08558"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="59522"/>
 		</Entity>
 		<Entity uid="15204">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="449.55744" z="686.4469"/>
 			<Orientation y="-2.18158"/>
 			<Actor seed="63452"/>
 		</Entity>
 		<Entity uid="15205">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="447.82407" z="700.96229"/>
 			<Orientation y="0.30446"/>
 			<Actor seed="17468"/>
 		</Entity>
 		<Entity uid="15206">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="453.6858" z="713.19105"/>
 			<Orientation y="-1.90365"/>
 			<Actor seed="15536"/>
 		</Entity>
 		<Entity uid="15207">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="424.25043" z="790.94275"/>
 			<Orientation y="-2.43429"/>
 			<Actor seed="21488"/>
 		</Entity>
 		<Entity uid="15208">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="424.06138" z="784.94532"/>
 			<Orientation y="1.27105"/>
 			<Actor seed="49214"/>
 		</Entity>
 		<Entity uid="15209">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="436.3423" z="789.94446"/>
 			<Orientation y="-2.35146"/>
 			<Actor seed="51598"/>
 		</Entity>
 		<Entity uid="15210">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="379.7381" z="835.00135"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="5590"/>
 		</Entity>
 		<Entity uid="15211">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="387.37204" z="830.45167"/>
 			<Orientation y="-2.48658"/>
 			<Actor seed="32684"/>
 		</Entity>
 		<Entity uid="15212">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="278.86261" z="810.49665"/>
 			<Orientation y="0.75435"/>
 			<Actor seed="16378"/>
 		</Entity>
 		<Entity uid="15213">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="293.82074" z="825.12623"/>
 			<Orientation y="1.53716"/>
 			<Actor seed="51210"/>
 		</Entity>
 		<Entity uid="15214">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="105.19051" z="785.49726"/>
 			<Orientation y="0.47582"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml
@@ -14800,140 +14800,140 @@
 			<Actor seed="56226"/>
 		</Entity>
 		<Entity uid="5464">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="616.81897" z="754.8581"/>
 			<Orientation y="-0.7529"/>
 			<Actor seed="56210"/>
 		</Entity>
 		<Entity uid="5465">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="622.42408" z="763.05524"/>
 			<Orientation y="1.22231"/>
 			<Actor seed="15970"/>
 		</Entity>
 		<Entity uid="5466">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="634.3736" z="774.94703"/>
 			<Orientation y="-2.81234"/>
 			<Actor seed="44444"/>
 		</Entity>
 		<Entity uid="5467">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="604.43665" z="751.39374"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="62800"/>
 		</Entity>
 		<Entity uid="5468">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="608.80585" z="765.86921"/>
 			<Orientation y="1.09432"/>
 			<Actor seed="51452"/>
 		</Entity>
 		<Entity uid="5469">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="872.3288" z="958.58997"/>
 			<Orientation y="1.57081"/>
 			<Actor seed="18268"/>
 		</Entity>
 		<Entity uid="5470">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="880.68195" z="965.33063"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="36744"/>
 		</Entity>
 		<Entity uid="5471">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="886.7317" z="977.54694"/>
 			<Orientation y="-1.8317"/>
 			<Actor seed="56760"/>
 		</Entity>
 		<Entity uid="5472">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="887.56623" z="967.26825"/>
 			<Orientation y="-2.94274"/>
 			<Actor seed="55022"/>
 		</Entity>
 		<Entity uid="5473">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="878.31336" z="979.65955"/>
 			<Orientation y="-2.41157"/>
 			<Actor seed="47206"/>
 		</Entity>
 		<Entity uid="5474">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="581.2392" z="515.09424"/>
 			<Orientation y="1.30622"/>
 			<Actor seed="52900"/>
 		</Entity>
 		<Entity uid="5475">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="581.97034" z="500.34574"/>
 			<Orientation y="-2.49666"/>
 			<Actor seed="62852"/>
 		</Entity>
 		<Entity uid="5476">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="577.88233" z="493.5831"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="48912"/>
 		</Entity>
 		<Entity uid="5477">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="589.83008" z="506.87397"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="58576"/>
 		</Entity>
 		<Entity uid="5478">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="594.18097" z="517.90693"/>
 			<Orientation y="-1.89942"/>
 			<Actor seed="46536"/>
 		</Entity>
 		<Entity uid="5479">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="436.71143" z="344.21552"/>
 			<Orientation y="-2.10332"/>
 			<Actor seed="56798"/>
 		</Entity>
 		<Entity uid="5480">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="435.3191" z="333.3878"/>
 			<Orientation y="1.13793"/>
 			<Actor seed="29004"/>
 		</Entity>
 		<Entity uid="5481">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="429.17374" z="358.15015"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="34832"/>
 		</Entity>
 		<Entity uid="5482">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="423.25345" z="346.27274"/>
 			<Orientation y="0.73792"/>
 			<Actor seed="10880"/>
 		</Entity>
 		<Entity uid="5483">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="425.15043" z="331.4607"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
@@ -14789,56 +14789,56 @@
 			<Actor seed="11738"/>
 		</Entity>
 		<Entity uid="2940">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="952.62128" z="645.20917"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="16092"/>
 		</Entity>
 		<Entity uid="2941">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="970.57447" z="604.39417"/>
 			<Orientation y="-1.84159"/>
 			<Actor seed="17300"/>
 		</Entity>
 		<Entity uid="2942">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="615.46094" z="343.45258"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="52740"/>
 		</Entity>
 		<Entity uid="2943">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="675.79548" z="304.34339"/>
 			<Orientation y="-1.68592"/>
 			<Actor seed="19654"/>
 		</Entity>
 		<Entity uid="2944">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="316.69288" z="683.91938"/>
 			<Orientation y="-2.81008"/>
 			<Actor seed="16030"/>
 		</Entity>
 		<Entity uid="2945">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="275.63791" z="602.11231"/>
 			<Orientation y="-2.67591"/>
 			<Actor seed="17828"/>
 		</Entity>
 		<Entity uid="2946">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="615.21766" z="951.79847"/>
 			<Orientation y="-2.06238"/>
 			<Actor seed="42576"/>
 		</Entity>
 		<Entity uid="2947">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="687.76697" z="973.48664"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/savanna_river.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/savanna_river.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/savanna_river.xml
@@ -24955,308 +24955,308 @@
 			<Actor seed="9288"/>
 		</Entity>
 		<Entity uid="4244">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="341.22162" z="509.04917"/>
 			<Orientation y="2.0275"/>
 			<Actor seed="17680"/>
 		</Entity>
 		<Entity uid="4245">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="343.1136" z="529.16712"/>
 			<Orientation y="-1.76871"/>
 			<Actor seed="36948"/>
 		</Entity>
 		<Entity uid="4246">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="448.84015" z="530.2682"/>
 			<Orientation y="1.6891"/>
 			<Actor seed="62924"/>
 		</Entity>
 		<Entity uid="4247">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="533.08057" z="510.0799"/>
 			<Orientation y="-1.00408"/>
 			<Actor seed="42736"/>
 		</Entity>
 		<Entity uid="4248">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="597.4513" z="535.02826"/>
 			<Orientation y="1.84597"/>
 			<Actor seed="18622"/>
 		</Entity>
 		<Entity uid="4249">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="607.69916" z="532.96393"/>
 			<Orientation y="-1.4089"/>
 			<Actor seed="46604"/>
 		</Entity>
 		<Entity uid="4250">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="624.5445" z="533.10853"/>
 			<Orientation y="-0.0051"/>
 			<Actor seed="40676"/>
 		</Entity>
 		<Entity uid="4251">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="651.06458" z="534.33808"/>
 			<Orientation y="-1.88038"/>
 			<Actor seed="22388"/>
 		</Entity>
 		<Entity uid="4252">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="760.69434" z="514.57935"/>
 			<Orientation y="1.59098"/>
 			<Actor seed="17490"/>
 		</Entity>
 		<Entity uid="4253">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="782.15326" z="516.63141"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27242"/>
 		</Entity>
 		<Entity uid="4254">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="811.02063" z="519.38172"/>
 			<Orientation y="1.78748"/>
 			<Actor seed="8434"/>
 		</Entity>
 		<Entity uid="4255">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="834.91993" z="515.52259"/>
 			<Orientation y="-0.03782"/>
 			<Actor seed="13882"/>
 		</Entity>
 		<Entity uid="4256">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="884.72071" z="516.08783"/>
 			<Orientation y="1.96776"/>
 			<Actor seed="45476"/>
 		</Entity>
 		<Entity uid="4257">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="893.00757" z="541.96753"/>
 			<Orientation y="-0.81252"/>
 			<Actor seed="23562"/>
 		</Entity>
 		<Entity uid="4258">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="907.99646" z="540.53638"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39896"/>
 		</Entity>
 		<Entity uid="4259">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="960.40455" z="517.67896"/>
 			<Orientation y="-0.13604"/>
 			<Actor seed="57548"/>
 		</Entity>
 		<Entity uid="4260">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="965.84803" z="544.29493"/>
 			<Orientation y="1.55387"/>
 			<Actor seed="16566"/>
 		</Entity>
 		<Entity uid="4261">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="405.89084" z="531.53785"/>
 			<Orientation y="1.58011"/>
 			<Actor seed="24830"/>
 		</Entity>
 		<Entity uid="4262">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="268.17188" z="527.6767"/>
 			<Orientation y="-1.52517"/>
 			<Actor seed="23276"/>
 		</Entity>
 		<Entity uid="4263">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="232.79976" z="524.39411"/>
 			<Orientation y="-1.79577"/>
 			<Actor seed="35894"/>
 		</Entity>
 		<Entity uid="4264">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="226.73951" z="523.02204"/>
 			<Orientation y="-1.79577"/>
 			<Actor seed="36098"/>
 		</Entity>
 		<Entity uid="4265">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="172.15271" z="525.33008"/>
 			<Orientation y="-1.5736"/>
 			<Actor seed="30472"/>
 		</Entity>
 		<Entity uid="4266">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="141.78888" z="523.94257"/>
 			<Orientation y="2.01957"/>
 			<Actor seed="29844"/>
 		</Entity>
 		<Entity uid="4267">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="60.08471" z="500.85032"/>
 			<Orientation y="-2.09585"/>
 			<Actor seed="18034"/>
 		</Entity>
 		<Entity uid="4268">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="52.26662" z="496.75068"/>
 			<Orientation y="-1.67913"/>
 			<Actor seed="63794"/>
 		</Entity>
 		<Entity uid="4269">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="40.90232" z="495.96103"/>
 			<Orientation y="-1.44837"/>
 			<Actor seed="20536"/>
 		</Entity>
 		<Entity uid="4270">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="32.22081" z="496.77533"/>
 			<Orientation y="-1.5694"/>
 			<Actor seed="50236"/>
 		</Entity>
 		<Entity uid="4271">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="25.37093" z="526.68091"/>
 			<Orientation y="-2.29445"/>
 			<Actor seed="10322"/>
 		</Entity>
 		<Entity uid="4272">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="69.68517" z="521.7605"/>
 			<Orientation y="-0.25414"/>
 			<Actor seed="47486"/>
 		</Entity>
 		<Entity uid="4273">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="134.36048" z="499.97599"/>
 			<Orientation y="-1.02634"/>
 			<Actor seed="21524"/>
 		</Entity>
 		<Entity uid="4274">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="150.72208" z="501.60212"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="34542"/>
 		</Entity>
 		<Entity uid="4275">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="229.71444" z="502.88184"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40930"/>
 		</Entity>
 		<Entity uid="4276">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="309.64786" z="506.20444"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="37982"/>
 		</Entity>
 		<Entity uid="4277">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="298.76545" z="505.92313"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="32072"/>
 		</Entity>
 		<Entity uid="4278">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="310.07401" z="524.90284"/>
 			<Orientation y="-2.57244"/>
 			<Actor seed="25168"/>
 		</Entity>
 		<Entity uid="4279">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="466.94654" z="532.24946"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="31568"/>
 		</Entity>
 		<Entity uid="4280">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="426.8917" z="531.65467"/>
 			<Orientation y="0.0702"/>
 			<Actor seed="25062"/>
 		</Entity>
 		<Entity uid="4281">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="553.42273" z="533.45191"/>
 			<Orientation y="0.48896"/>
 			<Actor seed="64450"/>
 		</Entity>
 		<Entity uid="4282">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="573.26081" z="506.47321"/>
 			<Orientation y="3.039"/>
 			<Actor seed="7722"/>
 		</Entity>
 		<Entity uid="4283">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="626.67585" z="508.00211"/>
 			<Orientation y="3.03331"/>
 			<Actor seed="56408"/>
 		</Entity>
 		<Entity uid="4284">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="705.52613" z="508.83851"/>
 			<Orientation y="-3.01685"/>
 			<Actor seed="53630"/>
 		</Entity>
 		<Entity uid="4285">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="725.21027" z="537.87574"/>
 			<Orientation y="-0.10262"/>
 			<Actor seed="872"/>
 		</Entity>
 		<Entity uid="4286">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="802.85706" z="538.7685"/>
 			<Orientation y="0.37713"/>
 			<Actor seed="55418"/>
 		</Entity>
 		<Entity uid="4287">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="873.30982" z="512.90748"/>
 			<Orientation y="-1.74036"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml
@@ -10243,70 +10243,70 @@
 			<Actor seed="9714"/>
 		</Entity>
 		<Entity uid="1727">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1009.07789" z="749.92524"/>
 			<Orientation y="-1.87305"/>
 			<Actor seed="23316"/>
 		</Entity>
 		<Entity uid="1728">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1078.45167" z="758.04963"/>
 			<Orientation y="1.50838"/>
 			<Actor seed="12794"/>
 		</Entity>
 		<Entity uid="1729">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1091.07447" z="826.9131"/>
 			<Orientation y="-2.25692"/>
 			<Actor seed="35140"/>
 		</Entity>
 		<Entity uid="1730">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="998.99421" z="856.6836"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="6354"/>
 		</Entity>
 		<Entity uid="1731">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="924.89655" z="795.29242"/>
 			<Orientation y="0.4826"/>
 			<Actor seed="44472"/>
 		</Entity>
 		<Entity uid="1732">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1040.11097" z="1396.88978"/>
 			<Orientation y="0.73198"/>
 			<Actor seed="39092"/>
 		</Entity>
 		<Entity uid="1733">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1171.20423" z="1386.02051"/>
 			<Orientation y="-2.64147"/>
 			<Actor seed="64928"/>
 		</Entity>
 		<Entity uid="1734">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1060.88538" z="1303.90015"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="29856"/>
 		</Entity>
 		<Entity uid="1735">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="975.03595" z="1325.22193"/>
 			<Orientation y="-0.74985"/>
 			<Actor seed="22574"/>
 		</Entity>
 		<Entity uid="1736">
-			<Template>gaia/fauna_crocodile</Template>
+			<Template>gaia/fauna_crocodile_nile</Template>
 			<Player>0</Player>
 			<Position x="1175.1792" z="1314.75452"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive_wolf">
-  <Footprint>
-    <Square width="1.5" depth="3.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Arctic Wolf</GenericName>
-    <SpecificName>Canis lupus</SpecificName>
-    <Icon>gaia/fauna_arctic_wolf.png</Icon>
-  </Identity>
-  <StatusBars>
-    <HeightOffset>3.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>fauna/arctic_wolf.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf_domestic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf_domestic.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf_domestic.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_arctic_wolf">
-  <Identity>
-    <Classes datatype="tokens">Domestic</Classes>
-  </Identity>
-  <UnitAI>
-    <NaturalBehaviour>violent</NaturalBehaviour>
-  </UnitAI>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>30.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>0.0</Crush>
-      </Damage>
-      <MaxRange>8.0</MaxRange>
-      <RepeatTime>2000</RepeatTime>
-    </Melee>
-  </Attack>
-  <Footprint>
-    <Square width="3.0" depth="12.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Nile Crocodile</GenericName>
-    <SpecificName>Crocodylus niloticus</SpecificName>
-    <Icon>gaia/fauna_crocodile.png</Icon>
-  </Identity>
-  <Position>
-    <Anchor>pitch-roll</Anchor>
-  </Position>
-  <Selectable>
-    <Overlay>
-      <Texture>
-        <MainTexture>128x512/ellipse.png</MainTexture>
-        <MainTextureMask>128x512/ellipse_mask.png</MainTextureMask>
-      </Texture>
-    </Overlay>
-  </Selectable>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/lion_select.xml</select>
-      <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_death.xml</death>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>3.0</HeightOffset>
-  </StatusBars>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.3</WalkSpeed>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>fauna/crocodile.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna_wild_aggressive">
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>30.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>0.0</Crush>
+      </Damage>
+      <MaxRange>8.0</MaxRange>
+      <RepeatTime>2000</RepeatTime>
+    </Melee>
+  </Attack>
+  <Footprint>
+    <Square width="3.0" depth="12.0"/>
+    <Height>2.0</Height>
+  </Footprint>
+  <Identity>
+    <GenericName>Nile Crocodile</GenericName>
+    <SpecificName>Crocodylus niloticus</SpecificName>
+    <Icon>gaia/fauna_crocodile.png</Icon>
+  </Identity>
+  <Position>
+    <Anchor>pitch-roll</Anchor>
+  </Position>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x512/ellipse.png</MainTexture>
+        <MainTextureMask>128x512/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
+  <Sound>
+    <SoundGroups>
+      <select>actor/fauna/animal/lion_select.xml</select>
+      <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
+      <death>actor/fauna/animal/lion_death.xml</death>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>3.0</HeightOffset>
+  </StatusBars>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.3</WalkSpeed>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>fauna/crocodile.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna_wild_aggressive_dog">
+  <Footprint>
+    <Square width="1.5" depth="3.0"/>
+    <Height>2.0</Height>
+  </Footprint>
+  <Identity>
+    <GenericName>Mastiff</GenericName>
+    <SpecificName>Canis lupus familiaris</SpecificName>
+    <Icon>gaia/fauna_dog.png</Icon>
+  </Identity>
+  <StatusBars>
+    <HeightOffset>3.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>fauna/mastiff.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna_wild_aggressive_dog">
+  <Footprint>
+    <Square width="1.5" depth="3.0"/>
+    <Height>2.0</Height>
+  </Footprint>
+  <Identity>
+    <GenericName>Wolfhound</GenericName>
+    <SpecificName>Canis lupus familiaris</SpecificName>
+    <Icon>units/brit_wolfhound.png</Icon>
+  </Identity>
+  <StatusBars>
+    <HeightOffset>3.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>units/britons/wolfhound.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_pony.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_pony.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_pony.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="gaia/fauna_horse">
+  <Footprint>
+    <Square width="2.5" depth="5.0"/>
+    <Height>3.0</Height>
+  </Footprint>
+  <Identity>
+    <GenericName>Pony</GenericName>
+  </Identity>
+  <StatusBars>
+    <HeightOffset>4.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>fauna/pony.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_mastiff.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_mastiff.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_mastiff.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive_dog">
-  <Footprint>
-    <Square width="1.5" depth="3.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Mastiff</GenericName>
-    <SpecificName>Canis lupus familiaris</SpecificName>
-    <Icon>gaia/fauna_dog.png</Icon>
-  </Identity>
-  <StatusBars>
-    <HeightOffset>3.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>fauna/mastiff.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pony.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pony.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pony.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="gaia/fauna_horse">
-  <Footprint>
-    <Square width="2.5" depth="5.0"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Pony</GenericName>
-  </Identity>
-  <StatusBars>
-    <HeightOffset>4.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>fauna/pony.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>20.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>20.0</Crush>
-      </Damage>
-      <MaxRange>6.0</MaxRange>
-      <RepeatTime>2000</RepeatTime>
-    </Melee>
-  </Attack>
-  <Footprint>
-    <Square width="3.0" depth="6.0"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>White Rhinoceros</GenericName>
-    <SpecificName>Ceratotherium simum</SpecificName>
-    <Icon>gaia/fauna_rhino.png</Icon>
-  </Identity>
-  <ResourceSupply>
-    <Amount>300</Amount>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/lion_select.xml</select>
-      <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_death.xml</death>
-    </SoundGroups>
-  </Sound>
-  <StatusBars>
-    <HeightOffset>4.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>fauna/rhino.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna_hunt_aggressive">
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack>20.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>20.0</Crush>
+      </Damage>
+      <MaxRange>6.0</MaxRange>
+      <RepeatTime>2000</RepeatTime>
+    </Melee>
+  </Attack>
+  <Footprint>
+    <Square width="3.0" depth="6.0"/>
+    <Height>3.0</Height>
+  </Footprint>
+  <Identity>
+    <GenericName>White Rhinoceros</GenericName>
+    <SpecificName>Ceratotherium simum</SpecificName>
+    <Icon>gaia/fauna_rhino.png</Icon>
+  </Identity>
+  <ResourceSupply>
+    <Amount>300</Amount>
+  </ResourceSupply>
+  <Sound>
+    <SoundGroups>
+      <select>actor/fauna/animal/lion_select.xml</select>
+      <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
+      <death>actor/fauna/animal/lion_death.xml</death>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>4.0</HeightOffset>
+  </StatusBars>
+  <VisualActor>
+    <Actor>fauna/rhino.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="gaia/fauna_wolf">
+  <Identity>
+    <GenericName>Arctic Wolf</GenericName>
+    <Icon>gaia/fauna_arctic_wolf.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>fauna/arctic_wolf.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic_domestic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic_domestic.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic_domestic.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="gaia/fauna_wolf_arctic">
+  <Identity>
+    <Classes datatype="tokens">Domestic</Classes>
+  </Identity>
+  <UnitAI>
+    <NaturalBehaviour>violent</NaturalBehaviour>
+  </UnitAI>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive_dog">
-  <Footprint>
-    <Square width="1.5" depth="3.0"/>
-    <Height>2.0</Height>
-  </Footprint>
-  <Identity>
-    <GenericName>Wolfhound</GenericName>
-    <SpecificName>Canis lupus familiaris</SpecificName>
-    <Icon>units/brit_wolfhound.png</Icon>
-  </Identity>
-  <StatusBars>
-    <HeightOffset>3.0</HeightOffset>
-  </StatusBars>
-  <VisualActor>
-    <Actor>units/britons/wolfhound.xml</Actor>
-  </VisualActor>
-</Entity>