diff --git a/code/modules/nightmare/nmnodes/mapload.dm b/code/modules/nightmare/nmnodes/mapload.dm
index 4b9ae2a3014b..0687399a6612 100644
--- a/code/modules/nightmare/nmnodes/mapload.dm
+++ b/code/modules/nightmare/nmnodes/mapload.dm
@@ -94,7 +94,7 @@
 	. = ..()
 	if(!.) return
 	var/dir_path = context.get_file_path(filepath, "map")
-	var/regex/matcher = new(@"^([0-9]+)([\.\+])([^_]+)(_.*)?\.dmm$", "i")
+	var/regex/matcher = new(@"^([0-9]+)([\.\+])(([^_]+)(_.*))?\.dmm$", "i")
 	var/list/dircontents = flist(dir_path)
 	for(var/filename in dircontents)
 		if(!matcher.Find(filename))
diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm
index cd01b5cb8040..9150ddb4f483 100644
--- a/maps/map_files/BigRed/BigRed.dmm
+++ b/maps/map_files/BigRed/BigRed.dmm
@@ -12652,7 +12652,7 @@
 /area/bigredv2/outside/office_complex)
 "aLh" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "lz1north"
+	insert_tag = "lz1north_mining"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/space_port)
@@ -28397,7 +28397,7 @@
 /area/bigredv2/outside/dorms)
 "ers" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "etatunnel"
+	insert_tag = "etatunnel_open"
 	},
 /turf/closed/wall/solaris/rock,
 /area/bigredv2/caves)
@@ -28742,7 +28742,7 @@
 /area/bigredv2/caves/mining)
 "eUT" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "viro-rock"
+	insert_tag = "viro-rock_open"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/virology)
@@ -31085,7 +31085,7 @@
 /area/bigredv2/outside/space_port_lz2)
 "iIp" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "chapel"
+	insert_tag = "chapel_cult"
 	},
 /turf/closed/wall/solaris,
 /area/bigredv2/outside/chapel)
@@ -31310,7 +31310,7 @@
 /area/bigredv2/caves/mining)
 "jcn" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "tcomms"
+	insert_tag = "tcomms_open"
 	},
 /turf/closed/wall/solaris/rock,
 /area/bigredv2/caves)
@@ -31462,7 +31462,7 @@
 	dir = 5
 	},
 /obj/effect/landmark/nightmare{
-	insert_tag = "dorms"
+	insert_tag = "dorms_party"
 	},
 /turf/open/floor,
 /area/bigredv2/outside/dorms)
@@ -33180,7 +33180,7 @@
 /area/bigredv2/caves/mining)
 "lMt" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "cargo"
+	insert_tag = "cargo_containers"
 	},
 /turf/closed/wall/solaris,
 /area/bigredv2/outside/cargo)
@@ -33195,7 +33195,7 @@
 /area/bigredv2/caves_lambda)
 "lMB" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "lz1cave"
+	insert_tag = "lz1cave_flank"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/space_port)
@@ -34345,7 +34345,7 @@
 /area/bigredv2/outside/filtration_cave_cas)
 "nGt" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "admin"
+	insert_tag = "admin_pmc"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/admin_building)
@@ -35360,7 +35360,7 @@
 /area/bigredv2/outside/admin_building)
 "pdN" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "lz1entrance"
+	insert_tag = "lz1entrance_v2"
 	},
 /turf/open/mars,
 /area/bigredv2/outside/nw)
@@ -36458,7 +36458,7 @@
 /area/bigredv2/caves/mining)
 "qTu" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "viro"
+	insert_tag = "viro_open"
 	},
 /turf/closed/wall/solaris/rock,
 /area/bigredv2/caves)
@@ -36795,7 +36795,7 @@
 /area/bigredv2/caves/mining)
 "rrl" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "filtration"
+	insert_tag = "filtration_restored"
 	},
 /turf/open/mars_cave{
 	icon_state = "mars_cave_2"
@@ -38745,7 +38745,7 @@
 /area/bigredv2/caves/mining)
 "tYM" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "prison"
+	insert_tag = "prison_breakout"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/marshal_office)
@@ -39079,7 +39079,7 @@
 /area/bigredv2/caves/mining)
 "uCD" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "reactor"
+	insert_tag = "reactor_meltdown"
 	},
 /turf/closed/wall/solaris/rock,
 /area/bigredv2/caves)
@@ -39685,7 +39685,7 @@
 /area/bigredv2/caves/eta/research)
 "vvi" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "lz1containers"
+	insert_tag = "lz1containers_scramble"
 	},
 /turf/open/floor{
 	dir = 4;
@@ -41502,7 +41502,7 @@
 /area/bigredv2/outside/n)
 "yfe" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "eta"
+	insert_tag = "eta_carp"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/caves/eta/xenobiology)
diff --git a/maps/map_files/BigRed/sprinkles/30.cave-north_lambdapath.dmm b/maps/map_files/BigRed/sprinkles/30.cave-north_lambdapath.dmm
deleted file mode 100644
index 69d091b39d02..000000000000
--- a/maps/map_files/BigRed/sprinkles/30.cave-north_lambdapath.dmm
+++ /dev/null
@@ -1,214 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_18"
-	},
-/area/bigredv2/caves_north)
-"b" = (
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
-"c" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_2"
-	},
-/area/bigredv2/caves_lambda)
-"d" = (
-/turf/open/mars_cave,
-/area/bigredv2/caves_north)
-"e" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_2"
-	},
-/area/bigredv2/caves_north)
-"f" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_7"
-	},
-/area/bigredv2/caves_north)
-"g" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/turf/open/mars_cave{
-	icon_state = "mars_cave_2"
-	},
-/area/bigredv2/caves_lambda)
-"h" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/turf/open/mars_cave{
-	icon_state = "mars_cave_2"
-	},
-/area/bigredv2/caves_lambda)
-"j" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/turf/open/mars_cave{
-	icon_state = "mars_dirt_4"
-	},
-/area/bigredv2/caves_north)
-"m" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_14"
-	},
-/area/bigredv2/caves_north)
-"n" = (
-/turf/open/mars_cave{
-	icon_state = "mars_dirt_4"
-	},
-/area/bigredv2/caves_north)
-"o" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_17"
-	},
-/area/bigredv2/caves_north)
-"s" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_15"
-	},
-/area/bigredv2/caves_north)
-"C" = (
-/turf/open/mars_cave{
-	icon_state = "mars_dirt_6"
-	},
-/area/bigredv2/caves_north)
-"H" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_19"
-	},
-/area/bigredv2/caves_north)
-"M" = (
-/turf/open/mars_cave{
-	icon_state = "mars_dirt_5"
-	},
-/area/bigredv2/caves_north)
-"S" = (
-/turf/open/mars_cave{
-	icon_state = "mars_cave_7"
-	},
-/area/bigredv2/caves_lambda)
-"Z" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/turf/open/mars_cave{
-	icon_state = "mars_cave_16"
-	},
-/area/bigredv2/caves_lambda)
-
-(1,1,1) = {"
-a
-d
-e
-m
-C
-n
-H
-e
-e
-s
-"}
-(2,1,1) = {"
-b
-f
-s
-n
-j
-n
-o
-e
-e
-m
-"}
-(3,1,1) = {"
-b
-b
-s
-M
-n
-H
-d
-b
-b
-b
-"}
-(4,1,1) = {"
-b
-b
-g
-Z
-Z
-b
-b
-b
-b
-b
-"}
-(5,1,1) = {"
-b
-c
-c
-c
-c
-c
-b
-b
-b
-b
-"}
-(6,1,1) = {"
-b
-c
-c
-c
-h
-c
-c
-b
-b
-b
-"}
-(7,1,1) = {"
-S
-c
-c
-c
-c
-c
-c
-b
-c
-c
-"}
-(8,1,1) = {"
-c
-c
-c
-c
-c
-c
-c
-g
-c
-c
-"}
-(9,1,1) = {"
-c
-h
-c
-c
-c
-h
-c
-g
-c
-c
-"}
-(10,1,1) = {"
-c
-c
-c
-c
-c
-c
-c
-g
-c
-h
-"}
diff --git a/maps/map_files/BigRed/sprinkles/5+gruesome_medicaleast.dmm b/maps/map_files/BigRed/sprinkles/5+gruesome_medicaleast.dmm
deleted file mode 100644
index 96ed195a9bee..000000000000
--- a/maps/map_files/BigRed/sprinkles/5+gruesome_medicaleast.dmm
+++ /dev/null
@@ -1,53 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/obj/item/prop/helmetgarb/rosary{
-	pixel_y = 6
-	},
-/turf/template_noop,
-/area/template_noop)
-"d" = (
-/obj/item/clothing/head/soft/blue{
-	pixel_x = 5
-	},
-/turf/template_noop,
-/area/template_noop)
-"g" = (
-/obj/item/weapon/gun/pistol/holdout{
-	pixel_x = -4
-	},
-/turf/template_noop,
-/area/template_noop)
-"A" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/turf/template_noop,
-/area/template_noop)
-"K" = (
-/obj/item/limb/arm/l_arm{
-	dir = 8
-	},
-/obj/item/limb/arm/r_arm,
-/obj/item/limb/foot/l_foot{
-	dir = 1;
-	pixel_y = 21
-	},
-/obj/item/limb/head{
-	dir = 4;
-	pixel_x = 6
-	},
-/obj/effect/decal/cleanable/blood,
-/turf/template_noop,
-/area/template_noop)
-"M" = (
-/turf/template_noop,
-/area/template_noop)
-
-(1,1,1) = {"
-d
-A
-a
-"}
-(2,1,1) = {"
-K
-g
-M
-"}
diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm
index 4e06de75bc43..a86fb326152d 100644
--- a/maps/map_files/DesertDam/Desert_Dam.dmm
+++ b/maps/map_files/DesertDam/Desert_Dam.dmm
@@ -62185,7 +62185,7 @@
 /area/desert_dam/exterior/valley/valley_telecoms)
 "lrn" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "damtemple"
+	insert_tag = "damtemple_intact"
 	},
 /turf/open/desert/dirt{
 	icon_state = "desert_transition_edge1"
@@ -65097,7 +65097,7 @@
 	icon_state = "S"
 	},
 /obj/effect/landmark/nightmare{
-	insert_tag = "shipgone"
+	insert_tag = "shipgone_northlz"
 	},
 /turf/open/floor/prison{
 	dir = 10;
@@ -65450,7 +65450,7 @@
 /area/desert_dam/interior/dam_interior/garage)
 "wrl" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "cavein"
+	insert_tag = "cavein_engineering"
 	},
 /turf/closed/wall/rock/orange,
 /area/desert_dam/exterior/rock)
@@ -66042,7 +66042,7 @@
 	icon_state = "road_edge_decal3"
 	},
 /obj/effect/landmark/nightmare{
-	insert_tag = "minievac"
+	insert_tag = "minievac_westresearch"
 	},
 /turf/open/asphalt,
 /area/desert_dam/exterior/valley/valley_wilderness)
diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm
index 2fe5f7b45337..800d68c6cc5a 100644
--- a/maps/map_files/Kutjevo/Kutjevo.dmm
+++ b/maps/map_files/Kutjevo/Kutjevo.dmm
@@ -4549,7 +4549,7 @@
 /area/kutjevo/exterior/runoff_river)
 "fNe" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "cleaningprog"
+	insert_tag = "cleaningprog_botany"
 	},
 /turf/open/floor/kutjevo/tan,
 /area/kutjevo/interior/complex/botany)
@@ -8061,7 +8061,7 @@
 /area/kutjevo/interior/colony_central/mine_elevator)
 "kPw" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "trappedmonke"
+	insert_tag = "trappedmonke_andclown"
 	},
 /turf/open/floor/kutjevo/tan/multi_tiles,
 /area/kutjevo/interior/oob)
@@ -9504,7 +9504,7 @@
 /area/kutjevo/interior/complex/med)
 "mIg" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "plinkingspot"
+	insert_tag = "plinkingspot_northlz"
 	},
 /turf/closed/wall/kutjevo/rock/border,
 /area/kutjevo/exterior/scrubland)
diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm
index 11f57fc6680c..e3733e802bb1 100644
--- a/maps/map_files/LV624/LV624.dmm
+++ b/maps/map_files/LV624/LV624.dmm
@@ -20012,7 +20012,7 @@
 /area/lv624/ground/caves/sand_temple)
 "pca" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "nexuscenter"
+	insert_tag = "nexuscenter_barricaded"
 	},
 /turf/open/floor{
 	dir = 9;
@@ -22225,7 +22225,7 @@
 /area/lv624/lazarus/quartstorage)
 "tgi" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "lz-containers"
+	insert_tag = "lz-containers_swapped"
 	},
 /turf/open/floor{
 	icon_state = "warning"