diff --git a/data/json/mapgen/riverside/whaleys_house_river.json b/data/json/mapgen/riverside/whaleys_house_river.json
index 9d02b281dbeef..9997c11a0469b 100644
--- a/data/json/mapgen/riverside/whaleys_house_river.json
+++ b/data/json/mapgen/riverside/whaleys_house_river.json
@@ -113,13 +113,13 @@
       "palettes": [ "derelict_palette" ],
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
       "terrain": {
-        ".": "t_rock_floor",
-        "B": "t_rock_floor",
-        "X": "t_rock_floor",
-        "S": "t_rock_floor",
-        "b": "t_rock_floor",
-        "c": "t_rock_floor",
-        "r": "t_rock_floor",
+        ".": "t_floor",
+        "B": "t_floor",
+        "X": "t_floor",
+        "S": "t_floor",
+        "b": "t_floor",
+        "c": "t_floor",
+        "r": "t_floor",
         "0": "t_window_stained_blue",
         "w": "t_rock_wall_half",
         "#": "t_rock_wall"
@@ -143,31 +143,30 @@
       "rows": [
         "                        ",
         "                        ",
-        "          .......       ",
-        "          .......       ",
-        "          .......       ",
-        "         ...........    ",
+        "          -------       ",
+        "          -.....-       ",
+        "          -.....-       ",
+        "         --.....----    ",
         "        ...........     ",
-        "        ............    ",
+        "        ...........-    ",
         "        ...........     ",
         "        ...........     ",
-        "       ............     ",
-        "       ...........      ",
-        "       ...........      ",
-        "       ............     ",
-        "       ...........      ",
-        "       ............     ",
-        "       .............    ",
-        "       .............    ",
-        "       ....  .......    ",
+        "       -...........     ",
+        "       -..........      ",
+        "       -..........      ",
+        "       -...........     ",
+        "       -..........      ",
+        "       -...........     ",
+        "       -...........-    ",
+        "       -...........-    ",
+        "       ----  -------    ",
         "                        ",
         "                        ",
         "                        ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "roof_palette" ],
-      "terrain": { ".": "t_rock_floor_no_roof", " ": "t_open_air" }
+      "palettes": [ "roof_palette" ]
     }
   },
   {
@@ -311,15 +310,15 @@
         "                        ",
         "                        ",
         "            -------     ",
-        "            -.......    ",
-        "            -.:.....    ",
-        "            -.......    ",
+        "            -....       ",
+        "            -.:....     ",
+        "            -.....      ",
         "            -.......-   ",
         "            -.......5   ",
         "            -.......-   ",
         "            -.......-   ",
-        "            -.......    ",
-        "            -...   .    ",
+        "            -..         ",
+        "            -.          ",
         "            --          ",
         "                        ",
         "                        ",