diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index ddfcceac5a6..1828254d2ef 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -364,10 +364,11 @@
 /***********************/
 
 /obj/item/borg/upgrade/floorbuffer
-	name = "janitor cyborg floor buffer upgrade"
-	desc = "A floor buffer upgrade kit that can be attached to janitor cyborgs."
+	name = "janitorial floor buffer upgrade"
+	desc = "A floor buffer upgrade kit that can be attached to janitor cyborgs and mobile janicarts."
 	icon = 'icons/obj/vehicles.dmi'
 	icon_state = "upgrade"
+	origin_tech = "materials=3;engineering=4"
 	require_module = TRUE
 	module_type = /obj/item/robot_module/janitor
 	/// How much speed the cyborg loses while the buffer is active
diff --git a/code/modules/research/designs/janitorial_designs.dm b/code/modules/research/designs/janitorial_designs.dm
index 966e5e20e72..4743fb63a17 100644
--- a/code/modules/research/designs/janitorial_designs.dm
+++ b/code/modules/research/designs/janitorial_designs.dm
@@ -21,16 +21,6 @@
 	build_path = /obj/item/storage/bag/trash/bluespace
 	category = list("Janitorial")
 
-/datum/design/buffer
-	name = "Floor Buffer Upgrade"
-	desc = "A floor buffer that can be attached to vehicular janicarts."
-	id = "buffer"
-	req_tech = list("materials" = 4, "engineering" = 4)
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 3000, MAT_GLASS = 200)
-	build_path = /obj/item/janiupgrade
-	category = list("Janitorial")
-
 /datum/design/holosign
 	name = "Janitorial Holographic Sign Projector"
 	desc = "A holograpic projector used to project wet warning signs."
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 3c93fb8ce41..1de90e4c64d 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -1125,7 +1125,7 @@
 	build_type = MECHFAB
 	build_path = /obj/item/borg/upgrade/floorbuffer
 	req_tech = list("materials" = 4, "engineering" = 4)
-	materials = list(MAT_METAL=15000, MAT_GLASS=15000)
+	materials = list(MAT_METAL = 9000, MAT_GLASS = 7600)
 	construction_time = 12 SECONDS
 	category = list("Cyborg Upgrade Modules")
 
diff --git a/code/modules/vehicle/janivehicle.dm b/code/modules/vehicle/janivehicle.dm
index 2be7e94a239..f17278cb982 100644
--- a/code/modules/vehicle/janivehicle.dm
+++ b/code/modules/vehicle/janivehicle.dm
@@ -43,13 +43,6 @@
 	desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"."
 	icon_state = "keyjanitor"
 
-/obj/item/janiupgrade
-	name = "floor buffer upgrade"
-	desc = "An upgrade for mobile janicarts."
-	icon = 'icons/obj/vehicles.dmi'
-	icon_state = "upgrade"
-	origin_tech = "materials=3;engineering=4"
-
 /datum/action/floor_buffer
 	name = "Toggle Floor Buffer"
 	desc = "Movement speed is decreased while active."
@@ -111,7 +104,7 @@
 		mybag = I
 		update_icon(UPDATE_OVERLAYS)
 		return
-	if(istype(I, /obj/item/janiupgrade))
+	if(istype(I, /obj/item/borg/upgrade/floorbuffer))
 		if(buffer_installed)
 			to_chat(user, fail_msg)
 			return