diff --git a/code/modules/projectiles/ammunition/energy/gravity.dm b/code/modules/projectiles/ammunition/energy/gravity.dm
index be3a4494cd2..d8a6a1244de 100644
--- a/code/modules/projectiles/ammunition/energy/gravity.dm
+++ b/code/modules/projectiles/ammunition/energy/gravity.dm
@@ -1,36 +1,29 @@
-/obj/item/ammo_casing/energy/gravityrepulse
+/obj/item/ammo_casing/energy/gravity
+	e_cost = 0
+	fire_sound = 'sound/weapons/wave.ogg'
+	select_name = "gravity"
+	delay = 50
+	var/obj/item/gun/energy/gravity_gun/gun
+
+/obj/item/ammo_casing/energy/gravity/Initialize(mapload)
+	if(istype(loc,/obj/item/gun/energy/gravity_gun))
+		gun = loc
+	. = ..()
+
+/obj/item/ammo_casing/energy/gravity/Destroy()
+	gun = null
+	. = ..()
+
+/obj/item/ammo_casing/energy/gravity/repulse
 	projectile_type = /obj/item/projectile/gravityrepulse
-	e_cost = 0
-	fire_sound = 'sound/weapons/wave.ogg'
 	select_name = "repulse"
-	delay = 50
-	var/obj/item/gun/energy/gravity_gun/gun
 
-/obj/item/ammo_casing/energy/gravityrepulse/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
-	gun = G
-	. = ..()
-
-/obj/item/ammo_casing/energy/gravityattract
+/obj/item/ammo_casing/energy/gravity/attract
 	projectile_type = /obj/item/projectile/gravityattract
-	e_cost = 0
-	fire_sound = 'sound/weapons/wave.ogg'
 	select_name = "attract"
-	delay = 50
-	var/obj/item/gun/energy/gravity_gun/gun
 
-
-/obj/item/ammo_casing/energy/gravityattract/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
-	gun = G
-	. = ..()
-
-/obj/item/ammo_casing/energy/gravitychaos
+/obj/item/ammo_casing/energy/gravity/chaos
 	projectile_type = /obj/item/projectile/gravitychaos
-	e_cost = 0
-	fire_sound = 'sound/weapons/wave.ogg'
 	select_name = "chaos"
-	delay = 50
-	var/obj/item/gun/energy/gravity_gun/gun
 
-/obj/item/ammo_casing/energy/gravitychaos/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
-	gun = G
-	. = ..()
+
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index b6d51ff6ada..29947123bcc 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -294,7 +294,7 @@
 /obj/item/gun/energy/gravity_gun
 	name = "one-point bluespace-gravitational manipulator"
 	desc = "An experimental, multi-mode device that fires bolts of Zero-Point Energy, causing local distortions in gravity."
-	ammo_type = list(/obj/item/ammo_casing/energy/gravityrepulse, /obj/item/ammo_casing/energy/gravityattract, /obj/item/ammo_casing/energy/gravitychaos)
+	ammo_type = list(/obj/item/ammo_casing/energy/gravity/repulse, /obj/item/ammo_casing/energy/gravity/attract, /obj/item/ammo_casing/energy/gravity/chaos)
 	item_state = "gravity_gun"
 	icon_state = "gravity_gun"
 	var/power = 4
diff --git a/code/modules/projectiles/projectile/special/gravity.dm b/code/modules/projectiles/projectile/special/gravity.dm
index 89f753d36d5..fdc6b92ec99 100644
--- a/code/modules/projectiles/projectile/special/gravity.dm
+++ b/code/modules/projectiles/projectile/special/gravity.dm
@@ -13,7 +13,7 @@
 
 /obj/item/projectile/gravityrepulse/Initialize()
 	. = ..()
-	var/obj/item/ammo_casing/energy/gravityrepulse/C = loc
+	var/obj/item/ammo_casing/energy/gravity/repulse/C = loc
 	if(istype(C)) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items
 		power = min(C.gun.power, 15)
 
@@ -44,7 +44,7 @@
 
 /obj/item/projectile/gravityattract/Initialize()
 	. = ..()
-	var/obj/item/ammo_casing/energy/gravityattract/C = loc
+	var/obj/item/ammo_casing/energy/gravity/attract/C = loc
 	if(istype(C)) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items
 		power = min(C.gun.power, 15)
 
@@ -74,7 +74,7 @@
 
 /obj/item/projectile/gravitychaos/Initialize()
 	. = ..()
-	var/obj/item/ammo_casing/energy/gravitychaos/C = loc
+	var/obj/item/ammo_casing/energy/gravity/chaos/C = loc
 	if(istype(C)) //Hard-coded maximum power so servers can't be crashed by trying to throw the entire Z level's items
 		power = min(C.gun.power, 15)