diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 7a9d01bb7f..658a6a7692 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -107,7 +107,7 @@
 	icon_state = "mecha_ion"
 	origin_tech = "materials=4;engineering=4;combat=6;magnets=6"
 	energy_drain = 500
-	projectile = /obj/item/projectile/energy/tesla_cannon
+	projectile = /obj/item/projectile/energy/tesla/cannon
 	fire_sound = 'sound/magic/lightningbolt.ogg'
 
 
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index a6440e32ed..b1fd49779f 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -191,7 +191,7 @@
 	fire_sound = 'sound/magic/lightningbolt.ogg'
 	e_cost = 200
 	select_name = "stun"
-	projectile_type = /obj/item/projectile/energy/tesla_revolver
+	projectile_type = /obj/item/projectile/energy/tesla/revolver
 
 /obj/item/ammo_casing/energy/gravityrepulse
 	projectile_type = /obj/item/projectile/gravityrepulse
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index c1a67f4c81..974ea935f2 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -159,44 +159,34 @@
 /obj/item/projectile/energy/bolt/large
 	damage = 20
 
-/obj/item/projectile/energy/tesla_revolver
+/obj/item/projectile/energy/tesla
 	name = "tesla bolt"
 	icon_state = "tesla_projectile"
 	impact_effect_type = /obj/effect/overlay/temp/impact_effect/blue_laser
 	var/chain
 
-/obj/item/projectile/energy/tesla_revolver/fire(setAngle)
+/obj/item/projectile/energy/tesla/fire(setAngle)
 	if(firer)
 		chain = firer.Beam(src, icon_state = "lightning[rand(1, 12)]", time = INFINITY, maxdistance = INFINITY)
 	..()
 
-/obj/item/projectile/energy/tesla_revolver/on_hit(atom/target)
-	. = ..()
-	if(isliving(target))
-		tesla_zap(src, 3, 10000)
-	qdel(src)
-
-/obj/item/projectile/energy/tesla_revolver/Destroy()
+/obj/item/projectile/energy/tesla/Destroy()
 	qdel(chain)
 	return ..()
 
+/obj/item/projectile/energy/tesla/revolver
+	name = "energy orb"
 
-/obj/item/projectile/energy/tesla_cannon
-	name = "tesla bolt"
-	icon_state = "tesla_projectile"
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/blue_laser
-	var/chain
+/obj/item/projectile/energy/tesla/revolver/on_hit(atom/target)
+	. = ..()
+	if(isliving(target))
+		tesla_zap(target, 3, 10000)
+	qdel(src)
 
-/obj/item/projectile/energy/tesla_cannon/fire(setAngle)
-	if(firer)
-		chain = firer.Beam(src, icon_state = "lightning[rand(1, 12)]", time = INFINITY, maxdistance = INFINITY)
-	..()
+/obj/item/projectile/energy/tesla/cannon
+	name = "tesla orb"
 
-/obj/item/projectile/energy/tesla_cannon/on_hit(atom/target)
+/obj/item/projectile/energy/tesla/cannon/on_hit(atom/target)
 	. = ..()
-	tesla_zap(src, 3, 10000, explosive = FALSE, stun_mobs = FALSE)
+	tesla_zap(target, 3, 10000, explosive = FALSE, stun_mobs = FALSE)
 	qdel(src)
-
-/obj/item/projectile/energy/tesla_cannon/Destroy()
-	qdel(chain)
-	return ..()