diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b7739b542c..57dd5ad702 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -103,7 +103,7 @@ public class Kelbim extends AbstractNpcAI
 	private static final ZoneType ZONE = ZoneManager.getInstance().getZoneById(60023);
 	private static final Location KELBIM_LOCATION = new Location(-55386, 58939, -274);
 	// Vars
-	private static Npc _kelbimBoss;
+	private static GrandBossInstance _kelbimBoss;
 	private static long _lastAction;
 	private static int _bossStage;
 	private static ArrayList<Npc> _minions = new ArrayList<>();
@@ -191,8 +191,8 @@ public class Kelbim extends AbstractNpcAI
 			}
 			case "stage_1_kelbim_spawn":
 			{
-				_kelbimBoss = addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0);
-				GrandBossManager.getInstance().addBoss((GrandBossInstance) _kelbimBoss);
+				_kelbimBoss = (GrandBossInstance) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0);
+				GrandBossManager.getInstance().addBoss(_kelbimBoss);
 				_lastAction = System.currentTimeMillis();
 				startQuestTimer("check_activity_task", 60000, null, null);
 				startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null);
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/26100-26199.xml
index 0e1c719b4d..1d8929b8da 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/26100-26199.xml
@@ -2304,7 +2304,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="26124" level="104" type="RaidBoss" name="Kelbim" title="Fallen Guardian of Atelia">
+	<npc id="26124" level="104" type="GrandBoss" name="Kelbim" title="Fallen Guardian of Atelia">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b7739b542c..57dd5ad702 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -103,7 +103,7 @@ public class Kelbim extends AbstractNpcAI
 	private static final ZoneType ZONE = ZoneManager.getInstance().getZoneById(60023);
 	private static final Location KELBIM_LOCATION = new Location(-55386, 58939, -274);
 	// Vars
-	private static Npc _kelbimBoss;
+	private static GrandBossInstance _kelbimBoss;
 	private static long _lastAction;
 	private static int _bossStage;
 	private static ArrayList<Npc> _minions = new ArrayList<>();
@@ -191,8 +191,8 @@ public class Kelbim extends AbstractNpcAI
 			}
 			case "stage_1_kelbim_spawn":
 			{
-				_kelbimBoss = addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0);
-				GrandBossManager.getInstance().addBoss((GrandBossInstance) _kelbimBoss);
+				_kelbimBoss = (GrandBossInstance) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0);
+				GrandBossManager.getInstance().addBoss(_kelbimBoss);
 				_lastAction = System.currentTimeMillis();
 				startQuestTimer("check_activity_task", 60000, null, null);
 				startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null);
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/26100-26199.xml
index 2231e2b17e..f250b75a1a 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/26100-26199.xml
@@ -1647,7 +1647,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="26124" level="104" type="RaidBoss" name="Kelbim" title="Fallen Guardian of Atelia">
+	<npc id="26124" level="104" type="GrandBoss" name="Kelbim" title="Fallen Guardian of Atelia">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b7739b542c..57dd5ad702 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -103,7 +103,7 @@ public class Kelbim extends AbstractNpcAI
 	private static final ZoneType ZONE = ZoneManager.getInstance().getZoneById(60023);
 	private static final Location KELBIM_LOCATION = new Location(-55386, 58939, -274);
 	// Vars
-	private static Npc _kelbimBoss;
+	private static GrandBossInstance _kelbimBoss;
 	private static long _lastAction;
 	private static int _bossStage;
 	private static ArrayList<Npc> _minions = new ArrayList<>();
@@ -191,8 +191,8 @@ public class Kelbim extends AbstractNpcAI
 			}
 			case "stage_1_kelbim_spawn":
 			{
-				_kelbimBoss = addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0);
-				GrandBossManager.getInstance().addBoss((GrandBossInstance) _kelbimBoss);
+				_kelbimBoss = (GrandBossInstance) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0);
+				GrandBossManager.getInstance().addBoss(_kelbimBoss);
 				_lastAction = System.currentTimeMillis();
 				startQuestTimer("check_activity_task", 60000, null, null);
 				startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null);
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26100-26199.xml
index 6601199c1b..b528040ae2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26100-26199.xml
@@ -1647,7 +1647,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="26124" level="104" type="RaidBoss" name="Kelbim" title="Fallen Guardian of Atelia">
+	<npc id="26124" level="104" type="GrandBoss" name="Kelbim" title="Fallen Guardian of Atelia">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b7739b542c..57dd5ad702 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -103,7 +103,7 @@ public class Kelbim extends AbstractNpcAI
 	private static final ZoneType ZONE = ZoneManager.getInstance().getZoneById(60023);
 	private static final Location KELBIM_LOCATION = new Location(-55386, 58939, -274);
 	// Vars
-	private static Npc _kelbimBoss;
+	private static GrandBossInstance _kelbimBoss;
 	private static long _lastAction;
 	private static int _bossStage;
 	private static ArrayList<Npc> _minions = new ArrayList<>();
@@ -191,8 +191,8 @@ public class Kelbim extends AbstractNpcAI
 			}
 			case "stage_1_kelbim_spawn":
 			{
-				_kelbimBoss = addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0);
-				GrandBossManager.getInstance().addBoss((GrandBossInstance) _kelbimBoss);
+				_kelbimBoss = (GrandBossInstance) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0);
+				GrandBossManager.getInstance().addBoss(_kelbimBoss);
 				_lastAction = System.currentTimeMillis();
 				startQuestTimer("check_activity_task", 60000, null, null);
 				startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null);
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/26100-26199.xml
index 601b35d83c..9d6177c0cb 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/npcs/26100-26199.xml
@@ -1647,7 +1647,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="26124" level="104" type="RaidBoss" name="Kelbim" title="Fallen Guardian of Atelia">
+	<npc id="26124" level="104" type="GrandBoss" name="Kelbim" title="Fallen Guardian of Atelia">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b7739b542c..57dd5ad702 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -103,7 +103,7 @@ public class Kelbim extends AbstractNpcAI
 	private static final ZoneType ZONE = ZoneManager.getInstance().getZoneById(60023);
 	private static final Location KELBIM_LOCATION = new Location(-55386, 58939, -274);
 	// Vars
-	private static Npc _kelbimBoss;
+	private static GrandBossInstance _kelbimBoss;
 	private static long _lastAction;
 	private static int _bossStage;
 	private static ArrayList<Npc> _minions = new ArrayList<>();
@@ -191,8 +191,8 @@ public class Kelbim extends AbstractNpcAI
 			}
 			case "stage_1_kelbim_spawn":
 			{
-				_kelbimBoss = addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0);
-				GrandBossManager.getInstance().addBoss((GrandBossInstance) _kelbimBoss);
+				_kelbimBoss = (GrandBossInstance) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0);
+				GrandBossManager.getInstance().addBoss(_kelbimBoss);
 				_lastAction = System.currentTimeMillis();
 				startQuestTimer("check_activity_task", 60000, null, null);
 				startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null);
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/26100-26199.xml
index ca8f0816eb..c8e88e7b9a 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/npcs/26100-26199.xml
@@ -1647,7 +1647,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="26124" level="104" type="RaidBoss" name="Kelbim" title="Fallen Guardian of Atelia">
+	<npc id="26124" level="104" type="GrandBoss" name="Kelbim" title="Fallen Guardian of Atelia">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b7739b542c..57dd5ad702 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -103,7 +103,7 @@ public class Kelbim extends AbstractNpcAI
 	private static final ZoneType ZONE = ZoneManager.getInstance().getZoneById(60023);
 	private static final Location KELBIM_LOCATION = new Location(-55386, 58939, -274);
 	// Vars
-	private static Npc _kelbimBoss;
+	private static GrandBossInstance _kelbimBoss;
 	private static long _lastAction;
 	private static int _bossStage;
 	private static ArrayList<Npc> _minions = new ArrayList<>();
@@ -191,8 +191,8 @@ public class Kelbim extends AbstractNpcAI
 			}
 			case "stage_1_kelbim_spawn":
 			{
-				_kelbimBoss = addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0);
-				GrandBossManager.getInstance().addBoss((GrandBossInstance) _kelbimBoss);
+				_kelbimBoss = (GrandBossInstance) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0);
+				GrandBossManager.getInstance().addBoss(_kelbimBoss);
 				_lastAction = System.currentTimeMillis();
 				startQuestTimer("check_activity_task", 60000, null, null);
 				startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null);
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/26100-26199.xml
index 8838586219..b715d57d07 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/npcs/26100-26199.xml
@@ -1596,7 +1596,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="26124" level="104" type="RaidBoss" name="Kelbim" title="Fallen Guardian of Atelia">
+	<npc id="26124" level="104" type="GrandBoss" name="Kelbim" title="Fallen Guardian of Atelia">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="364810170816" sp="875542221" />
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index b7739b542c..57dd5ad702 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -103,7 +103,7 @@ public class Kelbim extends AbstractNpcAI
 	private static final ZoneType ZONE = ZoneManager.getInstance().getZoneById(60023);
 	private static final Location KELBIM_LOCATION = new Location(-55386, 58939, -274);
 	// Vars
-	private static Npc _kelbimBoss;
+	private static GrandBossInstance _kelbimBoss;
 	private static long _lastAction;
 	private static int _bossStage;
 	private static ArrayList<Npc> _minions = new ArrayList<>();
@@ -191,8 +191,8 @@ public class Kelbim extends AbstractNpcAI
 			}
 			case "stage_1_kelbim_spawn":
 			{
-				_kelbimBoss = addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0);
-				GrandBossManager.getInstance().addBoss((GrandBossInstance) _kelbimBoss);
+				_kelbimBoss = (GrandBossInstance) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0);
+				GrandBossManager.getInstance().addBoss(_kelbimBoss);
 				_lastAction = System.currentTimeMillis();
 				startQuestTimer("check_activity_task", 60000, null, null);
 				startQuestTimer("stage_all_random_area_attack", Rnd.get(2, 3) * 60000, null, null);
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/26100-26199.xml
index 769a876fbe..22360abaa7 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/npcs/26100-26199.xml
@@ -1596,7 +1596,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="26124" level="104" type="RaidBoss" name="Kelbim" title="Fallen Guardian of Atelia">
+	<npc id="26124" level="104" type="GrandBoss" name="Kelbim" title="Fallen Guardian of Atelia">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="364810170816" sp="875542221" />