diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index 81e51f6ddd4..24e10a2d371 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -3535,10 +3535,6 @@
 /obj/structure/bed/chair{
 	dir = 1
 	},
-/obj/machinery/camera/network/command{
-	c_tag = "Bridge - Pod 1";
-	dir = 4
-	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/shuttle/floor,
 /area/space)
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 8623241eec2..b453918b383 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -2446,7 +2446,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/camera/network/command{
+/obj/machinery/camera/network/security{
 	c_tag = "Security - Corridor Camera 6"
 	},
 /turf/simulated/floor/tiled,
@@ -11880,7 +11880,7 @@
 	},
 /obj/machinery/door/airlock/glass_engineering{
 	name = "Engineering Hallway";
-	req_one_access = list(11)
+	req_one_access = list(10)
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/engine_monitoring)
@@ -12954,7 +12954,7 @@
 	},
 /obj/machinery/door/airlock/glass_engineering{
 	name = "Engineering Hallway";
-	req_one_access = list(11)
+	req_one_access = list(10)
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/engine_monitoring)
@@ -13924,10 +13924,6 @@
 /turf/simulated/floor/tiled,
 /area/engineering/engine_monitoring)
 "aAa" = (
-/obj/machinery/door/airlock/glass_engineering{
-	name = "Engineering Hallway";
-	req_one_access = list(11)
-	},
 /obj/machinery/door/firedoor{
 	dir = 1;
 	name = "Engineering Firelock"
@@ -13935,6 +13931,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/airlock/glass_engineering{
+	name = "Engineering Hallway";
+	req_one_access = list(10)
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/engine_monitoring)
 "aAb" = (
@@ -14811,10 +14811,6 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_monitoring)
 "aBB" = (
-/obj/machinery/door/airlock/glass_engineering{
-	name = "Engineering Hallway";
-	req_one_access = list(11,24)
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
@@ -14826,6 +14822,10 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/airlock/glass_engineering{
+	name = "Engineering Hallway";
+	req_one_access = list(10)
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/engine_monitoring)
 "aBC" = (
@@ -29985,7 +29985,7 @@
 	pixel_y = 0
 	},
 /obj/machinery/camera/network/medbay{
-	c_tag = "Medical - Virology Morgue";
+	c_tag = "Medical - EMT Garage";
 	dir = 4;
 	icon_state = "camera"
 	},
@@ -50384,10 +50384,6 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/camera/network/civilian_east{
-	c_tag = "Surface - Restrooms";
-	dir = 8
-	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/locker/locker_toilet)
 "bIq" = (
@@ -57363,14 +57359,14 @@
 /obj/machinery/light_switch{
 	pixel_y = 28
 	},
-/obj/machinery/camera/network/security{
-	c_tag = "Maintenance - Janitorial Office"
-	},
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/camera/network/civilian_west{
+	c_tag = "Maintenance - Janitorial Office"
+	},
 /turf/simulated/floor/tiled{
 	icon_state = "vault";
 	dir = 5
@@ -62057,6 +62053,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/assembly/robotics)
+"ceM" = (
+/obj/machinery/camera/network/civilian_west{
+	c_tag = "Main Level - Restrooms";
+	dir = 8
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/locker/locker_toilet)
 
 (1,1,1) = {"
 aaa
@@ -91514,7 +91517,7 @@ bGK
 bHy
 bIp
 bHy
-bHy
+ceM
 bHy
 bGK
 bLI
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index 6c8cf5686c5..ee966102458 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -7788,7 +7788,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/machinery/camera/network/command{
+/obj/machinery/camera/network/civilian_east{
 	c_tag = "Surface - Corridor Camera 11";
 	dir = 4
 	},
@@ -8531,7 +8531,7 @@
 	pixel_y = -24
 	},
 /obj/machinery/light,
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_east{
 	c_tag = "Surface - Vacant Office 1";
 	dir = 1
 	},
@@ -9721,7 +9721,7 @@
 	dir = 8
 	},
 /obj/machinery/camera/network/command{
-	c_tag = "AI Core - SMES Room 2";
+	c_tag = "Bridge - Pod 2";
 	dir = 4
 	},
 /turf/simulated/shuttle/floor,
@@ -15667,7 +15667,7 @@
 "CU" = (
 /obj/effect/decal/cleanable/generic,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera/network/security{
+/obj/machinery/camera/network/civilian_east{
 	c_tag = "Surface - Custodial Closet"
 	},
 /turf/simulated/floor/plating,
@@ -17340,15 +17340,15 @@
 /area/quartermaster/qm)
 "FX" = (
 /obj/structure/disposalpipe/segment,
-/obj/machinery/camera/network/civilian_west{
-	c_tag = "Cargo - Quartermaster's Office";
-	dir = 8
-	},
 /obj/machinery/firealarm{
 	dir = 4;
 	layer = 3.3;
 	pixel_x = 26
 	},
+/obj/machinery/camera/network/civilian_east{
+	c_tag = "Cargo - Quartermaster's Office";
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/qm)
 "FY" = (
@@ -18139,14 +18139,14 @@
 /turf/simulated/wall,
 /area/quartermaster/loading)
 "Hl" = (
-/obj/machinery/camera/network/civilian_west{
-	c_tag = "Cargo - Mail Room";
-	dir = 4
-	},
 /obj/machinery/firealarm{
 	dir = 8;
 	pixel_x = -24
 	},
+/obj/machinery/camera/network/civilian_east{
+	c_tag = "Cargo - Mail Room";
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/loading)
 "Hm" = (
@@ -46876,7 +46876,7 @@ aw
 aa
 aa
 bq
-It
+Is
 cl
 cl
 cl