diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 6a0a5b851ab4..04a9b8beea57 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -328,30 +328,30 @@ Class Procs:
 /obj/structure/machinery/ui_state(mob/user)
 	return GLOB.not_incapacitated_and_adjacent_state
 
-//made into prop from an old destilery project abandon 9 year ago.
+//made into "prop" from an old destilery project abandon 9 year ago.
 
-/obj/structure/prop/mill
+/obj/structure/machinery/mill
 	name = "\improper Mill"
 	desc = "It is a machine that grinds produce."
 	icon_state = "autolathe"
 	density = TRUE
 	anchored = TRUE
 
-/obj/structure/prop/fermenter
+/obj/structure/machinery/fermenter
 	name = "\improper Fermenter"
 	desc = "It is a machine that ferments produce into alcoholic drinks."
 	icon_state = "autolathe"
 	density = TRUE
 	anchored = TRUE
 
-/obj/structure/prop/still
+/obj/structure/machinery/still
 	name = "\improper Still"
 	desc = "It is a machine that produces hard liquor from alcoholic drinks."
 	icon_state = "autolathe"
 	density = TRUE
 	anchored = TRUE
 
-/obj/structure/prop/squeezer
+/obj/structure/machinery/squeezer
 	name = "\improper Squeezer"
 	desc = "It is a machine that squeezes extracts from produce."
 	icon_state = "autolathe"
diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm
index ab3ad1af07d0..48f7f9089399 100644
--- a/maps/map_files/BigRed/BigRed.dmm
+++ b/maps/map_files/BigRed/BigRed.dmm
@@ -3723,7 +3723,7 @@
 	},
 /area/bigredv2/caves/lambda/xenobiology)
 "akI" = (
-/obj/structure/prop/mill,
+/obj/structure/machinery/mill,
 /turf/open/floor{
 	dir = 1;
 	icon_state = "whitegreen"
@@ -10069,7 +10069,7 @@
 /turf/open/floor,
 /area/bigredv2/outside/hydroponics)
 "aCn" = (
-/obj/structure/prop/fermenter,
+/obj/structure/machinery/fermenter,
 /turf/open/floor,
 /area/bigredv2/outside/hydroponics)
 "aCo" = (
@@ -11749,7 +11749,7 @@
 	},
 /area/bigredv2/outside/bar)
 "aGJ" = (
-/obj/structure/prop/squeezer,
+/obj/structure/machinery/squeezer,
 /turf/open/floor{
 	icon_state = "wood"
 	},
@@ -22470,7 +22470,7 @@
 /turf/open/floor/plating,
 /area/bigredv2/outside/engineering)
 "bmp" = (
-/obj/structure/prop/mill,
+/obj/structure/machinery/mill,
 /turf/open/floor{
 	dir = 1;
 	icon_state = "darkyellow2"
@@ -38436,7 +38436,7 @@
 /turf/open/floor/plating,
 /area/bigredv2/caves/mining)
 "uFp" = (
-/obj/structure/prop/mill,
+/obj/structure/machinery/mill,
 /turf/open/floor,
 /area/bigred/ground/garage_workshop)
 "uFD" = (
diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm
index 00d3def81af4..bf1d64fbc499 100644
--- a/maps/map_files/DesertDam/Desert_Dam.dmm
+++ b/maps/map_files/DesertDam/Desert_Dam.dmm
@@ -12676,7 +12676,7 @@
 /turf/open/floor/plating,
 /area/desert_dam/exterior/valley/valley_crashsite)
 "aMk" = (
-/obj/structure/prop/mill,
+/obj/structure/machinery/mill,
 /turf/open/floor/plating,
 /area/desert_dam/exterior/valley/valley_crashsite)
 "aMl" = (
@@ -29519,7 +29519,7 @@
 	},
 /area/desert_dam/interior/dam_interior/workshop)
 "bPQ" = (
-/obj/structure/prop/mill,
+/obj/structure/machinery/mill,
 /turf/open/floor/prison{
 	icon_state = "sterile_white"
 	},
@@ -30711,7 +30711,7 @@
 	},
 /area/desert_dam/building/security/prison)
 "bTs" = (
-/obj/structure/prop/squeezer,
+/obj/structure/machinery/squeezer,
 /turf/open/floor/interior/wood,
 /area/desert_dam/building/bar/backroom)
 "bTt" = (
@@ -49264,7 +49264,7 @@
 /turf/open/floor/prison,
 /area/desert_dam/building/hydroponics/hydroponics)
 "ddR" = (
-/obj/structure/prop/fermenter,
+/obj/structure/machinery/fermenter,
 /turf/open/floor/prison,
 /area/desert_dam/building/hydroponics/hydroponics)
 "ddS" = (
diff --git a/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm b/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm
index 5a3312e4b11c..7928c7f06b71 100644
--- a/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm
+++ b/maps/map_files/DesertDam/standalone/crashlanding-upp-bar.dmm
@@ -398,7 +398,7 @@
 /turf/open/asphalt,
 /area/desert_dam/exterior/valley/bar_valley_dam)
 "hk" = (
-/obj/structure/prop/squeezer,
+/obj/structure/machinery/squeezer,
 /turf/open/floor/plating,
 /area/desert_dam/building/bar/backroom)
 "hm" = (
diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
index 7df560775312..f4b3d26d3e93 100644
--- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
+++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
@@ -3992,7 +3992,7 @@
 	},
 /area/lv522/oob/w_y_vault)
 "cbp" = (
-/obj/structure/prop/squeezer,
+/obj/structure/machinery/squeezer,
 /turf/open/floor{
 	icon_state = "wood"
 	},
@@ -13326,7 +13326,7 @@
 	},
 /area/lv522/outdoors/colony_streets/windbreaker/observation)
 "fRc" = (
-/obj/structure/prop/mill,
+/obj/structure/machinery/mill,
 /turf/open/floor/prison{
 	icon_state = "darkbrownfull2"
 	},
@@ -39738,7 +39738,7 @@
 	},
 /area/lv522/indoors/a_block/admin)
 "pDe" = (
-/obj/structure/prop/squeezer,
+/obj/structure/machinery/squeezer,
 /turf/open/floor/prison{
 	dir = 4;
 	icon_state = "greenfull"
@@ -48184,7 +48184,7 @@
 /obj/structure/platform{
 	dir = 1
 	},
-/obj/structure/prop/squeezer,
+/obj/structure/machinery/squeezer,
 /turf/open/floor/plating,
 /area/lv522/indoors/c_block/cargo)
 "sBH" = (
@@ -50462,7 +50462,7 @@
 /obj/structure/prop/invuln/ice_prefab/trim{
 	dir = 8
 	},
-/obj/structure/prop/mill,
+/obj/structure/machinery/mill,
 /turf/open/auto_turf/shale/layer1,
 /area/lv522/outdoors/colony_streets/central_streets)
 "trZ" = (
diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm
index 6648b71c4398..becac81a1897 100644
--- a/maps/map_files/LV624/LV624.dmm
+++ b/maps/map_files/LV624/LV624.dmm
@@ -7626,14 +7626,14 @@
 	},
 /area/lv624/lazarus/quart)
 "aHm" = (
-/obj/structure/prop/fermenter,
+/obj/structure/machinery/fermenter,
 /turf/open/floor{
 	dir = 4;
 	icon_state = "whiteyellowfull"
 	},
 /area/lv624/lazarus/quart)
 "aHn" = (
-/obj/structure/prop/still,
+/obj/structure/machinery/still,
 /turf/open/floor{
 	dir = 4;
 	icon_state = "whiteyellowfull"