diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index cc63fd350e0c..9c75aa56edcc 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -115,7 +115,7 @@
 
 //ATTACK HAND IGNORING PARENT RETURN VALUE
 /obj/item/gun/energy/attack_hand(mob/user)
-	if(!internal_cell && loc == user && user.is_holding(src) && cell && tac_reloads)
+	if(!internal_magazine && loc == user && user.is_holding(src) && cell && tac_reloads)
 		eject_cell(user)
 		return
 	return ..()
@@ -126,7 +126,7 @@
 		update_appearance()
 
 /obj/item/gun/energy/attackby(obj/item/A, mob/user, params)
-	if (!internal_cell && (A.type in allowed_ammo_types))
+	if (!internal_magazine && (A.type in allowed_ammo_types))
 		var/obj/item/stock_parts/cell/gun/C = A
 		if (!cell)
 			insert_cell(user, C)
@@ -169,7 +169,7 @@
 	update_appearance()
 
 /obj/item/gun/energy/screwdriver_act(mob/living/user, obj/item/I)
-	if(cell && !internal_cell)
+	if(cell && !internal_magazine)
 		to_chat(user, span_notice("You begin unscrewing and pulling out the cell..."))
 		if(I.use_tool(src, user, unscrewing_time, volume = 100))
 			to_chat(user, span_notice("You remove the power cell."))
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index 217c25620c60..2844991f9cc7 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -127,7 +127,7 @@
 	item_state = "nucgun"
 	charge_delay = 5
 	can_charge = FALSE
-	internal_cell = TRUE
+	internal_magazine = TRUE
 	ammo_x_offset = 2
 	ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler)
 	selfcharge = 1
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 28db4448d534..c7cebd1025be 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -12,7 +12,7 @@
 	obj_flags = UNIQUE_RENAME
 	weapon_weight = WEAPON_LIGHT
 	automatic_charge_overlays = FALSE
-	internal_cell = TRUE //prevents you from giving it an OP cell - WS Edit
+	internal_magazine = TRUE //prevents you from giving it an OP cell - WS Edit
 	custom_price = 750
 	w_class = WEIGHT_CLASS_BULKY
 
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index 07007cc42c31..973297d1b4e4 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -13,7 +13,7 @@
 	flags_1 =  CONDUCT_1
 	slot_flags = ITEM_SLOT_BACK
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/laser)
-	internal_cell = TRUE //prevents you from giving it an OP cell - WS Edit
+	internal_magazine = TRUE //prevents you from giving it an OP cell - WS Edit
 	default_ammo_type = /obj/item/stock_parts/cell/pulse
 	allowed_ammo_types = list(
 		/obj/item/stock_parts/cell/pulse,
@@ -41,7 +41,7 @@
 	slot_flags = ITEM_SLOT_BACK
 	icon_state = "pulse_carbine"
 	item_state = null
-	internal_cell = FALSE
+	internal_magazine = FALSE
 	default_ammo_type = /obj/item/stock_parts/cell/gun/large
 	allowed_ammo_types = list(
 		/obj/item/stock_parts/cell/gun/large,
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 720fbf3e0832..e394aa2b7b4d 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -127,7 +127,7 @@
 	tool_behaviour = TOOL_DECONSTRUCT
 	wall_decon_damage = 200
 	toolspeed = 0.9 //plasmacutters can be used like angle grinders, and are a bit faster
-	internal_cell = TRUE //so you don't cheese through the need for plasma - WS EDIT
+	internal_magazine = TRUE //so you don't cheese through the need for plasma - WS EDIT
 	var/charge_cut = 100 //amount of charge used up to start action (multiplied by amount) and per progress_flash_divisor ticks of cutting
 	var/adv = FALSE
 
diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm
index b2f0f383e157..3d1c407a7e56 100644
--- a/code/modules/projectiles/guns/misc/beam_rifle.dm
+++ b/code/modules/projectiles/guns/misc/beam_rifle.dm
@@ -28,7 +28,7 @@
 	weapon_weight = WEAPON_HEAVY
 	w_class = WEIGHT_CLASS_BULKY
 	ammo_type = list(/obj/item/ammo_casing/energy/beam_rifle/hitscan)
-	internal_cell = FALSE //prevents you from giving it an OP cell - WS Edit //shut up dumb nerd
+	internal_magazine = FALSE //prevents you from giving it an OP cell - WS Edit //shut up dumb nerd
 	default_ammo_type = /obj/item/stock_parts/cell/gun/large
 	allowed_ammo_types = list(
 		/obj/item/stock_parts/cell/gun/large,