diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/job.dm
similarity index 100%
rename from code/controllers/subsystem/jobs.dm
rename to code/controllers/subsystem/job.dm
diff --git a/code/controllers/subsystem/processing/objects.dm b/code/controllers/subsystem/processing/obj.dm
similarity index 63%
rename from code/controllers/subsystem/processing/objects.dm
rename to code/controllers/subsystem/processing/obj.dm
index ee15dc06031..85d2fbb0301 100644
--- a/code/controllers/subsystem/processing/objects.dm
+++ b/code/controllers/subsystem/processing/obj.dm
@@ -1,5 +1,4 @@
-var/datum/controller/subsystem/objects/SSobj
-/datum/controller/subsystem/objects
+PROCESSING_SUBSYTEM(obj)
 	name = "Objects"
 	priority = 40
 	flags = SS_NO_INIT
@@ -7,12 +6,10 @@ var/datum/controller/subsystem/objects/SSobj
 	var/list/processing = list()
 	var/list/currentrun = list()
 
-/datum/controller/subsystem/objects/New()
-	NEW_SS_GLOBAL(SSobj)
-/datum/controller/subsystem/objects/stat_entry()
+/datum/controller/subsystem/obj/stat_entry()
 	..("P:[processing.len]")
 
-/datum/controller/subsystem/objects/fire(resumed = 0)
+/datum/controller/subsystem/obj/fire(resumed = 0)
 	if (!resumed)
 		src.currentrun = processing.Copy()
 	//cache for sanic speed (lists are references anyways)
@@ -28,5 +25,5 @@ var/datum/controller/subsystem/objects/SSobj
 		if (MC_TICK_CHECK)
 			return
 
-/datum/controller/subsystem/objects/Recover()
+/datum/controller/subsystem/obj/Recover()
 	processing = SSobj.processing
diff --git a/code/controllers/subsystem/server_maintenance.dm b/code/controllers/subsystem/server_maint.dm
similarity index 100%
rename from code/controllers/subsystem/server_maintenance.dm
rename to code/controllers/subsystem/server_maint.dm
diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttle.dm
similarity index 100%
rename from code/controllers/subsystem/shuttles.dm
rename to code/controllers/subsystem/shuttle.dm
diff --git a/code/controllers/subsystem/time_tracking.dm b/code/controllers/subsystem/time_track.dm
similarity index 100%
rename from code/controllers/subsystem/time_tracking.dm
rename to code/controllers/subsystem/time_track.dm
diff --git a/code/controllers/subsystem/title_screen.dm b/code/controllers/subsystem/title.dm
similarity index 100%
rename from code/controllers/subsystem/title_screen.dm
rename to code/controllers/subsystem/title.dm
diff --git a/code/controllers/subsystem/voting.dm b/code/controllers/subsystem/vote.dm
similarity index 100%
rename from code/controllers/subsystem/voting.dm
rename to code/controllers/subsystem/vote.dm
diff --git a/tgstation.dme b/tgstation.dme
index d38ab9c6536..f369cf6e64b 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -159,13 +159,13 @@
 #include "code\controllers\subsystem\icon_smooth.dm"
 #include "code\controllers\subsystem\inbounds.dm"
 #include "code\controllers\subsystem\ipintel.dm"
-#include "code\controllers\subsystem\jobs.dm"
+#include "code\controllers\subsystem\job.dm"
 #include "code\controllers\subsystem\lighting.dm"
 #include "code\controllers\subsystem\machines.dm"
 #include "code\controllers\subsystem\mapping.dm"
 #include "code\controllers\subsystem\minimap.dm"
 #include "code\controllers\subsystem\mobs.dm"
-#include "code\controllers\subsystem\npcpool.dm"
+#include "code\controllers\subsystem\npc.dm"
 #include "code\controllers\subsystem\orbit.dm"
 #include "code\controllers\subsystem\pai.dm"
 #include "code\controllers\subsystem\parallax.dm"
@@ -173,23 +173,23 @@
 #include "code\controllers\subsystem\ping.dm"
 #include "code\controllers\subsystem\radio.dm"
 #include "code\controllers\subsystem\religion.dm"
-#include "code\controllers\subsystem\server_maintenance.dm"
-#include "code\controllers\subsystem\shuttles.dm"
+#include "code\controllers\subsystem\server_maint.dm"
+#include "code\controllers\subsystem\shuttle.dm"
 #include "code\controllers\subsystem\spacedrift.dm"
 #include "code\controllers\subsystem\squeak.dm"
 #include "code\controllers\subsystem\stickyban.dm"
 #include "code\controllers\subsystem\sun.dm"
 #include "code\controllers\subsystem\tgui.dm"
 #include "code\controllers\subsystem\throwing.dm"
-#include "code\controllers\subsystem\SSticker.dm"
-#include "code\controllers\subsystem\time_tracking.dm"
+#include "code\controllers\subsystem\ticker.dm"
+#include "code\controllers\subsystem\time_track.dm"
 #include "code\controllers\subsystem\timer.dm"
-#include "code\controllers\subsystem\title_screen.dm"
-#include "code\controllers\subsystem\voting.dm"
+#include "code\controllers\subsystem\title.dm"
+#include "code\controllers\subsystem\vote.dm"
 #include "code\controllers\subsystem\weather.dm"
 #include "code\controllers\subsystem\processing\fastprocess.dm"
 #include "code\controllers\subsystem\processing\flightpacks.dm"
-#include "code\controllers\subsystem\processing\objects.dm"
+#include "code\controllers\subsystem\processing\obj.dm"
 #include "code\controllers\subsystem\processing\overlays.dm"
 #include "code\controllers\subsystem\processing\processing.dm"
 #include "code\datums\action.dm"