diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu
index c5fe1da0a..5d9ec105b 100644
--- a/wadsrc/static/language.enu
+++ b/wadsrc/static/language.enu
@@ -1423,6 +1423,24 @@ TXT_QUIETUS_PIECE = "SEGMENT OF QUIETUS";
 TXT_WRAITHVERGE_PIECE = "SEGMENT OF WRAITHVERGE";
 TXT_BLOODSCOURGE_PIECE = "SEGMENT OF BLOODSCOURGE";
 
+// Friendly names
+
+FN_FIREDEMON = "Afrit";
+FN_DEMON1 = "Serpent";
+FN_ETTIN = "Ettin";
+FN_CENTAUR = "Centaur";
+FN_SLAUGHTAUR = "Slaughtaur";
+FN_BISHOP = "Bishop";
+FN_ICEGUY = "Wendigo";
+FN_SERPENT = "Stalker";
+FN_WRAITH = "Reiver";
+FN_DRAGON = "Death Wyvern";
+FN_KORAX = "Korax";
+FN_FBOSS = "Zedek";
+FN_MBOSS = "Menelkir";
+FN_CBOSS = "Traductus";
+FN_HERESIARCH = "Heresiarch";
+
 // Strife locks
 
 TXT_NEEDKEY = "You don't have the key";
diff --git a/wadsrc/static/zscript/hexen/bishop.txt b/wadsrc/static/zscript/hexen/bishop.txt
index 4fd0cde41..63b0168b5 100644
--- a/wadsrc/static/zscript/hexen/bishop.txt
+++ b/wadsrc/static/zscript/hexen/bishop.txt
@@ -24,6 +24,7 @@ class Bishop : Actor
 		DeathSound "BishopDeath";
 		ActiveSound "BishopActiveSounds";
 		Obituary"$OB_BISHOP";
+		Tag "$FN_BISHOP";
 	}
 
 	States
diff --git a/wadsrc/static/zscript/hexen/centaur.txt b/wadsrc/static/zscript/hexen/centaur.txt
index 8cd5639a2..4be9860ee 100644
--- a/wadsrc/static/zscript/hexen/centaur.txt
+++ b/wadsrc/static/zscript/hexen/centaur.txt
@@ -21,6 +21,7 @@ class Centaur : Actor
 		HowlSound "PuppyBeat";
 		Obituary "$OB_CENTAUR";
 		DamageFactor "Electric", 3;
+		Tag "$FN_CENTAUR";
 	}
 	States
 	{
@@ -107,6 +108,7 @@ class CentaurLeader : Centaur
 		Speed 10;
 		Obituary "$OB_SLAUGHTAUR";
 		HitObituary "$OB_SLAUGHTAURHIT";
+		Tag "$FN_SLAUGHTAUR";
 	}
 	States
 	{
diff --git a/wadsrc/static/zscript/hexen/clericboss.txt b/wadsrc/static/zscript/hexen/clericboss.txt
index 4bf223517..a472c1ac4 100644
--- a/wadsrc/static/zscript/hexen/clericboss.txt
+++ b/wadsrc/static/zscript/hexen/clericboss.txt
@@ -15,7 +15,8 @@ class ClericBoss : Actor
 		+DONTMORPH
 		PainSound "PlayerClericPain";
 		DeathSound "PlayerClericCrazyDeath";
-		Obituary "$OBCBOSS";
+		Obituary "$OB_CBOSS";
+		Tag "$FN_CBOSS";
 	}
 
 	States
diff --git a/wadsrc/static/zscript/hexen/demons.txt b/wadsrc/static/zscript/hexen/demons.txt
index 778bb957e..08f81b2a8 100644
--- a/wadsrc/static/zscript/hexen/demons.txt
+++ b/wadsrc/static/zscript/hexen/demons.txt
@@ -20,6 +20,7 @@ class Demon1 : Actor
 		DeathSound "DemonDeath";
 		ActiveSound "DemonActive";
 		Obituary "$OB_DEMON1";
+		Tag "$FN_DEMON1";
 	}
 	
 	const ChunkFlags = SXF_TRANSFERTRANSLATION | SXF_ABSOLUTEVELOCITY;
diff --git a/wadsrc/static/zscript/hexen/dragon.txt b/wadsrc/static/zscript/hexen/dragon.txt
index 5eafb3201..bf5d91b16 100644
--- a/wadsrc/static/zscript/hexen/dragon.txt
+++ b/wadsrc/static/zscript/hexen/dragon.txt
@@ -19,6 +19,7 @@ class Dragon : Actor
 		DeathSound "DragonDeath";
 		ActiveSound "DragonActive";
 		Obituary "$OB_DRAGON";
+		Tag "$FN_DRAGON";
 	}
 
 	States
diff --git a/wadsrc/static/zscript/hexen/ettin.txt b/wadsrc/static/zscript/hexen/ettin.txt
index 8ddf9e7d2..6650c6a41 100644
--- a/wadsrc/static/zscript/hexen/ettin.txt
+++ b/wadsrc/static/zscript/hexen/ettin.txt
@@ -22,6 +22,7 @@ class Ettin : Actor
 		ActiveSound "EttinActive";
 		HowlSound "PuppyBeat";
 		Obituary "$OB_ETTIN";
+		Tag "$FN_ETTIN";
 	}
 	States
 	{
diff --git a/wadsrc/static/zscript/hexen/fighterboss.txt b/wadsrc/static/zscript/hexen/fighterboss.txt
index 9871cf571..6ff4c90b1 100644
--- a/wadsrc/static/zscript/hexen/fighterboss.txt
+++ b/wadsrc/static/zscript/hexen/fighterboss.txt
@@ -17,6 +17,7 @@ class FighterBoss : Actor
 		PainSound "PlayerFighterPain";
 		DeathSound "PlayerFighterCrazyDeath";
 		Obituary "$OB_FBOSS";
+		Tag "$FN_FBOSS";
 	}
 
 	States
diff --git a/wadsrc/static/zscript/hexen/firedemon.txt b/wadsrc/static/zscript/hexen/firedemon.txt
index e10156402..5ea5e27bd 100644
--- a/wadsrc/static/zscript/hexen/firedemon.txt
+++ b/wadsrc/static/zscript/hexen/firedemon.txt
@@ -24,6 +24,7 @@ class FireDemon : Actor
 		DeathSound "FireDemonDeath";
 		ActiveSound "FireDemonActive";
 		Obituary "$OB_FIREDEMON";
+		Tag "$FN_FIREDEMON";
 	}
 
 	States
diff --git a/wadsrc/static/zscript/hexen/heresiarch.txt b/wadsrc/static/zscript/hexen/heresiarch.txt
index cd5502177..d7888ccfd 100644
--- a/wadsrc/static/zscript/hexen/heresiarch.txt
+++ b/wadsrc/static/zscript/hexen/heresiarch.txt
@@ -70,6 +70,7 @@ class Heresiarch : Actor
 		DeathSound "SorcererDeathScream";
 		ActiveSound "SorcererActive";
 		Obituary "$OB_HERESIARCH";
+		Tag "$FN_HERESIARCH";
 	}
 	
 	States
diff --git a/wadsrc/static/zscript/hexen/iceguy.txt b/wadsrc/static/zscript/hexen/iceguy.txt
index 41105b728..4a293b94e 100644
--- a/wadsrc/static/zscript/hexen/iceguy.txt
+++ b/wadsrc/static/zscript/hexen/iceguy.txt
@@ -20,6 +20,7 @@ class IceGuy : Actor
 		AttackSound "IceGuyAttack";
 		ActiveSound "IceGuyActive";
 		Obituary "$OB_ICEGUY";
+		Tag "$FN_ICEGUY";
 	}
 
 
diff --git a/wadsrc/static/zscript/hexen/korax.txt b/wadsrc/static/zscript/hexen/korax.txt
index b94664bea..316bba1d2 100644
--- a/wadsrc/static/zscript/hexen/korax.txt
+++ b/wadsrc/static/zscript/hexen/korax.txt
@@ -60,6 +60,7 @@ class Korax : Actor
 		DeathSound "KoraxDeath";
 		ActiveSound "KoraxActive";
 		Obituary "$OB_KORAX";
+		Tag "$FN_KORAX";
 	}
 
 	States
diff --git a/wadsrc/static/zscript/hexen/mageboss.txt b/wadsrc/static/zscript/hexen/mageboss.txt
index 0c081d786..eea86e33e 100644
--- a/wadsrc/static/zscript/hexen/mageboss.txt
+++ b/wadsrc/static/zscript/hexen/mageboss.txt
@@ -16,6 +16,7 @@ class MageBoss : Actor
 		PainSound "PlayerMagePain";
 		DeathSound "PlayerMageCrazyDeath";
 		Obituary "$OB_MBOSS";
+		Tag "$FN_MBOSS";
 	}
 
 	States
diff --git a/wadsrc/static/zscript/hexen/serpent.txt b/wadsrc/static/zscript/hexen/serpent.txt
index 3ebf5aad2..9d6826381 100644
--- a/wadsrc/static/zscript/hexen/serpent.txt
+++ b/wadsrc/static/zscript/hexen/serpent.txt
@@ -22,6 +22,7 @@ class Serpent : Actor
 		PainSound "SerpentPain";
 		DeathSound "SerpentDeath";
 		HitObituary "$OB_SERPENTHIT";
+		Tag "$FN_SERPENT";
 	}
 
 	States
diff --git a/wadsrc/static/zscript/hexen/wraith.txt b/wadsrc/static/zscript/hexen/wraith.txt
index 4b90dc4f6..ad4d00db6 100644
--- a/wadsrc/static/zscript/hexen/wraith.txt
+++ b/wadsrc/static/zscript/hexen/wraith.txt
@@ -21,6 +21,7 @@ class Wraith : Actor
 		ActiveSound "WraithActive";
 		HitObituary "$OB_WRAITHHIT";
 		Obituary "$OB_WRAITH";
+		Tag "$FN_WRAITH";
 	}
 
 	States