diff --git a/code/_globalvars/lists/maintenance_loot.dm.rej b/code/_globalvars/lists/maintenance_loot.dm.rej
new file mode 100644
index 0000000000..5d0a85aa8e
--- /dev/null
+++ b/code/_globalvars/lists/maintenance_loot.dm.rej
@@ -0,0 +1,10 @@
+diff a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm	(rejected hunks)
+@@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
+ 	/obj/item/wirecutters = 1,
+ 	/obj/item/wrench = 4,
+ 	/obj/item/relic = 3,
+-	/obj/itemcrafting/receiver = 2,
++	/obj/item/weaponcrafting/receiver = 2,
+ 	/obj/item/clothing/head/cone = 2,
+ 	/obj/item/grenade/smokebomb = 2,
+ 	/obj/item/device/geiger_counter = 3,
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm.rej b/code/game/objects/items/stacks/sheets/sheet_types.dm.rej
new file mode 100644
index 0000000000..42a73bb09c
--- /dev/null
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm.rej
@@ -0,0 +1,10 @@
+diff a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm	(rejected hunks)
+@@ -132,7 +132,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
+ 	new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \
+ 	new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
+ 	new/datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \
+-	new/datum/stack_recipe("rifle stock", /obj/itemcrafting/stock, 10, time = 40), \
++	new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
+ 	new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \
+ 	new/datum/stack_recipe("wooden chair", /obj/structure/chair/wood/, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
+ 	new/datum/stack_recipe("winged wooden chair", /obj/structure/chair/wood/wings, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
diff --git a/code/modules/crafting/guncrafting.dm.rej b/code/modules/crafting/guncrafting.dm.rej
new file mode 100644
index 0000000000..46afc0167b
--- /dev/null
+++ b/code/modules/crafting/guncrafting.dm.rej
@@ -0,0 +1,17 @@
+diff a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm	(rejected hunks)
+@@ -2,13 +2,13 @@
+ 
+ // PARTS //
+ 
+-/obj/itemcrafting/receiver
++/obj/item/weaponcrafting/receiver
+ 	name = "modular receiver"
+ 	desc = "A prototype modular receiver and trigger assembly for a firearm."
+ 	icon = 'icons/obj/improvised.dmi'
+ 	icon_state = "receiver"
+ 
+-/obj/itemcrafting/stock
++/obj/item/weaponcrafting/stock
+ 	name = "rifle stock"
+ 	desc = "A classic rifle stock that doubles as a grip, roughly carved out of wood."
+ 	icon = 'icons/obj/improvised.dmi'
diff --git a/code/modules/crafting/recipes.dm.rej b/code/modules/crafting/recipes.dm.rej
new file mode 100644
index 0000000000..71b26fbfc8
--- /dev/null
+++ b/code/modules/crafting/recipes.dm.rej
@@ -0,0 +1,13 @@
+diff a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm	(rejected hunks)
+@@ -295,9 +295,9 @@
+ /datum/crafting_recipe/ishotgun
+ 	name = "Improvised Shotgun"
+ 	result = /obj/item/gun/ballistic/revolver/doublebarrel/improvised
+-	reqs = list(/obj/itemcrafting/receiver = 1,
++	reqs = list(/obj/item/weaponcrafting/receiver = 1,
+ 				/obj/item/pipe = 1,
+-				/obj/itemcrafting/stock = 1,
++				/obj/item/weaponcrafting/stock = 1,
+ 				/obj/item/stack/packageWrap = 5)
+ 	tools = list(/obj/item/screwdriver)
+ 	time = 100
diff --git a/code/modules/research/designs/autolathe_designs.dm.rej b/code/modules/research/designs/autolathe_designs.dm.rej
new file mode 100644
index 0000000000..dafe48d4c9
--- /dev/null
+++ b/code/modules/research/designs/autolathe_designs.dm.rej
@@ -0,0 +1,10 @@
+diff a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm	(rejected hunks)
+@@ -629,7 +629,7 @@
+ 	id = "reciever"
+ 	build_type = AUTOLATHE
+ 	materials = list(MAT_METAL = 15000)
+-	build_path = /obj/itemcrafting/receiver
++	build_path = /obj/item/weaponcrafting/receiver
+ 	category = list("hacked", "Security")
+ 
+ /datum/design/shotgun_slug