diff --git a/L2J_Mobius_Underground/dist/game/data/stats/npcs/03400-03499.xml b/L2J_Mobius_Underground/dist/game/data/stats/npcs/03400-03499.xml
index b1fdad1cca..d1727355fa 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/npcs/03400-03499.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/npcs/03400-03499.xml
@@ -2717,7 +2717,7 @@
 			<height normal="74" />
 		</collision>
 	</npc>
-	<npc id="3473" level="96" type="L2Monster" name="Omega Golem" title="Raid Boss">
+	<npc id="3473" level="96" type="L2RaidBoss" name="Omega Golem" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<minions name="Privates">
@@ -2896,7 +2896,7 @@
 			<height normal="37.5" />
 		</collision>
 	</npc>
-	<npc id="3477" level="88" type="L2Monster" name="Reinforced Super Kat the Cat" title="Raid Boss">
+	<npc id="3477" level="88" type="L2RaidBoss" name="Reinforced Super Kat the Cat" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="Party_Type" value="2" />
@@ -2992,7 +2992,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="3479" level="92" type="L2Monster" name="Darkened Super Feline Queen" title="Raid Boss">
+	<npc id="3479" level="92" type="L2RaidBoss" name="Darkened Super Feline Queen" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="Skill01_Probablity" value="400" />
@@ -3085,7 +3085,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="3481" level="94" type="L2Monster" name="Control-crazed Mew the Cat" title="Raid Boss">
+	<npc id="3481" level="94" type="L2RaidBoss" name="Control-crazed Mew the Cat" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="Skill01_Probablity" value="300" />
diff --git a/L2J_Mobius_Underground/dist/game/data/stats/npcs/08500-08599.xml b/L2J_Mobius_Underground/dist/game/data/stats/npcs/08500-08599.xml
index 56494f9076..75fd3434dd 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/npcs/08500-08599.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/npcs/08500-08599.xml
@@ -1424,7 +1424,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="8551" level="99" type="L2Monster" name="Katura Queen" title="Raid Boss">
+	<npc id="8551" level="99" type="L2RaidBoss" name="Katura Queen" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>FEMALE</sex>
@@ -1609,7 +1609,7 @@
 			<height normal="39" />
 		</collision>
 	</npc>
-	<npc id="8557" level="99" type="L2Monster" name="Lunatic Lord" title="Raid Boss">
+	<npc id="8557" level="99" type="L2RaidBoss" name="Lunatic Lord" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Underground/dist/game/data/stats/npcs/25700-25799.xml b/L2J_Mobius_Underground/dist/game/data/stats/npcs/25700-25799.xml
index 21b97aa36c..3f3b519465 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/npcs/25700-25799.xml
@@ -1915,7 +1915,7 @@
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
-	<npc id="25732" level="85" type="L2Monster" name="Dragon Beast" title="Raid Boss">
+	<npc id="25732" level="85" type="L2RaidBoss" name="Dragon Beast" title="Raid Boss">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="selfheal_skill" id="6886" level="1" />
@@ -3674,7 +3674,7 @@
 			<height normal="84" />
 		</collision>
 	</npc>
-	<npc id="25761" level="97" type="L2Monster" name="Georgios" title="Raid Boss">
+	<npc id="25761" level="97" type="L2RaidBoss" name="Georgios" title="Raid Boss">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<skill name="Skill01_ID" id="14012" level="2" />
@@ -3743,7 +3743,7 @@
 			<height normal="91" />
 		</collision>
 	</npc>
-	<npc id="25762" level="97" type="L2Monster" name="Angelos" title="Raid Boss">
+	<npc id="25762" level="97" type="L2RaidBoss" name="Angelos" title="Raid Boss">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<skill name="Skill01_ID" id="14001" level="3" />
@@ -3896,7 +3896,7 @@
 			<height normal="78" />
 		</collision>
 	</npc>
-	<npc id="25764" level="97" type="L2Monster" name="Steregos" title="Raid Boss">
+	<npc id="25764" level="97" type="L2RaidBoss" name="Steregos" title="Raid Boss">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<skill name="Skill01_ID" id="14034" level="1" />
@@ -4183,7 +4183,7 @@
 			<height normal="86" />
 		</collision>
 	</npc>
-	<npc id="25768" level="97" type="L2Monster" name="Evangelos" title="Raid Boss">
+	<npc id="25768" level="97" type="L2RaidBoss" name="Evangelos" title="Raid Boss">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<skill name="Skill01_ID" id="14009" level="3" />
@@ -4247,7 +4247,7 @@
 			<height normal="59" />
 		</collision>
 	</npc>
-	<npc id="25769" level="97" type="L2Monster" name="Sotiris" title="Raid Boss">
+	<npc id="25769" level="97" type="L2RaidBoss" name="Sotiris" title="Raid Boss">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<skill name="Skill01_ID" id="14009" level="3" />
diff --git a/L2J_Mobius_Underground/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_Underground/dist/game/data/stats/npcs/25800-25899.xml
index c7b66fc2bd..a642c2c4c9 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/npcs/25800-25899.xml
@@ -1118,7 +1118,7 @@
 			<height normal="77" />
 		</collision>
 	</npc>
-	<npc id="25825" level="97" type="L2Monster" name="Ron" title="Raid Boss">
+	<npc id="25825" level="97" type="L2RaidBoss" name="Ron" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
@@ -2115,7 +2115,7 @@
 			<height normal="84" />
 		</collision>
 	</npc>
-	<npc id="25844" level="96" type="L2Monster" name="Magical Warrior Konyar" title="Raid Boss">
+	<npc id="25844" level="96" type="L2RaidBoss" name="Magical Warrior Konyar" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
@@ -2170,7 +2170,7 @@
 			<height normal="84" />
 		</collision>
 	</npc>
-	<npc id="25845" level="96" type="L2Monster" name="Magical Warrior Konyar" title="Raid Boss">
+	<npc id="25845" level="96" type="L2RaidBoss" name="Magical Warrior Konyar" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
@@ -2948,7 +2948,7 @@
 			<height normal="93" />
 		</collision>
 	</npc>
-	<npc id="25867" level="98" type="L2Monster" name="Spezion" title="Raid Boss">
+	<npc id="25867" level="98" type="L2RaidBoss" name="Spezion" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
@@ -3003,7 +3003,7 @@
 			<height normal="81" />
 		</collision>
 	</npc>
-	<npc id="25868" level="98" type="L2Monster" name="Spezion" title="Raid Boss">
+	<npc id="25868" level="98" type="L2RaidBoss" name="Spezion" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="Skill01_Probablity" value="300" />
@@ -3059,7 +3059,7 @@
 			<height normal="81" />
 		</collision>
 	</npc>
-	<npc id="25869" level="98" type="L2Monster" name="Berserk Spezion" title="Raid Boss">
+	<npc id="25869" level="98" type="L2RaidBoss" name="Berserk Spezion" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="14149" level="1" />
@@ -3536,7 +3536,7 @@
 			<height normal="38" />
 		</collision>
 	</npc>
-	<npc id="25879" level="88" type="L2Monster" name="Queen of Darkness" title="Raid Boss">
+	<npc id="25879" level="88" type="L2RaidBoss" name="Queen of Darkness" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveArounding" value="0" />
@@ -3577,7 +3577,7 @@
 			<height normal="80" />
 		</collision>
 	</npc>
-	<npc id="25880" level="97" type="L2Monster" name="Georgios" title="Raid Boss">
+	<npc id="25880" level="97" type="L2RaidBoss" name="Georgios" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="14012" level="2" />
@@ -4084,7 +4084,7 @@
 			<height normal="65.5" />
 		</collision>
 	</npc>
-	<npc id="25885" level="97" type="L2Monster" name="Guillotine of Death" title="Raid Boss">
+	<npc id="25885" level="97" type="L2RaidBoss" name="Guillotine of Death" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="Attack_BoostValue" value="148" />
@@ -4746,7 +4746,7 @@
 			<height normal="40" grown="48.5" />
 		</collision>
 	</npc>
-	<npc id="25894" level="94" type="L2Monster" name="Enraged Master Kinen" title="Raid Boss">
+	<npc id="25894" level="94" type="L2RaidBoss" name="Enraged Master Kinen" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
diff --git a/L2J_Mobius_Underground/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_Underground/dist/game/data/stats/npcs/25900-25999.xml
index 788d585105..30c871731a 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/npcs/25900-25999.xml
@@ -1872,7 +1872,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="25940" level="99" type="L2Monster" name="Yehan Klodekus" title="Raid Boss">
+	<npc id="25940" level="99" type="L2RaidBoss" name="Yehan Klodekus" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>FEMALE</sex>
@@ -1903,7 +1903,7 @@
 			<height normal="62.4" />
 		</collision>
 	</npc>
-	<npc id="25941" level="99" type="L2Monster" name="Yehan Klanikus" title="Raid Boss">
+	<npc id="25941" level="99" type="L2RaidBoss" name="Yehan Klanikus" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Underground/dist/game/data/stats/npcs/26000-26099.xml b/L2J_Mobius_Underground/dist/game/data/stats/npcs/26000-26099.xml
index 5152e14acb..021140ae11 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/npcs/26000-26099.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/npcs/26000-26099.xml
@@ -5622,7 +5622,7 @@
 			<height normal="94" />
 		</collision>
 	</npc>
-	<npc id="26090" level="99" type="L2Monster" name="Abyssal Makkum" title="Raid Boss">
+	<npc id="26090" level="99" type="L2RaidBoss" name="Abyssal Makkum" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
@@ -5676,7 +5676,7 @@
 			<height normal="94" />
 		</collision>
 	</npc>
-	<npc id="26092" level="99" type="L2Monster" name="Gigantic Golden Pig" title="Raid Boss">
+	<npc id="26092" level="99" type="L2RaidBoss" name="Gigantic Golden Pig" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>