diff --git a/plugins/include/tf2_stocks.inc b/plugins/include/tf2_stocks.inc
index fe64473a..6556909e 100644
--- a/plugins/include/tf2_stocks.inc
+++ b/plugins/include/tf2_stocks.inc
@@ -74,45 +74,45 @@
 
 // Custom kill identifiers for the customkill property on the player_death event
 enum {
-	TF_DMG_CUSTOM_HEADSHOT = 1,
-	TF_DMG_CUSTOM_BACKSTAB,
-	TF_DMG_CUSTOM_BURNING,
-	TF_DMG_WRENCH_FIX,
-	TF_DMG_CUSTOM_MINIGUN,
-	TF_DMG_CUSTOM_SUICIDE,
-	TF_DMG_CUSTOM_TAUNTATK_HADOUKEN,
-	TF_DMG_CUSTOM_BURNING_FLARE,
-	TF_DMG_CUSTOM_TAUNTATK_HIGH_NOON,
-	TF_DMG_CUSTOM_TAUNTATK_GRAND_SLAM,
-	TF_DMG_CUSTOM_PENETRATE_MY_TEAM,
-	TF_DMG_CUSTOM_PENETRATE_ALL_PLAYERS,
-	TF_DMG_CUSTOM_TAUNTATK_FENCING,
-	TF_DMG_CUSTOM_PENETRATE_HEADSHOT,
-	TF_DMG_CUSTOM_TELEFRAG,
-	TF_DMG_CUSTOM_TAUNTATK_ARROW_STAB,
-	TF_DMG_CUSTOM_BURNING_ARROW,
-	TF_DMG_CUSTOM_FLYINGBURN,
-	TF_DMG_CUSTOM_PUMPKIN_BOMB,
-	TF_DMG_CUSTOM_DECAPITATION,
-	TF_DMG_CUSTOM_TAUNTATK_GRENADE,
-	TF_DMG_CUSTOM_BASEBALL,
-	TF_DMG_CUSTOM_CHARGE_IMPACT,
-	TF_DMG_CUSTOM_TAUNTATK_BARBARIAN_SWING,
-	TF_DMG_CUSTOM_AIR_STICKY_BURST,
-	TF_DMG_CUSTOM_DEFENSIVE_STICKY,
-	TF_DMG_CUSTOM_PICKAXE,
-	TF_DMG_CUSTOM_ROCKET_DIRECTHIT,
-	TF_DMG_CUSTOM_TAUNTATK_UBERSLICE,
-	TF_DMG_CUSTOM_PLAYER_SENTRY,
-	TF_DMG_CUSTOM_STANDARD_STICKY,
-	TF_DMG_CUSTOM_SHOTGUN_REVENGE_CRIT,
-	TF_DMG_CUSTOM_TAUNTATK_ENGINEER_GUITAR_SMASH,
-	TF_DMG_CUSTOM_BLEEDING,
-	TF_DMG_CUSTOM_GOLD_WRENCH,
-	TF_DMG_CUSTOM_CARRIED_BUILDING,
-	TF_DMG_CUSTOM_COMBO_PUNCH,
-	TF_DMG_CUSTOM_TAUNTATK_ENGINEER_ARM_KILL,
-	TF_DMG_CUSTOM_FISH_KILL
+	TF_CUSTOM_HEADSHOT = 1,
+	TF_CUSTOM_BACKSTAB,
+	TF_CUSTOM_BURNING,
+	TF_CUSTOM_WRENCH_FIX,
+	TF_CUSTOM_MINIGUN,
+	TF_CUSTOM_SUICIDE,
+	TF_CUSTOM_TAUNT_HADOUKEN,
+	TF_CUSTOM_BURNING_FLARE,
+	TF_CUSTOM_TAUNT_HIGH_NOON,
+	TF_CUSTOM_TAUNT_GRAND_SLAM,
+	TF_CUSTOM_PENETRATE_MY_TEAM,
+	TF_CUSTOM_PENETRATE_ALL_PLAYERS,
+	TF_CUSTOM_TAUNT_FENCING,
+	TF_CUSTOM_PENETRATE_HEADSHOT,
+	TF_CUSTOM_TELEFRAG,
+	TF_CUSTOM_TAUNT_ARROW_STAB,
+	TF_CUSTOM_BURNING_ARROW,
+	TF_CUSTOM_FLYINGBURN,
+	TF_CUSTOM_PUMPKIN_BOMB,
+	TF_CUSTOM_DECAPITATION,
+	TF_CUSTOM_TAUNT_GRENADE,
+	TF_CUSTOM_BASEBALL,
+	TF_CUSTOM_CHARGE_IMPACT,
+	TF_CUSTOM_TAUNT_BARBARIAN_SWING,
+	TF_CUSTOM_AIR_STICKY_BURST,
+	TF_CUSTOM_DEFENSIVE_STICKY,
+	TF_CUSTOM_PICKAXE,
+	TF_CUSTOM_ROCKET_DIRECTHIT,
+	TF_CUSTOM_TAUNT_UBERSLICE,
+	TF_CUSTOM_PLAYER_SENTRY,
+	TF_CUSTOM_STANDARD_STICKY,
+	TF_CUSTOM_SHOTGUN_REVENGE_CRIT,
+	TF_CUSTOM_TAUNT_ENGINEER_SMASH,
+	TF_CUSTOM_BLEEDING,
+	TF_CUSTOM_GOLD_WRENCH,
+	TF_CUSTOM_CARRIED_BUILDING,
+	TF_CUSTOM_COMBO_PUNCH,
+	TF_CUSTOM_TAUNT_ENGINEER_ARM,
+	TF_CUSTOM_FISH_KILL
 };
 
 // Weapon codes as used in some events, such as player_death
@@ -182,7 +182,7 @@ enum {
 	TF_WEAPON_BUFF_ITEM,
 	TF_WEAPON_PUMPKIN_BOMB,
 	TF_WEAPON_SWORD,
-	TF_WEAPON_ROCKETLAUNCHER_DIRECTHIT,
+	TF_WEAPON_DIRECTHIT,
 	TF_WEAPON_LIFELINE,
 	TF_WEAPON_LASER_POINTER,
 	TF_WEAPON_DISPENSER_GUN,