diff --git a/Source/monster.cpp b/Source/monster.cpp
index e35403ca9..509ef7f62 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -120,14 +120,14 @@ void (*AiProc[])(int i) = {
 	&MAI_Lachdanan,
 	&MAI_Warlord,
 #ifdef HELLFIRE
-	&mai_ranged_441680,
-	&mai_ranged_44168B,
-	&mai_horkdemon,
-	&mai_ranged_441649,
-	&mai_ranged_441654,
-	&mai_ranged_44165F,
-	&mai_ranged_44166A,
-	&mai_roundranged_441EA0
+	&MAI_Firebat,
+	&MAI_Torchant,
+	&MAI_HorkDemon,
+	&MAI_Lich,
+	&MAI_ArchLich,
+	&MAI_Psychorb,
+	&MAI_Necromorb,
+	&MAI_BoneDemon
 #endif
 };
 
@@ -4304,22 +4304,22 @@ void MAI_Succ(int i)
 }
 
 #ifdef HELLFIRE
-void mai_ranged_441649(int i)
+void MAI_Lich(int i)
 {
 	MAI_Ranged(i, MIS_LICH, FALSE);
 }
 
-void mai_ranged_441654(int i)
+void MAI_ArchLich(int i)
 {
 	MAI_Ranged(i, MIS_ARCHLICH, FALSE);
 }
 
-void mai_ranged_44165F(int i)
+void MAI_Psychorb(int i)
 {
 	MAI_Ranged(i, MIS_PSYCHORB, FALSE);
 }
 
-void mai_ranged_44166A(int i)
+void MAI_Necromorb(int i)
 {
 	MAI_Ranged(i, MIS_NECROMORB, FALSE);
 }
@@ -4331,12 +4331,12 @@ void MAI_AcidUniq(int i)
 }
 
 #ifdef HELLFIRE
-void mai_ranged_441680(int i)
+void MAI_Firebat(int i)
 {
 	MAI_Ranged(i, MIS_FIREBOLT, FALSE);
 }
 
-void mai_ranged_44168B(int i)
+void MAI_Torchant(int i)
 {
 	MAI_Ranged(i, MIS_FIREBALL, FALSE);
 }
@@ -4577,7 +4577,7 @@ void MAI_Storm(int i)
 }
 
 #ifdef HELLFIRE
-void mai_roundranged_441EA0(int i)
+void MAI_BoneDemon(int i)
 {
 	MAI_RoundRanged(i, MIS_BONEDEMON, TRUE, 4, 0);
 }
@@ -4891,7 +4891,7 @@ void MAI_Rhino(int i)
 }
 
 #ifdef HELLFIRE
-void mai_horkdemon(int i)
+void MAI_HorkDemon(int i)
 {
 	MonsterStruct *Monst;
 	int fx, fy, mx, my, md, v, dist;
diff --git a/Source/monster.h b/Source/monster.h
index 70fca6216..62292b54e 100644
--- a/Source/monster.h
+++ b/Source/monster.h
@@ -63,15 +63,15 @@ void MAI_Ranged(int i, int missile_type, BOOL special);
 void MAI_GoatBow(int i);
 void MAI_Succ(int i);
 #ifdef HELLFIRE
-void mai_ranged_441649(int i);
-void mai_ranged_441654(int i);
-void mai_ranged_44165F(int i);
-void mai_ranged_44166A(int i);
+void MAI_Lich(int i);
+void MAI_ArchLich(int i);
+void MAI_Psychorb(int i);
+void MAI_Necromorb(int i);
 #endif
 void MAI_AcidUniq(int i);
 #ifdef HELLFIRE
-void mai_ranged_441680(int i);
-void mai_ranged_44168B(int i);
+void MAI_Firebat(int i);
+void MAI_Torchant(int i);
 #endif
 void MAI_Scav(int i);
 void MAI_Garg(int i);
@@ -79,7 +79,7 @@ void MAI_RoundRanged(int i, int missile_type, BOOL checkdoors, int dam, int less
 void MAI_Magma(int i);
 void MAI_Storm(int i);
 #ifdef HELLFIRE
-void mai_roundranged_441EA0(int i);
+void MAI_BoneDemon(int i);
 #endif
 void MAI_Acid(int i);
 void MAI_Diablo(int i);
@@ -88,7 +88,7 @@ void MAI_Golum(int i);
 void MAI_SkelKing(int i);
 void MAI_Rhino(int i);
 #ifdef HELLFIRE
-void mai_horkdemon(int i);
+void MAI_HorkDemon(int i);
 #endif
 void MAI_Counselor(int i);
 void MAI_Garbud(int i);
diff --git a/comparer-config/hellfire.toml b/comparer-config/hellfire.toml
index 8261073dd..9fad3b438 100644
--- a/comparer-config/hellfire.toml
+++ b/comparer-config/hellfire.toml
@@ -5188,22 +5188,22 @@ addr = 0x44163E
 size = 0xB
 
 [[func]]
-name = "mai_ranged_441649"
+name = "MAI_Lich"
 addr = 0x441649
 size = 0xB
 
 [[func]]
-name = "mai_ranged_441654"
+name = "MAI_ArchLich"
 addr = 0x441654
 size = 0xB
 
 [[func]]
-name = "mai_ranged_44165F"
+name = "MAI_Psychorb"
 addr = 0x44165F
 size = 0xB
 
 [[func]]
-name = "mai_ranged_44166A"
+name = "MAI_Necromorb"
 addr = 0x44166A
 size = 0xB
 
@@ -5213,12 +5213,12 @@ addr = 0x441675
 size = 0xB
 
 [[func]]
-name = "mai_ranged_441680"
+name = "MAI_Firebat"
 addr = 0x441680
 size = 0xB
 
 [[func]]
-name = "mai_ranged_44168B"
+name = "MAI_Torchant"
 addr = 0x44168B
 size = 0xB
 
@@ -5258,7 +5258,7 @@ addr = 0x441E91
 size = 0xF
 
 [[func]]
-name = "mai_roundranged_441EA0"
+name = "MAI_BoneDemon"
 addr = 0x441EA0
 size = 0xF
 
@@ -5298,7 +5298,7 @@ addr = 0x44271A
 size = 0x2EA
 
 [[func]]
-name = "mai_horkdemon"
+name = "MAI_HorkDemon"
 addr = 0x442A04
 size = 0x2B1