diff --git a/data/json/mapgen/cathedral.json b/data/json/mapgen/cathedral.json
index 2fa671af5cf1b..34d1dff58e06d 100644
--- a/data/json/mapgen/cathedral.json
+++ b/data/json/mapgen/cathedral.json
@@ -57,7 +57,7 @@
         "                                  |||           "
       ],
       "palettes": [ "cathedral" ],
-      "terrain": { ",": "t_linoleum_gray", " ": "t_soil", "n": "t_rock_floor", "@": "t_rock_floor", "_": "t_rock_floor" },
+      "terrain": { ",": "t_linoleum_gray", " ": "t_soil", "n": "t_thconc_floor", "@": "t_thconc_floor", "_": "t_thconc_floor" },
       "place_item": [ { "item": "small_relic", "x": 21, "y": 36 } ],
       "place_monsters": [
         { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "density": 0.1 },
@@ -209,7 +209,7 @@
         "                                                "
       ],
       "palettes": [ "cathedral" ],
-      "terrain": { "_": "t_rock_floor_no_roof", " ": "t_open_air", "*": "t_open_air_rooved" },
+      "terrain": { "_": "t_concrete", " ": "t_open_air", "*": "t_open_air_rooved" },
       "place_monsters": [
         { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 6, 23 ], "y": [ 6, 12 ], "density": 0.1 },
         { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 24, 41 ], "y": [ 6, 12 ], "density": 0.1 }
@@ -284,7 +284,7 @@
         "                                                "
       ],
       "palettes": [ "cathedral" ],
-      "terrain": { "_": "t_rock_floor_no_roof", " ": "t_open_air", "*": "t_glass_roof" },
+      "terrain": { "_": "t_concrete", " ": "t_open_air", "*": "t_glass_roof" },
       "place_nested": [
         {
           "chunks": [
@@ -442,7 +442,7 @@
           "y": [ 6, 8 ]
         }
       ],
-      "terrain": { " ": "t_open_air", "_": "t_rock_floor_no_roof" }
+      "terrain": { " ": "t_open_air", "_": "t_concrete" }
     }
   }
 ]
diff --git a/data/json/mapgen_palettes/cathedral_palette.json b/data/json/mapgen_palettes/cathedral_palette.json
index 987bd1c788642..a9a23179bdd14 100644
--- a/data/json/mapgen_palettes/cathedral_palette.json
+++ b/data/json/mapgen_palettes/cathedral_palette.json
@@ -28,7 +28,7 @@
       "i": "t_rock_wall_half",
       "í": "t_rock_wall_half",
       "x": "t_wall_wood",
-      "X": "t_rock_floor",
+      "X": "t_thconc_floor",
       "R": "t_door_metal_c",
       "P": "t_door_bar_locked",
       "-": "t_bars",