diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index 2f909120d13..8acf829e55d 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -3,7 +3,7 @@ var/global/list/portals = list()					//list of all /obj/effect/portal
 var/global/list/airlocks = list()					//list of all airlocks
 var/global/list/mechas_list = list()				//list of all mechs. Used by hostile mobs target tracking.
 var/global/list/shuttle_caller_list = list()  		//list of all communication consoles and AIs, for automatic shuttle calls when there are none.
-var/global/list/machines = list()					//NOTE: this is a list of ALL machines now. The processing machines list is SSmachine.processing !
+var/global/list/machines = list()					//NOTE: this is a list of ALL machines now. The processing machines list is SSmachines.processing !
 var/global/list/syndicate_shuttle_boards = list()	//important to keep track of for managing nukeops war declarations.
 var/global/list/navbeacons = list()					//list of all bot nagivation beacons, used for patrolling.
 var/global/list/teleportbeacons = list()			//list of all tracking beacons used by teleporters
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index 223abc2322e..61a3e695333 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -628,7 +628,7 @@ var/datum/controller/subsystem/garbage/SSgarbage
 	SearchVar(SSipintel)
 	SearchVar(SSjob)
 	SearchVar(SSlighting)
-	SearchVar(SSmachine)
+	SearchVar(SSmachines)
 	SearchVar(SSmapping)
 	SearchVar(SSminimap)
 	SearchVar(SSmob)
diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm
index 0f2356a8f2a..e7c8d93a42e 100644
--- a/code/controllers/subsystem/machines.dm
+++ b/code/controllers/subsystem/machines.dm
@@ -1,4 +1,4 @@
-var/datum/controller/subsystem/machines/SSmachine
+var/datum/controller/subsystem/machines/SSmachines
 
 /datum/controller/subsystem/machines
 	name = "Machines"
@@ -26,7 +26,7 @@ var/datum/controller/subsystem/machines/SSmachine
 			propagate_network(PC,PC.powernet)
 
 /datum/controller/subsystem/machines/New()
-	NEW_SS_GLOBAL(SSmachine)
+	NEW_SS_GLOBAL(SSmachines)
 
 
 /datum/controller/subsystem/machines/stat_entry()
@@ -65,7 +65,7 @@ var/datum/controller/subsystem/machines/SSmachine
 			propagate_network(PC,PC.powernet)
 
 /datum/controller/subsystem/machines/Recover()
-	if (istype(SSmachine.processing))
-		processing = SSmachine.processing
-	if (istype(SSmachine.powernets))
-		powernets = SSmachine.powernets
\ No newline at end of file
+	if (istype(SSmachines.processing))
+		processing = SSmachines.processing
+	if (istype(SSmachines.powernets))
+		powernets = SSmachines.powernets
\ No newline at end of file
diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm
index 3a00945d27a..7e970272313 100644
--- a/code/game/gamemodes/gang/dominator.dm
+++ b/code/game/gamemodes/gang/dominator.dm
@@ -59,7 +59,7 @@
 						G.message_gangtools("WARNING: [gang.name] Gang takeover imminent. Their dominator at [domloc.map_name] must be destroyed!",1,1)
 
 	if(!.)
-		STOP_PROCESSING(SSmachine, src)
+		STOP_PROCESSING(SSmachines, src)
 
 /obj/machinery/dominator/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
 	switch(damage_type)
@@ -122,7 +122,7 @@
 	cut_overlays()
 	operating = 0
 	stat |= BROKEN
-	STOP_PROCESSING(SSmachine, src)
+	STOP_PROCESSING(SSmachines, src)
 
 /obj/machinery/dominator/Destroy()
 	if(!(stat & BROKEN))
@@ -132,7 +132,7 @@
 	qdel(spark_system)
 	qdel(countdown)
 	countdown = null
-	STOP_PROCESSING(SSmachine, src)
+	STOP_PROCESSING(SSmachines, src)
 	return ..()
 
 /obj/machinery/dominator/emp_act(severity)
@@ -181,7 +181,7 @@
 		countdown.start()
 
 		set_light(3)
-		START_PROCESSING(SSmachine, src)
+		START_PROCESSING(SSmachines, src)
 
 		gang.message_gangtools("Hostile takeover in progress: Estimated [time] minutes until victory.[gang.dom_attempts ? "" : " This is your final attempt."]")
 		for(var/datum/gang/G in SSticker.mode.gangs)
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index eb3ee75e31b..7c1bc7478dd 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -73,7 +73,7 @@
 		if(beaker)
 			usr.visible_message("<span class='warning'>[usr] attaches \the [src] to \the [target].</span>", "<span class='notice'>You attach \the [src] to \the [target].</span>")
 			attached = target
-			START_PROCESSING(SSmachine, src)
+			START_PROCESSING(SSmachines, src)
 			update_icon()
 		else
 			to_chat(usr, "<span class='warning'>There's nothing attached to the IV drip!</span>")
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index b69d7286178..5e57532c79a 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -130,7 +130,7 @@ Class Procs:
 	..()
 	machines += src
 	if(!speed_process)
-		START_PROCESSING(SSmachine, src)
+		START_PROCESSING(SSmachines, src)
 	else
 		START_PROCESSING(SSfastprocess, src)
 	power_change()
@@ -138,7 +138,7 @@ Class Procs:
 /obj/machinery/Destroy()
 	machines.Remove(src)
 	if(!speed_process)
-		STOP_PROCESSING(SSmachine, src)
+		STOP_PROCESSING(SSmachines, src)
 	else
 		STOP_PROCESSING(SSfastprocess, src)
 	dropContents()
diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm
index 1a6dbe7e6d9..81e71a837ee 100644
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -69,7 +69,7 @@ var/explosionid = 1
 	//postpone processing for a bit
 	var/postponeCycles = max(round(devastation_range/8),1)
 	SSlighting.postpone(postponeCycles)
-	SSmachine.postpone(postponeCycles)
+	SSmachines.postpone(postponeCycles)
 
 	if(heavy_impact_range > 1)
 		if(smoke)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index f123b597d95..a3ef6c863b1 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -383,7 +383,7 @@ var/list/TYPES_SHORTCUTS = list(
 /client/proc/cmd_debug_make_powernets()
 	set category = "Debug"
 	set name = "Make Powernets"
-	SSmachine.makepowernets()
+	SSmachines.makepowernets()
 	log_admin("[key_name(src)] has remade the powernet. makepowernets() called.")
 	message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.", 0)
 	feedback_add_details("admin_verb","MPWN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
index 7f355b3b028..ca576d24e6e 100644
--- a/code/modules/mapping/map_template.dm
+++ b/code/modules/mapping/map_template.dm
@@ -39,7 +39,7 @@
 				atmos_machines += A
 
 	SSatoms.InitializeAtoms(atoms)
-	SSmachine.setup_template_powernets(cables)
+	SSmachines.setup_template_powernets(cables)
 	SSair.setup_template_machinery(atmos_machines)
 
 /datum/map_template/proc/load_new_z()
diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm
index 9c1f9758a83..b6c5e20e5fb 100644
--- a/code/modules/power/antimatter/shielding.dm
+++ b/code/modules/power/antimatter/shielding.dm
@@ -192,7 +192,7 @@
 /obj/machinery/am_shielding/proc/setup_core()
 	processing = 1
 	machines |= src
-	START_PROCESSING(SSmachine, src)
+	START_PROCESSING(SSmachines, src)
 	if(!control_unit)
 		return
 	control_unit.linked_cores.Add(src)
diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm
index 28ef1488d02..b6f61103ca3 100644
--- a/code/modules/power/powernet.dm
+++ b/code/modules/power/powernet.dm
@@ -15,7 +15,7 @@
 	var/netexcess = 0			// excess power on the powernet (typically avail-load)///////
 
 /datum/powernet/New()
-	SSmachine.powernets += src
+	SSmachines.powernets += src
 
 /datum/powernet/Destroy()
 	//Go away references, you suck!
@@ -26,7 +26,7 @@
 		nodes -= M
 		M.powernet = null
 
-	SSmachine.powernets -= src
+	SSmachines.powernets -= src
 	return ..()
 
 /datum/powernet/proc/is_empty()