diff --git a/_maps/map_files/Deathmatch/OSHA_Violator.dmm b/_maps/deathmatch/OSHA_Violator.dmm
similarity index 100%
rename from _maps/map_files/Deathmatch/OSHA_Violator.dmm
rename to _maps/deathmatch/OSHA_Violator.dmm
diff --git a/_maps/map_files/Deathmatch/starwars.dmm b/_maps/deathmatch/arena_station.dmm
similarity index 100%
rename from _maps/map_files/Deathmatch/starwars.dmm
rename to _maps/deathmatch/arena_station.dmm
diff --git a/_maps/map_files/Deathmatch/raidthebase.dmm b/_maps/deathmatch/backalley.dmm
similarity index 100%
rename from _maps/map_files/Deathmatch/raidthebase.dmm
rename to _maps/deathmatch/backalley.dmm
diff --git a/_maps/map_files/Deathmatch/instagib.dmm b/_maps/deathmatch/instagib.dmm
similarity index 100%
rename from _maps/map_files/Deathmatch/instagib.dmm
rename to _maps/deathmatch/instagib.dmm
diff --git a/_maps/map_files/Deathmatch/Maint_Mania.dmm b/_maps/deathmatch/maint_mania.dmm
similarity index 100%
rename from _maps/map_files/Deathmatch/Maint_Mania.dmm
rename to _maps/deathmatch/maint_mania.dmm
diff --git a/_maps/map_files/Deathmatch/meatower.dmm b/_maps/deathmatch/meat_tower.dmm
similarity index 100%
rename from _maps/map_files/Deathmatch/meatower.dmm
rename to _maps/deathmatch/meat_tower.dmm
diff --git a/_maps/map_files/Deathmatch/mech_madness.dmm b/_maps/deathmatch/mech_madness.dmm
similarity index 100%
rename from _maps/map_files/Deathmatch/mech_madness.dmm
rename to _maps/deathmatch/mech_madness.dmm
diff --git a/_maps/map_files/Deathmatch/The_Brig.dmm b/_maps/deathmatch/meta_brig.dmm
similarity index 100%
rename from _maps/map_files/Deathmatch/The_Brig.dmm
rename to _maps/deathmatch/meta_brig.dmm
diff --git a/_maps/map_files/Deathmatch/ragecage.dmm b/_maps/deathmatch/ragecage.dmm
similarity index 100%
rename from _maps/map_files/Deathmatch/ragecage.dmm
rename to _maps/deathmatch/ragecage.dmm
diff --git a/_maps/map_files/Deathmatch/SecuRing.dmm b/_maps/deathmatch/secu_ring.dmm
similarity index 100%
rename from _maps/map_files/Deathmatch/SecuRing.dmm
rename to _maps/deathmatch/secu_ring.dmm
diff --git a/_maps/map_files/Deathmatch/shooting_range.dmm b/_maps/deathmatch/shooting_range.dmm
similarity index 100%
rename from _maps/map_files/Deathmatch/shooting_range.dmm
rename to _maps/deathmatch/shooting_range.dmm
diff --git a/_maps/map_files/Deathmatch/Sniper_elite.dmm b/_maps/deathmatch/sniper_elite.dmm
similarity index 100%
rename from _maps/map_files/Deathmatch/Sniper_elite.dmm
rename to _maps/deathmatch/sniper_elite.dmm
diff --git a/_maps/map_files/Deathmatch/chinatown.dmm b/_maps/deathmatch/sunrise.dmm
similarity index 100%
rename from _maps/map_files/Deathmatch/chinatown.dmm
rename to _maps/deathmatch/sunrise.dmm
diff --git a/_maps/map_files/Deathmatch/arena.dmm b/_maps/deathmatch/underground_arena.dmm
similarity index 100%
rename from _maps/map_files/Deathmatch/arena.dmm
rename to _maps/deathmatch/underground_arena.dmm
diff --git a/code/modules/deathmatch/deathmatch_maps.dm b/code/modules/deathmatch/deathmatch_maps.dm
index 71d7e8a8651..e594ab24fcb 100644
--- a/code/modules/deathmatch/deathmatch_maps.dm
+++ b/code/modules/deathmatch/deathmatch_maps.dm
@@ -1,11 +1,13 @@
 /datum/lazy_template/deathmatch //deathmatch maps that have any possibility of the walls being destroyed should use indestructible walls, because baseturf moment
-	map_dir = "_maps/map_files/Deathmatch"
+	map_dir = "_maps/deathmatch"
 	place_on_top = TRUE
 	/// Map UI Name
 	var/name
 	/// Map Description
 	var/desc = ""
+	/// Minimum players for this map
 	var/min_players = 2
+	/// Maximum players for this map
 	var/max_players = 2 // TODO: make this automatic.
 	/// The map will end in this time
 	var/automatic_gameend_time = 8 MINUTES
@@ -26,24 +28,24 @@
 	desc = "Dark maintenance tunnels, floor pills, improvised weaponry and a bloody beatdown. Welcome to assistant utopia."
 	max_players = 8
 	allowed_loadouts = list(/datum/outfit/deathmatch_loadout/assistant)
-	map_name = "Maint_Mania"
-	key = "Maint_Mania"
+	map_name = "maint_mania"
+	key = "maint_mania"
 
 /datum/lazy_template/deathmatch/osha_violator
 	name = "OSHA Violator"
 	desc = "What would Engineering be without an overly complicated engine, with conveyor belts, emitters and shield generators sprinkled about? That's right, not Engineering."
 	max_players = 10
 	allowed_loadouts = list(/datum/outfit/deathmatch_loadout/assistant)
-	map_name = "OSHA_Violator"
-	key = "OSHA_Violator"
+	map_name = "OSHA_violator"
+	key = "OSHA_violator"
 
 /datum/lazy_template/deathmatch/the_brig
 	name = "The Brig"
 	desc = "A recreation of MetaStation Brig."
 	max_players = 12
 	allowed_loadouts = list(/datum/outfit/deathmatch_loadout/assistant)
-	map_name = "The_Brig"
-	key = "The_Brig"
+	map_name = "meta_brig"
+	key = "meta_brig"
 
 /datum/lazy_template/deathmatch/shooting_range
 	name = "Shooting Range"
@@ -61,8 +63,8 @@
 	desc = "Presenting the Security Ring, ever wanted to shoot people with disablers? Well now you can."
 	max_players = 4
 	allowed_loadouts = list(/datum/outfit/deathmatch_loadout/securing_sec)
-	map_name = "SecuRing"
-	key = "SecuRing"
+	map_name = "secu_ring"
+	key = "secu_ring"
 
 /datum/lazy_template/deathmatch/instagib
 	name = "Instagib"
@@ -80,29 +82,29 @@
 	map_name = "mech_madness"
 	key = "mech_madness"
 
-/datum/lazy_template/deathmatch/sniperelite
+/datum/lazy_template/deathmatch/sniper_elite
 	name = "Sniper Elite"
 	desc = "Sound of gunfire and screaming people make my day"
 	max_players = 8
 	allowed_loadouts = list(/datum/outfit/deathmatch_loadout/operative/sniper)
-	map_name = "Sniper_elite"
-	key = "Sniper_elite"
+	map_name = "sniper_elite"
+	key = "sniper_elite"
 
 /datum/lazy_template/deathmatch/meatower
 	name = "Meat Tower"
 	desc = "There can only be one chef in this kitchen"
 	max_players = 8
 	allowed_loadouts = list(/datum/outfit/deathmatch_loadout/chef)
-	map_name = "meatower"
-	key = "meatower"
+	map_name = "meat_tower"
+	key = "meat_tower"
 
 /datum/lazy_template/deathmatch/sunrise
 	name = "Sunrise"
 	desc = "DEHUMANIZE YOURSELF AND FACE TO BLOODSHED DEHUMANIZE YOURSELF AND FACE TO BLOODSHED DEHUMANIZE YOURSELF AND FACE TO BLOODSHED DEHUMANIZE YOURSELF AND FACE TO BLOODSHED"
 	max_players = 8
 	allowed_loadouts = list(/datum/outfit/deathmatch_loadout/samurai)
-	map_name = "chinatown"
-	key = "chinatown"
+	map_name = "sunrise"
+	key = "sunrise"
 
 /datum/lazy_template/deathmatch/starwars
 	name = "Arena Station"
@@ -124,10 +126,10 @@
 		/datum/outfit/deathmatch_loadout/battler/tgcoder,
 		/datum/outfit/deathmatch_loadout/naked,
 	)
-	map_name = "starwars"
-	key = "starwars"
+	map_name = "arena_station"
+	key = "arena_station"
 
-/datum/lazy_template/deathmatch/arenaplatform
+/datum/lazy_template/deathmatch/underground_thunderdome
 	name = "Underground Thunderdome"
 	desc = "An illegal underground thunderdome, for larger amounts of murder."
 	max_players = 15
@@ -135,10 +137,10 @@
 		/datum/outfit/deathmatch_loadout/operative,
 		/datum/outfit/deathmatch_loadout/naked,
 	)
-	map_name = "arena"
-	key = "arena"
+	map_name = "underground_arena"
+	key = "underground_arena"
 
-/datum/lazy_template/deathmatch/raidthebase
+/datum/lazy_template/deathmatch/backalley
 	name = "Backalley"
 	desc = "You are not built for these streets."
 	max_players = 8
@@ -146,5 +148,5 @@
 		/datum/outfit/deathmatch_loadout/assistant,
 		/datum/outfit/deathmatch_loadout/naked,
 	)
-	map_name = "raidthebase"
-	key = "raidthebase"
+	map_name = "backalley"
+	key = "backalley"