diff --git a/modular_bandastation/objects/code/mecha/combat.dm b/modular_bandastation/objects/code/mecha/combat.dm
index 4e42bb11a79d4..5515eafc865b3 100644
--- a/modular_bandastation/objects/code/mecha/combat.dm
+++ b/modular_bandastation/objects/code/mecha/combat.dm
@@ -75,7 +75,7 @@
 
 /obj/vehicle/sealed/mecha/gygax/nt/populate_parts()
 	. = ..()
-	cell = new /obj/item/stock_parts/cell/high/slime_hypercharged
+	cell = new /obj/item/stock_parts/power_store/cell/high/slime_hypercharged
 	scanmod = new /obj/item/stock_parts/scanning_module/triphasic(src)
 	capacitor = new /obj/item/stock_parts/capacitor/quadratic(src)
 	servo = new /obj/item/stock_parts/servo/femto(src)
@@ -128,7 +128,7 @@
 
 /obj/vehicle/sealed/mecha/durand/rover/populate_parts()
 	. = ..()
-	cell = new /obj/item/stock_parts/cell/bluespace
+	cell = new /obj/item/stock_parts/power_store/cell/bluespace
 	scanmod = new /obj/item/stock_parts/scanning_module/triphasic(src)
 	capacitor = new /obj/item/stock_parts/capacitor/quadratic(src)
 	servo = new /obj/item/stock_parts/servo/femto(src)
diff --git a/modular_bandastation/objects/code/mecha/lockermech.dm b/modular_bandastation/objects/code/mecha/lockermech.dm
index bf86c5004a553..f3221ee983e36 100644
--- a/modular_bandastation/objects/code/mecha/lockermech.dm
+++ b/modular_bandastation/objects/code/mecha/lockermech.dm
@@ -62,7 +62,7 @@
 		/obj/item/c_tube = 1, // To make it airtight
 		/obj/item/flashlight = 1, // For the mech light
 		/obj/item/stack/sticky_tape = 25, // ¯\_(ツ)_/¯
-		/obj/item/stock_parts/cell/high = 1,
+		/obj/item/stock_parts/power_store/cell/high = 1,
 		/obj/item/stack/rods = 4 // To mount the equipment
 	)
 	tool_behaviors = list(TOOL_WELDER, TOOL_SCREWDRIVER)
diff --git a/modular_bandastation/objects/code/weapons/melee/electrostaff.dm b/modular_bandastation/objects/code/weapons/melee/electrostaff.dm
index e4f0f02e17b4f..2c2145e2a48e9 100644
--- a/modular_bandastation/objects/code/weapons/melee/electrostaff.dm
+++ b/modular_bandastation/objects/code/weapons/melee/electrostaff.dm
@@ -12,7 +12,7 @@
 	force = 10
 	throwforce = 7
 	cooldown = 3.5 SECONDS
-	preload_cell_type = /obj/item/stock_parts/cell/high
+	preload_cell_type = /obj/item/stock_parts/power_store/cell/high
 	block_chance = 30
 
 /obj/item/melee/baton/security/electrostaff/purple
@@ -65,7 +65,7 @@
 	tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
 	result = /obj/item/melee/baton/security/electrostaff
 	reqs = list(/obj/item/melee/baton/security = 2,
-				/obj/item/stock_parts/cell/high = 1,
+				/obj/item/stock_parts/power_store/cell/high = 1,
 				/obj/item/stack/cable_coil = 5,
 				/obj/item/assembly/signaler/anomaly/flux = 1,
 				/obj/item/weaponcrafting/gunkit/electrostaff = 1)
diff --git a/modular_bandastation/spawners/code/spawners.dm b/modular_bandastation/spawners/code/spawners.dm
index dc3cb91926b5e..b89bff6d02afb 100644
--- a/modular_bandastation/spawners/code/spawners.dm
+++ b/modular_bandastation/spawners/code/spawners.dm
@@ -168,7 +168,7 @@
 		/obj/item/storage/box/emergencytank = 1,
 		/obj/item/clothing/head/utility/welding = 1,
 		/obj/item/stack/sheet/iron = 10,
-		/obj/item/stock_parts/cell/high = 1,
+		/obj/item/stock_parts/power_store/cell/high = 1,
 	)
 
 /obj/effect/mob_spawn/corpse/spacebattle/engineer
@@ -191,7 +191,7 @@
 		/obj/item/storage/box/emergencytank = 1,
 		/obj/item/clothing/head/utility/welding = 1,
 		/obj/item/stack/sheet/iron = 10,
-		/obj/item/stock_parts/cell/high = 1,
+		/obj/item/stock_parts/power_store/cell/high = 1,
 	)
 
 /obj/effect/mob_spawn/corpse/spacebattle/engineer/space
@@ -228,7 +228,7 @@
 	backpack_contents = list(
 		/obj/item/reagent_containers/pill/patch/aiuri = 1,
 		/obj/item/reagent_containers/pill/patch/libital = 1,
-		/obj/item/stock_parts/cell/high = 1,
+		/obj/item/stock_parts/power_store/cell/high = 1,
 		/obj/item/storage/box/breacherslug = 1,
 	)