diff --git a/AndorsTrail/res/raw/monsterlist_guynmart.json b/AndorsTrail/res/raw/monsterlist_guynmart.json
index 4876382b0..cafc8753f 100644
--- a/AndorsTrail/res/raw/monsterlist_guynmart.json
+++ b/AndorsTrail/res/raw/monsterlist_guynmart.json
@@ -56,7 +56,7 @@
     },
     {
         "id":"guynmart_guard_guide",
-        "name":"Guynmart Guard",
+        "name":"Guynmart guard",
         "iconID":"monsters_ld1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -64,7 +64,7 @@
     },
     {
         "id":"guynmart_gguard",
-        "name":"Guynmart Guard",
+        "name":"Guynmart guard",
         "iconID":"monsters_ld1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -73,7 +73,7 @@
     },
     {
         "id":"guynmart_player",
-        "name":"Guynmart Guard",
+        "name":"Guynmart guard",
         "iconID":"monsters_ld1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -81,7 +81,7 @@
     },
     {
         "id":"guynmart_mguard",
-        "name":"Guynmart Guard",
+        "name":"Guynmart guard",
         "iconID":"monsters_ld1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -90,7 +90,7 @@
     },
     {
         "id":"guynmart_wguard",
-        "name":"Guynmart Guard",
+        "name":"Guynmart guard",
         "iconID":"monsters_ld1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -99,7 +99,7 @@
     },
     {
         "id":"guynmart_wguard1",
-        "name":"Guynmart Guard",
+        "name":"Guynmart guard",
         "iconID":"monsters_ld1:0",
         "maxHP":120,
         "maxAP":10,
@@ -118,7 +118,7 @@
     },
     {
         "id":"guynmart_wguard9a",
-        "name":"Guynmart Guard",
+        "name":"Guynmart guard",
         "iconID":"monsters_ld1:0",
         "maxHP":120,
         "maxAP":10,
@@ -137,7 +137,7 @@
     },
     {
         "id":"guynmart_guard_store",
-        "name":"Guynmart Guard",
+        "name":"Guynmart guard",
         "iconID":"monsters_ld1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -146,7 +146,7 @@
     },
     {
         "id":"guynmart_guard_storea",
-        "name":"Guynmart Guard",
+        "name":"Guynmart guard",
         "iconID":"monsters_ld1:0",
         "maxHP":120,
         "maxAP":10,
@@ -165,7 +165,7 @@
     },
     {
         "id":"guynmart_guard_storea2",
-        "name":"Guynmart Guard",
+        "name":"Guynmart guard",
         "iconID":"monsters_ld1:0",
         "maxHP":120,
         "maxAP":10,
@@ -184,7 +184,7 @@
     },
     {
         "id":"guynmart_guard_arms",
-        "name":"Guynmart Guard",
+        "name":"Guynmart guard",
         "iconID":"monsters_ld1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -193,7 +193,7 @@
     },
     {
         "id":"guynmart_tguard",
-        "name":"Guynmart Guard",
+        "name":"Guynmart guard",
         "iconID":"monsters_ld1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -202,7 +202,7 @@
     },
     {
         "id":"guynmart_tguard2",
-        "name":"Guynmart Guard",
+        "name":"Guynmart guard",
         "iconID":"monsters_ld1:0",
         "unique":1,
         "monsterClass":"humanoid",
@@ -260,7 +260,7 @@
     },
     {
         "id":"guynmart_gateguard",
-        "name":"Guynmart Guard",
+        "name":"Guynmart guard",
         "iconID":"monsters_ld1:0",
         "maxHP":120,
         "maxAP":10,
@@ -798,14 +798,14 @@
     },
     {
         "id":"guynmart_dog1",
-        "name":"Shephards Dog",
+        "name":"Shepherd's dog",
         "iconID":"monsters_dogs:4",
         "monsterClass":"animal",
         "phraseID":"guynmart_dog10_10"
     },
     {
         "id":"guynmart_dog2",
-        "name":"Shephards Dog",
+        "name":"Shepherd's dog",
         "iconID":"monsters_dogs:4",
         "monsterClass":"animal",
         "phraseID":"guynmart_dog10_10"
diff --git a/AndorsTrail/res/raw/monsterlist_stoutford.json b/AndorsTrail/res/raw/monsterlist_stoutford.json
index f34d5bfa4..4d1fe0c5d 100644
--- a/AndorsTrail/res/raw/monsterlist_stoutford.json
+++ b/AndorsTrail/res/raw/monsterlist_stoutford.json
@@ -38,13 +38,13 @@
     },
     {
         "id":"stoutford_gateguard",
-        "name":"Stoutford Guard",
+        "name":"Stoutford guard",
         "iconID":"monsters_tometik2:43",
         "phraseID":"stoutford_gateguard_0"
     },
     {
         "id":"stoutford_guard1",
-        "name":"Stoutford Guard",
+        "name":"Stoutford guard",
         "iconID":"monsters_tometik2:44",
         "phraseID":"stoutford_guard1_0"
     },
@@ -126,7 +126,7 @@
     },
     {
         "id":"stoutford_thief",
-        "name":"Quiet Thief",
+        "name":"Quiet thief",
         "iconID":"monsters_rogue1:0",
         "monsterClass":"humanoid",
         "spawnGroup":"stoutford_thief",
diff --git a/AndorsTrail/res/raw/monsterlist_stoutford_combined.json b/AndorsTrail/res/raw/monsterlist_stoutford_combined.json
index 1565f0b6f..fad4044cf 100644
--- a/AndorsTrail/res/raw/monsterlist_stoutford_combined.json
+++ b/AndorsTrail/res/raw/monsterlist_stoutford_combined.json
@@ -1,7 +1,7 @@
 [
     {
         "id":"stoutford_farmer2",
-        "name":"Busy Farmer",
+        "name":"Busy farmer",
         "iconID":"monsters_man1:0",
         "monsterClass":"humanoid",
         "spawnGroup":"stoutford_farmer2",
@@ -9,7 +9,7 @@
     },
     {
         "id":"stoutford_farmer3",
-        "name":"Old Farmer",
+        "name":"Old farmer",
         "iconID":"monsters_mage2:0",
         "monsterClass":"humanoid",
         "spawnGroup":"stoutford_farmer3",
@@ -188,7 +188,7 @@
     },
     {
         "id":"lakecave2_key",
-        "name":"Glade Key",
+        "name":"Glade key",
         "iconID":"items_japozero:387",
         "unique":1,
         "spawnGroup":"lakecave2_key",
@@ -196,7 +196,7 @@
     },
     {
         "id":"lakecave2_key2",
-        "name":"Glade Key",
+        "name":"Glade key",
         "iconID":"items_japozero:387",
         "unique":1,
         "spawnGroup":"lakecave2_key2",
@@ -602,40 +602,40 @@
     },
     {
         "id":"stoutford_guard1_b",
-        "name":"Stoutford Guard",
+        "name":"Stoutford guard",
         "iconID":"monsters_tometik2:44",
         "spawnGroup":"stoutford_guard1",
         "phraseID":"stoutford_guard1_0b"
     },
     {
         "id":"stoutford_guard1_c",
-        "name":"Stoutford Guard",
+        "name":"Stoutford guard",
         "iconID":"monsters_tometik2:44",
         "spawnGroup":"stoutford_guard1",
         "phraseID":"stoutford_guard1_0c"
     },
     {
         "id":"stoutford_guard1a",
-        "name":"Stoutford Guard",
+        "name":"Stoutford guard",
         "iconID":"monsters_tometik2:44",
         "spawnGroup":"stoutford_guard1a",
         "phraseID":"stoutford_guard1_0"
     },
     {
         "id":"stoutford_guard1b",
-        "name":"Stoutford Guard",
+        "name":"Stoutford guard",
         "iconID":"monsters_tometik2:44",
         "phraseID":"stoutford_guard1_0"
     },
     {
         "id":"stoutford_guard1c",
-        "name":"Stoutford Guard",
+        "name":"Stoutford guard",
         "iconID":"monsters_tometik2:44",
         "phraseID":"stoutford_guard1_0"
     },
     {
         "id":"stoutford_guard2",
-        "name":"Stoutford Guard",
+        "name":"Stoutford guard",
         "iconID":"monsters_tometik2:45",
         "monsterClass":"humanoid",
         "spawnGroup":"stoutford_guard1",
@@ -643,7 +643,7 @@
     },
     {
         "id":"stoutford_guard3",
-        "name":"Stoutford Guard",
+        "name":"Stoutford guard",
         "iconID":"monsters_tometik7:71",
         "monsterClass":"humanoid",
         "spawnGroup":"stoutford_guard1",
@@ -651,21 +651,21 @@
     },
     {
         "id":"stoutford_guard4",
-        "name":"Stoutford Guard",
+        "name":"Stoutford guard",
         "iconID":"monsters_tometik7:71",
         "monsterClass":"humanoid",
         "phraseID":"stoutford_guard4"
     },
     {
         "id":"stoutford_guard_wild21a",
-        "name":"Stoutford Guard",
+        "name":"Stoutford guard",
         "iconID":"monsters_tometik7:71",
         "monsterClass":"humanoid",
         "phraseID":"key_wild21a"
     },
     {
         "id":"stoutford_guard_camp1",
-        "name":"Stoutford Guard",
+        "name":"Stoutford guard",
         "iconID":"monsters_tometik7:71",
         "maxHP":40,
         "moveCost":5,
@@ -685,7 +685,7 @@
     },
     {
         "id":"stoutford_guard_camp2",
-        "name":"Stoutford Guard",
+        "name":"Stoutford guard",
         "iconID":"monsters_tometik7:71",
         "maxHP":40,
         "moveCost":5,
diff --git a/AndorsTrail/res/xml/waterwaya3.tmx b/AndorsTrail/res/xml/waterwaya3.tmx
index c3974fc7a..bc2bb691b 100644
--- a/AndorsTrail/res/xml/waterwaya3.tmx
+++ b/AndorsTrail/res/xml/waterwaya3.tmx
@@ -195,7 +195,7 @@
  </layer>
  <layer name="Above" width="22" height="8">
   <data encoding="base64" compression="zlib">
-   eJxjYMAE+ySxCJII7hBhBkjNXRzqYOLIakBsfHoodds7Sez2kgpA+tDD8B0V3I0LwMy+QyJNS7dsBOJNNLIDBGB+AADatiUc
+   eJxjYMAE+ySxCJII7hBhBkjNXUnsau9KoqqBsZH51HAbMvudJHZ7SQUgfehh+I4K7sYF3iGFIyk0Ld2yEYg30cgOEID5AQCq7CcG
   </data>
  </layer>
  <layer name="Walkable" width="22" height="8">