diff --git a/maps/submaps/admin_use_vr/_guttersite.dm b/maps/submaps/admin_use_vr/guttersite.dm
similarity index 81%
rename from maps/submaps/admin_use_vr/_guttersite.dm
rename to maps/submaps/admin_use_vr/guttersite.dm
index 655c067f26..23c54af980 100644
--- a/maps/submaps/admin_use_vr/_guttersite.dm
+++ b/maps/submaps/admin_use_vr/guttersite.dm
@@ -49,40 +49,40 @@
 
 //TFF 26/12/19 - Sub-areas for the APCs.
 /area/tether_away/guttersite/engines
-	name = "POI - Gutter Engineering"
+	name = "Gutter - Gutter Engineering"
 
 /area/tether_away/guttersite/security
-	name = "POI - Gutter Security and Holding"
+	name = "Gutter - Gutter Security and Holding"
 
 /area/tether_away/guttersite/docking
-	name = "POI - Gutter Docks"
+	name = "Gutter - Gutter Docks"
 
 /area/tether_away/guttersite/office
-	name = "POI - Gutter Offices"
+	name = "Gutter - Gutter Offices"
 
 /area/tether_away/guttersite/atmos
-	name = "POI - Gutter Atmospherics"
+	name = "Gutter - Gutter Atmospherics"
 
 /area/tether_away/guttersite/maint
-	name = "POI - Gutter Maintenance"
+	name = "Gutter - Gutter Maintenance"
 
 /area/tether_away/guttersite/vault
-	name = "POI - Gutter Vault"
+	name = "Gutter - Gutter Vault"
 
 /area/tether_away/guttersite/bridge
-	name = "POI - Gutter Bridge"
+	name = "Gutter - Gutter Bridge"
 
 /area/tether_away/guttersite/walkway
-	name = "POI - Gutter Walkway"
+	name = "Gutter - Gutter Walkway"
 
 /area/tether_away/guttersite/medbay
-	name = "POI - Gutter Medbay"
+	name = "Gutter - Gutter Medbay"
 
 /area/tether_away/guttersite/commons
-	name = "POI - Gutter Commons"
+	name = "Gutter - Gutter Commons"
 
 /area/tether_away/guttersite/storage
-	name = "POI - Gutter Tool Storage"
+	name = "Gutter - Gutter Tool Storage"
 
 /area/tether_away/guttersite/teleporter
-	name = "POI - Gutter Teleporter"
+	name = "Gutter - Gutter Teleporter"
diff --git a/maps/submaps/depreciated_vr/_depreciated.dm b/maps/submaps/depreciated_vr/_depreciated.dm
new file mode 100644
index 0000000000..facff5db09
--- /dev/null
+++ b/maps/submaps/depreciated_vr/_depreciated.dm
@@ -0,0 +1,9 @@
+/datum/map_template/admin_use/old_mercenary
+	name = "Special Area - Old Merc Base"
+	desc = "So much red!"
+	mappath = 'maps/submaps/admin_use_vr/mercbase.dmm'
+
+/datum/map_template/admin_use/ert
+	name = "Special Area - ERT"
+	desc = "ERT Base."
+	mappath = 'maps/submaps/admin_use_vr/ert_base.dmm'
diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm
index 639d56f121..35cdc69d6c 100644
--- a/maps/tether/submaps/_tether_submaps.dm
+++ b/maps/tether/submaps/_tether_submaps.dm
@@ -57,6 +57,7 @@
 
 #include "../../submaps/admin_use_vr/ert.dm"
 #include "../../submaps/admin_use_vr/mercship.dm"
+#include "../../submaps/admin_use_vr/guttersite.dm"
 
 /datum/map_template/admin_use/ert
 	name = "Special Area - ERT"
@@ -78,11 +79,6 @@
 	desc = "Prepare tae be boarded, arr!"
 	mappath = 'maps/submaps/admin_use_vr/kk_mercship.dmm'
 
-/datum/map_template/admin_use/old_mercenary
-	name = "Special Area - Old Merc Base"
-	desc = "So much red!"
-	mappath = 'maps/submaps/admin_use_vr/mercbase.dmm'
-
 /datum/map_template/admin_use/skipjack
 	name = "Special Area - Skipjack Base"
 	desc = "Stinky!"
@@ -103,6 +99,11 @@
 	desc = "Sneaky"
 	mappath = 'maps/submaps/admin_use_vr/dojo.dmm'
 
+/datum/map_template/admin_use/guttersite
+	name = "Special Area - Guttersite"
+	desc = "A space for bad guys to hang out"
+	mappath = 'maps/submaps/admin_use_vr/guttersite.dmm'
+
 //////////////////////////////////////////////////////////////////////////////
 //Rogue Mines Stuff
 
@@ -164,7 +165,6 @@
 #include "../../expedition_vr/aerostat/surface.dmm"
 #include "../../expedition_vr/space/debrisfield.dmm"
 #include "../../expedition_vr/space/fueldepot.dmm"
-#include "../../expedition_vr/space/guttersite.dmm"
 #endif
 
 #include "../../expedition_vr/beach/_beach.dm"