diff --git a/defs.qh b/defs.qh
index 5d1aeed..ae5944c 100644
--- a/defs.qh
+++ b/defs.qh
@@ -1317,7 +1317,7 @@ float (entity e) EF_GlowColor;
 #define DMSG_MARTYR				40
 #define DMSG_HOVER				41 //Boot exhaust!
 #define DMSG_LAND_MINE			42
-#define DMSG_TESLA				43
+#define DMSG_GREN_EMP_RADIUS		43
 #define DMSG_DEMON_FIRE			44
 #define DMSG_BERSERK			45
 #define DMSG_MAUSER				50
@@ -1343,7 +1343,6 @@ float (entity e) EF_GlowColor;
 #define DMSG_FF_STUCK_HACKED	69
 #define DMSG_PHYSICS		70
 #define DMSG_OUTOFBOUNDS	71
-#define DMSG_GREN_EMP_RADIUS	72
 
 //Defs for objects a spikeshooter can spawn  Misc.qc
 #define SPAWNFLAG_SUPERSPIKE	1 
diff --git a/obituary.qc b/obituary.qc
index c064440..14a5b0a 100644
--- a/obituary.qc
+++ b/obituary.qc
@@ -172,7 +172,7 @@ void (entity targ, entity atk) Give_Frags_Building =
 		ro = atk.martyr_enemy;
 
 	if ((((targ.classname == "player") && Teammate(ro.team_no, targ.team_no)) ||
-		Teammate(ro.team_no, targ.real_owner.team_no)) && ((deathmsg != DMSG_TESLA) ||
+		Teammate(ro.team_no, targ.real_owner.team_no)) && ((deathmsg != DMSG_LIGHTNING) ||
 		!(atk.tf_items & NIT_SECURITY_CAMERA)))
 	{
 		if (targ.classname == "player") // More the victim than the owner's fault
@@ -1297,7 +1297,7 @@ void (entity targ, entity attacker) Obituary_Player_by_SentryTesla =
 		} else if (deathmsg == DMSG_SENTRYGUN_BULLET) {
 			deathstring = " is mown down by ";
 			deathstring2 = "'s sentry gun\n";
-		} else if (deathmsg == DMSG_TESLA) {
+		} else if (deathmsg == DMSG_LIGHTNING) {
 			local float rnum = random ();
 
 			if (rnum < FRAC (2, 4)) {
diff --git a/tesla.qc b/tesla.qc
index 2924aca..1860dc7 100644
--- a/tesla.qc
+++ b/tesla.qc
@@ -491,7 +491,7 @@ float() Tesla_Fire =
 	{
 		local float damg;
 		damg = random() * 100 + 200 * self.ammo_nails; // the bigger they come, the harder they fall
-		deathmsg = DMSG_TESLA;
+		deathmsg = DMSG_LIGHTNING;
 		WriteByte (MSG_MULTICAST, SVC_TEMPENTITY);
 		WriteByte (MSG_MULTICAST, TE_EXPLOSION);
 		WriteCoord (MSG_MULTICAST, self.origin_x);
@@ -503,7 +503,7 @@ float() Tesla_Fire =
 		return FALSE;
 	}
 		
-	deathmsg = DMSG_TESLA;
+	deathmsg = DMSG_LIGHTNING;
 
  // OfN - Check for force field