diff --git a/data/json/mapgen/lab/lab_floorplans.json b/data/json/mapgen/lab/lab_floorplans.json
index e8de8426cae13..c85af876508bc 100644
--- a/data/json/mapgen/lab/lab_floorplans.json
+++ b/data/json/mapgen/lab/lab_floorplans.json
@@ -124,13 +124,13 @@
         "...............+       |",
         "...............|       |",
         "FFFHFFFFFFFFHFF|       |",
-        "..........F....|       |",
-        "..........F....----?---|",
-        ".....PPP..F.............",
-        ".....PPP..F.............",
-        "..........F....----+---|",
+        "..........v....|       |",
+        "..........v....----?---|",
+        ".....PPP..v.............",
+        ".....PPP..v.............",
+        "..........v....----+---|",
         "..........H....|       |",
-        "..........F....|       |",
+        "..........v....|       |",
         "FFFFFHFFFFFFF|-|       |",
         ".............|r|       |",
         "r............+.|       |",
@@ -141,11 +141,11 @@
         "c...c|.rrr...|-|X.ccc.X|"
       ],
       "palettes": [ "lab_palette", "lab_loot_research" ],
-      "furniture": { "f": "f_null", "P": "f_generator_broken" },
+      "furniture": { "P": "f_generator_broken" },
       "terrain": {
         "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ],
         "F": "t_chainfence_h",
-        "f": "t_chainfence_v",
+        "v": "t_chainfence_v",
         "H": "t_chaingate_c",
         "C": "t_gates_control_concrete_lab"
       },
@@ -440,22 +440,22 @@
         "....l|         |........",
         "....l|         |........",
         "--+--|         |........",
-        ".....|         |..fFFHFF",
-        ".c.c.?         +..f.....",
-        ".c.c.|         |..fXX..X",
-        ".c.c.|         |..fXX..X",
-        ".....|         |..f....r",
-        "--+--|         |..fXX..r",
-        "RR.RR-----?-----..fXX..r",
+        ".....|         |..vFFHFF",
+        ".c.c.?         +..v.....",
+        ".c.c.|         |..vXX..X",
+        ".c.c.|         |..vXX..X",
+        ".....|         |..v....r",
+        "--+--|         |..vXX..r",
+        "RR.RR-----?-----..vXX..r",
         ".....+............H....r",
-        ".RRR.|............f.....",
-        ".....|............f.rrrr"
+        ".RRR.|............v.....",
+        ".....|............v.rrrr"
       ],
       "palettes": [ "lab_palette" ],
-      "furniture": { "^": "f_indoor_plant", "f": "f_null", "R": "f_rack" },
+      "furniture": { "^": "f_indoor_plant", "R": "f_rack" },
       "terrain": {
         "F": "t_chainfence_h",
-        "f": "t_chainfence_v",
+        "v": "t_chainfence_v",
         "H": "t_chaingate_c",
         "C": "t_gates_control_concrete_lab",
         "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ]
@@ -718,19 +718,19 @@
       "rotation": [ 0, 3 ],
       "fill_ter": "t_thconc_floor",
       "rows": [
-        ".....|...........f.rrrrr",
-        ".lll.|...........f......",
+        ".....|...........v.rrrrr",
+        ".lll.|...........v......",
         ".....W...........H.....r",
-        "llll.|...........fXX...r",
-        "-----|FFFF|---|..fXX...r",
-        ".....f....|...|..f.....r",
-        ".pSp.f.PP.|.&.|..fXX...X",
-        ".pSp.f.PP.|.x.|..fXX...X",
-        ".....f.PP.|...|..f......",
-        ".....H....|-M-|..fFFHFFf",
-        "FFHFFf........f.........",
-        ".....f........f.........",
-        ".....fFFFHFFFFf.........",
+        "llll.|...........vXX...r",
+        "-----|FFFF|---|..vXX...r",
+        ".....v....|...|..v.....r",
+        ".pSp.v.PP.|.&.|..vXX...X",
+        ".pSp.v.PP.|.x.|..vXX...X",
+        ".....v.PP.|...|..v......",
+        ".....H....|-M-|..vFFHFFv",
+        "FFHFFv........v.........",
+        ".....v........v.........",
+        ".....vFFFHFFFFv.........",
         ".......................x",
         "x................|-g-g--",
         "-------|.........|^.....",
@@ -744,10 +744,10 @@
         ".......|.........|......"
       ],
       "palettes": [ "lab_palette" ],
-      "furniture": { "S": "f_null", "^": "f_indoor_plant", "P": "f_generator_broken", "f": "f_null" },
+      "furniture": { "S": "f_null", "^": "f_indoor_plant", "P": "f_generator_broken" },
       "terrain": {
         "F": "t_chainfence_h",
-        "f": "t_chainfence_v",
+        "v": "t_chainfence_v",
         "H": "t_chaingate_c",
         "&": "t_radio_tower",
         "S": "t_sewage_pump",