diff --git a/binaries/data/mods/public/maps/random/african_plains.js b/binaries/data/mods/public/maps/random/african_plains.js
index a4e840897d..f168b46e3e 100644
--- a/binaries/data/mods/public/maps/random/african_plains.js
+++ b/binaries/data/mods/public/maps/random/african_plains.js
@@ -19,7 +19,7 @@ var oPalm = "gaia/flora_tree_senegal_date_palm";
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 oGiraffe2 = "gaia/fauna_giraffe_infant";
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";
diff --git a/binaries/data/mods/public/maps/random/botswanan_haven.js b/binaries/data/mods/public/maps/random/botswanan_haven.js
index 15b7cf3fbd..519ecfd0a1 100644
--- a/binaries/data/mods/public/maps/random/botswanan_haven.js
+++ b/binaries/data/mods/public/maps/random/botswanan_haven.js
@@ -19,8 +19,8 @@ const oGazelle = "gaia/fauna_gazelle";
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";
diff --git a/binaries/data/mods/public/maps/random/elephantine.js b/binaries/data/mods/public/maps/random/elephantine.js
index 6e946d1ba1..7e893db510 100644
--- a/binaries/data/mods/public/maps/random/elephantine.js
+++ b/binaries/data/mods/public/maps/random/elephantine.js
@@ -53,7 +53,7 @@ const oTreasure = [
];
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 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";
diff --git a/binaries/data/mods/public/maps/random/hellas_biomes.json b/binaries/data/mods/public/maps/random/hellas_biomes.json
index d0e3575a91..11f1095ac0 100644
--- a/binaries/data/mods/public/maps/random/hellas_biomes.json
+++ b/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",
diff --git a/binaries/data/mods/public/maps/random/india.js b/binaries/data/mods/public/maps/random/india.js
index f623e44472..05fdad0350 100644
--- a/binaries/data/mods/public/maps/random/india.js
+++ b/binaries/data/mods/public/maps/random/india.js
@@ -12,7 +12,7 @@ const oTree = "gaia/flora_tree_palm_tropic";
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";
diff --git a/binaries/data/mods/public/maps/random/jebel_barkal.js b/binaries/data/mods/public/maps/random/jebel_barkal.js
index 1ea6299948..bcd3019899 100644
--- a/binaries/data/mods/public/maps/random/jebel_barkal.js
+++ b/binaries/data/mods/public/maps/random/jebel_barkal.js
@@ -53,13 +53,13 @@ const oTreasuresCity = [oFoodTreasureBin, oFoodTreasureCrate, oFoodTreasureJars]
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";
diff --git a/binaries/data/mods/public/maps/random/ngorongoro.js b/binaries/data/mods/public/maps/random/ngorongoro.js
index 39265bd939..ecd642d0fb 100644
--- a/binaries/data/mods/public/maps/random/ngorongoro.js
+++ b/binaries/data/mods/public/maps/random/ngorongoro.js
@@ -81,7 +81,7 @@ function setBiomeHighlands()
function setBiomeEden()
{
- g_Gaia.mainHuntableAnimal = "gaia/fauna_rhino";
+ g_Gaia.mainHuntableAnimal = "gaia/fauna_rhinoceros_white";
g_Gaia.secondaryHuntableAnimal = "gaia/fauna_elephant_african_bush";
}
diff --git a/binaries/data/mods/public/maps/random/northern_lights.js b/binaries/data/mods/public/maps/random/northern_lights.js
index 483bf35ccf..8bde7c11fc 100644
--- a/binaries/data/mods/public/maps/random/northern_lights.js
+++ b/binaries/data/mods/public/maps/random/northern_lights.js
@@ -20,7 +20,7 @@ const oStoneSmall = "gaia/geology_stone_alpine_a";
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";
diff --git a/binaries/data/mods/public/maps/random/polar_sea.js b/binaries/data/mods/public/maps/random/polar_sea.js
index c820728da2..4fdcce7702 100644
--- a/binaries/data/mods/public/maps/random/polar_sea.js
+++ b/binaries/data/mods/public/maps/random/polar_sea.js
@@ -12,7 +12,7 @@ var tShore = "polar_ice_snow";
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";
diff --git a/binaries/data/mods/public/maps/random/polar_sea_triggers.js b/binaries/data/mods/public/maps/random/polar_sea_triggers.js
index a8e46c08e2..715cf87936 100644
--- a/binaries/data/mods/public/maps/random/polar_sea_triggers.js
+++ b/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;
diff --git a/binaries/data/mods/public/maps/random/scythian_rivulet.js b/binaries/data/mods/public/maps/random/scythian_rivulet.js
index 95a8aaa12a..2a0e2583bd 100644
--- a/binaries/data/mods/public/maps/random/scythian_rivulet.js
+++ b/binaries/data/mods/public/maps/random/scythian_rivulet.js
@@ -22,7 +22,7 @@ const oBush = "gaia/flora_bush_badlands";
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";
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml b/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
index b65b475ca6..e77153d47b 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4696b3a65ce258bdd94f9c8f3f9916f174466037bfbf8a360883682b9b62ce2b
-size 421132
+oid sha256:161bf486e545cd1095e2fce28e17f38413475ce6d4a08a18cf98806ac1b724c8
+size 421233
diff --git a/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml b/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
index f9fcdfb5e7..20a033ff3c 100644
--- a/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:28b774602542fdb7bf5b93c4eaf2a0c7b81c2574ab9e50caca62596b691d30e8
+oid sha256:df85de8466eefed879429f60da4eba69859d28bc0be29fc2de8b22ae609fc13d
size 648736
diff --git a/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml b/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
index d239553170..5b50f4fff5 100644
--- a/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c09fdcd6fe7b781b4b88b26e18089c3bd153123c97d3be5e172616ef33c965b4
+oid sha256:0f1e6820016f6fc3486b8ed55fb9ebf405c1466c5007b30eb63514c94117e932
size 443068
diff --git a/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml b/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml
index 6328c4be8a..15db1ef684 100644
--- a/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/atlas_valleys_8p.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:78fb0dce00d400437631853fec4e94653e562a38f677d75d08ad670f31e9c957
-size 1443531
+oid sha256:c8460df561bd078acdaa65e6ea898f2c45b2082a627445efaf9b2e6485f88a4e
+size 1443676
diff --git a/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml b/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
index aa8810b87c..9f13e839a7 100644
--- a/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a371df95a44b69ed19c12ccb5baac3c165ea445279a98a3c6162dd60139fc4e9
-size 457536
+oid sha256:aa30acf552f856cd24c4765a552f323633d790c9948ba256921484cd437d83b5
+size 457652
diff --git a/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml b/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml
index e5abc1f631..13d770bff3 100644
--- a/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/dueling_cliffs_3pv3p.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:601f8bbb5bbcf5355aa17bd555713e0ab7df8aa4c5431e0b48a074febd56cf61
+oid sha256:ca4c4858af07000670c259b9be6936af4d489d0b71f0deed3fca142da0ef76dd
size 685121
diff --git a/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml b/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
index 8a92e348ff..94af4025dd 100644
--- a/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f311d7709267fab173a8e3f03f853bd3961042f4fde2f7700a89222bf5f1ca6c
-size 3667821
+oid sha256:88351e324a3dca9cad6f3d197dbb9c10f9a58e53dcfb056222ce27823fa0174e
+size 3667941
diff --git a/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml b/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
index 8330c12173..dc2c94e15d 100644
--- a/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:dd335c38e97a832426e4a2e03794dba4e6c25c01a82cbc52f129548e499faedd
+oid sha256:392553b7dcb2551f27c38ebc82ce5754c1657ba6c96649e657d9ac801c332ad1
size 519330
diff --git a/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml b/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml
index 8b82b2c028..053a0b3dc8 100644
--- a/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/gambia_river_3p.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:87c30c615ca09d455b699cbcd0bd24b39864a14354f9fa0ed631683e7e56180e
-size 2088854
+oid sha256:69bbf513a6fcdf7f36e4e886424af4f36966912d52c7811eb7012bb7f0e3d64d
+size 2089334
diff --git a/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml b/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml
index da67929271..dcc007ac91 100644
--- a/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/nile_river_4p.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:09fce7eb6501bb00387df1473a1e3edd7130a49c6d1d3ada3162eb42faab08f1
-size 472441
+oid sha256:5ece82ded4931396f4c8a650f6af0315e804f159f65dda3ffda9c87abfb472d0
+size 472541
diff --git a/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml b/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
index 3fdd2d7911..0005dddb9f 100644
--- a/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:05889dcdcd3f4f7eb99aeeb74ee50453f2adfd612f902c9f7d475e7545179fcc
-size 509050
+oid sha256:5c64261702553a8dd802f65b4b670d39669c79fc0ae99193614c2801afaac2c7
+size 509090
diff --git a/binaries/data/mods/public/maps/skirmishes/savanna_river.xml b/binaries/data/mods/public/maps/skirmishes/savanna_river.xml
index bc95661103..6553169d7a 100644
--- a/binaries/data/mods/public/maps/skirmishes/savanna_river.xml
+++ b/binaries/data/mods/public/maps/skirmishes/savanna_river.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:87a90cf365d98fa0268f70b84430f2b88202f5cec9bf8e28e848ecb396c3db48
-size 893327
+oid sha256:2cec2551190fdf14471b6e5e4dfbd742003f47635f9ee785e702e1ec9c717a6a
+size 893547
diff --git a/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml b/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml
index a3ceba2472..e1237eb08a 100644
--- a/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml
+++ b/binaries/data/mods/public/maps/skirmishes/two_seas_6p.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:74a08e819058f89c88080d04a0aad82a2b247d4c6c6485bbc0e273aa6b8af527
-size 1849002
+oid sha256:3171d54163c0f6f7371de47b9b3c225f52485fc0452db9d57c8bee46ffcb69cb
+size 1849052
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml
deleted file mode 100644
index 26346182ca..0000000000
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
- 2.0
-
-
- Arctic Wolf
- Canis lupus
- gaia/fauna_arctic_wolf.png
-
-
- 3.0
-
-
- fauna/arctic_wolf.xml
-
-
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
similarity index 100%
rename from binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
rename to binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_mastiff.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml
similarity index 100%
rename from binaries/data/mods/public/simulation/templates/gaia/fauna_mastiff.xml
rename to binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
similarity index 100%
rename from binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml
rename to binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_pony.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_pony.xml
similarity index 100%
rename from binaries/data/mods/public/simulation/templates/gaia/fauna_pony.xml
rename to binaries/data/mods/public/simulation/templates/gaia/fauna_horse_pony.xml
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
similarity index 100%
rename from binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
rename to binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml
new file mode 100644
index 0000000000..f7771d2320
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml
@@ -0,0 +1,10 @@
+
+
+
+ Arctic Wolf
+ gaia/fauna_arctic_wolf.png
+
+
+ fauna/arctic_wolf.xml
+
+
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf_domestic.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic_domestic.xml
similarity index 82%
rename from binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf_domestic.xml
rename to binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic_domestic.xml
index a4818d2fb8..ef612060e1 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf_domestic.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic_domestic.xml
@@ -1,5 +1,5 @@
-
+
Domestic