diff --git a/_maps/RandomZLevels/mothership_astrum.dmm b/_maps/RandomZLevels/mothership_astrum.dmm
index fc2b324ce46..4a8b85b81c2 100644
--- a/_maps/RandomZLevels/mothership_astrum.dmm
+++ b/_maps/RandomZLevels/mothership_astrum.dmm
@@ -3849,7 +3849,7 @@
 /area/awaymission/mothership_astrum/deck1)
 "WT" = (
 /obj/structure/table/abductor,
-/obj/item/autosurgeon/organ/syndicate/thermal_eyes,
+/obj/item/autosurgeon/syndicate/thermal_eyes,
 /turf/open/floor/mineral/abductor,
 /area/awaymission/mothership_astrum/halls)
 "WW" = (
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 230521eab2e..25e90c82a40 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -87,7 +87,7 @@
 	new /obj/item/storage/briefcase/medicalgunset/cmo(src) //SKYRAT ADDITON MEDIGUNS//
 	// new /obj/item/reagent_containers/hypospray/cmo(src) - SKYRAT REMOVAL - New Hyposprays
 	new /obj/item/storage/hypospraykit/cmo(src) //SKYRAT ADDITION - New Hyposprays
-	new /obj/item/autosurgeon/organ/cmo(src)
+	new /obj/item/autosurgeon/medical_hud(src)
 	new /obj/item/door_remote/chief_medical_officer(src)
 	new /obj/item/clothing/neck/petcollar(src)
 	new /obj/item/pet_carrier(src)
diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/syndicate_base.dm b/code/modules/mapfluff/ruins/lavalandruin_code/syndicate_base.dm
index 23aff0759c0..b9161800685 100644
--- a/code/modules/mapfluff/ruins/lavalandruin_code/syndicate_base.dm
+++ b/code/modules/mapfluff/ruins/lavalandruin_code/syndicate_base.dm
@@ -24,11 +24,6 @@
 /obj/modular_map_root/syndicatebase
 	config_file = "strings/modular_maps/syndicatebase.toml"
 
-/obj/item/autosurgeon/organ/syndicate/commsagent
-	desc = "A device that automatically - painfully - inserts an implant. It seems someone's specially \
-	modified this one to only insert... tongues. Horrifying."
-	organ_type = /obj/item/organ/internal/tongue
-
 /obj/structure/closet/crate/secure/freezer/commsagent
 	name = "Assorted Tongues And Tongue Accessories"
 	desc = "Unearthing this was probably a mistake."
@@ -43,7 +38,7 @@
 	new /obj/item/organ/internal/tongue/robot(src) //DANGER! CRYSTAL HYPERSTRUCTURE-
 	new /obj/item/organ/internal/tongue/ethereal(src)
 	new /obj/item/organ/internal/tongue/tied(src)
-	new /obj/item/autosurgeon/organ/syndicate/commsagent(src)
+	new /obj/item/autosurgeon/syndicate/commsagent(src)
 	new	/obj/item/clothing/gloves/radio(src)
 
 /obj/machinery/power/supermatter_crystal/shard/syndicate
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index fec8ee2e797..7a62d01c92f 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -172,10 +172,10 @@
 	desc = "A sleek, sturdy box."
 	icon_state = "cyber_implants"
 	var/list/boxed = list(
-		/obj/item/autosurgeon/organ/syndicate/thermal_eyes,
-		/obj/item/autosurgeon/organ/syndicate/xray_eyes,
-		/obj/item/autosurgeon/organ/syndicate/anti_stun,
-		/obj/item/autosurgeon/organ/syndicate/reviver)
+		/obj/item/autosurgeon/syndicate/thermal_eyes,
+		/obj/item/autosurgeon/syndicate/xray_eyes,
+		/obj/item/autosurgeon/syndicate/anti_stun,
+		/obj/item/autosurgeon/syndicate/reviver)
 	var/amount = 5
 
 /obj/item/storage/box/cyber_implants/PopulateContents()
diff --git a/code/modules/surgery/organs/autosurgeon.dm b/code/modules/surgery/organs/autosurgeon.dm
index 60b6dfa6eae..4b44eee07de 100644
--- a/code/modules/surgery/organs/autosurgeon.dm
+++ b/code/modules/surgery/organs/autosurgeon.dm
@@ -3,124 +3,166 @@
 /obj/item/autosurgeon
 	name = "autosurgeon"
 	desc = "A device that automatically inserts an implant, skillchip or organ into the user without the hassle of extensive surgery. \
-		It has a screwdriver slot for removing accidentally added items."
+		It has a slot to insert implants or organs and a screwdriver slot for removing accidentally added items."
 	icon = 'icons/obj/device.dmi'
-	icon_state = "autoimplanter"
+	icon_state = "autosurgeon"
 	inhand_icon_state = "nothing"
 	w_class = WEIGHT_CLASS_SMALL
 
+	/// How many times you can use the autosurgeon before it becomes useless
 	var/uses = INFINITE
+	/// What organ will the autosurgeon sub-type will start with. ie, CMO autosurgeon start with a medi-hud.
+	var/starting_organ
+	/// The organ currently loaded in the autosurgeon, ready to be implanted.
+	var/obj/item/organ/stored_organ
+	/// The list of organs and their children we allow into the autosurgeon. An empty list means no whitelist.
+	var/list/organ_whitelist = list()
+	/// The percentage modifier for how fast you can use the autosurgeon to implant other people.
+	var/surgery_speed = 1
+	/// The overlay that shows when the autosurgeon has an organ inside of it.
+	var/loaded_overlay = "autosurgeon_loaded_overlay"
 
 /obj/item/autosurgeon/attack_self_tk(mob/user)
 	return //stops TK fuckery
 
-/obj/item/autosurgeon/organ
-	name = "implant autosurgeon"
-	desc = "A device that automatically inserts an implant or organ into the user without the hassle of extensive surgery. \
-		It has a slot to insert implants or organs and a screwdriver slot for removing accidentally added items."
-
-	var/organ_type = /obj/item/organ
-	var/starting_organ
-	var/obj/item/organ/storedorgan
-	var/surgery_speed = 1
-
-/obj/item/autosurgeon/organ/syndicate
-	name = "suspicious implant autosurgeon"
-	icon_state = "syndicate_autoimplanter"
-	surgery_speed = 0.75
-
-/obj/item/autosurgeon/organ/Initialize(mapload)
+/obj/item/autosurgeon/Initialize(mapload)
 	. = ..()
 	if(starting_organ)
-		insert_organ(new starting_organ(src))
+		load_organ(new starting_organ(src))
 
-/obj/item/autosurgeon/organ/proc/insert_organ(obj/item/item)
-	storedorgan = item
-	item.forceMove(src)
-	name = "[initial(name)] ([storedorgan.name])"
+/obj/item/autosurgeon/update_overlays()
+	. = ..()
+	if(stored_organ)
+		. += loaded_overlay
+		. += emissive_appearance(icon, loaded_overlay)
 
-/obj/item/autosurgeon/organ/proc/use_autosurgeon()
-	storedorgan = null
-	name = initial(name)
-	if(uses != INFINITE)
-		uses--
-	if(!uses)
-		desc = "[initial(desc)] Looks like it's been used up."
+/obj/item/autosurgeon/proc/load_organ(obj/item/organ/loaded_organ, mob/living/user)
+	if(user)
+		if(stored_organ)
+			to_chat(user, span_alert("[src] already has an implant stored."))
+			return
+
+		if(uses == 0)
+			to_chat(user, span_alert("[src] is used up and cannot be loaded with more implants."))
+			return
+
+		if(organ_whitelist.len)
+			var/organ_whitelisted
+			for(var/whitelisted_organ in organ_whitelist)
+				if(istype(loaded_organ, whitelisted_organ))
+					organ_whitelisted = TRUE
+					break
+			if(!organ_whitelisted)
+				to_chat(user, span_alert("[src] is not compatible with [loaded_organ]."))
+				return
+
+		if(!user.transferItemToLoc(loaded_organ, src))
+			to_chat(user, span_alert("[loaded_organ] is stuck to your hand!"))
+			return
+
+	stored_organ = loaded_organ
+	loaded_organ.forceMove(src)
+
+	name = "[initial(name)] ([stored_organ.name])" //to tell you the organ type, like "suspicious autosurgeon (Reviver implant)"
+	update_appearance()
+
+/obj/item/autosurgeon/proc/use_autosurgeon(mob/living/target, mob/living/user, implant_time)
+	if(!stored_organ)
+		to_chat(user, span_alert("[src] currently has no implant stored."))
+		return
 
-/obj/item/autosurgeon/organ/attack_self(mob/user)//when the object it used...
 	if(!uses)
 		to_chat(user, span_alert("[src] has already been used. The tools are dull and won't reactivate."))
 		return
-	else if(!storedorgan)
-		to_chat(user, span_alert("[src] currently has no implant stored."))
-		return
-	storedorgan.Insert(user)//insert stored organ into the user
-	user.visible_message(span_notice("[user] presses a button on [src], and you hear a short mechanical noise."), span_notice("You feel a sharp sting as [src] plunges into your body."))
-	playsound(get_turf(user), 'sound/weapons/circsawhit.ogg', 50, TRUE)
-	use_autosurgeon()
 
-/obj/item/autosurgeon/organ/attackby(obj/item/weapon, mob/user, params)
-	if(istype(weapon, organ_type))
-		if(storedorgan)
-			to_chat(user, span_alert("[src] already has an implant stored."))
+	if(implant_time)
+		user.visible_message( "[user] prepares to use [src] on [target].", "You begin to prepare to use [src] on [target].")
+		if(!do_after(user, (8 SECONDS * surgery_speed), target))
 			return
-		else if(!uses)
-			to_chat(user, span_alert("[src] has already been used up."))
-			return
-		if(!user.transferItemToLoc(weapon, src))
-			return
-		storedorgan = weapon
-		to_chat(user, span_notice("You insert the [weapon] into [src]."))
+
+	if(target != user)
+		log_combat(user, target, "autosurgeon implanted [stored_organ] into", "[src]", "in [AREACOORD(target)]")
+		user.visible_message(span_notice("[user] presses a button on [src] as it plunges into [target]'s body."), span_notice("You press a button on [src] as it plunges into [target]'s body."))
+	else
+		user.visible_message(span_notice("[user] pressses a button on [src] as it plunges into [user.p_their()] body."), "You press a button on [src] as it plunges into your body.")
+
+	stored_organ.Insert(target)//insert stored organ into the user
+	stored_organ = null
+	name = initial(name) //get rid of the organ in the name
+	playsound(target.loc, 'sound/weapons/circsawhit.ogg', 50, vary = TRUE)
+	update_appearance()
+
+	if(uses)
+		uses--
+	if(uses == 0)
+		desc = "[initial(desc)] Looks like it's been used up."
+
+/obj/item/autosurgeon/attack_self(mob/user)//when the object it used...
+	use_autosurgeon(user, user)
+
+/obj/item/autosurgeon/attack(mob/living/target, mob/living/user, params)
+	add_fingerprint(user)
+	use_autosurgeon(target, user, 8 SECONDS)
+
+/obj/item/autosurgeon/attackby(obj/item/attacking_item, mob/user, params)
+	if(istype(attacking_item, /obj/item/organ))
+		load_organ(attacking_item, user)
 	else
 		return ..()
 
-/obj/item/autosurgeon/organ/attack(mob/living/target, mob/living/user, params)
-	add_fingerprint(user)
-	user.visible_message(
-		"[user] prepares to use [src] on [target].",
-		"You begin to prepare to use [src] on [target]."
-	)
-	if(!do_after(user, (8 SECONDS * surgery_speed), target))
-		return
-	user.visible_message(span_notice("[user] presses a button on [src], and you hear a short mechanical noise."), span_notice("You press a button on [src] as it plunges into [target]'s body."))
-	to_chat(target, span_notice("You feel a sharp sting as something plunges into your body!"))
-	playsound(get_turf(user), 'sound/weapons/circsawhit.ogg', 50, vary = TRUE)
-	storedorgan.Insert(target) //let's actually get the organ into the target, yeah?
-	use_autosurgeon()
 
-/obj/item/autosurgeon/organ/screwdriver_act(mob/living/user, obj/item/screwtool)
+
+/obj/item/autosurgeon/screwdriver_act(mob/living/user, obj/item/screwtool)
 	if(..())
 		return TRUE
-	if(!storedorgan)
+	if(!stored_organ)
 		to_chat(user, span_warning("There's no implant in [src] for you to remove!"))
 	else
 		var/atom/drop_loc = user.drop_location()
 		for(var/atom/movable/stored_implant as anything in src)
 			stored_implant.forceMove(drop_loc)
+			stored_organ = null
 
-		to_chat(user, span_notice("You remove the [storedorgan] from [src]."))
+		to_chat(user, span_notice("You remove the [stored_organ] from [src]."))
 		screwtool.play_tool_sound(src)
-		use_autosurgeon()
 	return TRUE
 
-/obj/item/autosurgeon/organ/cmo
+/obj/item/autosurgeon/medical_hud
+	name = "autosurgeon"
 	desc = "A single use autosurgeon that contains a medical heads-up display augment. A screwdriver can be used to remove it, but implants can't be placed back in."
 	uses = 1
 	starting_organ = /obj/item/organ/internal/cyberimp/eyes/hud/medical
 
-/obj/item/autosurgeon/organ/syndicate/laser_arm
+
+/obj/item/autosurgeon/syndicate
+	name = "suspicious autosurgeon"
+	icon_state = "autosurgeon_syndicate"
+	surgery_speed = 0.75
+	loaded_overlay = "autosurgeon_syndicate_loaded_overlay"
+
+/obj/item/autosurgeon/syndicate/laser_arm
 	desc = "A single use autosurgeon that contains a combat arms-up laser augment. A screwdriver can be used to remove it, but implants can't be placed back in."
 	uses = 1
 	starting_organ = /obj/item/organ/internal/cyberimp/arm/gun/laser
 
-/obj/item/autosurgeon/organ/syndicate/thermal_eyes
+/obj/item/autosurgeon/syndicate/thermal_eyes
 	starting_organ = /obj/item/organ/internal/eyes/robotic/thermals
 
-/obj/item/autosurgeon/organ/syndicate/xray_eyes
+/obj/item/autosurgeon/syndicate/xray_eyes
 	starting_organ = /obj/item/organ/internal/eyes/robotic/xray
 
-/obj/item/autosurgeon/organ/syndicate/anti_stun
+/obj/item/autosurgeon/syndicate/anti_stun
 	starting_organ = /obj/item/organ/internal/cyberimp/brain/anti_stun
 
-/obj/item/autosurgeon/organ/syndicate/reviver
+/obj/item/autosurgeon/syndicate/reviver
 	starting_organ = /obj/item/organ/internal/cyberimp/chest/reviver
+
+/obj/item/autosurgeon/syndicate/commsagent
+	desc = "A device that automatically - painfully - inserts an implant. It seems someone's specially \
+	modified this one to only insert... tongues. Horrifying."
+	starting_organ = /obj/item/organ/internal/tongue
+
+
+/obj/item/autosurgeon/syndicate/commsagent/Initialize(mapload)
+	. = ..()
+	organ_whitelist += /obj/item/organ/internal/tongue
diff --git a/code/modules/uplink/uplink_items/job.dm b/code/modules/uplink/uplink_items/job.dm
index 1ae1d9a36e2..7f4a021c8a5 100644
--- a/code/modules/uplink/uplink_items/job.dm
+++ b/code/modules/uplink/uplink_items/job.dm
@@ -209,7 +209,7 @@
 	desc = "An implant that grants you a recharging laser gun inside your arm. Weak to EMPs. Comes with a syndicate autosurgeon for immediate self-application."
 	progression_minimum = 30 MINUTES
 	cost = 10
-	item = /obj/item/autosurgeon/organ/syndicate/laser_arm
+	item = /obj/item/autosurgeon/syndicate/laser_arm
 	restricted_roles = list(JOB_ROBOTICIST, JOB_RESEARCH_DIRECTOR)
 
 /datum/uplink_item/role_restricted/chemical_gun
diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm
index 027287887c1..47e18c5d763 100644
--- a/code/modules/uplink/uplink_items/nukeops.dm
+++ b/code/modules/uplink/uplink_items/nukeops.dm
@@ -741,7 +741,7 @@
 /datum/uplink_item/implants/antistun
 	name = "CNS Rebooter Implant"
 	desc = "This implant will help you get back up on your feet faster after being stunned. Comes with an autosurgeon."
-	item = /obj/item/autosurgeon/organ/syndicate/anti_stun
+	item = /obj/item/autosurgeon/syndicate/anti_stun
 	cost = 12
 	surplus = 0
 	purchasable_from = UPLINK_NUKE_OPS
@@ -767,7 +767,7 @@
 /datum/uplink_item/implants/reviver
 	name = "Reviver Implant"
 	desc = "This implant will attempt to revive and heal you if you lose consciousness. Comes with an autosurgeon."
-	item = /obj/item/autosurgeon/organ/syndicate/reviver
+	item = /obj/item/autosurgeon/syndicate/reviver
 	cost = 8
 	surplus = 0
 	purchasable_from = UPLINK_NUKE_OPS
@@ -775,7 +775,7 @@
 /datum/uplink_item/implants/thermals
 	name = "Thermal Eyes"
 	desc = "These cybernetic eyes will give you thermal vision. Comes with a free autosurgeon."
-	item = /obj/item/autosurgeon/organ/syndicate/thermal_eyes
+	item = /obj/item/autosurgeon/syndicate/thermal_eyes
 	cost = 8
 	surplus = 0
 	purchasable_from = UPLINK_NUKE_OPS
@@ -783,7 +783,7 @@
 /datum/uplink_item/implants/xray
 	name = "X-ray Vision Implant"
 	desc = "These cybernetic eyes will give you X-ray vision. Comes with an autosurgeon."
-	item = /obj/item/autosurgeon/organ/syndicate/xray_eyes
+	item = /obj/item/autosurgeon/syndicate/xray_eyes
 	cost = 10
 	surplus = 0
 	purchasable_from = UPLINK_NUKE_OPS
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 7403f40866c..56e30d13ff2 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/modular_skyrat/master_files/code/_globalvars/maint_loot_oddity.dm b/modular_skyrat/master_files/code/_globalvars/maint_loot_oddity.dm
index 4f34b93f9d8..72c806d02d4 100644
--- a/modular_skyrat/master_files/code/_globalvars/maint_loot_oddity.dm
+++ b/modular_skyrat/master_files/code/_globalvars/maint_loot_oddity.dm
@@ -5,7 +5,7 @@ GLOBAL_LIST_INIT(oddity_loot, list(// oddity: strange or crazy items
 	/obj/item/abductor_machine_beacon/chem_dispenser = 25,
 	/obj/item/ai_module/toy_ai = 5,
 	/obj/item/airlock_painter/decal/debug = 25,
-	/obj/item/autosurgeon/organ/cmo = 5,
+	/obj/item/autosurgeon/medical_hud = 5,
 	/obj/item/batterer = 100,
 	/obj/item/book_of_babel = 25,
 	/obj/item/chameleon = 5,
diff --git a/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm b/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm
index 87ab18d0ad7..d9b367a142c 100644
--- a/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm
+++ b/modular_skyrat/master_files/code/modules/uplink/uplink_items.dm
@@ -338,7 +338,7 @@
 /datum/uplink_item/implants/antistun_traitor
 	name = "CNS Rebooter Implant"
 	desc = "This implant will help you get back up on your feet faster after being stunned. Comes with an autosurgeon."
-	item = /obj/item/autosurgeon/organ/syndicate/anti_stun
+	item = /obj/item/autosurgeon/syndicate/anti_stun
 	cost = 6
 	surplus = 0
 	progression_minimum = 15 MINUTES
diff --git a/modular_skyrat/modules/assault_operatives/code/armaments/armament_implants.dm b/modular_skyrat/modules/assault_operatives/code/armaments/armament_implants.dm
index dbaf087c916..d081934b0d8 100644
--- a/modular_skyrat/modules/assault_operatives/code/armaments/armament_implants.dm
+++ b/modular_skyrat/modules/assault_operatives/code/armaments/armament_implants.dm
@@ -27,7 +27,7 @@
 	cost = 2
 
 /datum/armament_entry/assault_operatives/implants/hacking
-	item_type = /obj/item/autosurgeon/organ/syndicate/hackerman
+	item_type = /obj/item/autosurgeon/syndicate/hackerman
 	name = "Hacking Arm Implant"
 	description = "An advanced arm implant that comes with cutting edge hacking tools. Perfect for the cybernetically enhanced wirerunners."
 	cost = 2
@@ -47,17 +47,17 @@
 /datum/armament_entry/assault_operatives/implants/thermal
 	name = "Thermal Vision Implant"
 	description = "These cybernetic eyes will give you thermal vision."
-	item_type = /obj/item/autosurgeon/organ/syndicate/thermal_eyes
+	item_type = /obj/item/autosurgeon/syndicate/thermal_eyes
 	cost = 5
 
 /datum/armament_entry/assault_operatives/implants/nodrop
 	name = "Anti-Drop Implant"
 	description = "When activated forces your hand muscles to tightly grip the object you are holding, preventing you from dropping it involuntarily."
-	item_type = /obj/item/autosurgeon/organ/syndicate/nodrop
+	item_type = /obj/item/autosurgeon/syndicate/nodrop
 	cost = 6
 
 /datum/armament_entry/assault_operatives/implants/xray
 	name = "X-Ray Vision Implant"
 	description = "These cybernetic eyes will give you X-ray vision."
-	item_type = /obj/item/autosurgeon/organ/syndicate/xray_eyes
+	item_type = /obj/item/autosurgeon/syndicate/xray_eyes
 	cost = 7
diff --git a/modular_skyrat/modules/opposing_force/code/equipment/implants.dm b/modular_skyrat/modules/opposing_force/code/equipment/implants.dm
index c13a05e98ef..6819d6741bc 100644
--- a/modular_skyrat/modules/opposing_force/code/equipment/implants.dm
+++ b/modular_skyrat/modules/opposing_force/code/equipment/implants.dm
@@ -54,41 +54,41 @@
 
 // Cybernetic Enhancements
 /datum/opposing_force_equipment/implant/nodrop
-	item_type = /obj/item/autosurgeon/organ/syndicate/nodrop
+	item_type = /obj/item/autosurgeon/syndicate/nodrop
 	name = "Anti Drop Implant"
 	description = "An implant that prevents you from dropping items in your hand involuntarily. Comes loaded in a syndicate autosurgeon."
 
 /datum/opposing_force_equipment/implant/hackerman
-	item_type = /obj/item/autosurgeon/organ/syndicate/hackerman
+	item_type = /obj/item/autosurgeon/syndicate/hackerman
 	name = "Hacking Arm Implant"
 	description = "An advanced arm implant that comes with cutting edge hacking tools. Perfect for the cybernetically enhanced wirerunners."
 
 /datum/opposing_force_equipment/implant/cns
 	name = "CNS Rebooter Implant"
-	item_type = /obj/item/autosurgeon/organ/syndicate/anti_stun
+	item_type = /obj/item/autosurgeon/syndicate/anti_stun
 	description = "This implant will automatically give you back control over your central nervous system, reducing downtime when stunned."
 
 /datum/opposing_force_equipment/implant/reviver
 	name = "Reviver Implant"
-	item_type = /obj/item/autosurgeon/organ/syndicate/reviver
+	item_type = /obj/item/autosurgeon/syndicate/reviver
 	description = "This implant will attempt to revive and heal you if you lose consciousness. For the faint of heart!"
 
 /datum/opposing_force_equipment/implant/xray
 	name = "X-Ray Eyes"
-	item_type = /obj/item/autosurgeon/organ/syndicate/xray_eyes
+	item_type = /obj/item/autosurgeon/syndicate/xray_eyes
 	description = "These cybernetic eyes will give you X-ray vision. Blinking is futile."
 
 /datum/opposing_force_equipment/implant/thermal
 	name = "Thermal Eyes"
-	item_type = /obj/item/autosurgeon/organ/syndicate/thermal_eyes
+	item_type = /obj/item/autosurgeon/syndicate/thermal_eyes
 	description = "These cybernetic eye implants will give you thermal vision. Vertical slit pupil included."
 
 /datum/opposing_force_equipment/implant/armlaser
 	name = "Arm-mounted Laser Implant"
-	item_type = /obj/item/autosurgeon/organ/syndicate/laser_arm
+	item_type = /obj/item/autosurgeon/syndicate/laser_arm
 	description = "A variant of the arm cannon implant that fires lethal laser beams. The cannon emerges from the subject's arm and remains inside when not in use."
 
 /datum/opposing_force_equipment/implant/eswordarm
 	name = "Energy Sword Arm Implant"
-	item_type = /obj/item/autosurgeon/organ/syndicate/esword_arm
+	item_type = /obj/item/autosurgeon/syndicate/esword_arm
 	description = "It's an energy sword, in your arm. Pretty decent for getting past stop-searches and assassinating people. Comes loaded in a Syndicate brand autosurgeon to boot!"
diff --git a/modular_skyrat/modules/opposing_force/code/items.dm b/modular_skyrat/modules/opposing_force/code/items.dm
index a5186057f69..126c9952f21 100644
--- a/modular_skyrat/modules/opposing_force/code/items.dm
+++ b/modular_skyrat/modules/opposing_force/code/items.dm
@@ -31,7 +31,7 @@
 	new /obj/item/clothing/suit/armor/vest/leather/gunman(src)
 	new /obj/item/clothing/shoes/combat(src)
 
-/obj/item/autosurgeon/organ/syndicate/hackerman
+/obj/item/autosurgeon/syndicate/hackerman
 	starting_organ = /obj/item/organ/internal/cyberimp/arm/hacker
 
 /obj/item/storage/box/syndie_kit/insurgent
diff --git a/modular_skyrat/modules/robohand/code/silverhand_bundle.dm b/modular_skyrat/modules/robohand/code/silverhand_bundle.dm
index ae563e0cd9d..548758a00de 100644
--- a/modular_skyrat/modules/robohand/code/silverhand_bundle.dm
+++ b/modular_skyrat/modules/robohand/code/silverhand_bundle.dm
@@ -11,11 +11,11 @@
 	new /obj/item/clothing/glasses/sunglasses/robohand(src)
 	new /obj/item/clothing/suit/armor/bulletproof/robohand(src)
 	new /obj/item/autosurgeon/bodypart/r_arm_robotic(src)
-	new /obj/item/autosurgeon/organ/syndicate/esword_arm(src)
-	new /obj/item/autosurgeon/organ/syndicate/nodrop(src)
+	new /obj/item/autosurgeon/syndicate/esword_arm(src)
+	new /obj/item/autosurgeon/syndicate/nodrop(src)
 
 
-/obj/item/autosurgeon/organ/syndicate/esword_arm
+/obj/item/autosurgeon/syndicate/esword_arm
 	starting_organ = /obj/item/organ/internal/cyberimp/arm/esword
 
 /obj/item/clothing/under/pants/black/robohand
@@ -23,7 +23,7 @@
 	desc = "Strangely firm yet soft black pants, these appear to have some armor padding for added protection."
 	armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 20, BIO = 0, FIRE = 0, ACID = 0, WOUND = 5)
 
-/obj/item/autosurgeon/organ/syndicate/nodrop
+/obj/item/autosurgeon/syndicate/nodrop
 	starting_organ = /obj/item/organ/internal/cyberimp/brain/anti_drop
 
 //What do you mean glasses don't protect your head? Of course they do. Cyberpunk has flying cars(mostly intentional)!