diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 8c0c562d71..00ebb5f34f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -341,7 +341,7 @@ public class Anakim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+		final int status = GrandBossManager.getInstance().getStatus(ANAKIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -351,12 +351,12 @@ public class Anakim extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 		}
 	}
 	
@@ -367,14 +367,14 @@ public class Anakim extends AbstractNpcAI
 		{
 			case "unlock_anakim":
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -463,9 +463,9 @@ public class Anakim extends AbstractNpcAI
 					}
 					remnant.deleteMe();
 				}
-				if (GrandBossManager.getInstance().getBossStatus(ANAKIM) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(ANAKIM) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				}
 				break;
 			}
@@ -483,7 +483,7 @@ public class Anakim extends AbstractNpcAI
 	{
 		if ((npc.getId() == ENTER_CUBIC) || (npc.getId() == ANAKIM_CUBIC))
 		{
-			final int _anakimStatus = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+			final int _anakimStatus = GrandBossManager.getInstance().getStatus(ANAKIM);
 			if ((npc.getId() == ENTER_CUBIC) && (_anakimStatus > ALIVE))
 			{
 				return "31101-01.html";
@@ -541,7 +541,7 @@ public class Anakim extends AbstractNpcAI
 			
 			if ((_anakimStatus == ALIVE) && (npc.getId() == ENTER_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, WAITING);
+				GrandBossManager.getInstance().setStatus(ANAKIM, WAITING);
 				_spawns.clear();
 				for (SpawnHolder spawn : SPAWNS)
 				{
@@ -554,7 +554,7 @@ public class Anakim extends AbstractNpcAI
 			}
 			else if ((_anakimStatus == WAITING) && (npc.getId() == ANAKIM_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ANAKIM, FIGHTING);
 				// Spawn the rb
 				_anakimBoss = addSpawn(ANAKIM, 185080, -12613, -5499, 16550, false, 0);
 				GrandBossManager.getInstance().addBoss((GrandBoss) _anakimBoss);
@@ -610,7 +610,7 @@ public class Anakim extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185082, -12606, -5499, 6133, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD);
+			GrandBossManager.getInstance().setStatus(ANAKIM, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 357351f632..4b94ea1007 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 8db07e79e9..36d70dc920 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI
 		addTalkId(STONE_COFFIN);
 		addFirstTalkId(ELF);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
-		final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
+		final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -115,12 +115,12 @@ public class Beleth extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 		}
 		DoorData.getInstance().getDoor(DOOR1).openMe();
 	}
@@ -132,7 +132,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			case "BELETH_UNLOCK":
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 				DoorData.getInstance().getDoor(DOOR1).openMe();
 				break;
 			}
@@ -509,7 +509,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				if ((_lastAttack + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+					GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -539,7 +539,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
-		if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) < FIGHT))
+		if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) < FIGHT))
 		{
 			if (_priest != null)
 			{
@@ -550,7 +550,7 @@ public class Beleth extends AbstractNpcAI
 				_stone.deleteMe();
 			}
 			
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
 			startQuestTimer("SPAWN1", Config.BELETH_WAIT_TIME * 60 * 1000, null, null);
 		}
 		
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			cancelQuestTimer("CHECK_ATTACK", null, null);
 			setBelethKiller(killer);
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
 			final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index 9ac3657157..e2770b5bec 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -53,7 +53,7 @@ public class Wormhole extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(BELETH);
+			final int status = GrandBossManager.getInstance().getStatus(BELETH);
 			if (status == 1)
 			{
 				return "33901-4.html";
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java
index de153239c4..344ad52a0a 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
 			
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index cabf3daedc..8d618ecd4f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -367,7 +367,7 @@ public class Lilith extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
-		final int status = GrandBossManager.getInstance().getBossStatus(LILITH);
+		final int status = GrandBossManager.getInstance().getStatus(LILITH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -377,12 +377,12 @@ public class Lilith extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+			GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 		}
 	}
 	
@@ -393,14 +393,14 @@ public class Lilith extends AbstractNpcAI
 		{
 			case "unlock_lilith":
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -489,9 +489,9 @@ public class Lilith extends AbstractNpcAI
 					}
 					remnant.deleteMe();
 				}
-				if (GrandBossManager.getInstance().getBossStatus(LILITH) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(LILITH) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				}
 				break;
 			}
@@ -509,7 +509,7 @@ public class Lilith extends AbstractNpcAI
 	{
 		if ((npc.getId() == ENTER_CUBIC) || (npc.getId() == LILITH_CUBIC))
 		{
-			final int _lilithStatus = GrandBossManager.getInstance().getBossStatus(LILITH);
+			final int _lilithStatus = GrandBossManager.getInstance().getStatus(LILITH);
 			if ((npc.getId() == ENTER_CUBIC) && (_lilithStatus > ALIVE))
 			{
 				return "31118-01.html";
@@ -567,7 +567,7 @@ public class Lilith extends AbstractNpcAI
 			
 			if ((_lilithStatus == ALIVE) && (npc.getId() == ENTER_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, WAITING);
+				GrandBossManager.getInstance().setStatus(LILITH, WAITING);
 				_spawns.clear();
 				for (SpawnHolder spawn : SPAWNS)
 				{
@@ -580,7 +580,7 @@ public class Lilith extends AbstractNpcAI
 			}
 			else if ((_lilithStatus == WAITING) && (npc.getId() == LILITH_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LILITH, FIGHTING);
 				// Spawn the rb
 				_lilithBoss = addSpawn(LILITH, 185062, -9605, -5499, 15640, false, 0);
 				GrandBossManager.getInstance().addBoss((GrandBoss) _lilithBoss);
@@ -626,7 +626,7 @@ public class Lilith extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185062, -9605, -5499, 15640, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(LILITH, DEAD);
+			GrandBossManager.getInstance().setStatus(LILITH, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 40890fc9dc..5b16c333e2 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -53,12 +53,12 @@ public class KatoSicanus extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(LINDVIOR_LOCATION, true);
 				addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 60000, false);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 			}
 			else
 			{
@@ -115,7 +115,7 @@ public class KatoSicanus extends AbstractNpcAI
 					{
 						member.teleToLocation(LINDVIOR_LOCATION, true);
 						addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);
-						GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+						GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 05475517a1..32dc16c33f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -223,7 +223,7 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
-		final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+		final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -235,14 +235,14 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 			}
 		}
 		else
 		{
 			_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -428,9 +428,9 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair.oustAllPlayers();
 		_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, false));
 		cancelQuestTimers("attack_generator");
-		if (GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID) != 3)
+		if (GrandBossManager.getInstance().getStatus(LINDVIOR_RAID) != 3)
 		{
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -660,7 +660,7 @@ public class Lindvior extends AbstractNpcAI
 				cancelQuestTimers("attack_generator");
 				_lindviorfake.setDead(true);
 				_lindviorfake.deleteMe();
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, FIGHTING);
 				_lionel = addSpawn(LIONEL_HUNTER, 42630, -48231, -792, 855, false, 0, false);
 				
 				_lindvior = (GrandBoss) addSpawn(LINDVIOR_GROUND, CENTER_LOCATION, false, 0, true);
@@ -682,7 +682,7 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 				break;
 			}
 			case "stage_1_activate_generator":
@@ -851,7 +851,7 @@ public class Lindvior extends AbstractNpcAI
 			_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, true));
 			_lionel.deleteMe();
 			
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, DEAD);
 			final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0b685d633b..c5153f516d 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index ff34c76a64..70d36f9c61 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -54,11 +54,11 @@ public class Daichir extends AbstractNpcAI
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+			final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOCATION, true);
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+				GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 			}
 			else
 			{
@@ -107,7 +107,7 @@ public class Daichir extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOCATION, true);
-						GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+						GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 					}
 				}
 			}
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index b1bbe24b1a..c392c1abee 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -324,7 +324,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+		final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -334,12 +334,12 @@ public class Trasken extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 		}
 	}
 	
@@ -398,7 +398,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		_zoneLair.oustAllPlayers();
 		_zoneLair2.oustAllPlayers();
-		GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 	}
 	
 	@Override
@@ -575,7 +575,7 @@ public class Trasken extends AbstractNpcAI
 		{
 			case "unlock_trasken":
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 				break;
 			}
 			case "exitEarthWyrnCave":
@@ -604,7 +604,7 @@ public class Trasken extends AbstractNpcAI
 				ThreadPool.schedule(npc::decayMe, 10000);
 				cancelQuestTimer("finish", npc, null);
 				
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
+				GrandBossManager.getInstance().setStatus(TRASKEN, DEAD);
 				final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0528e31558..60ec4e0146 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = ZoneManager.getInstance().getZoneById(12010);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index add909d9b3..49319008fe 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 63e46356d2..f2c6d6ae29 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -204,7 +204,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index bea872a334..106815dd10 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,12 +107,12 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 8c0c562d71..00ebb5f34f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -341,7 +341,7 @@ public class Anakim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+		final int status = GrandBossManager.getInstance().getStatus(ANAKIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -351,12 +351,12 @@ public class Anakim extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 		}
 	}
 	
@@ -367,14 +367,14 @@ public class Anakim extends AbstractNpcAI
 		{
 			case "unlock_anakim":
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -463,9 +463,9 @@ public class Anakim extends AbstractNpcAI
 					}
 					remnant.deleteMe();
 				}
-				if (GrandBossManager.getInstance().getBossStatus(ANAKIM) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(ANAKIM) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				}
 				break;
 			}
@@ -483,7 +483,7 @@ public class Anakim extends AbstractNpcAI
 	{
 		if ((npc.getId() == ENTER_CUBIC) || (npc.getId() == ANAKIM_CUBIC))
 		{
-			final int _anakimStatus = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+			final int _anakimStatus = GrandBossManager.getInstance().getStatus(ANAKIM);
 			if ((npc.getId() == ENTER_CUBIC) && (_anakimStatus > ALIVE))
 			{
 				return "31101-01.html";
@@ -541,7 +541,7 @@ public class Anakim extends AbstractNpcAI
 			
 			if ((_anakimStatus == ALIVE) && (npc.getId() == ENTER_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, WAITING);
+				GrandBossManager.getInstance().setStatus(ANAKIM, WAITING);
 				_spawns.clear();
 				for (SpawnHolder spawn : SPAWNS)
 				{
@@ -554,7 +554,7 @@ public class Anakim extends AbstractNpcAI
 			}
 			else if ((_anakimStatus == WAITING) && (npc.getId() == ANAKIM_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ANAKIM, FIGHTING);
 				// Spawn the rb
 				_anakimBoss = addSpawn(ANAKIM, 185080, -12613, -5499, 16550, false, 0);
 				GrandBossManager.getInstance().addBoss((GrandBoss) _anakimBoss);
@@ -610,7 +610,7 @@ public class Anakim extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185082, -12606, -5499, 6133, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD);
+			GrandBossManager.getInstance().setStatus(ANAKIM, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 357351f632..4b94ea1007 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 8db07e79e9..36d70dc920 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI
 		addTalkId(STONE_COFFIN);
 		addFirstTalkId(ELF);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
-		final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
+		final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -115,12 +115,12 @@ public class Beleth extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 		}
 		DoorData.getInstance().getDoor(DOOR1).openMe();
 	}
@@ -132,7 +132,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			case "BELETH_UNLOCK":
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 				DoorData.getInstance().getDoor(DOOR1).openMe();
 				break;
 			}
@@ -509,7 +509,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				if ((_lastAttack + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+					GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -539,7 +539,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
-		if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) < FIGHT))
+		if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) < FIGHT))
 		{
 			if (_priest != null)
 			{
@@ -550,7 +550,7 @@ public class Beleth extends AbstractNpcAI
 				_stone.deleteMe();
 			}
 			
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
 			startQuestTimer("SPAWN1", Config.BELETH_WAIT_TIME * 60 * 1000, null, null);
 		}
 		
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			cancelQuestTimer("CHECK_ATTACK", null, null);
 			setBelethKiller(killer);
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
 			final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index 9ac3657157..e2770b5bec 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -53,7 +53,7 @@ public class Wormhole extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(BELETH);
+			final int status = GrandBossManager.getInstance().getStatus(BELETH);
 			if (status == 1)
 			{
 				return "33901-4.html";
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java
index de153239c4..344ad52a0a 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
 			
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index 27a44fc962..b94d17f47b 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -117,7 +117,7 @@ public class Kelbim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+		final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -129,14 +129,14 @@ public class Kelbim extends AbstractNpcAI
 			{
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
 			openDoor(DOOR1, 0);
 			openDoor(DOOR2, 0);
-			GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 		}
 	}
 	
@@ -147,7 +147,7 @@ public class Kelbim extends AbstractNpcAI
 		{
 			case "unlock_kelbim":
 			{
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 				Broadcast.toAllOnlinePlayers(new Earthquake(-55754, 59903, -269, 20, 10));
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
@@ -157,7 +157,7 @@ public class Kelbim extends AbstractNpcAI
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -183,7 +183,7 @@ public class Kelbim extends AbstractNpcAI
 			case "stage_1_start":
 			{
 				_bossStage = 1;
-				GrandBossManager.getInstance().setBossStatus(KELBIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(KELBIM, FIGHTING);
 				playMovie(ZONE.getPlayersInside(), Movie.SC_KELBIM_OPENING);
 				startQuestTimer("stage_1_kelbim_spawn", 25000, null, null);
 				break;
@@ -307,7 +307,7 @@ public class Kelbim extends AbstractNpcAI
 	{
 		if (npc.getId() == ENTER_DEVICE)
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+			final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 			if (status > ALIVE)
 			{
 				return "34052-1.html";
@@ -349,7 +349,7 @@ public class Kelbim extends AbstractNpcAI
 				{
 					if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
 					{
-						GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
+						GrandBossManager.getInstance().setStatus(KELBIM, WAITING);
 						startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
 						member.teleToLocation(KELBIM_LOCATION, true);
 					}
@@ -430,7 +430,7 @@ public class Kelbim extends AbstractNpcAI
 		notifyEvent("cancel_timers", null, null);
 		closeDoor(DOOR1, 0);
 		closeDoor(DOOR2, 0);
-		GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD);
+		GrandBossManager.getInstance().setStatus(KELBIM, DEAD);
 		final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
 		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index cabf3daedc..8d618ecd4f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -367,7 +367,7 @@ public class Lilith extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
-		final int status = GrandBossManager.getInstance().getBossStatus(LILITH);
+		final int status = GrandBossManager.getInstance().getStatus(LILITH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -377,12 +377,12 @@ public class Lilith extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+			GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 		}
 	}
 	
@@ -393,14 +393,14 @@ public class Lilith extends AbstractNpcAI
 		{
 			case "unlock_lilith":
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -489,9 +489,9 @@ public class Lilith extends AbstractNpcAI
 					}
 					remnant.deleteMe();
 				}
-				if (GrandBossManager.getInstance().getBossStatus(LILITH) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(LILITH) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				}
 				break;
 			}
@@ -509,7 +509,7 @@ public class Lilith extends AbstractNpcAI
 	{
 		if ((npc.getId() == ENTER_CUBIC) || (npc.getId() == LILITH_CUBIC))
 		{
-			final int _lilithStatus = GrandBossManager.getInstance().getBossStatus(LILITH);
+			final int _lilithStatus = GrandBossManager.getInstance().getStatus(LILITH);
 			if ((npc.getId() == ENTER_CUBIC) && (_lilithStatus > ALIVE))
 			{
 				return "31118-01.html";
@@ -567,7 +567,7 @@ public class Lilith extends AbstractNpcAI
 			
 			if ((_lilithStatus == ALIVE) && (npc.getId() == ENTER_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, WAITING);
+				GrandBossManager.getInstance().setStatus(LILITH, WAITING);
 				_spawns.clear();
 				for (SpawnHolder spawn : SPAWNS)
 				{
@@ -580,7 +580,7 @@ public class Lilith extends AbstractNpcAI
 			}
 			else if ((_lilithStatus == WAITING) && (npc.getId() == LILITH_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LILITH, FIGHTING);
 				// Spawn the rb
 				_lilithBoss = addSpawn(LILITH, 185062, -9605, -5499, 15640, false, 0);
 				GrandBossManager.getInstance().addBoss((GrandBoss) _lilithBoss);
@@ -626,7 +626,7 @@ public class Lilith extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185062, -9605, -5499, 15640, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(LILITH, DEAD);
+			GrandBossManager.getInstance().setStatus(LILITH, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 40890fc9dc..5b16c333e2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -53,12 +53,12 @@ public class KatoSicanus extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(LINDVIOR_LOCATION, true);
 				addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 60000, false);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 			}
 			else
 			{
@@ -115,7 +115,7 @@ public class KatoSicanus extends AbstractNpcAI
 					{
 						member.teleToLocation(LINDVIOR_LOCATION, true);
 						addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);
-						GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+						GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 05475517a1..32dc16c33f 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -223,7 +223,7 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
-		final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+		final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -235,14 +235,14 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 			}
 		}
 		else
 		{
 			_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -428,9 +428,9 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair.oustAllPlayers();
 		_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, false));
 		cancelQuestTimers("attack_generator");
-		if (GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID) != 3)
+		if (GrandBossManager.getInstance().getStatus(LINDVIOR_RAID) != 3)
 		{
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -660,7 +660,7 @@ public class Lindvior extends AbstractNpcAI
 				cancelQuestTimers("attack_generator");
 				_lindviorfake.setDead(true);
 				_lindviorfake.deleteMe();
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, FIGHTING);
 				_lionel = addSpawn(LIONEL_HUNTER, 42630, -48231, -792, 855, false, 0, false);
 				
 				_lindvior = (GrandBoss) addSpawn(LINDVIOR_GROUND, CENTER_LOCATION, false, 0, true);
@@ -682,7 +682,7 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 				break;
 			}
 			case "stage_1_activate_generator":
@@ -851,7 +851,7 @@ public class Lindvior extends AbstractNpcAI
 			_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, true));
 			_lionel.deleteMe();
 			
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, DEAD);
 			final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0b685d633b..c5153f516d 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index ff34c76a64..70d36f9c61 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -54,11 +54,11 @@ public class Daichir extends AbstractNpcAI
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+			final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOCATION, true);
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+				GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 			}
 			else
 			{
@@ -107,7 +107,7 @@ public class Daichir extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOCATION, true);
-						GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+						GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 					}
 				}
 			}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index b1bbe24b1a..c392c1abee 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -324,7 +324,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+		final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -334,12 +334,12 @@ public class Trasken extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 		}
 	}
 	
@@ -398,7 +398,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		_zoneLair.oustAllPlayers();
 		_zoneLair2.oustAllPlayers();
-		GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 	}
 	
 	@Override
@@ -575,7 +575,7 @@ public class Trasken extends AbstractNpcAI
 		{
 			case "unlock_trasken":
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 				break;
 			}
 			case "exitEarthWyrnCave":
@@ -604,7 +604,7 @@ public class Trasken extends AbstractNpcAI
 				ThreadPool.schedule(npc::decayMe, 10000);
 				cancelQuestTimer("finish", npc, null);
 				
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
+				GrandBossManager.getInstance().setStatus(TRASKEN, DEAD);
 				final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0528e31558..60ec4e0146 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = ZoneManager.getInstance().getZoneById(12010);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index add909d9b3..49319008fe 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 63e46356d2..f2c6d6ae29 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -204,7 +204,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index bea872a334..106815dd10 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,12 +107,12 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index ff1e43330f..50c14b79bb 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -69,7 +69,7 @@ public class Kekropus extends AbstractNpcAI
 			}
 			case "helios":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -132,7 +132,7 @@ public class Kekropus extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS, WAITING);
+					GrandBossManager.getInstance().setStatus(HELIOS, WAITING);
 					heliosAI().startQuestTimer("beginning", Config.HELIOS_WAIT_TIME * 60000, null, null);
 				}
 				break;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 8c0c562d71..00ebb5f34f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -341,7 +341,7 @@ public class Anakim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+		final int status = GrandBossManager.getInstance().getStatus(ANAKIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -351,12 +351,12 @@ public class Anakim extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 		}
 	}
 	
@@ -367,14 +367,14 @@ public class Anakim extends AbstractNpcAI
 		{
 			case "unlock_anakim":
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -463,9 +463,9 @@ public class Anakim extends AbstractNpcAI
 					}
 					remnant.deleteMe();
 				}
-				if (GrandBossManager.getInstance().getBossStatus(ANAKIM) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(ANAKIM) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				}
 				break;
 			}
@@ -483,7 +483,7 @@ public class Anakim extends AbstractNpcAI
 	{
 		if ((npc.getId() == ENTER_CUBIC) || (npc.getId() == ANAKIM_CUBIC))
 		{
-			final int _anakimStatus = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+			final int _anakimStatus = GrandBossManager.getInstance().getStatus(ANAKIM);
 			if ((npc.getId() == ENTER_CUBIC) && (_anakimStatus > ALIVE))
 			{
 				return "31101-01.html";
@@ -541,7 +541,7 @@ public class Anakim extends AbstractNpcAI
 			
 			if ((_anakimStatus == ALIVE) && (npc.getId() == ENTER_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, WAITING);
+				GrandBossManager.getInstance().setStatus(ANAKIM, WAITING);
 				_spawns.clear();
 				for (SpawnHolder spawn : SPAWNS)
 				{
@@ -554,7 +554,7 @@ public class Anakim extends AbstractNpcAI
 			}
 			else if ((_anakimStatus == WAITING) && (npc.getId() == ANAKIM_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ANAKIM, FIGHTING);
 				// Spawn the rb
 				_anakimBoss = addSpawn(ANAKIM, 185080, -12613, -5499, 16550, false, 0);
 				GrandBossManager.getInstance().addBoss((GrandBoss) _anakimBoss);
@@ -610,7 +610,7 @@ public class Anakim extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185082, -12606, -5499, 6133, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD);
+			GrandBossManager.getInstance().setStatus(ANAKIM, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 357351f632..4b94ea1007 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 8db07e79e9..36d70dc920 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI
 		addTalkId(STONE_COFFIN);
 		addFirstTalkId(ELF);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
-		final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
+		final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -115,12 +115,12 @@ public class Beleth extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 		}
 		DoorData.getInstance().getDoor(DOOR1).openMe();
 	}
@@ -132,7 +132,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			case "BELETH_UNLOCK":
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 				DoorData.getInstance().getDoor(DOOR1).openMe();
 				break;
 			}
@@ -509,7 +509,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				if ((_lastAttack + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+					GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -539,7 +539,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
-		if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) < FIGHT))
+		if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) < FIGHT))
 		{
 			if (_priest != null)
 			{
@@ -550,7 +550,7 @@ public class Beleth extends AbstractNpcAI
 				_stone.deleteMe();
 			}
 			
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
 			startQuestTimer("SPAWN1", Config.BELETH_WAIT_TIME * 60 * 1000, null, null);
 		}
 		
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			cancelQuestTimer("CHECK_ATTACK", null, null);
 			setBelethKiller(killer);
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
 			final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index 9ac3657157..e2770b5bec 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -53,7 +53,7 @@ public class Wormhole extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(BELETH);
+			final int status = GrandBossManager.getInstance().getStatus(BELETH);
 			if (status == 1)
 			{
 				return "33901-4.html";
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java
index de153239c4..344ad52a0a 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
 			
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index 0235b491b0..d6de973ec6 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -147,7 +147,7 @@ public class Helios extends AbstractNpcAI
 		_bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
-		final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+		final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -159,14 +159,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 			}
 		}
 		else
 		{
 			_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_tempHelios);
-			GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+			GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 		}
 	}
 	
@@ -329,14 +329,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 				break;
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(HELIOS3) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(HELIOS3) == WAITING)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, FIGHTING);
+					GrandBossManager.getInstance().setStatus(HELIOS3, FIGHTING);
 					_bossInstance = addSpawn(HELIOS1, HELIOS_SPAWN_LOC.getX(), HELIOS_SPAWN_LOC.getY(), HELIOS_SPAWN_LOC.getZ(), HELIOS_SPAWN_LOC.getHeading(), false, 0, false);
 					for (SpawnHolder spawn : SPAWNS_MINIONS)
 					{
@@ -348,12 +348,12 @@ public class Helios extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					_bossZone.oustAllPlayers();
 					Broadcast.toAllOnlinePlayers(new ExShowScreenMessage(NpcStringId.THE_HEROES_DRAINED_OF_THEIR_POWERS_HAVE_BEEN_BANISHED_FROM_THE_THRONE_OF_HELIOS_BY_HELIOS_POWERS, ExShowScreenMessage.TOP_CENTER, 10000, true));
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+					GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 					clean();
 				}
 				break;
@@ -481,7 +481,7 @@ public class Helios extends AbstractNpcAI
 			{
 				clean();
 				_bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true));
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD);
+				GrandBossManager.getInstance().setStatus(HELIOS3, DEAD);
 				final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index 27a44fc962..b94d17f47b 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -117,7 +117,7 @@ public class Kelbim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+		final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -129,14 +129,14 @@ public class Kelbim extends AbstractNpcAI
 			{
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
 			openDoor(DOOR1, 0);
 			openDoor(DOOR2, 0);
-			GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 		}
 	}
 	
@@ -147,7 +147,7 @@ public class Kelbim extends AbstractNpcAI
 		{
 			case "unlock_kelbim":
 			{
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 				Broadcast.toAllOnlinePlayers(new Earthquake(-55754, 59903, -269, 20, 10));
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
@@ -157,7 +157,7 @@ public class Kelbim extends AbstractNpcAI
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -183,7 +183,7 @@ public class Kelbim extends AbstractNpcAI
 			case "stage_1_start":
 			{
 				_bossStage = 1;
-				GrandBossManager.getInstance().setBossStatus(KELBIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(KELBIM, FIGHTING);
 				playMovie(ZONE.getPlayersInside(), Movie.SC_KELBIM_OPENING);
 				startQuestTimer("stage_1_kelbim_spawn", 25000, null, null);
 				break;
@@ -307,7 +307,7 @@ public class Kelbim extends AbstractNpcAI
 	{
 		if (npc.getId() == ENTER_DEVICE)
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+			final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 			if (status > ALIVE)
 			{
 				return "34052-1.html";
@@ -349,7 +349,7 @@ public class Kelbim extends AbstractNpcAI
 				{
 					if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
 					{
-						GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
+						GrandBossManager.getInstance().setStatus(KELBIM, WAITING);
 						startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
 						member.teleToLocation(KELBIM_LOCATION, true);
 					}
@@ -430,7 +430,7 @@ public class Kelbim extends AbstractNpcAI
 		notifyEvent("cancel_timers", null, null);
 		closeDoor(DOOR1, 0);
 		closeDoor(DOOR2, 0);
-		GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD);
+		GrandBossManager.getInstance().setStatus(KELBIM, DEAD);
 		final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
 		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index cabf3daedc..8d618ecd4f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -367,7 +367,7 @@ public class Lilith extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
-		final int status = GrandBossManager.getInstance().getBossStatus(LILITH);
+		final int status = GrandBossManager.getInstance().getStatus(LILITH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -377,12 +377,12 @@ public class Lilith extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+			GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 		}
 	}
 	
@@ -393,14 +393,14 @@ public class Lilith extends AbstractNpcAI
 		{
 			case "unlock_lilith":
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -489,9 +489,9 @@ public class Lilith extends AbstractNpcAI
 					}
 					remnant.deleteMe();
 				}
-				if (GrandBossManager.getInstance().getBossStatus(LILITH) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(LILITH) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				}
 				break;
 			}
@@ -509,7 +509,7 @@ public class Lilith extends AbstractNpcAI
 	{
 		if ((npc.getId() == ENTER_CUBIC) || (npc.getId() == LILITH_CUBIC))
 		{
-			final int _lilithStatus = GrandBossManager.getInstance().getBossStatus(LILITH);
+			final int _lilithStatus = GrandBossManager.getInstance().getStatus(LILITH);
 			if ((npc.getId() == ENTER_CUBIC) && (_lilithStatus > ALIVE))
 			{
 				return "31118-01.html";
@@ -567,7 +567,7 @@ public class Lilith extends AbstractNpcAI
 			
 			if ((_lilithStatus == ALIVE) && (npc.getId() == ENTER_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, WAITING);
+				GrandBossManager.getInstance().setStatus(LILITH, WAITING);
 				_spawns.clear();
 				for (SpawnHolder spawn : SPAWNS)
 				{
@@ -580,7 +580,7 @@ public class Lilith extends AbstractNpcAI
 			}
 			else if ((_lilithStatus == WAITING) && (npc.getId() == LILITH_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LILITH, FIGHTING);
 				// Spawn the rb
 				_lilithBoss = addSpawn(LILITH, 185062, -9605, -5499, 15640, false, 0);
 				GrandBossManager.getInstance().addBoss((GrandBoss) _lilithBoss);
@@ -626,7 +626,7 @@ public class Lilith extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185062, -9605, -5499, 15640, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(LILITH, DEAD);
+			GrandBossManager.getInstance().setStatus(LILITH, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 40890fc9dc..5b16c333e2 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -53,12 +53,12 @@ public class KatoSicanus extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(LINDVIOR_LOCATION, true);
 				addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 60000, false);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 			}
 			else
 			{
@@ -115,7 +115,7 @@ public class KatoSicanus extends AbstractNpcAI
 					{
 						member.teleToLocation(LINDVIOR_LOCATION, true);
 						addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);
-						GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+						GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 05475517a1..32dc16c33f 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -223,7 +223,7 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
-		final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+		final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -235,14 +235,14 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 			}
 		}
 		else
 		{
 			_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -428,9 +428,9 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair.oustAllPlayers();
 		_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, false));
 		cancelQuestTimers("attack_generator");
-		if (GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID) != 3)
+		if (GrandBossManager.getInstance().getStatus(LINDVIOR_RAID) != 3)
 		{
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -660,7 +660,7 @@ public class Lindvior extends AbstractNpcAI
 				cancelQuestTimers("attack_generator");
 				_lindviorfake.setDead(true);
 				_lindviorfake.deleteMe();
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, FIGHTING);
 				_lionel = addSpawn(LIONEL_HUNTER, 42630, -48231, -792, 855, false, 0, false);
 				
 				_lindvior = (GrandBoss) addSpawn(LINDVIOR_GROUND, CENTER_LOCATION, false, 0, true);
@@ -682,7 +682,7 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 				break;
 			}
 			case "stage_1_activate_generator":
@@ -851,7 +851,7 @@ public class Lindvior extends AbstractNpcAI
 			_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, true));
 			_lionel.deleteMe();
 			
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, DEAD);
 			final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0b685d633b..c5153f516d 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index ff34c76a64..70d36f9c61 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -54,11 +54,11 @@ public class Daichir extends AbstractNpcAI
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+			final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOCATION, true);
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+				GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 			}
 			else
 			{
@@ -107,7 +107,7 @@ public class Daichir extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOCATION, true);
-						GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+						GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 					}
 				}
 			}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index b1bbe24b1a..c392c1abee 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -324,7 +324,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+		final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -334,12 +334,12 @@ public class Trasken extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 		}
 	}
 	
@@ -398,7 +398,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		_zoneLair.oustAllPlayers();
 		_zoneLair2.oustAllPlayers();
-		GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 	}
 	
 	@Override
@@ -575,7 +575,7 @@ public class Trasken extends AbstractNpcAI
 		{
 			case "unlock_trasken":
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 				break;
 			}
 			case "exitEarthWyrnCave":
@@ -604,7 +604,7 @@ public class Trasken extends AbstractNpcAI
 				ThreadPool.schedule(npc::decayMe, 10000);
 				cancelQuestTimer("finish", npc, null);
 				
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
+				GrandBossManager.getInstance().setStatus(TRASKEN, DEAD);
 				final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0528e31558..60ec4e0146 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = ZoneManager.getInstance().getZoneById(12010);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index add909d9b3..49319008fe 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 63e46356d2..f2c6d6ae29 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -204,7 +204,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index bea872a334..106815dd10 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,12 +107,12 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index ff1e43330f..50c14b79bb 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -69,7 +69,7 @@ public class Kekropus extends AbstractNpcAI
 			}
 			case "helios":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -132,7 +132,7 @@ public class Kekropus extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS, WAITING);
+					GrandBossManager.getInstance().setStatus(HELIOS, WAITING);
 					heliosAI().startQuestTimer("beginning", Config.HELIOS_WAIT_TIME * 60000, null, null);
 				}
 				break;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 8c0c562d71..00ebb5f34f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -341,7 +341,7 @@ public class Anakim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+		final int status = GrandBossManager.getInstance().getStatus(ANAKIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -351,12 +351,12 @@ public class Anakim extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 		}
 	}
 	
@@ -367,14 +367,14 @@ public class Anakim extends AbstractNpcAI
 		{
 			case "unlock_anakim":
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -463,9 +463,9 @@ public class Anakim extends AbstractNpcAI
 					}
 					remnant.deleteMe();
 				}
-				if (GrandBossManager.getInstance().getBossStatus(ANAKIM) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(ANAKIM) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				}
 				break;
 			}
@@ -483,7 +483,7 @@ public class Anakim extends AbstractNpcAI
 	{
 		if ((npc.getId() == ENTER_CUBIC) || (npc.getId() == ANAKIM_CUBIC))
 		{
-			final int _anakimStatus = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+			final int _anakimStatus = GrandBossManager.getInstance().getStatus(ANAKIM);
 			if ((npc.getId() == ENTER_CUBIC) && (_anakimStatus > ALIVE))
 			{
 				return "31101-01.html";
@@ -541,7 +541,7 @@ public class Anakim extends AbstractNpcAI
 			
 			if ((_anakimStatus == ALIVE) && (npc.getId() == ENTER_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, WAITING);
+				GrandBossManager.getInstance().setStatus(ANAKIM, WAITING);
 				_spawns.clear();
 				for (SpawnHolder spawn : SPAWNS)
 				{
@@ -554,7 +554,7 @@ public class Anakim extends AbstractNpcAI
 			}
 			else if ((_anakimStatus == WAITING) && (npc.getId() == ANAKIM_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ANAKIM, FIGHTING);
 				// Spawn the rb
 				_anakimBoss = addSpawn(ANAKIM, 185080, -12613, -5499, 16550, false, 0);
 				GrandBossManager.getInstance().addBoss((GrandBoss) _anakimBoss);
@@ -610,7 +610,7 @@ public class Anakim extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185082, -12606, -5499, 6133, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD);
+			GrandBossManager.getInstance().setStatus(ANAKIM, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 7a7b195897..36aa0b9897 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 8db07e79e9..36d70dc920 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI
 		addTalkId(STONE_COFFIN);
 		addFirstTalkId(ELF);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
-		final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
+		final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -115,12 +115,12 @@ public class Beleth extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 		}
 		DoorData.getInstance().getDoor(DOOR1).openMe();
 	}
@@ -132,7 +132,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			case "BELETH_UNLOCK":
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 				DoorData.getInstance().getDoor(DOOR1).openMe();
 				break;
 			}
@@ -509,7 +509,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				if ((_lastAttack + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+					GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -539,7 +539,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
-		if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) < FIGHT))
+		if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) < FIGHT))
 		{
 			if (_priest != null)
 			{
@@ -550,7 +550,7 @@ public class Beleth extends AbstractNpcAI
 				_stone.deleteMe();
 			}
 			
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
 			startQuestTimer("SPAWN1", Config.BELETH_WAIT_TIME * 60 * 1000, null, null);
 		}
 		
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			cancelQuestTimer("CHECK_ATTACK", null, null);
 			setBelethKiller(killer);
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
 			final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index 9ac3657157..e2770b5bec 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -53,7 +53,7 @@ public class Wormhole extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(BELETH);
+			final int status = GrandBossManager.getInstance().getStatus(BELETH);
 			if (status == 1)
 			{
 				return "33901-4.html";
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java
index de153239c4..344ad52a0a 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
 			
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index 0235b491b0..d6de973ec6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -147,7 +147,7 @@ public class Helios extends AbstractNpcAI
 		_bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
-		final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+		final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -159,14 +159,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 			}
 		}
 		else
 		{
 			_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_tempHelios);
-			GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+			GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 		}
 	}
 	
@@ -329,14 +329,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 				break;
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(HELIOS3) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(HELIOS3) == WAITING)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, FIGHTING);
+					GrandBossManager.getInstance().setStatus(HELIOS3, FIGHTING);
 					_bossInstance = addSpawn(HELIOS1, HELIOS_SPAWN_LOC.getX(), HELIOS_SPAWN_LOC.getY(), HELIOS_SPAWN_LOC.getZ(), HELIOS_SPAWN_LOC.getHeading(), false, 0, false);
 					for (SpawnHolder spawn : SPAWNS_MINIONS)
 					{
@@ -348,12 +348,12 @@ public class Helios extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					_bossZone.oustAllPlayers();
 					Broadcast.toAllOnlinePlayers(new ExShowScreenMessage(NpcStringId.THE_HEROES_DRAINED_OF_THEIR_POWERS_HAVE_BEEN_BANISHED_FROM_THE_THRONE_OF_HELIOS_BY_HELIOS_POWERS, ExShowScreenMessage.TOP_CENTER, 10000, true));
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+					GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 					clean();
 				}
 				break;
@@ -481,7 +481,7 @@ public class Helios extends AbstractNpcAI
 			{
 				clean();
 				_bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true));
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD);
+				GrandBossManager.getInstance().setStatus(HELIOS3, DEAD);
 				final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index 27a44fc962..b94d17f47b 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -117,7 +117,7 @@ public class Kelbim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+		final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -129,14 +129,14 @@ public class Kelbim extends AbstractNpcAI
 			{
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
 			openDoor(DOOR1, 0);
 			openDoor(DOOR2, 0);
-			GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 		}
 	}
 	
@@ -147,7 +147,7 @@ public class Kelbim extends AbstractNpcAI
 		{
 			case "unlock_kelbim":
 			{
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 				Broadcast.toAllOnlinePlayers(new Earthquake(-55754, 59903, -269, 20, 10));
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
@@ -157,7 +157,7 @@ public class Kelbim extends AbstractNpcAI
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -183,7 +183,7 @@ public class Kelbim extends AbstractNpcAI
 			case "stage_1_start":
 			{
 				_bossStage = 1;
-				GrandBossManager.getInstance().setBossStatus(KELBIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(KELBIM, FIGHTING);
 				playMovie(ZONE.getPlayersInside(), Movie.SC_KELBIM_OPENING);
 				startQuestTimer("stage_1_kelbim_spawn", 25000, null, null);
 				break;
@@ -307,7 +307,7 @@ public class Kelbim extends AbstractNpcAI
 	{
 		if (npc.getId() == ENTER_DEVICE)
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+			final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 			if (status > ALIVE)
 			{
 				return "34052-1.html";
@@ -349,7 +349,7 @@ public class Kelbim extends AbstractNpcAI
 				{
 					if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
 					{
-						GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
+						GrandBossManager.getInstance().setStatus(KELBIM, WAITING);
 						startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
 						member.teleToLocation(KELBIM_LOCATION, true);
 					}
@@ -430,7 +430,7 @@ public class Kelbim extends AbstractNpcAI
 		notifyEvent("cancel_timers", null, null);
 		closeDoor(DOOR1, 0);
 		closeDoor(DOOR2, 0);
-		GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD);
+		GrandBossManager.getInstance().setStatus(KELBIM, DEAD);
 		final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
 		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index cabf3daedc..8d618ecd4f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -367,7 +367,7 @@ public class Lilith extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
-		final int status = GrandBossManager.getInstance().getBossStatus(LILITH);
+		final int status = GrandBossManager.getInstance().getStatus(LILITH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -377,12 +377,12 @@ public class Lilith extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+			GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 		}
 	}
 	
@@ -393,14 +393,14 @@ public class Lilith extends AbstractNpcAI
 		{
 			case "unlock_lilith":
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -489,9 +489,9 @@ public class Lilith extends AbstractNpcAI
 					}
 					remnant.deleteMe();
 				}
-				if (GrandBossManager.getInstance().getBossStatus(LILITH) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(LILITH) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				}
 				break;
 			}
@@ -509,7 +509,7 @@ public class Lilith extends AbstractNpcAI
 	{
 		if ((npc.getId() == ENTER_CUBIC) || (npc.getId() == LILITH_CUBIC))
 		{
-			final int _lilithStatus = GrandBossManager.getInstance().getBossStatus(LILITH);
+			final int _lilithStatus = GrandBossManager.getInstance().getStatus(LILITH);
 			if ((npc.getId() == ENTER_CUBIC) && (_lilithStatus > ALIVE))
 			{
 				return "31118-01.html";
@@ -567,7 +567,7 @@ public class Lilith extends AbstractNpcAI
 			
 			if ((_lilithStatus == ALIVE) && (npc.getId() == ENTER_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, WAITING);
+				GrandBossManager.getInstance().setStatus(LILITH, WAITING);
 				_spawns.clear();
 				for (SpawnHolder spawn : SPAWNS)
 				{
@@ -580,7 +580,7 @@ public class Lilith extends AbstractNpcAI
 			}
 			else if ((_lilithStatus == WAITING) && (npc.getId() == LILITH_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LILITH, FIGHTING);
 				// Spawn the rb
 				_lilithBoss = addSpawn(LILITH, 185062, -9605, -5499, 15640, false, 0);
 				GrandBossManager.getInstance().addBoss((GrandBoss) _lilithBoss);
@@ -626,7 +626,7 @@ public class Lilith extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185062, -9605, -5499, 15640, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(LILITH, DEAD);
+			GrandBossManager.getInstance().setStatus(LILITH, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 40890fc9dc..5b16c333e2 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -53,12 +53,12 @@ public class KatoSicanus extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(LINDVIOR_LOCATION, true);
 				addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 60000, false);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 			}
 			else
 			{
@@ -115,7 +115,7 @@ public class KatoSicanus extends AbstractNpcAI
 					{
 						member.teleToLocation(LINDVIOR_LOCATION, true);
 						addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);
-						GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+						GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 05475517a1..32dc16c33f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -223,7 +223,7 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
-		final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+		final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -235,14 +235,14 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 			}
 		}
 		else
 		{
 			_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -428,9 +428,9 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair.oustAllPlayers();
 		_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, false));
 		cancelQuestTimers("attack_generator");
-		if (GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID) != 3)
+		if (GrandBossManager.getInstance().getStatus(LINDVIOR_RAID) != 3)
 		{
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -660,7 +660,7 @@ public class Lindvior extends AbstractNpcAI
 				cancelQuestTimers("attack_generator");
 				_lindviorfake.setDead(true);
 				_lindviorfake.deleteMe();
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, FIGHTING);
 				_lionel = addSpawn(LIONEL_HUNTER, 42630, -48231, -792, 855, false, 0, false);
 				
 				_lindvior = (GrandBoss) addSpawn(LINDVIOR_GROUND, CENTER_LOCATION, false, 0, true);
@@ -682,7 +682,7 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 				break;
 			}
 			case "stage_1_activate_generator":
@@ -851,7 +851,7 @@ public class Lindvior extends AbstractNpcAI
 			_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, true));
 			_lionel.deleteMe();
 			
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, DEAD);
 			final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0b685d633b..c5153f516d 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index ff34c76a64..70d36f9c61 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -54,11 +54,11 @@ public class Daichir extends AbstractNpcAI
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+			final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOCATION, true);
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+				GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 			}
 			else
 			{
@@ -107,7 +107,7 @@ public class Daichir extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOCATION, true);
-						GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+						GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 					}
 				}
 			}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index b1bbe24b1a..c392c1abee 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -324,7 +324,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+		final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -334,12 +334,12 @@ public class Trasken extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 		}
 	}
 	
@@ -398,7 +398,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		_zoneLair.oustAllPlayers();
 		_zoneLair2.oustAllPlayers();
-		GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 	}
 	
 	@Override
@@ -575,7 +575,7 @@ public class Trasken extends AbstractNpcAI
 		{
 			case "unlock_trasken":
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 				break;
 			}
 			case "exitEarthWyrnCave":
@@ -604,7 +604,7 @@ public class Trasken extends AbstractNpcAI
 				ThreadPool.schedule(npc::decayMe, 10000);
 				cancelQuestTimer("finish", npc, null);
 				
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
+				GrandBossManager.getInstance().setStatus(TRASKEN, DEAD);
 				final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0528e31558..60ec4e0146 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = ZoneManager.getInstance().getZoneById(12010);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index add909d9b3..49319008fe 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 63e46356d2..f2c6d6ae29 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -204,7 +204,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 2f64b979bf..e685806718 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -41,11 +41,11 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 		for (int i = 0; i < count; i++)
 		{
 			final int bossId = packet.readD();
-			if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == RaidBossStatus.ALIVE)
+			if (DBSpawnManager.getInstance().getStatus(bossId) == RaidBossStatus.ALIVE)
 			{
 				_bossIds.add(bossId);
 			}
-			else if (GrandBossManager.getInstance().getBossStatus(bossId) == 0)
+			else if (GrandBossManager.getInstance().getStatus(bossId) == 0)
 			{
 				_bossIds.add(bossId);
 			}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index ff1e43330f..50c14b79bb 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -69,7 +69,7 @@ public class Kekropus extends AbstractNpcAI
 			}
 			case "helios":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -132,7 +132,7 @@ public class Kekropus extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS, WAITING);
+					GrandBossManager.getInstance().setStatus(HELIOS, WAITING);
 					heliosAI().startQuestTimer("beginning", Config.HELIOS_WAIT_TIME * 60000, null, null);
 				}
 				break;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 8c0c562d71..00ebb5f34f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -341,7 +341,7 @@ public class Anakim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+		final int status = GrandBossManager.getInstance().getStatus(ANAKIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -351,12 +351,12 @@ public class Anakim extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 		}
 	}
 	
@@ -367,14 +367,14 @@ public class Anakim extends AbstractNpcAI
 		{
 			case "unlock_anakim":
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -463,9 +463,9 @@ public class Anakim extends AbstractNpcAI
 					}
 					remnant.deleteMe();
 				}
-				if (GrandBossManager.getInstance().getBossStatus(ANAKIM) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(ANAKIM) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				}
 				break;
 			}
@@ -483,7 +483,7 @@ public class Anakim extends AbstractNpcAI
 	{
 		if ((npc.getId() == ENTER_CUBIC) || (npc.getId() == ANAKIM_CUBIC))
 		{
-			final int _anakimStatus = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+			final int _anakimStatus = GrandBossManager.getInstance().getStatus(ANAKIM);
 			if ((npc.getId() == ENTER_CUBIC) && (_anakimStatus > ALIVE))
 			{
 				return "31101-01.html";
@@ -541,7 +541,7 @@ public class Anakim extends AbstractNpcAI
 			
 			if ((_anakimStatus == ALIVE) && (npc.getId() == ENTER_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, WAITING);
+				GrandBossManager.getInstance().setStatus(ANAKIM, WAITING);
 				_spawns.clear();
 				for (SpawnHolder spawn : SPAWNS)
 				{
@@ -554,7 +554,7 @@ public class Anakim extends AbstractNpcAI
 			}
 			else if ((_anakimStatus == WAITING) && (npc.getId() == ANAKIM_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ANAKIM, FIGHTING);
 				// Spawn the rb
 				_anakimBoss = addSpawn(ANAKIM, 185080, -12613, -5499, 16550, false, 0);
 				GrandBossManager.getInstance().addBoss((GrandBoss) _anakimBoss);
@@ -610,7 +610,7 @@ public class Anakim extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185082, -12606, -5499, 6133, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD);
+			GrandBossManager.getInstance().setStatus(ANAKIM, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 7a7b195897..36aa0b9897 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 8db07e79e9..36d70dc920 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI
 		addTalkId(STONE_COFFIN);
 		addFirstTalkId(ELF);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
-		final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
+		final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -115,12 +115,12 @@ public class Beleth extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 		}
 		DoorData.getInstance().getDoor(DOOR1).openMe();
 	}
@@ -132,7 +132,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			case "BELETH_UNLOCK":
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 				DoorData.getInstance().getDoor(DOOR1).openMe();
 				break;
 			}
@@ -509,7 +509,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				if ((_lastAttack + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+					GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -539,7 +539,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
-		if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) < FIGHT))
+		if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) < FIGHT))
 		{
 			if (_priest != null)
 			{
@@ -550,7 +550,7 @@ public class Beleth extends AbstractNpcAI
 				_stone.deleteMe();
 			}
 			
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
 			startQuestTimer("SPAWN1", Config.BELETH_WAIT_TIME * 60 * 1000, null, null);
 		}
 		
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			cancelQuestTimer("CHECK_ATTACK", null, null);
 			setBelethKiller(killer);
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
 			final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index 9ac3657157..e2770b5bec 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -53,7 +53,7 @@ public class Wormhole extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(BELETH);
+			final int status = GrandBossManager.getInstance().getStatus(BELETH);
 			if (status == 1)
 			{
 				return "33901-4.html";
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java
index de153239c4..344ad52a0a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
 			
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index 0235b491b0..d6de973ec6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -147,7 +147,7 @@ public class Helios extends AbstractNpcAI
 		_bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
-		final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+		final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -159,14 +159,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 			}
 		}
 		else
 		{
 			_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_tempHelios);
-			GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+			GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 		}
 	}
 	
@@ -329,14 +329,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 				break;
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(HELIOS3) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(HELIOS3) == WAITING)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, FIGHTING);
+					GrandBossManager.getInstance().setStatus(HELIOS3, FIGHTING);
 					_bossInstance = addSpawn(HELIOS1, HELIOS_SPAWN_LOC.getX(), HELIOS_SPAWN_LOC.getY(), HELIOS_SPAWN_LOC.getZ(), HELIOS_SPAWN_LOC.getHeading(), false, 0, false);
 					for (SpawnHolder spawn : SPAWNS_MINIONS)
 					{
@@ -348,12 +348,12 @@ public class Helios extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					_bossZone.oustAllPlayers();
 					Broadcast.toAllOnlinePlayers(new ExShowScreenMessage(NpcStringId.THE_HEROES_DRAINED_OF_THEIR_POWERS_HAVE_BEEN_BANISHED_FROM_THE_THRONE_OF_HELIOS_BY_HELIOS_POWERS, ExShowScreenMessage.TOP_CENTER, 10000, true));
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+					GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 					clean();
 				}
 				break;
@@ -481,7 +481,7 @@ public class Helios extends AbstractNpcAI
 			{
 				clean();
 				_bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true));
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD);
+				GrandBossManager.getInstance().setStatus(HELIOS3, DEAD);
 				final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index 27a44fc962..b94d17f47b 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -117,7 +117,7 @@ public class Kelbim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+		final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -129,14 +129,14 @@ public class Kelbim extends AbstractNpcAI
 			{
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
 			openDoor(DOOR1, 0);
 			openDoor(DOOR2, 0);
-			GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 		}
 	}
 	
@@ -147,7 +147,7 @@ public class Kelbim extends AbstractNpcAI
 		{
 			case "unlock_kelbim":
 			{
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 				Broadcast.toAllOnlinePlayers(new Earthquake(-55754, 59903, -269, 20, 10));
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
@@ -157,7 +157,7 @@ public class Kelbim extends AbstractNpcAI
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -183,7 +183,7 @@ public class Kelbim extends AbstractNpcAI
 			case "stage_1_start":
 			{
 				_bossStage = 1;
-				GrandBossManager.getInstance().setBossStatus(KELBIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(KELBIM, FIGHTING);
 				playMovie(ZONE.getPlayersInside(), Movie.SC_KELBIM_OPENING);
 				startQuestTimer("stage_1_kelbim_spawn", 25000, null, null);
 				break;
@@ -307,7 +307,7 @@ public class Kelbim extends AbstractNpcAI
 	{
 		if (npc.getId() == ENTER_DEVICE)
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+			final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 			if (status > ALIVE)
 			{
 				return "34052-1.html";
@@ -349,7 +349,7 @@ public class Kelbim extends AbstractNpcAI
 				{
 					if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
 					{
-						GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
+						GrandBossManager.getInstance().setStatus(KELBIM, WAITING);
 						startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
 						member.teleToLocation(KELBIM_LOCATION, true);
 					}
@@ -430,7 +430,7 @@ public class Kelbim extends AbstractNpcAI
 		notifyEvent("cancel_timers", null, null);
 		closeDoor(DOOR1, 0);
 		closeDoor(DOOR2, 0);
-		GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD);
+		GrandBossManager.getInstance().setStatus(KELBIM, DEAD);
 		final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
 		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index cabf3daedc..8d618ecd4f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -367,7 +367,7 @@ public class Lilith extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
-		final int status = GrandBossManager.getInstance().getBossStatus(LILITH);
+		final int status = GrandBossManager.getInstance().getStatus(LILITH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -377,12 +377,12 @@ public class Lilith extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+			GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 		}
 	}
 	
@@ -393,14 +393,14 @@ public class Lilith extends AbstractNpcAI
 		{
 			case "unlock_lilith":
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -489,9 +489,9 @@ public class Lilith extends AbstractNpcAI
 					}
 					remnant.deleteMe();
 				}
-				if (GrandBossManager.getInstance().getBossStatus(LILITH) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(LILITH) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				}
 				break;
 			}
@@ -509,7 +509,7 @@ public class Lilith extends AbstractNpcAI
 	{
 		if ((npc.getId() == ENTER_CUBIC) || (npc.getId() == LILITH_CUBIC))
 		{
-			final int _lilithStatus = GrandBossManager.getInstance().getBossStatus(LILITH);
+			final int _lilithStatus = GrandBossManager.getInstance().getStatus(LILITH);
 			if ((npc.getId() == ENTER_CUBIC) && (_lilithStatus > ALIVE))
 			{
 				return "31118-01.html";
@@ -567,7 +567,7 @@ public class Lilith extends AbstractNpcAI
 			
 			if ((_lilithStatus == ALIVE) && (npc.getId() == ENTER_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, WAITING);
+				GrandBossManager.getInstance().setStatus(LILITH, WAITING);
 				_spawns.clear();
 				for (SpawnHolder spawn : SPAWNS)
 				{
@@ -580,7 +580,7 @@ public class Lilith extends AbstractNpcAI
 			}
 			else if ((_lilithStatus == WAITING) && (npc.getId() == LILITH_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LILITH, FIGHTING);
 				// Spawn the rb
 				_lilithBoss = addSpawn(LILITH, 185062, -9605, -5499, 15640, false, 0);
 				GrandBossManager.getInstance().addBoss((GrandBoss) _lilithBoss);
@@ -626,7 +626,7 @@ public class Lilith extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185062, -9605, -5499, 15640, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(LILITH, DEAD);
+			GrandBossManager.getInstance().setStatus(LILITH, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 40890fc9dc..5b16c333e2 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -53,12 +53,12 @@ public class KatoSicanus extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(LINDVIOR_LOCATION, true);
 				addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 60000, false);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 			}
 			else
 			{
@@ -115,7 +115,7 @@ public class KatoSicanus extends AbstractNpcAI
 					{
 						member.teleToLocation(LINDVIOR_LOCATION, true);
 						addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);
-						GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+						GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 05475517a1..32dc16c33f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -223,7 +223,7 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
-		final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+		final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -235,14 +235,14 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 			}
 		}
 		else
 		{
 			_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -428,9 +428,9 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair.oustAllPlayers();
 		_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, false));
 		cancelQuestTimers("attack_generator");
-		if (GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID) != 3)
+		if (GrandBossManager.getInstance().getStatus(LINDVIOR_RAID) != 3)
 		{
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -660,7 +660,7 @@ public class Lindvior extends AbstractNpcAI
 				cancelQuestTimers("attack_generator");
 				_lindviorfake.setDead(true);
 				_lindviorfake.deleteMe();
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, FIGHTING);
 				_lionel = addSpawn(LIONEL_HUNTER, 42630, -48231, -792, 855, false, 0, false);
 				
 				_lindvior = (GrandBoss) addSpawn(LINDVIOR_GROUND, CENTER_LOCATION, false, 0, true);
@@ -682,7 +682,7 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 				break;
 			}
 			case "stage_1_activate_generator":
@@ -851,7 +851,7 @@ public class Lindvior extends AbstractNpcAI
 			_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, true));
 			_lionel.deleteMe();
 			
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, DEAD);
 			final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0b685d633b..c5153f516d 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index ff34c76a64..70d36f9c61 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -54,11 +54,11 @@ public class Daichir extends AbstractNpcAI
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+			final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOCATION, true);
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+				GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 			}
 			else
 			{
@@ -107,7 +107,7 @@ public class Daichir extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOCATION, true);
-						GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+						GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 					}
 				}
 			}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index b1bbe24b1a..c392c1abee 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -324,7 +324,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+		final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -334,12 +334,12 @@ public class Trasken extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 		}
 	}
 	
@@ -398,7 +398,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		_zoneLair.oustAllPlayers();
 		_zoneLair2.oustAllPlayers();
-		GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 	}
 	
 	@Override
@@ -575,7 +575,7 @@ public class Trasken extends AbstractNpcAI
 		{
 			case "unlock_trasken":
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 				break;
 			}
 			case "exitEarthWyrnCave":
@@ -604,7 +604,7 @@ public class Trasken extends AbstractNpcAI
 				ThreadPool.schedule(npc::decayMe, 10000);
 				cancelQuestTimer("finish", npc, null);
 				
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
+				GrandBossManager.getInstance().setStatus(TRASKEN, DEAD);
 				final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0528e31558..60ec4e0146 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = ZoneManager.getInstance().getZoneById(12010);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index add909d9b3..49319008fe 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 63e46356d2..f2c6d6ae29 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -204,7 +204,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 2f64b979bf..e685806718 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -41,11 +41,11 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 		for (int i = 0; i < count; i++)
 		{
 			final int bossId = packet.readD();
-			if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == RaidBossStatus.ALIVE)
+			if (DBSpawnManager.getInstance().getStatus(bossId) == RaidBossStatus.ALIVE)
 			{
 				_bossIds.add(bossId);
 			}
-			else if (GrandBossManager.getInstance().getBossStatus(bossId) == 0)
+			else if (GrandBossManager.getInstance().getStatus(bossId) == 0)
 			{
 				_bossIds.add(bossId);
 			}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index ff1e43330f..50c14b79bb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -69,7 +69,7 @@ public class Kekropus extends AbstractNpcAI
 			}
 			case "helios":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -132,7 +132,7 @@ public class Kekropus extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS, WAITING);
+					GrandBossManager.getInstance().setStatus(HELIOS, WAITING);
 					heliosAI().startQuestTimer("beginning", Config.HELIOS_WAIT_TIME * 60000, null, null);
 				}
 				break;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index bf7ab3400a..92b4915758 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -51,11 +51,11 @@ public class Erda extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(ETINA_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(ETINA_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOC, true);
-				GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+				GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 			}
 			else
 			{
@@ -104,7 +104,7 @@ public class Erda extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOC, false);
-						GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+						GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 8c0c562d71..00ebb5f34f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -341,7 +341,7 @@ public class Anakim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+		final int status = GrandBossManager.getInstance().getStatus(ANAKIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -351,12 +351,12 @@ public class Anakim extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 		}
 	}
 	
@@ -367,14 +367,14 @@ public class Anakim extends AbstractNpcAI
 		{
 			case "unlock_anakim":
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -463,9 +463,9 @@ public class Anakim extends AbstractNpcAI
 					}
 					remnant.deleteMe();
 				}
-				if (GrandBossManager.getInstance().getBossStatus(ANAKIM) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(ANAKIM) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				}
 				break;
 			}
@@ -483,7 +483,7 @@ public class Anakim extends AbstractNpcAI
 	{
 		if ((npc.getId() == ENTER_CUBIC) || (npc.getId() == ANAKIM_CUBIC))
 		{
-			final int _anakimStatus = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+			final int _anakimStatus = GrandBossManager.getInstance().getStatus(ANAKIM);
 			if ((npc.getId() == ENTER_CUBIC) && (_anakimStatus > ALIVE))
 			{
 				return "31101-01.html";
@@ -541,7 +541,7 @@ public class Anakim extends AbstractNpcAI
 			
 			if ((_anakimStatus == ALIVE) && (npc.getId() == ENTER_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, WAITING);
+				GrandBossManager.getInstance().setStatus(ANAKIM, WAITING);
 				_spawns.clear();
 				for (SpawnHolder spawn : SPAWNS)
 				{
@@ -554,7 +554,7 @@ public class Anakim extends AbstractNpcAI
 			}
 			else if ((_anakimStatus == WAITING) && (npc.getId() == ANAKIM_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ANAKIM, FIGHTING);
 				// Spawn the rb
 				_anakimBoss = addSpawn(ANAKIM, 185080, -12613, -5499, 16550, false, 0);
 				GrandBossManager.getInstance().addBoss((GrandBoss) _anakimBoss);
@@ -610,7 +610,7 @@ public class Anakim extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185082, -12606, -5499, 6133, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD);
+			GrandBossManager.getInstance().setStatus(ANAKIM, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 7a7b195897..36aa0b9897 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 8db07e79e9..36d70dc920 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI
 		addTalkId(STONE_COFFIN);
 		addFirstTalkId(ELF);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
-		final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
+		final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -115,12 +115,12 @@ public class Beleth extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 		}
 		DoorData.getInstance().getDoor(DOOR1).openMe();
 	}
@@ -132,7 +132,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			case "BELETH_UNLOCK":
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 				DoorData.getInstance().getDoor(DOOR1).openMe();
 				break;
 			}
@@ -509,7 +509,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				if ((_lastAttack + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+					GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -539,7 +539,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
-		if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) < FIGHT))
+		if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) < FIGHT))
 		{
 			if (_priest != null)
 			{
@@ -550,7 +550,7 @@ public class Beleth extends AbstractNpcAI
 				_stone.deleteMe();
 			}
 			
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
 			startQuestTimer("SPAWN1", Config.BELETH_WAIT_TIME * 60 * 1000, null, null);
 		}
 		
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			cancelQuestTimer("CHECK_ATTACK", null, null);
 			setBelethKiller(killer);
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
 			final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index 9ac3657157..e2770b5bec 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -53,7 +53,7 @@ public class Wormhole extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(BELETH);
+			final int status = GrandBossManager.getInstance().getStatus(BELETH);
 			if (status == 1)
 			{
 				return "33901-4.html";
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java
index de153239c4..344ad52a0a 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
 			
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index 00c7e9bea0..f8c473c6cb 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -328,7 +328,7 @@ public class EtisVanEtina extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
-		final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1);
+		final int status = GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -338,12 +338,12 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 			}
 		}
 		else
 		{
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 		}
 	}
 	
@@ -354,16 +354,16 @@ public class EtisVanEtina extends AbstractNpcAI
 		{
 			case "unlock_etina":
 			{
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE)
+					if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE)
 					{
-						GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+						GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 					}
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
@@ -381,7 +381,7 @@ public class EtisVanEtina extends AbstractNpcAI
 					}
 					startQuestTimer("end_etina", 2000, null, null);
 				}
-				else if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == FIGHTING)
+				else if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == FIGHTING)
 				{
 					startQuestTimer("check_activity_task", 60000, null, null);
 				}
@@ -505,9 +505,9 @@ public class EtisVanEtina extends AbstractNpcAI
 		closeDoor(DOOR2, 0);
 		closeDoor(DOOR3, 0);
 		closeDoor(DOOR4, 0);
-		if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE))
+		if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE))
 		{
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 		}
 	}
 	
@@ -680,7 +680,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				_collapseTask.cancel(true);
 				_collapseTask = null;
 			}
-			if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
+			if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
 			{
 				_spawned = true;
 				_spawns.clear();
@@ -696,7 +696,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				_paragon = (Monster) addSpawn(PARAGON, PARAGON_LOC);
 				_paragon.setInvul(true);
 				BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true)));
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, FIGHTING);
 				_lastAction = System.currentTimeMillis();
 				startQuestTimer("check_activity_task", 60000, null, null);
 			}
@@ -726,7 +726,7 @@ public class EtisVanEtina extends AbstractNpcAI
 		{
 			notifyEvent("cancel_timers", null, null);
 			BOSS_ZONE.getPlayersInside().forEach(player -> playMovie(player, Movie.SC_ETIS_VAN_ETINA_ENDING));
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, DEAD);
 			final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index 0235b491b0..d6de973ec6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -147,7 +147,7 @@ public class Helios extends AbstractNpcAI
 		_bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
-		final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+		final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -159,14 +159,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 			}
 		}
 		else
 		{
 			_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_tempHelios);
-			GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+			GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 		}
 	}
 	
@@ -329,14 +329,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 				break;
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(HELIOS3) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(HELIOS3) == WAITING)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, FIGHTING);
+					GrandBossManager.getInstance().setStatus(HELIOS3, FIGHTING);
 					_bossInstance = addSpawn(HELIOS1, HELIOS_SPAWN_LOC.getX(), HELIOS_SPAWN_LOC.getY(), HELIOS_SPAWN_LOC.getZ(), HELIOS_SPAWN_LOC.getHeading(), false, 0, false);
 					for (SpawnHolder spawn : SPAWNS_MINIONS)
 					{
@@ -348,12 +348,12 @@ public class Helios extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					_bossZone.oustAllPlayers();
 					Broadcast.toAllOnlinePlayers(new ExShowScreenMessage(NpcStringId.THE_HEROES_DRAINED_OF_THEIR_POWERS_HAVE_BEEN_BANISHED_FROM_THE_THRONE_OF_HELIOS_BY_HELIOS_POWERS, ExShowScreenMessage.TOP_CENTER, 10000, true));
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+					GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 					clean();
 				}
 				break;
@@ -481,7 +481,7 @@ public class Helios extends AbstractNpcAI
 			{
 				clean();
 				_bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true));
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD);
+				GrandBossManager.getInstance().setStatus(HELIOS3, DEAD);
 				final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index 27a44fc962..b94d17f47b 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -117,7 +117,7 @@ public class Kelbim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+		final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -129,14 +129,14 @@ public class Kelbim extends AbstractNpcAI
 			{
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
 			openDoor(DOOR1, 0);
 			openDoor(DOOR2, 0);
-			GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 		}
 	}
 	
@@ -147,7 +147,7 @@ public class Kelbim extends AbstractNpcAI
 		{
 			case "unlock_kelbim":
 			{
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 				Broadcast.toAllOnlinePlayers(new Earthquake(-55754, 59903, -269, 20, 10));
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
@@ -157,7 +157,7 @@ public class Kelbim extends AbstractNpcAI
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -183,7 +183,7 @@ public class Kelbim extends AbstractNpcAI
 			case "stage_1_start":
 			{
 				_bossStage = 1;
-				GrandBossManager.getInstance().setBossStatus(KELBIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(KELBIM, FIGHTING);
 				playMovie(ZONE.getPlayersInside(), Movie.SC_KELBIM_OPENING);
 				startQuestTimer("stage_1_kelbim_spawn", 25000, null, null);
 				break;
@@ -307,7 +307,7 @@ public class Kelbim extends AbstractNpcAI
 	{
 		if (npc.getId() == ENTER_DEVICE)
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+			final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 			if (status > ALIVE)
 			{
 				return "34052-1.html";
@@ -349,7 +349,7 @@ public class Kelbim extends AbstractNpcAI
 				{
 					if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
 					{
-						GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
+						GrandBossManager.getInstance().setStatus(KELBIM, WAITING);
 						startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
 						member.teleToLocation(KELBIM_LOCATION, true);
 					}
@@ -430,7 +430,7 @@ public class Kelbim extends AbstractNpcAI
 		notifyEvent("cancel_timers", null, null);
 		closeDoor(DOOR1, 0);
 		closeDoor(DOOR2, 0);
-		GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD);
+		GrandBossManager.getInstance().setStatus(KELBIM, DEAD);
 		final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
 		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index cabf3daedc..8d618ecd4f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -367,7 +367,7 @@ public class Lilith extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
-		final int status = GrandBossManager.getInstance().getBossStatus(LILITH);
+		final int status = GrandBossManager.getInstance().getStatus(LILITH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -377,12 +377,12 @@ public class Lilith extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+			GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 		}
 	}
 	
@@ -393,14 +393,14 @@ public class Lilith extends AbstractNpcAI
 		{
 			case "unlock_lilith":
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -489,9 +489,9 @@ public class Lilith extends AbstractNpcAI
 					}
 					remnant.deleteMe();
 				}
-				if (GrandBossManager.getInstance().getBossStatus(LILITH) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(LILITH) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				}
 				break;
 			}
@@ -509,7 +509,7 @@ public class Lilith extends AbstractNpcAI
 	{
 		if ((npc.getId() == ENTER_CUBIC) || (npc.getId() == LILITH_CUBIC))
 		{
-			final int _lilithStatus = GrandBossManager.getInstance().getBossStatus(LILITH);
+			final int _lilithStatus = GrandBossManager.getInstance().getStatus(LILITH);
 			if ((npc.getId() == ENTER_CUBIC) && (_lilithStatus > ALIVE))
 			{
 				return "31118-01.html";
@@ -567,7 +567,7 @@ public class Lilith extends AbstractNpcAI
 			
 			if ((_lilithStatus == ALIVE) && (npc.getId() == ENTER_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, WAITING);
+				GrandBossManager.getInstance().setStatus(LILITH, WAITING);
 				_spawns.clear();
 				for (SpawnHolder spawn : SPAWNS)
 				{
@@ -580,7 +580,7 @@ public class Lilith extends AbstractNpcAI
 			}
 			else if ((_lilithStatus == WAITING) && (npc.getId() == LILITH_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(LILITH, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LILITH, FIGHTING);
 				// Spawn the rb
 				_lilithBoss = addSpawn(LILITH, 185062, -9605, -5499, 15640, false, 0);
 				GrandBossManager.getInstance().addBoss((GrandBoss) _lilithBoss);
@@ -626,7 +626,7 @@ public class Lilith extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185062, -9605, -5499, 15640, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(LILITH, DEAD);
+			GrandBossManager.getInstance().setStatus(LILITH, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 40890fc9dc..5b16c333e2 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -53,12 +53,12 @@ public class KatoSicanus extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(LINDVIOR_LOCATION, true);
 				addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 60000, false);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 			}
 			else
 			{
@@ -115,7 +115,7 @@ public class KatoSicanus extends AbstractNpcAI
 					{
 						member.teleToLocation(LINDVIOR_LOCATION, true);
 						addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);
-						GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+						GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 05475517a1..32dc16c33f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -223,7 +223,7 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
-		final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+		final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -235,14 +235,14 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 			}
 		}
 		else
 		{
 			_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -428,9 +428,9 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair.oustAllPlayers();
 		_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, false));
 		cancelQuestTimers("attack_generator");
-		if (GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID) != 3)
+		if (GrandBossManager.getInstance().getStatus(LINDVIOR_RAID) != 3)
 		{
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -660,7 +660,7 @@ public class Lindvior extends AbstractNpcAI
 				cancelQuestTimers("attack_generator");
 				_lindviorfake.setDead(true);
 				_lindviorfake.deleteMe();
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, FIGHTING);
 				_lionel = addSpawn(LIONEL_HUNTER, 42630, -48231, -792, 855, false, 0, false);
 				
 				_lindvior = (GrandBoss) addSpawn(LINDVIOR_GROUND, CENTER_LOCATION, false, 0, true);
@@ -682,7 +682,7 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 				break;
 			}
 			case "stage_1_activate_generator":
@@ -851,7 +851,7 @@ public class Lindvior extends AbstractNpcAI
 			_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, true));
 			_lionel.deleteMe();
 			
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, DEAD);
 			final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 50a6e42559..c856b7e7ad 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -84,7 +84,7 @@ public class Orfen extends AbstractNpcAI
 		};
 		registerMobs(mobs);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -99,7 +99,7 @@ public class Orfen extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn Orfen.
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -146,7 +146,7 @@ public class Orfen extends AbstractNpcAI
 		if (event.equalsIgnoreCase("orfen_unlock"))
 		{
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_minion_loc"))
@@ -302,7 +302,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -315,7 +315,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index ff34c76a64..70d36f9c61 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -54,11 +54,11 @@ public class Daichir extends AbstractNpcAI
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+			final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOCATION, true);
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+				GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 			}
 			else
 			{
@@ -107,7 +107,7 @@ public class Daichir extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOCATION, true);
-						GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+						GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 					}
 				}
 			}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index b1bbe24b1a..c392c1abee 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -324,7 +324,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+		final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -334,12 +334,12 @@ public class Trasken extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 		}
 	}
 	
@@ -398,7 +398,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		_zoneLair.oustAllPlayers();
 		_zoneLair2.oustAllPlayers();
-		GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 	}
 	
 	@Override
@@ -575,7 +575,7 @@ public class Trasken extends AbstractNpcAI
 		{
 			case "unlock_trasken":
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 				break;
 			}
 			case "exitEarthWyrnCave":
@@ -604,7 +604,7 @@ public class Trasken extends AbstractNpcAI
 				ThreadPool.schedule(npc::decayMe, 10000);
 				cancelQuestTimer("finish", npc, null);
 				
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
+				GrandBossManager.getInstance().setStatus(TRASKEN, DEAD);
 				final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0528e31558..60ec4e0146 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = ZoneManager.getInstance().getZoneById(12010);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index add909d9b3..49319008fe 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 63e46356d2..f2c6d6ae29 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -204,7 +204,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 2f64b979bf..e685806718 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -41,11 +41,11 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 		for (int i = 0; i < count; i++)
 		{
 			final int bossId = packet.readD();
-			if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == RaidBossStatus.ALIVE)
+			if (DBSpawnManager.getInstance().getStatus(bossId) == RaidBossStatus.ALIVE)
 			{
 				_bossIds.add(bossId);
 			}
-			else if (GrandBossManager.getInstance().getBossStatus(bossId) == 0)
+			else if (GrandBossManager.getInstance().getStatus(bossId) == 0)
 			{
 				_bossIds.add(bossId);
 			}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index ff1e43330f..50c14b79bb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -69,7 +69,7 @@ public class Kekropus extends AbstractNpcAI
 			}
 			case "helios":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -132,7 +132,7 @@ public class Kekropus extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS, WAITING);
+					GrandBossManager.getInstance().setStatus(HELIOS, WAITING);
 					heliosAI().startQuestTimer("beginning", Config.HELIOS_WAIT_TIME * 60000, null, null);
 				}
 				break;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index bf7ab3400a..92b4915758 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -51,11 +51,11 @@ public class Erda extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(ETINA_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(ETINA_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOC, true);
-				GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+				GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 			}
 			else
 			{
@@ -104,7 +104,7 @@ public class Erda extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOC, false);
-						GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+						GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 0ce3b63fe1..a4a93ce801 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -90,7 +90,7 @@ public class Anakim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+		final int status = GrandBossManager.getInstance().getStatus(ANAKIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -102,14 +102,14 @@ public class Anakim extends AbstractNpcAI
 			{
 				_anakimTemp = (GrandBoss) addSpawn(ANAKIM, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_anakimTemp);
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 			}
 		}
 		else
 		{
 			_anakimTemp = (GrandBoss) addSpawn(ANAKIM, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_anakimTemp);
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 		}
 	}
 	
@@ -122,14 +122,14 @@ public class Anakim extends AbstractNpcAI
 			{
 				_anakimTemp = (GrandBoss) addSpawn(ANAKIM, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_anakimTemp);
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -175,9 +175,9 @@ public class Anakim extends AbstractNpcAI
 					_anakimBoss.deleteMe();
 				}
 				BOSS_ZONE.oustAllPlayers();
-				if (GrandBossManager.getInstance().getBossStatus(ANAKIM) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(ANAKIM) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				}
 				break;
 			}
@@ -195,7 +195,7 @@ public class Anakim extends AbstractNpcAI
 	{
 		if (npc.getId() == ANAKIM_CUBIC)
 		{
-			final int _anakimStatus = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+			final int _anakimStatus = GrandBossManager.getInstance().getStatus(ANAKIM);
 			if (_anakimStatus > ALIVE)
 			{
 				return "31101-01.html";
@@ -248,7 +248,7 @@ public class Anakim extends AbstractNpcAI
 			
 			if ((_anakimStatus == ALIVE) && (npc.getId() == ANAKIM_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ANAKIM, FIGHTING);
 				// Spawn the rb
 				_anakimBoss = addSpawn(ANAKIM, 185080, -12613, -5499, 16550, false, 0);
 				GrandBossManager.getInstance().addBoss((GrandBoss) _anakimBoss);
@@ -296,7 +296,7 @@ public class Anakim extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185082, -12606, -5499, 6133, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD);
+			GrandBossManager.getInstance().setStatus(ANAKIM, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 7a7b195897..36aa0b9897 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 8db07e79e9..36d70dc920 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI
 		addTalkId(STONE_COFFIN);
 		addFirstTalkId(ELF);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
-		final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
+		final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -115,12 +115,12 @@ public class Beleth extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 		}
 		DoorData.getInstance().getDoor(DOOR1).openMe();
 	}
@@ -132,7 +132,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			case "BELETH_UNLOCK":
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 				DoorData.getInstance().getDoor(DOOR1).openMe();
 				break;
 			}
@@ -509,7 +509,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				if ((_lastAttack + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+					GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -539,7 +539,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
-		if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) < FIGHT))
+		if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) < FIGHT))
 		{
 			if (_priest != null)
 			{
@@ -550,7 +550,7 @@ public class Beleth extends AbstractNpcAI
 				_stone.deleteMe();
 			}
 			
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
 			startQuestTimer("SPAWN1", Config.BELETH_WAIT_TIME * 60 * 1000, null, null);
 		}
 		
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			cancelQuestTimer("CHECK_ATTACK", null, null);
 			setBelethKiller(killer);
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
 			final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index 9ac3657157..e2770b5bec 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -53,7 +53,7 @@ public class Wormhole extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(BELETH);
+			final int status = GrandBossManager.getInstance().getStatus(BELETH);
 			if (status == 1)
 			{
 				return "33901-4.html";
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java
index de153239c4..344ad52a0a 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
 			
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index 00c7e9bea0..f8c473c6cb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -328,7 +328,7 @@ public class EtisVanEtina extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
-		final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1);
+		final int status = GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -338,12 +338,12 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 			}
 		}
 		else
 		{
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 		}
 	}
 	
@@ -354,16 +354,16 @@ public class EtisVanEtina extends AbstractNpcAI
 		{
 			case "unlock_etina":
 			{
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE)
+					if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE)
 					{
-						GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+						GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 					}
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
@@ -381,7 +381,7 @@ public class EtisVanEtina extends AbstractNpcAI
 					}
 					startQuestTimer("end_etina", 2000, null, null);
 				}
-				else if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == FIGHTING)
+				else if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == FIGHTING)
 				{
 					startQuestTimer("check_activity_task", 60000, null, null);
 				}
@@ -505,9 +505,9 @@ public class EtisVanEtina extends AbstractNpcAI
 		closeDoor(DOOR2, 0);
 		closeDoor(DOOR3, 0);
 		closeDoor(DOOR4, 0);
-		if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE))
+		if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE))
 		{
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 		}
 	}
 	
@@ -680,7 +680,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				_collapseTask.cancel(true);
 				_collapseTask = null;
 			}
-			if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
+			if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
 			{
 				_spawned = true;
 				_spawns.clear();
@@ -696,7 +696,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				_paragon = (Monster) addSpawn(PARAGON, PARAGON_LOC);
 				_paragon.setInvul(true);
 				BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true)));
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, FIGHTING);
 				_lastAction = System.currentTimeMillis();
 				startQuestTimer("check_activity_task", 60000, null, null);
 			}
@@ -726,7 +726,7 @@ public class EtisVanEtina extends AbstractNpcAI
 		{
 			notifyEvent("cancel_timers", null, null);
 			BOSS_ZONE.getPlayersInside().forEach(player -> playMovie(player, Movie.SC_ETIS_VAN_ETINA_ENDING));
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, DEAD);
 			final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index 205fe31ebf..d129e19b72 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -81,7 +81,7 @@ public class Fafurion extends AbstractNpcAI
 		addKillId(FAFURION_STAGE_1, FAFURION_STAGE_2, FAFURION_STAGE_3, FAFURION_STAGE_4, FAFURION_STAGE_5, FAFURION_STAGE_6, FAFURION_STAGE_7);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
-		final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+		final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -93,14 +93,14 @@ public class Fafurion extends AbstractNpcAI
 			{
 				final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(fafurion);
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 			}
 		}
 		else
 		{
 			final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(fafurion);
-			GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+			GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 		}
 	}
 	
@@ -114,7 +114,7 @@ public class Fafurion extends AbstractNpcAI
 			{
 				final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(fafurion);
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 				break;
 			}
 			case "warning":
@@ -131,7 +131,7 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID) == WAITING)
 				{
 					// checking fafurion stage.
 					_stage = GlobalVariablesManager.getInstance().getInt("Fafurion_Stage", 1);
@@ -139,7 +139,7 @@ public class Fafurion extends AbstractNpcAI
 					{
 						playMovie(p, Movie.SC_FAFURION_INTRO);
 					});
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
 					switch (_stage)
 					{
 						case 1:
@@ -184,14 +184,14 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+				final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					for (Player plr : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 5000))
 					{
 						plr.sendPacket(new ExShowScreenMessage(NpcStringId.EXCEEDED_THE_FAFURION_S_NEST_RAID_TIME_LIMIT, ExShowScreenMessage.TOP_CENTER, 10000, true));
 					}
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 					FAFURION_ZONE.oustAllPlayers();
 					npc.deleteMe();
 					if (_stage > 1)
@@ -204,7 +204,7 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "enter_area":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+				final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -263,7 +263,7 @@ public class Fafurion extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, WAITING);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, WAITING);
 					startQuestTimer("beginning", Config.FAFURION_WAIT_TIME * 60000, null, null);
 					startQuestTimer("warning", Config.FAFURION_WAIT_TIME > 0 ? (Config.FAFURION_WAIT_TIME * 60000) - 30000 : 0, null, player);
 				}
@@ -446,7 +446,7 @@ public class Fafurion extends AbstractNpcAI
 				p.sendPacket(new ExShowScreenMessage(NpcStringId.HONORED_WARRIORS_HAVE_DEFEATED_THE_WATER_DRAGON_FAFURION, ExShowScreenMessage.TOP_CENTER, 20000, true));
 			});
 			
-			GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD);
+			GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, DEAD);
 			final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index 0235b491b0..d6de973ec6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -147,7 +147,7 @@ public class Helios extends AbstractNpcAI
 		_bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
-		final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+		final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -159,14 +159,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 			}
 		}
 		else
 		{
 			_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_tempHelios);
-			GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+			GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 		}
 	}
 	
@@ -329,14 +329,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 				break;
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(HELIOS3) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(HELIOS3) == WAITING)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, FIGHTING);
+					GrandBossManager.getInstance().setStatus(HELIOS3, FIGHTING);
 					_bossInstance = addSpawn(HELIOS1, HELIOS_SPAWN_LOC.getX(), HELIOS_SPAWN_LOC.getY(), HELIOS_SPAWN_LOC.getZ(), HELIOS_SPAWN_LOC.getHeading(), false, 0, false);
 					for (SpawnHolder spawn : SPAWNS_MINIONS)
 					{
@@ -348,12 +348,12 @@ public class Helios extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					_bossZone.oustAllPlayers();
 					Broadcast.toAllOnlinePlayers(new ExShowScreenMessage(NpcStringId.THE_HEROES_DRAINED_OF_THEIR_POWERS_HAVE_BEEN_BANISHED_FROM_THE_THRONE_OF_HELIOS_BY_HELIOS_POWERS, ExShowScreenMessage.TOP_CENTER, 10000, true));
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+					GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 					clean();
 				}
 				break;
@@ -481,7 +481,7 @@ public class Helios extends AbstractNpcAI
 			{
 				clean();
 				_bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true));
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD);
+				GrandBossManager.getInstance().setStatus(HELIOS3, DEAD);
 				final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index 27a44fc962..b94d17f47b 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -117,7 +117,7 @@ public class Kelbim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+		final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -129,14 +129,14 @@ public class Kelbim extends AbstractNpcAI
 			{
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
 			openDoor(DOOR1, 0);
 			openDoor(DOOR2, 0);
-			GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 		}
 	}
 	
@@ -147,7 +147,7 @@ public class Kelbim extends AbstractNpcAI
 		{
 			case "unlock_kelbim":
 			{
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 				Broadcast.toAllOnlinePlayers(new Earthquake(-55754, 59903, -269, 20, 10));
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
@@ -157,7 +157,7 @@ public class Kelbim extends AbstractNpcAI
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -183,7 +183,7 @@ public class Kelbim extends AbstractNpcAI
 			case "stage_1_start":
 			{
 				_bossStage = 1;
-				GrandBossManager.getInstance().setBossStatus(KELBIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(KELBIM, FIGHTING);
 				playMovie(ZONE.getPlayersInside(), Movie.SC_KELBIM_OPENING);
 				startQuestTimer("stage_1_kelbim_spawn", 25000, null, null);
 				break;
@@ -307,7 +307,7 @@ public class Kelbim extends AbstractNpcAI
 	{
 		if (npc.getId() == ENTER_DEVICE)
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+			final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 			if (status > ALIVE)
 			{
 				return "34052-1.html";
@@ -349,7 +349,7 @@ public class Kelbim extends AbstractNpcAI
 				{
 					if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
 					{
-						GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
+						GrandBossManager.getInstance().setStatus(KELBIM, WAITING);
 						startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
 						member.teleToLocation(KELBIM_LOCATION, true);
 					}
@@ -430,7 +430,7 @@ public class Kelbim extends AbstractNpcAI
 		notifyEvent("cancel_timers", null, null);
 		closeDoor(DOOR1, 0);
 		closeDoor(DOOR2, 0);
-		GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD);
+		GrandBossManager.getInstance().setStatus(KELBIM, DEAD);
 		final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
 		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 88c871b9ab..9199e144f3 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -89,7 +89,7 @@ public class Lilith extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
-		final int status = GrandBossManager.getInstance().getBossStatus(LILITH);
+		final int status = GrandBossManager.getInstance().getStatus(LILITH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -101,14 +101,14 @@ public class Lilith extends AbstractNpcAI
 			{
 				_tempLilith = (GrandBoss) addSpawn(LILITH, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempLilith);
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 			}
 		}
 		else
 		{
 			_tempLilith = (GrandBoss) addSpawn(LILITH, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_tempLilith);
-			GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+			GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 		}
 	}
 	
@@ -121,14 +121,14 @@ public class Lilith extends AbstractNpcAI
 			{
 				_tempLilith = (GrandBoss) addSpawn(LILITH, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempLilith);
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -175,9 +175,9 @@ public class Lilith extends AbstractNpcAI
 				}
 				BOSS_ZONE.oustAllPlayers();
 				PRE_LILITH_ZONE.oustAllPlayers();
-				if (GrandBossManager.getInstance().getBossStatus(LILITH) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(LILITH) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				}
 				break;
 			}
@@ -193,7 +193,7 @@ public class Lilith extends AbstractNpcAI
 	@Override
 	public String onTalk(Npc npc, Player player)
 	{
-		final int _lilithStatus = GrandBossManager.getInstance().getBossStatus(LILITH);
+		final int _lilithStatus = GrandBossManager.getInstance().getStatus(LILITH);
 		if ((npc.getId() == LILITH_CUBIC) && (_lilithStatus > ALIVE))
 		{
 			return "31118-01.html";
@@ -246,7 +246,7 @@ public class Lilith extends AbstractNpcAI
 		
 		if ((_lilithStatus == ALIVE) && (npc.getId() == LILITH_CUBIC))
 		{
-			GrandBossManager.getInstance().setBossStatus(LILITH, FIGHTING);
+			GrandBossManager.getInstance().setStatus(LILITH, FIGHTING);
 			// Spawn the rb
 			_lilithBoss = addSpawn(LILITH, 185062, -9605, -5499, 15640, false, 0);
 			GrandBossManager.getInstance().addBoss((GrandBoss) _lilithBoss);
@@ -289,7 +289,7 @@ public class Lilith extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185062, -9605, -5499, 15640, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(LILITH, DEAD);
+			GrandBossManager.getInstance().setStatus(LILITH, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 40890fc9dc..5b16c333e2 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -53,12 +53,12 @@ public class KatoSicanus extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(LINDVIOR_LOCATION, true);
 				addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 60000, false);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 			}
 			else
 			{
@@ -115,7 +115,7 @@ public class KatoSicanus extends AbstractNpcAI
 					{
 						member.teleToLocation(LINDVIOR_LOCATION, true);
 						addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);
-						GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+						GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 05475517a1..32dc16c33f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -223,7 +223,7 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
-		final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+		final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -235,14 +235,14 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 			}
 		}
 		else
 		{
 			_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -428,9 +428,9 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair.oustAllPlayers();
 		_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, false));
 		cancelQuestTimers("attack_generator");
-		if (GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID) != 3)
+		if (GrandBossManager.getInstance().getStatus(LINDVIOR_RAID) != 3)
 		{
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -660,7 +660,7 @@ public class Lindvior extends AbstractNpcAI
 				cancelQuestTimers("attack_generator");
 				_lindviorfake.setDead(true);
 				_lindviorfake.deleteMe();
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, FIGHTING);
 				_lionel = addSpawn(LIONEL_HUNTER, 42630, -48231, -792, 855, false, 0, false);
 				
 				_lindvior = (GrandBoss) addSpawn(LINDVIOR_GROUND, CENTER_LOCATION, false, 0, true);
@@ -682,7 +682,7 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 				break;
 			}
 			case "stage_1_activate_generator":
@@ -851,7 +851,7 @@ public class Lindvior extends AbstractNpcAI
 			_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, true));
 			_lionel.deleteMe();
 			
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, DEAD);
 			final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 50a6e42559..c856b7e7ad 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -84,7 +84,7 @@ public class Orfen extends AbstractNpcAI
 		};
 		registerMobs(mobs);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -99,7 +99,7 @@ public class Orfen extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn Orfen.
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -146,7 +146,7 @@ public class Orfen extends AbstractNpcAI
 		if (event.equalsIgnoreCase("orfen_unlock"))
 		{
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_minion_loc"))
@@ -302,7 +302,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -315,7 +315,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index ff34c76a64..70d36f9c61 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -54,11 +54,11 @@ public class Daichir extends AbstractNpcAI
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+			final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOCATION, true);
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+				GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 			}
 			else
 			{
@@ -107,7 +107,7 @@ public class Daichir extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOCATION, true);
-						GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+						GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 					}
 				}
 			}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index b1bbe24b1a..c392c1abee 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -324,7 +324,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+		final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -334,12 +334,12 @@ public class Trasken extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 		}
 	}
 	
@@ -398,7 +398,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		_zoneLair.oustAllPlayers();
 		_zoneLair2.oustAllPlayers();
-		GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 	}
 	
 	@Override
@@ -575,7 +575,7 @@ public class Trasken extends AbstractNpcAI
 		{
 			case "unlock_trasken":
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 				break;
 			}
 			case "exitEarthWyrnCave":
@@ -604,7 +604,7 @@ public class Trasken extends AbstractNpcAI
 				ThreadPool.schedule(npc::decayMe, 10000);
 				cancelQuestTimer("finish", npc, null);
 				
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
+				GrandBossManager.getInstance().setStatus(TRASKEN, DEAD);
 				final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0528e31558..60ec4e0146 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = ZoneManager.getInstance().getZoneById(12010);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index add909d9b3..49319008fe 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 570d2d05d1..aff7f4b711 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -205,7 +205,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE, FAFURION).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 2f64b979bf..e685806718 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -41,11 +41,11 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 		for (int i = 0; i < count; i++)
 		{
 			final int bossId = packet.readD();
-			if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == RaidBossStatus.ALIVE)
+			if (DBSpawnManager.getInstance().getStatus(bossId) == RaidBossStatus.ALIVE)
 			{
 				_bossIds.add(bossId);
 			}
-			else if (GrandBossManager.getInstance().getBossStatus(bossId) == 0)
+			else if (GrandBossManager.getInstance().getStatus(bossId) == 0)
 			{
 				_bossIds.add(bossId);
 			}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index ff1e43330f..50c14b79bb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -69,7 +69,7 @@ public class Kekropus extends AbstractNpcAI
 			}
 			case "helios":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -132,7 +132,7 @@ public class Kekropus extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS, WAITING);
+					GrandBossManager.getInstance().setStatus(HELIOS, WAITING);
 					heliosAI().startQuestTimer("beginning", Config.HELIOS_WAIT_TIME * 60000, null, null);
 				}
 				break;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index bf7ab3400a..92b4915758 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -51,11 +51,11 @@ public class Erda extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(ETINA_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(ETINA_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOC, true);
-				GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+				GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 			}
 			else
 			{
@@ -104,7 +104,7 @@ public class Erda extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOC, false);
-						GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+						GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
index 0ce3b63fe1..a4a93ce801 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java
@@ -90,7 +90,7 @@ public class Anakim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+		final int status = GrandBossManager.getInstance().getStatus(ANAKIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -102,14 +102,14 @@ public class Anakim extends AbstractNpcAI
 			{
 				_anakimTemp = (GrandBoss) addSpawn(ANAKIM, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_anakimTemp);
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 			}
 		}
 		else
 		{
 			_anakimTemp = (GrandBoss) addSpawn(ANAKIM, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_anakimTemp);
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 		}
 	}
 	
@@ -122,14 +122,14 @@ public class Anakim extends AbstractNpcAI
 			{
 				_anakimTemp = (GrandBoss) addSpawn(ANAKIM, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_anakimTemp);
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -175,9 +175,9 @@ public class Anakim extends AbstractNpcAI
 					_anakimBoss.deleteMe();
 				}
 				BOSS_ZONE.oustAllPlayers();
-				if (GrandBossManager.getInstance().getBossStatus(ANAKIM) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(ANAKIM) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
 				}
 				break;
 			}
@@ -195,7 +195,7 @@ public class Anakim extends AbstractNpcAI
 	{
 		if (npc.getId() == ANAKIM_CUBIC)
 		{
-			final int _anakimStatus = GrandBossManager.getInstance().getBossStatus(ANAKIM);
+			final int _anakimStatus = GrandBossManager.getInstance().getStatus(ANAKIM);
 			if (_anakimStatus > ALIVE)
 			{
 				return "31101-01.html";
@@ -248,7 +248,7 @@ public class Anakim extends AbstractNpcAI
 			
 			if ((_anakimStatus == ALIVE) && (npc.getId() == ANAKIM_CUBIC))
 			{
-				GrandBossManager.getInstance().setBossStatus(ANAKIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ANAKIM, FIGHTING);
 				// Spawn the rb
 				_anakimBoss = addSpawn(ANAKIM, 185080, -12613, -5499, 16550, false, 0);
 				GrandBossManager.getInstance().addBoss((GrandBoss) _anakimBoss);
@@ -296,7 +296,7 @@ public class Anakim extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185082, -12606, -5499, 6133, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD);
+			GrandBossManager.getInstance().setStatus(ANAKIM, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index f4ae4aa580..5090a94ed4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -642,7 +642,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -652,7 +652,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 8db07e79e9..36d70dc920 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI
 		addTalkId(STONE_COFFIN);
 		addFirstTalkId(ELF);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
-		final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
+		final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -115,12 +115,12 @@ public class Beleth extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 		}
 		DoorData.getInstance().getDoor(DOOR1).openMe();
 	}
@@ -132,7 +132,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			case "BELETH_UNLOCK":
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 				DoorData.getInstance().getDoor(DOOR1).openMe();
 				break;
 			}
@@ -509,7 +509,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				if ((_lastAttack + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+					GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -539,7 +539,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
-		if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) < FIGHT))
+		if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) < FIGHT))
 		{
 			if (_priest != null)
 			{
@@ -550,7 +550,7 @@ public class Beleth extends AbstractNpcAI
 				_stone.deleteMe();
 			}
 			
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
 			startQuestTimer("SPAWN1", Config.BELETH_WAIT_TIME * 60 * 1000, null, null);
 		}
 		
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			cancelQuestTimer("CHECK_ATTACK", null, null);
 			setBelethKiller(killer);
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
 			final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index 9ac3657157..e2770b5bec 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -53,7 +53,7 @@ public class Wormhole extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(BELETH);
+			final int status = GrandBossManager.getInstance().getStatus(BELETH);
 			if (status == 1)
 			{
 				return "33901-4.html";
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java
index de153239c4..344ad52a0a 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
 			
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index 00c7e9bea0..f8c473c6cb 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -328,7 +328,7 @@ public class EtisVanEtina extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
-		final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1);
+		final int status = GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -338,12 +338,12 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 			}
 		}
 		else
 		{
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 		}
 	}
 	
@@ -354,16 +354,16 @@ public class EtisVanEtina extends AbstractNpcAI
 		{
 			case "unlock_etina":
 			{
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE)
+					if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE)
 					{
-						GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+						GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 					}
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
@@ -381,7 +381,7 @@ public class EtisVanEtina extends AbstractNpcAI
 					}
 					startQuestTimer("end_etina", 2000, null, null);
 				}
-				else if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == FIGHTING)
+				else if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == FIGHTING)
 				{
 					startQuestTimer("check_activity_task", 60000, null, null);
 				}
@@ -505,9 +505,9 @@ public class EtisVanEtina extends AbstractNpcAI
 		closeDoor(DOOR2, 0);
 		closeDoor(DOOR3, 0);
 		closeDoor(DOOR4, 0);
-		if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE))
+		if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE))
 		{
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 		}
 	}
 	
@@ -680,7 +680,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				_collapseTask.cancel(true);
 				_collapseTask = null;
 			}
-			if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
+			if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
 			{
 				_spawned = true;
 				_spawns.clear();
@@ -696,7 +696,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				_paragon = (Monster) addSpawn(PARAGON, PARAGON_LOC);
 				_paragon.setInvul(true);
 				BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true)));
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, FIGHTING);
 				_lastAction = System.currentTimeMillis();
 				startQuestTimer("check_activity_task", 60000, null, null);
 			}
@@ -726,7 +726,7 @@ public class EtisVanEtina extends AbstractNpcAI
 		{
 			notifyEvent("cancel_timers", null, null);
 			BOSS_ZONE.getPlayersInside().forEach(player -> playMovie(player, Movie.SC_ETIS_VAN_ETINA_ENDING));
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, DEAD);
 			final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index 5c351fd118..2bf65b5b37 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -81,7 +81,7 @@ public class Fafurion extends AbstractNpcAI
 		addKillId(FAFURION_STAGE_1, FAFURION_STAGE_2, FAFURION_STAGE_3, FAFURION_STAGE_4, FAFURION_STAGE_5, FAFURION_STAGE_6, FAFURION_STAGE_7);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
-		final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+		final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -93,14 +93,14 @@ public class Fafurion extends AbstractNpcAI
 			{
 				final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(fafurion);
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 			}
 		}
 		else
 		{
 			final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(fafurion);
-			GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+			GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 		}
 	}
 	
@@ -114,7 +114,7 @@ public class Fafurion extends AbstractNpcAI
 			{
 				final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(fafurion);
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 				break;
 			}
 			case "warning":
@@ -131,7 +131,7 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID) == WAITING)
 				{
 					// checking fafurion stage.
 					_stage = GlobalVariablesManager.getInstance().getInt("Fafurion_Stage", 1);
@@ -139,7 +139,7 @@ public class Fafurion extends AbstractNpcAI
 					{
 						playMovie(p, Movie.SC_FAFURION_INTRO);
 					});
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
 					switch (_stage)
 					{
 						case 1:
@@ -184,14 +184,14 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+				final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					for (Player plr : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 5000))
 					{
 						plr.sendPacket(new ExShowScreenMessage(NpcStringId.EXCEEDED_THE_FAFURION_S_NEST_RAID_TIME_LIMIT, ExShowScreenMessage.TOP_CENTER, 10000, true));
 					}
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 					FAFURION_ZONE.oustAllPlayers();
 					npc.deleteMe();
 					if (_stage > 1)
@@ -204,7 +204,7 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "enter_area":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+				final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -263,7 +263,7 @@ public class Fafurion extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, WAITING);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, WAITING);
 					startQuestTimer("beginning", Config.FAFURION_WAIT_TIME * 60000, null, null);
 					startQuestTimer("warning", Config.FAFURION_WAIT_TIME > 0 ? (Config.FAFURION_WAIT_TIME * 60000) - 30000 : 0, null, player);
 				}
@@ -446,7 +446,7 @@ public class Fafurion extends AbstractNpcAI
 				p.sendPacket(new ExShowScreenMessage(NpcStringId.HONORED_WARRIORS_HAVE_DEFEATED_THE_WATER_DRAGON_FAFURION, ExShowScreenMessage.TOP_CENTER, 20000, true));
 			});
 			
-			GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD);
+			GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, DEAD);
 			final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index 0235b491b0..d6de973ec6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -147,7 +147,7 @@ public class Helios extends AbstractNpcAI
 		_bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
-		final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+		final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -159,14 +159,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 			}
 		}
 		else
 		{
 			_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_tempHelios);
-			GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+			GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 		}
 	}
 	
@@ -329,14 +329,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 				break;
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(HELIOS3) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(HELIOS3) == WAITING)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, FIGHTING);
+					GrandBossManager.getInstance().setStatus(HELIOS3, FIGHTING);
 					_bossInstance = addSpawn(HELIOS1, HELIOS_SPAWN_LOC.getX(), HELIOS_SPAWN_LOC.getY(), HELIOS_SPAWN_LOC.getZ(), HELIOS_SPAWN_LOC.getHeading(), false, 0, false);
 					for (SpawnHolder spawn : SPAWNS_MINIONS)
 					{
@@ -348,12 +348,12 @@ public class Helios extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					_bossZone.oustAllPlayers();
 					Broadcast.toAllOnlinePlayers(new ExShowScreenMessage(NpcStringId.THE_HEROES_DRAINED_OF_THEIR_POWERS_HAVE_BEEN_BANISHED_FROM_THE_THRONE_OF_HELIOS_BY_HELIOS_POWERS, ExShowScreenMessage.TOP_CENTER, 10000, true));
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+					GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 					clean();
 				}
 				break;
@@ -481,7 +481,7 @@ public class Helios extends AbstractNpcAI
 			{
 				clean();
 				_bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true));
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD);
+				GrandBossManager.getInstance().setStatus(HELIOS3, DEAD);
 				final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index 27a44fc962..b94d17f47b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -117,7 +117,7 @@ public class Kelbim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+		final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -129,14 +129,14 @@ public class Kelbim extends AbstractNpcAI
 			{
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
 			openDoor(DOOR1, 0);
 			openDoor(DOOR2, 0);
-			GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 		}
 	}
 	
@@ -147,7 +147,7 @@ public class Kelbim extends AbstractNpcAI
 		{
 			case "unlock_kelbim":
 			{
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 				Broadcast.toAllOnlinePlayers(new Earthquake(-55754, 59903, -269, 20, 10));
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
@@ -157,7 +157,7 @@ public class Kelbim extends AbstractNpcAI
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -183,7 +183,7 @@ public class Kelbim extends AbstractNpcAI
 			case "stage_1_start":
 			{
 				_bossStage = 1;
-				GrandBossManager.getInstance().setBossStatus(KELBIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(KELBIM, FIGHTING);
 				playMovie(ZONE.getPlayersInside(), Movie.SC_KELBIM_OPENING);
 				startQuestTimer("stage_1_kelbim_spawn", 25000, null, null);
 				break;
@@ -307,7 +307,7 @@ public class Kelbim extends AbstractNpcAI
 	{
 		if (npc.getId() == ENTER_DEVICE)
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+			final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 			if (status > ALIVE)
 			{
 				return "34052-1.html";
@@ -349,7 +349,7 @@ public class Kelbim extends AbstractNpcAI
 				{
 					if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
 					{
-						GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
+						GrandBossManager.getInstance().setStatus(KELBIM, WAITING);
 						startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
 						member.teleToLocation(KELBIM_LOCATION, true);
 					}
@@ -430,7 +430,7 @@ public class Kelbim extends AbstractNpcAI
 		notifyEvent("cancel_timers", null, null);
 		closeDoor(DOOR1, 0);
 		closeDoor(DOOR2, 0);
-		GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD);
+		GrandBossManager.getInstance().setStatus(KELBIM, DEAD);
 		final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
 		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
index 88c871b9ab..9199e144f3 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java
@@ -89,7 +89,7 @@ public class Lilith extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
-		final int status = GrandBossManager.getInstance().getBossStatus(LILITH);
+		final int status = GrandBossManager.getInstance().getStatus(LILITH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -101,14 +101,14 @@ public class Lilith extends AbstractNpcAI
 			{
 				_tempLilith = (GrandBoss) addSpawn(LILITH, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempLilith);
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 			}
 		}
 		else
 		{
 			_tempLilith = (GrandBoss) addSpawn(LILITH, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_tempLilith);
-			GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+			GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 		}
 	}
 	
@@ -121,14 +121,14 @@ public class Lilith extends AbstractNpcAI
 			{
 				_tempLilith = (GrandBoss) addSpawn(LILITH, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempLilith);
-				GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+				GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -175,9 +175,9 @@ public class Lilith extends AbstractNpcAI
 				}
 				BOSS_ZONE.oustAllPlayers();
 				PRE_LILITH_ZONE.oustAllPlayers();
-				if (GrandBossManager.getInstance().getBossStatus(LILITH) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(LILITH) != DEAD)
 				{
-					GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
+					GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
 				}
 				break;
 			}
@@ -193,7 +193,7 @@ public class Lilith extends AbstractNpcAI
 	@Override
 	public String onTalk(Npc npc, Player player)
 	{
-		final int _lilithStatus = GrandBossManager.getInstance().getBossStatus(LILITH);
+		final int _lilithStatus = GrandBossManager.getInstance().getStatus(LILITH);
 		if ((npc.getId() == LILITH_CUBIC) && (_lilithStatus > ALIVE))
 		{
 			return "31118-01.html";
@@ -246,7 +246,7 @@ public class Lilith extends AbstractNpcAI
 		
 		if ((_lilithStatus == ALIVE) && (npc.getId() == LILITH_CUBIC))
 		{
-			GrandBossManager.getInstance().setBossStatus(LILITH, FIGHTING);
+			GrandBossManager.getInstance().setStatus(LILITH, FIGHTING);
 			// Spawn the rb
 			_lilithBoss = addSpawn(LILITH, 185062, -9605, -5499, 15640, false, 0);
 			GrandBossManager.getInstance().addBoss((GrandBoss) _lilithBoss);
@@ -289,7 +289,7 @@ public class Lilith extends AbstractNpcAI
 			notifyEvent("cancel_timers", null, null);
 			addSpawn(EXIST_CUBIC, 185062, -9605, -5499, 15640, false, 900000); // 15min
 			
-			GrandBossManager.getInstance().setBossStatus(LILITH, DEAD);
+			GrandBossManager.getInstance().setStatus(LILITH, DEAD);
 			final long respawnTime = getRespawnTime();
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 40890fc9dc..5b16c333e2 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -53,12 +53,12 @@ public class KatoSicanus extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(LINDVIOR_LOCATION, true);
 				addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 60000, false);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 			}
 			else
 			{
@@ -115,7 +115,7 @@ public class KatoSicanus extends AbstractNpcAI
 					{
 						member.teleToLocation(LINDVIOR_LOCATION, true);
 						addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);
-						GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+						GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 05475517a1..32dc16c33f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -223,7 +223,7 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
-		final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+		final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -235,14 +235,14 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 			}
 		}
 		else
 		{
 			_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -428,9 +428,9 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair.oustAllPlayers();
 		_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, false));
 		cancelQuestTimers("attack_generator");
-		if (GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID) != 3)
+		if (GrandBossManager.getInstance().getStatus(LINDVIOR_RAID) != 3)
 		{
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -660,7 +660,7 @@ public class Lindvior extends AbstractNpcAI
 				cancelQuestTimers("attack_generator");
 				_lindviorfake.setDead(true);
 				_lindviorfake.deleteMe();
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, FIGHTING);
 				_lionel = addSpawn(LIONEL_HUNTER, 42630, -48231, -792, 855, false, 0, false);
 				
 				_lindvior = (GrandBoss) addSpawn(LINDVIOR_GROUND, CENTER_LOCATION, false, 0, true);
@@ -682,7 +682,7 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 				break;
 			}
 			case "stage_1_activate_generator":
@@ -851,7 +851,7 @@ public class Lindvior extends AbstractNpcAI
 			_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, true));
 			_lionel.deleteMe();
 			
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, DEAD);
 			final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 50a6e42559..c856b7e7ad 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -84,7 +84,7 @@ public class Orfen extends AbstractNpcAI
 		};
 		registerMobs(mobs);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -99,7 +99,7 @@ public class Orfen extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn Orfen.
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -146,7 +146,7 @@ public class Orfen extends AbstractNpcAI
 		if (event.equalsIgnoreCase("orfen_unlock"))
 		{
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_minion_loc"))
@@ -302,7 +302,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -315,7 +315,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index ff34c76a64..70d36f9c61 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -54,11 +54,11 @@ public class Daichir extends AbstractNpcAI
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+			final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOCATION, true);
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+				GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 			}
 			else
 			{
@@ -107,7 +107,7 @@ public class Daichir extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOCATION, true);
-						GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+						GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 					}
 				}
 			}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index b1bbe24b1a..c392c1abee 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -324,7 +324,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+		final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -334,12 +334,12 @@ public class Trasken extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 		}
 	}
 	
@@ -398,7 +398,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		_zoneLair.oustAllPlayers();
 		_zoneLair2.oustAllPlayers();
-		GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 	}
 	
 	@Override
@@ -575,7 +575,7 @@ public class Trasken extends AbstractNpcAI
 		{
 			case "unlock_trasken":
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 				break;
 			}
 			case "exitEarthWyrnCave":
@@ -604,7 +604,7 @@ public class Trasken extends AbstractNpcAI
 				ThreadPool.schedule(npc::decayMe, 10000);
 				cancelQuestTimer("finish", npc, null);
 				
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
+				GrandBossManager.getInstance().setStatus(TRASKEN, DEAD);
 				final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0528e31558..60ec4e0146 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = ZoneManager.getInstance().getZoneById(12010);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index add909d9b3..49319008fe 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 570d2d05d1..aff7f4b711 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -205,7 +205,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE, FAFURION).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 2f64b979bf..e685806718 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -41,11 +41,11 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 		for (int i = 0; i < count; i++)
 		{
 			final int bossId = packet.readD();
-			if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == RaidBossStatus.ALIVE)
+			if (DBSpawnManager.getInstance().getStatus(bossId) == RaidBossStatus.ALIVE)
 			{
 				_bossIds.add(bossId);
 			}
-			else if (GrandBossManager.getInstance().getBossStatus(bossId) == 0)
+			else if (GrandBossManager.getInstance().getStatus(bossId) == 0)
 			{
 				_bossIds.add(bossId);
 			}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
index 0aa8825973..36666c5e39 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
@@ -53,11 +53,11 @@ public class Leona extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(ETINA_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(ETINA_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOC, true);
-				GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+				GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 			}
 			else
 			{
@@ -106,7 +106,7 @@ public class Leona extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOC, false);
-						GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+						GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index ff1e43330f..50c14b79bb 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -69,7 +69,7 @@ public class Kekropus extends AbstractNpcAI
 			}
 			case "helios":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -132,7 +132,7 @@ public class Kekropus extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS, WAITING);
+					GrandBossManager.getInstance().setStatus(HELIOS, WAITING);
 					heliosAI().startQuestTimer("beginning", Config.HELIOS_WAIT_TIME * 60000, null, null);
 				}
 				break;
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index bf7ab3400a..92b4915758 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -51,11 +51,11 @@ public class Erda extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(ETINA_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(ETINA_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOC, true);
-				GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+				GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 			}
 			else
 			{
@@ -104,7 +104,7 @@ public class Erda extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOC, false);
-						GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+						GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index f4ae4aa580..5090a94ed4 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -642,7 +642,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -652,7 +652,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 8db07e79e9..36d70dc920 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI
 		addTalkId(STONE_COFFIN);
 		addFirstTalkId(ELF);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
-		final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
+		final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -115,12 +115,12 @@ public class Beleth extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 		}
 		DoorData.getInstance().getDoor(DOOR1).openMe();
 	}
@@ -132,7 +132,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			case "BELETH_UNLOCK":
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 				DoorData.getInstance().getDoor(DOOR1).openMe();
 				break;
 			}
@@ -509,7 +509,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				if ((_lastAttack + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+					GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -539,7 +539,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
-		if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) < FIGHT))
+		if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) < FIGHT))
 		{
 			if (_priest != null)
 			{
@@ -550,7 +550,7 @@ public class Beleth extends AbstractNpcAI
 				_stone.deleteMe();
 			}
 			
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
 			startQuestTimer("SPAWN1", Config.BELETH_WAIT_TIME * 60 * 1000, null, null);
 		}
 		
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			cancelQuestTimer("CHECK_ATTACK", null, null);
 			setBelethKiller(killer);
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
 			final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index 9ac3657157..e2770b5bec 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -53,7 +53,7 @@ public class Wormhole extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(BELETH);
+			final int status = GrandBossManager.getInstance().getStatus(BELETH);
 			if (status == 1)
 			{
 				return "33901-4.html";
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Core/Core.java
index de153239c4..344ad52a0a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
 			
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index 072bfac22e..1000c576ba 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -328,7 +328,7 @@ public class EtisVanEtina extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
-		final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1);
+		final int status = GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -338,12 +338,12 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 			}
 		}
 		else
 		{
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 		}
 	}
 	
@@ -354,16 +354,16 @@ public class EtisVanEtina extends AbstractNpcAI
 		{
 			case "unlock_etina":
 			{
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE)
+					if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE)
 					{
-						GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+						GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 					}
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
@@ -381,7 +381,7 @@ public class EtisVanEtina extends AbstractNpcAI
 					}
 					startQuestTimer("end_etina", 2000, null, null);
 				}
-				else if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == FIGHTING)
+				else if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == FIGHTING)
 				{
 					startQuestTimer("check_activity_task", 60000, null, null);
 				}
@@ -505,9 +505,9 @@ public class EtisVanEtina extends AbstractNpcAI
 		closeDoor(DOOR2, 0);
 		closeDoor(DOOR3, 0);
 		closeDoor(DOOR4, 0);
-		if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE))
+		if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE))
 		{
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 		}
 	}
 	
@@ -680,7 +680,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				_collapseTask.cancel(true);
 				_collapseTask = null;
 			}
-			if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
+			if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
 			{
 				_spawned = true;
 				_spawns.clear();
@@ -696,7 +696,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				_paragon = (Monster) addSpawn(PARAGON, PARAGON_LOC);
 				_paragon.setInvul(true);
 				BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true)));
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, FIGHTING);
 				_lastAction = System.currentTimeMillis();
 				startQuestTimer("check_activity_task", 60000, null, null);
 			}
@@ -726,7 +726,7 @@ public class EtisVanEtina extends AbstractNpcAI
 		{
 			notifyEvent("cancel_timers", null, null);
 			BOSS_ZONE.getPlayersInside().forEach(player -> playMovie(player, Movie.SC_ETIS_VAN_ETINA_ENDING));
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, DEAD);
 			final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index 41fb0a71ed..40235b2693 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -81,7 +81,7 @@ public class Fafurion extends AbstractNpcAI
 		addKillId(FAFURION_STAGE_1, FAFURION_STAGE_2, FAFURION_STAGE_3, FAFURION_STAGE_4, FAFURION_STAGE_5, FAFURION_STAGE_6, FAFURION_STAGE_7);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
-		final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+		final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -93,14 +93,14 @@ public class Fafurion extends AbstractNpcAI
 			{
 				final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(fafurion);
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 			}
 		}
 		else
 		{
 			final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(fafurion);
-			GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+			GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 		}
 	}
 	
@@ -114,7 +114,7 @@ public class Fafurion extends AbstractNpcAI
 			{
 				final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(fafurion);
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 				break;
 			}
 			case "warning":
@@ -131,7 +131,7 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID) == WAITING)
 				{
 					// checking fafurion stage.
 					_stage = GlobalVariablesManager.getInstance().getInt("Fafurion_Stage", 1);
@@ -139,7 +139,7 @@ public class Fafurion extends AbstractNpcAI
 					{
 						playMovie(p, Movie.SC_FAFURION_INTRO);
 					});
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
 					switch (_stage)
 					{
 						case 1:
@@ -184,14 +184,14 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+				final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					for (Player plr : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 5000))
 					{
 						plr.sendPacket(new ExShowScreenMessage(NpcStringId.FAFURION_S_NEST_RAID_IS_OVER, ExShowScreenMessage.TOP_CENTER, 10000, true));
 					}
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 					FAFURION_ZONE.oustAllPlayers();
 					npc.deleteMe();
 					if (_stage > 1)
@@ -204,7 +204,7 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "enter_area":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+				final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -263,7 +263,7 @@ public class Fafurion extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, WAITING);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, WAITING);
 					startQuestTimer("beginning", Config.FAFURION_WAIT_TIME * 60000, null, null);
 					startQuestTimer("warning", Config.FAFURION_WAIT_TIME > 0 ? (Config.FAFURION_WAIT_TIME * 60000) - 30000 : 0, null, player);
 				}
@@ -446,7 +446,7 @@ public class Fafurion extends AbstractNpcAI
 				p.sendPacket(new ExShowScreenMessage(NpcStringId.HONORED_WARRIORS_HAVE_DEFEATED_THE_WATER_DRAGON_FAFURION, ExShowScreenMessage.TOP_CENTER, 20000, true));
 			});
 			
-			GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD);
+			GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, DEAD);
 			final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index 0235b491b0..d6de973ec6 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -147,7 +147,7 @@ public class Helios extends AbstractNpcAI
 		_bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
-		final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+		final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -159,14 +159,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 			}
 		}
 		else
 		{
 			_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_tempHelios);
-			GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+			GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 		}
 	}
 	
@@ -329,14 +329,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 				break;
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(HELIOS3) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(HELIOS3) == WAITING)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, FIGHTING);
+					GrandBossManager.getInstance().setStatus(HELIOS3, FIGHTING);
 					_bossInstance = addSpawn(HELIOS1, HELIOS_SPAWN_LOC.getX(), HELIOS_SPAWN_LOC.getY(), HELIOS_SPAWN_LOC.getZ(), HELIOS_SPAWN_LOC.getHeading(), false, 0, false);
 					for (SpawnHolder spawn : SPAWNS_MINIONS)
 					{
@@ -348,12 +348,12 @@ public class Helios extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					_bossZone.oustAllPlayers();
 					Broadcast.toAllOnlinePlayers(new ExShowScreenMessage(NpcStringId.THE_HEROES_DRAINED_OF_THEIR_POWERS_HAVE_BEEN_BANISHED_FROM_THE_THRONE_OF_HELIOS_BY_HELIOS_POWERS, ExShowScreenMessage.TOP_CENTER, 10000, true));
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+					GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 					clean();
 				}
 				break;
@@ -481,7 +481,7 @@ public class Helios extends AbstractNpcAI
 			{
 				clean();
 				_bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true));
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD);
+				GrandBossManager.getInstance().setStatus(HELIOS3, DEAD);
 				final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index 27a44fc962..b94d17f47b 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -117,7 +117,7 @@ public class Kelbim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+		final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -129,14 +129,14 @@ public class Kelbim extends AbstractNpcAI
 			{
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
 			openDoor(DOOR1, 0);
 			openDoor(DOOR2, 0);
-			GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 		}
 	}
 	
@@ -147,7 +147,7 @@ public class Kelbim extends AbstractNpcAI
 		{
 			case "unlock_kelbim":
 			{
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 				Broadcast.toAllOnlinePlayers(new Earthquake(-55754, 59903, -269, 20, 10));
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
@@ -157,7 +157,7 @@ public class Kelbim extends AbstractNpcAI
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -183,7 +183,7 @@ public class Kelbim extends AbstractNpcAI
 			case "stage_1_start":
 			{
 				_bossStage = 1;
-				GrandBossManager.getInstance().setBossStatus(KELBIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(KELBIM, FIGHTING);
 				playMovie(ZONE.getPlayersInside(), Movie.SC_KELBIM_OPENING);
 				startQuestTimer("stage_1_kelbim_spawn", 25000, null, null);
 				break;
@@ -307,7 +307,7 @@ public class Kelbim extends AbstractNpcAI
 	{
 		if (npc.getId() == ENTER_DEVICE)
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+			final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 			if (status > ALIVE)
 			{
 				return "34052-1.html";
@@ -349,7 +349,7 @@ public class Kelbim extends AbstractNpcAI
 				{
 					if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
 					{
-						GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
+						GrandBossManager.getInstance().setStatus(KELBIM, WAITING);
 						startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
 						member.teleToLocation(KELBIM_LOCATION, true);
 					}
@@ -430,7 +430,7 @@ public class Kelbim extends AbstractNpcAI
 		notifyEvent("cancel_timers", null, null);
 		closeDoor(DOOR1, 0);
 		closeDoor(DOOR2, 0);
-		GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD);
+		GrandBossManager.getInstance().setStatus(KELBIM, DEAD);
 		final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
 		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 40890fc9dc..5b16c333e2 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -53,12 +53,12 @@ public class KatoSicanus extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(LINDVIOR_LOCATION, true);
 				addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 60000, false);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 			}
 			else
 			{
@@ -115,7 +115,7 @@ public class KatoSicanus extends AbstractNpcAI
 					{
 						member.teleToLocation(LINDVIOR_LOCATION, true);
 						addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);
-						GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+						GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 05475517a1..32dc16c33f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -223,7 +223,7 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
-		final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+		final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -235,14 +235,14 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 			}
 		}
 		else
 		{
 			_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -428,9 +428,9 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair.oustAllPlayers();
 		_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, false));
 		cancelQuestTimers("attack_generator");
-		if (GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID) != 3)
+		if (GrandBossManager.getInstance().getStatus(LINDVIOR_RAID) != 3)
 		{
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -660,7 +660,7 @@ public class Lindvior extends AbstractNpcAI
 				cancelQuestTimers("attack_generator");
 				_lindviorfake.setDead(true);
 				_lindviorfake.deleteMe();
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, FIGHTING);
 				_lionel = addSpawn(LIONEL_HUNTER, 42630, -48231, -792, 855, false, 0, false);
 				
 				_lindvior = (GrandBoss) addSpawn(LINDVIOR_GROUND, CENTER_LOCATION, false, 0, true);
@@ -682,7 +682,7 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 				break;
 			}
 			case "stage_1_activate_generator":
@@ -851,7 +851,7 @@ public class Lindvior extends AbstractNpcAI
 			_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, true));
 			_lionel.deleteMe();
 			
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, DEAD);
 			final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 50a6e42559..c856b7e7ad 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -84,7 +84,7 @@ public class Orfen extends AbstractNpcAI
 		};
 		registerMobs(mobs);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -99,7 +99,7 @@ public class Orfen extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn Orfen.
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -146,7 +146,7 @@ public class Orfen extends AbstractNpcAI
 		if (event.equalsIgnoreCase("orfen_unlock"))
 		{
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_minion_loc"))
@@ -302,7 +302,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -315,7 +315,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index ff34c76a64..70d36f9c61 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -54,11 +54,11 @@ public class Daichir extends AbstractNpcAI
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+			final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOCATION, true);
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+				GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 			}
 			else
 			{
@@ -107,7 +107,7 @@ public class Daichir extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOCATION, true);
-						GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+						GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 					}
 				}
 			}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index 523bb946c7..f621e8786a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -324,7 +324,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+		final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -334,12 +334,12 @@ public class Trasken extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 		}
 	}
 	
@@ -398,7 +398,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		_zoneLair.oustAllPlayers();
 		_zoneLair2.oustAllPlayers();
-		GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 	}
 	
 	@Override
@@ -575,7 +575,7 @@ public class Trasken extends AbstractNpcAI
 		{
 			case "unlock_trasken":
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 				break;
 			}
 			case "exitEarthWyrnCave":
@@ -604,7 +604,7 @@ public class Trasken extends AbstractNpcAI
 				ThreadPool.schedule(npc::decayMe, 10000);
 				cancelQuestTimer("finish", npc, null);
 				
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
+				GrandBossManager.getInstance().setStatus(TRASKEN, DEAD);
 				final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0528e31558..60ec4e0146 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = ZoneManager.getInstance().getZoneById(12010);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index add909d9b3..49319008fe 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index eeb7a402ea..036c52246f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -159,7 +159,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(VALAKAS, BAIUM, QUEENANT, ORFEN, CORE, FAFURION).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 997b5ab5e5..ab16454461 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 342ddc4466..ec8e5d5ac8 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -48,7 +48,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			final GrandBoss boss = GrandBossManager.getInstance().getBoss(bossId);
 			if (boss == null)
 			{
-				final RaidBossStatus status = DBSpawnManager.getInstance().getNpcStatusId(bossId);
+				final RaidBossStatus status = DBSpawnManager.getInstance().getStatus(bossId);
 				if (status != RaidBossStatus.UNDEFINED)
 				{
 					final Npc npc = DBSpawnManager.getInstance().getNpc(bossId);
@@ -71,7 +71,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			{
 				if (boss.isDead() || !boss.isSpawned())
 				{
-					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0))
+					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getStatus(BAIUM) == 0))
 					{
 						_statuses.put(bossId, RaidBossStatus.ALIVE);
 					}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
index 0aa8825973..36666c5e39 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
@@ -53,11 +53,11 @@ public class Leona extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(ETINA_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(ETINA_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOC, true);
-				GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+				GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 			}
 			else
 			{
@@ -106,7 +106,7 @@ public class Leona extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOC, false);
-						GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+						GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index ff1e43330f..50c14b79bb 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -69,7 +69,7 @@ public class Kekropus extends AbstractNpcAI
 			}
 			case "helios":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -132,7 +132,7 @@ public class Kekropus extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS, WAITING);
+					GrandBossManager.getInstance().setStatus(HELIOS, WAITING);
 					heliosAI().startQuestTimer("beginning", Config.HELIOS_WAIT_TIME * 60000, null, null);
 				}
 				break;
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index bf7ab3400a..92b4915758 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -51,11 +51,11 @@ public class Erda extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(ETINA_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(ETINA_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOC, true);
-				GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+				GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 			}
 			else
 			{
@@ -104,7 +104,7 @@ public class Erda extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOC, false);
-						GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+						GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index f4ae4aa580..5090a94ed4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -642,7 +642,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -652,7 +652,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 8db07e79e9..36d70dc920 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI
 		addTalkId(STONE_COFFIN);
 		addFirstTalkId(ELF);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
-		final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
+		final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -115,12 +115,12 @@ public class Beleth extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 		}
 		DoorData.getInstance().getDoor(DOOR1).openMe();
 	}
@@ -132,7 +132,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			case "BELETH_UNLOCK":
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 				DoorData.getInstance().getDoor(DOOR1).openMe();
 				break;
 			}
@@ -509,7 +509,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				if ((_lastAttack + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+					GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -539,7 +539,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
-		if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) < FIGHT))
+		if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) < FIGHT))
 		{
 			if (_priest != null)
 			{
@@ -550,7 +550,7 @@ public class Beleth extends AbstractNpcAI
 				_stone.deleteMe();
 			}
 			
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
 			startQuestTimer("SPAWN1", Config.BELETH_WAIT_TIME * 60 * 1000, null, null);
 		}
 		
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			cancelQuestTimer("CHECK_ATTACK", null, null);
 			setBelethKiller(killer);
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
 			final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index 9ac3657157..e2770b5bec 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -53,7 +53,7 @@ public class Wormhole extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(BELETH);
+			final int status = GrandBossManager.getInstance().getStatus(BELETH);
 			if (status == 1)
 			{
 				return "33901-4.html";
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Core/Core.java
index de153239c4..344ad52a0a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
 			
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index 072bfac22e..1000c576ba 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -328,7 +328,7 @@ public class EtisVanEtina extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
-		final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1);
+		final int status = GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -338,12 +338,12 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 			}
 		}
 		else
 		{
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 		}
 	}
 	
@@ -354,16 +354,16 @@ public class EtisVanEtina extends AbstractNpcAI
 		{
 			case "unlock_etina":
 			{
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE)
+					if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE)
 					{
-						GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+						GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 					}
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
@@ -381,7 +381,7 @@ public class EtisVanEtina extends AbstractNpcAI
 					}
 					startQuestTimer("end_etina", 2000, null, null);
 				}
-				else if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == FIGHTING)
+				else if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == FIGHTING)
 				{
 					startQuestTimer("check_activity_task", 60000, null, null);
 				}
@@ -505,9 +505,9 @@ public class EtisVanEtina extends AbstractNpcAI
 		closeDoor(DOOR2, 0);
 		closeDoor(DOOR3, 0);
 		closeDoor(DOOR4, 0);
-		if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE))
+		if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE))
 		{
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 		}
 	}
 	
@@ -680,7 +680,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				_collapseTask.cancel(true);
 				_collapseTask = null;
 			}
-			if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
+			if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
 			{
 				_spawned = true;
 				_spawns.clear();
@@ -696,7 +696,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				_paragon = (Monster) addSpawn(PARAGON, PARAGON_LOC);
 				_paragon.setInvul(true);
 				BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true)));
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, FIGHTING);
 				_lastAction = System.currentTimeMillis();
 				startQuestTimer("check_activity_task", 60000, null, null);
 			}
@@ -726,7 +726,7 @@ public class EtisVanEtina extends AbstractNpcAI
 		{
 			notifyEvent("cancel_timers", null, null);
 			BOSS_ZONE.getPlayersInside().forEach(player -> playMovie(player, Movie.SC_ETIS_VAN_ETINA_ENDING));
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, DEAD);
 			final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index 41fb0a71ed..40235b2693 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -81,7 +81,7 @@ public class Fafurion extends AbstractNpcAI
 		addKillId(FAFURION_STAGE_1, FAFURION_STAGE_2, FAFURION_STAGE_3, FAFURION_STAGE_4, FAFURION_STAGE_5, FAFURION_STAGE_6, FAFURION_STAGE_7);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
-		final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+		final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -93,14 +93,14 @@ public class Fafurion extends AbstractNpcAI
 			{
 				final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(fafurion);
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 			}
 		}
 		else
 		{
 			final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(fafurion);
-			GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+			GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 		}
 	}
 	
@@ -114,7 +114,7 @@ public class Fafurion extends AbstractNpcAI
 			{
 				final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(fafurion);
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 				break;
 			}
 			case "warning":
@@ -131,7 +131,7 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID) == WAITING)
 				{
 					// checking fafurion stage.
 					_stage = GlobalVariablesManager.getInstance().getInt("Fafurion_Stage", 1);
@@ -139,7 +139,7 @@ public class Fafurion extends AbstractNpcAI
 					{
 						playMovie(p, Movie.SC_FAFURION_INTRO);
 					});
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
 					switch (_stage)
 					{
 						case 1:
@@ -184,14 +184,14 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+				final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					for (Player plr : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 5000))
 					{
 						plr.sendPacket(new ExShowScreenMessage(NpcStringId.FAFURION_S_NEST_RAID_IS_OVER, ExShowScreenMessage.TOP_CENTER, 10000, true));
 					}
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 					FAFURION_ZONE.oustAllPlayers();
 					npc.deleteMe();
 					if (_stage > 1)
@@ -204,7 +204,7 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "enter_area":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+				final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -263,7 +263,7 @@ public class Fafurion extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, WAITING);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, WAITING);
 					startQuestTimer("beginning", Config.FAFURION_WAIT_TIME * 60000, null, null);
 					startQuestTimer("warning", Config.FAFURION_WAIT_TIME > 0 ? (Config.FAFURION_WAIT_TIME * 60000) - 30000 : 0, null, player);
 				}
@@ -446,7 +446,7 @@ public class Fafurion extends AbstractNpcAI
 				p.sendPacket(new ExShowScreenMessage(NpcStringId.HONORED_WARRIORS_HAVE_DEFEATED_THE_WATER_DRAGON_FAFURION, ExShowScreenMessage.TOP_CENTER, 20000, true));
 			});
 			
-			GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD);
+			GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, DEAD);
 			final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index 0235b491b0..d6de973ec6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -147,7 +147,7 @@ public class Helios extends AbstractNpcAI
 		_bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
-		final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+		final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -159,14 +159,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 			}
 		}
 		else
 		{
 			_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_tempHelios);
-			GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+			GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 		}
 	}
 	
@@ -329,14 +329,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 				break;
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(HELIOS3) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(HELIOS3) == WAITING)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, FIGHTING);
+					GrandBossManager.getInstance().setStatus(HELIOS3, FIGHTING);
 					_bossInstance = addSpawn(HELIOS1, HELIOS_SPAWN_LOC.getX(), HELIOS_SPAWN_LOC.getY(), HELIOS_SPAWN_LOC.getZ(), HELIOS_SPAWN_LOC.getHeading(), false, 0, false);
 					for (SpawnHolder spawn : SPAWNS_MINIONS)
 					{
@@ -348,12 +348,12 @@ public class Helios extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					_bossZone.oustAllPlayers();
 					Broadcast.toAllOnlinePlayers(new ExShowScreenMessage(NpcStringId.THE_HEROES_DRAINED_OF_THEIR_POWERS_HAVE_BEEN_BANISHED_FROM_THE_THRONE_OF_HELIOS_BY_HELIOS_POWERS, ExShowScreenMessage.TOP_CENTER, 10000, true));
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+					GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 					clean();
 				}
 				break;
@@ -481,7 +481,7 @@ public class Helios extends AbstractNpcAI
 			{
 				clean();
 				_bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true));
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD);
+				GrandBossManager.getInstance().setStatus(HELIOS3, DEAD);
 				final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index 27a44fc962..b94d17f47b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -117,7 +117,7 @@ public class Kelbim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+		final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -129,14 +129,14 @@ public class Kelbim extends AbstractNpcAI
 			{
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
 			openDoor(DOOR1, 0);
 			openDoor(DOOR2, 0);
-			GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 		}
 	}
 	
@@ -147,7 +147,7 @@ public class Kelbim extends AbstractNpcAI
 		{
 			case "unlock_kelbim":
 			{
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 				Broadcast.toAllOnlinePlayers(new Earthquake(-55754, 59903, -269, 20, 10));
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
@@ -157,7 +157,7 @@ public class Kelbim extends AbstractNpcAI
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -183,7 +183,7 @@ public class Kelbim extends AbstractNpcAI
 			case "stage_1_start":
 			{
 				_bossStage = 1;
-				GrandBossManager.getInstance().setBossStatus(KELBIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(KELBIM, FIGHTING);
 				playMovie(ZONE.getPlayersInside(), Movie.SC_KELBIM_OPENING);
 				startQuestTimer("stage_1_kelbim_spawn", 25000, null, null);
 				break;
@@ -307,7 +307,7 @@ public class Kelbim extends AbstractNpcAI
 	{
 		if (npc.getId() == ENTER_DEVICE)
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+			final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 			if (status > ALIVE)
 			{
 				return "34052-1.html";
@@ -349,7 +349,7 @@ public class Kelbim extends AbstractNpcAI
 				{
 					if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
 					{
-						GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
+						GrandBossManager.getInstance().setStatus(KELBIM, WAITING);
 						startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
 						member.teleToLocation(KELBIM_LOCATION, true);
 					}
@@ -430,7 +430,7 @@ public class Kelbim extends AbstractNpcAI
 		notifyEvent("cancel_timers", null, null);
 		closeDoor(DOOR1, 0);
 		closeDoor(DOOR2, 0);
-		GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD);
+		GrandBossManager.getInstance().setStatus(KELBIM, DEAD);
 		final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
 		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 40890fc9dc..5b16c333e2 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -53,12 +53,12 @@ public class KatoSicanus extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(LINDVIOR_LOCATION, true);
 				addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 60000, false);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 			}
 			else
 			{
@@ -115,7 +115,7 @@ public class KatoSicanus extends AbstractNpcAI
 					{
 						member.teleToLocation(LINDVIOR_LOCATION, true);
 						addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);
-						GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+						GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 05475517a1..32dc16c33f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -223,7 +223,7 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
-		final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+		final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -235,14 +235,14 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 			}
 		}
 		else
 		{
 			_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -428,9 +428,9 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair.oustAllPlayers();
 		_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, false));
 		cancelQuestTimers("attack_generator");
-		if (GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID) != 3)
+		if (GrandBossManager.getInstance().getStatus(LINDVIOR_RAID) != 3)
 		{
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -660,7 +660,7 @@ public class Lindvior extends AbstractNpcAI
 				cancelQuestTimers("attack_generator");
 				_lindviorfake.setDead(true);
 				_lindviorfake.deleteMe();
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, FIGHTING);
 				_lionel = addSpawn(LIONEL_HUNTER, 42630, -48231, -792, 855, false, 0, false);
 				
 				_lindvior = (GrandBoss) addSpawn(LINDVIOR_GROUND, CENTER_LOCATION, false, 0, true);
@@ -682,7 +682,7 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 				break;
 			}
 			case "stage_1_activate_generator":
@@ -851,7 +851,7 @@ public class Lindvior extends AbstractNpcAI
 			_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, true));
 			_lionel.deleteMe();
 			
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, DEAD);
 			final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 50a6e42559..c856b7e7ad 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -84,7 +84,7 @@ public class Orfen extends AbstractNpcAI
 		};
 		registerMobs(mobs);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -99,7 +99,7 @@ public class Orfen extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn Orfen.
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -146,7 +146,7 @@ public class Orfen extends AbstractNpcAI
 		if (event.equalsIgnoreCase("orfen_unlock"))
 		{
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_minion_loc"))
@@ -302,7 +302,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -315,7 +315,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 69f8397c06..db5f7dc5cd 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -47,7 +47,7 @@ public class QueenAnt extends AbstractNpcAI
 		addKillId(QUEEN_ANT);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN_ANT);
-		if (GrandBossManager.getInstance().getBossStatus(QUEEN_ANT) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(QUEEN_ANT) == DEAD)
 		{
 			// Load the unlock date and time for queen ant from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -58,7 +58,7 @@ public class QueenAnt extends AbstractNpcAI
 			else // The time has already expired while the server was offline. Immediately spawn queen ant.
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN_ANT, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN_ANT, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN_ANT, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -88,7 +88,7 @@ public class QueenAnt extends AbstractNpcAI
 		if ("queen_unlock".equals(event))
 		{
 			final GrandBoss queen = (GrandBoss) addSpawn(QUEEN_ANT, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(QUEEN_ANT, ALIVE);
+			GrandBossManager.getInstance().setStatus(QUEEN_ANT, ALIVE);
 			spawnBoss(queen);
 		}
 		return super.onAdvEvent(event, npc, player);
@@ -98,7 +98,7 @@ public class QueenAnt extends AbstractNpcAI
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
 		npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-		GrandBossManager.getInstance().setBossStatus(QUEEN_ANT, DEAD);
+		GrandBossManager.getInstance().setStatus(QUEEN_ANT, DEAD);
 		
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index ff34c76a64..70d36f9c61 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -54,11 +54,11 @@ public class Daichir extends AbstractNpcAI
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+			final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOCATION, true);
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+				GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 			}
 			else
 			{
@@ -107,7 +107,7 @@ public class Daichir extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOCATION, true);
-						GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+						GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 					}
 				}
 			}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index 523bb946c7..f621e8786a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -324,7 +324,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+		final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -334,12 +334,12 @@ public class Trasken extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 		}
 	}
 	
@@ -398,7 +398,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		_zoneLair.oustAllPlayers();
 		_zoneLair2.oustAllPlayers();
-		GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 	}
 	
 	@Override
@@ -575,7 +575,7 @@ public class Trasken extends AbstractNpcAI
 		{
 			case "unlock_trasken":
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 				break;
 			}
 			case "exitEarthWyrnCave":
@@ -604,7 +604,7 @@ public class Trasken extends AbstractNpcAI
 				ThreadPool.schedule(npc::decayMe, 10000);
 				cancelQuestTimer("finish", npc, null);
 				
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
+				GrandBossManager.getInstance().setStatus(TRASKEN, DEAD);
 				final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0528e31558..60ec4e0146 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = ZoneManager.getInstance().getZoneById(12010);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index add909d9b3..49319008fe 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index eeb7a402ea..036c52246f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -159,7 +159,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(VALAKAS, BAIUM, QUEENANT, ORFEN, CORE, FAFURION).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 997b5ab5e5..ab16454461 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 342ddc4466..ec8e5d5ac8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -48,7 +48,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			final GrandBoss boss = GrandBossManager.getInstance().getBoss(bossId);
 			if (boss == null)
 			{
-				final RaidBossStatus status = DBSpawnManager.getInstance().getNpcStatusId(bossId);
+				final RaidBossStatus status = DBSpawnManager.getInstance().getStatus(bossId);
 				if (status != RaidBossStatus.UNDEFINED)
 				{
 					final Npc npc = DBSpawnManager.getInstance().getNpc(bossId);
@@ -71,7 +71,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			{
 				if (boss.isDead() || !boss.isSpawned())
 				{
-					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0))
+					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getStatus(BAIUM) == 0))
 					{
 						_statuses.put(bossId, RaidBossStatus.ALIVE);
 					}
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
index 0aa8825973..36666c5e39 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
@@ -53,11 +53,11 @@ public class Leona extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(ETINA_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(ETINA_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOC, true);
-				GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+				GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 			}
 			else
 			{
@@ -106,7 +106,7 @@ public class Leona extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOC, false);
-						GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+						GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index ff1e43330f..50c14b79bb 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -69,7 +69,7 @@ public class Kekropus extends AbstractNpcAI
 			}
 			case "helios":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -132,7 +132,7 @@ public class Kekropus extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS, WAITING);
+					GrandBossManager.getInstance().setStatus(HELIOS, WAITING);
 					heliosAI().startQuestTimer("beginning", Config.HELIOS_WAIT_TIME * 60000, null, null);
 				}
 				break;
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index bf7ab3400a..92b4915758 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -51,11 +51,11 @@ public class Erda extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(ETINA_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(ETINA_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOC, true);
-				GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+				GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 			}
 			else
 			{
@@ -104,7 +104,7 @@ public class Erda extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOC, false);
-						GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+						GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index f4ae4aa580..5090a94ed4 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -642,7 +642,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -652,7 +652,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 8db07e79e9..36d70dc920 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI
 		addTalkId(STONE_COFFIN);
 		addFirstTalkId(ELF);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
-		final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
+		final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -115,12 +115,12 @@ public class Beleth extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 		}
 		DoorData.getInstance().getDoor(DOOR1).openMe();
 	}
@@ -132,7 +132,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			case "BELETH_UNLOCK":
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 				DoorData.getInstance().getDoor(DOOR1).openMe();
 				break;
 			}
@@ -509,7 +509,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				if ((_lastAttack + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+					GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -539,7 +539,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
-		if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) < FIGHT))
+		if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) < FIGHT))
 		{
 			if (_priest != null)
 			{
@@ -550,7 +550,7 @@ public class Beleth extends AbstractNpcAI
 				_stone.deleteMe();
 			}
 			
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
 			startQuestTimer("SPAWN1", Config.BELETH_WAIT_TIME * 60 * 1000, null, null);
 		}
 		
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			cancelQuestTimer("CHECK_ATTACK", null, null);
 			setBelethKiller(killer);
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
 			final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index 9ac3657157..e2770b5bec 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -53,7 +53,7 @@ public class Wormhole extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(BELETH);
+			final int status = GrandBossManager.getInstance().getStatus(BELETH);
 			if (status == 1)
 			{
 				return "33901-4.html";
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java
index de153239c4..344ad52a0a 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
 			
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index 072bfac22e..1000c576ba 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -328,7 +328,7 @@ public class EtisVanEtina extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
-		final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1);
+		final int status = GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -338,12 +338,12 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 			}
 		}
 		else
 		{
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 		}
 	}
 	
@@ -354,16 +354,16 @@ public class EtisVanEtina extends AbstractNpcAI
 		{
 			case "unlock_etina":
 			{
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE)
+					if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE)
 					{
-						GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+						GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 					}
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
@@ -381,7 +381,7 @@ public class EtisVanEtina extends AbstractNpcAI
 					}
 					startQuestTimer("end_etina", 2000, null, null);
 				}
-				else if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == FIGHTING)
+				else if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == FIGHTING)
 				{
 					startQuestTimer("check_activity_task", 60000, null, null);
 				}
@@ -505,9 +505,9 @@ public class EtisVanEtina extends AbstractNpcAI
 		closeDoor(DOOR2, 0);
 		closeDoor(DOOR3, 0);
 		closeDoor(DOOR4, 0);
-		if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE))
+		if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE))
 		{
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 		}
 	}
 	
@@ -680,7 +680,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				_collapseTask.cancel(true);
 				_collapseTask = null;
 			}
-			if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
+			if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
 			{
 				_spawned = true;
 				_spawns.clear();
@@ -696,7 +696,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				_paragon = (Monster) addSpawn(PARAGON, PARAGON_LOC);
 				_paragon.setInvul(true);
 				BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true)));
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, FIGHTING);
 				_lastAction = System.currentTimeMillis();
 				startQuestTimer("check_activity_task", 60000, null, null);
 			}
@@ -726,7 +726,7 @@ public class EtisVanEtina extends AbstractNpcAI
 		{
 			notifyEvent("cancel_timers", null, null);
 			BOSS_ZONE.getPlayersInside().forEach(player -> playMovie(player, Movie.SC_ETIS_VAN_ETINA_ENDING));
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, DEAD);
 			final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index 41fb0a71ed..40235b2693 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -81,7 +81,7 @@ public class Fafurion extends AbstractNpcAI
 		addKillId(FAFURION_STAGE_1, FAFURION_STAGE_2, FAFURION_STAGE_3, FAFURION_STAGE_4, FAFURION_STAGE_5, FAFURION_STAGE_6, FAFURION_STAGE_7);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
-		final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+		final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -93,14 +93,14 @@ public class Fafurion extends AbstractNpcAI
 			{
 				final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(fafurion);
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 			}
 		}
 		else
 		{
 			final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(fafurion);
-			GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+			GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 		}
 	}
 	
@@ -114,7 +114,7 @@ public class Fafurion extends AbstractNpcAI
 			{
 				final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(fafurion);
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 				break;
 			}
 			case "warning":
@@ -131,7 +131,7 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID) == WAITING)
 				{
 					// checking fafurion stage.
 					_stage = GlobalVariablesManager.getInstance().getInt("Fafurion_Stage", 1);
@@ -139,7 +139,7 @@ public class Fafurion extends AbstractNpcAI
 					{
 						playMovie(p, Movie.SC_FAFURION_INTRO);
 					});
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
 					switch (_stage)
 					{
 						case 1:
@@ -184,14 +184,14 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+				final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					for (Player plr : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 5000))
 					{
 						plr.sendPacket(new ExShowScreenMessage(NpcStringId.FAFURION_S_NEST_RAID_IS_OVER, ExShowScreenMessage.TOP_CENTER, 10000, true));
 					}
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 					FAFURION_ZONE.oustAllPlayers();
 					npc.deleteMe();
 					if (_stage > 1)
@@ -204,7 +204,7 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "enter_area":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+				final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -263,7 +263,7 @@ public class Fafurion extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, WAITING);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, WAITING);
 					startQuestTimer("beginning", Config.FAFURION_WAIT_TIME * 60000, null, null);
 					startQuestTimer("warning", Config.FAFURION_WAIT_TIME > 0 ? (Config.FAFURION_WAIT_TIME * 60000) - 30000 : 0, null, player);
 				}
@@ -446,7 +446,7 @@ public class Fafurion extends AbstractNpcAI
 				p.sendPacket(new ExShowScreenMessage(NpcStringId.HONORED_WARRIORS_HAVE_DEFEATED_THE_WATER_DRAGON_FAFURION, ExShowScreenMessage.TOP_CENTER, 20000, true));
 			});
 			
-			GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD);
+			GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, DEAD);
 			final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index 0235b491b0..d6de973ec6 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -147,7 +147,7 @@ public class Helios extends AbstractNpcAI
 		_bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
-		final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+		final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -159,14 +159,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 			}
 		}
 		else
 		{
 			_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_tempHelios);
-			GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+			GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 		}
 	}
 	
@@ -329,14 +329,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 				break;
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(HELIOS3) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(HELIOS3) == WAITING)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, FIGHTING);
+					GrandBossManager.getInstance().setStatus(HELIOS3, FIGHTING);
 					_bossInstance = addSpawn(HELIOS1, HELIOS_SPAWN_LOC.getX(), HELIOS_SPAWN_LOC.getY(), HELIOS_SPAWN_LOC.getZ(), HELIOS_SPAWN_LOC.getHeading(), false, 0, false);
 					for (SpawnHolder spawn : SPAWNS_MINIONS)
 					{
@@ -348,12 +348,12 @@ public class Helios extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					_bossZone.oustAllPlayers();
 					Broadcast.toAllOnlinePlayers(new ExShowScreenMessage(NpcStringId.THE_HEROES_DRAINED_OF_THEIR_POWERS_HAVE_BEEN_BANISHED_FROM_THE_THRONE_OF_HELIOS_BY_HELIOS_POWERS, ExShowScreenMessage.TOP_CENTER, 10000, true));
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+					GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 					clean();
 				}
 				break;
@@ -481,7 +481,7 @@ public class Helios extends AbstractNpcAI
 			{
 				clean();
 				_bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true));
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD);
+				GrandBossManager.getInstance().setStatus(HELIOS3, DEAD);
 				final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index 27a44fc962..b94d17f47b 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -117,7 +117,7 @@ public class Kelbim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+		final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -129,14 +129,14 @@ public class Kelbim extends AbstractNpcAI
 			{
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
 			openDoor(DOOR1, 0);
 			openDoor(DOOR2, 0);
-			GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 		}
 	}
 	
@@ -147,7 +147,7 @@ public class Kelbim extends AbstractNpcAI
 		{
 			case "unlock_kelbim":
 			{
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 				Broadcast.toAllOnlinePlayers(new Earthquake(-55754, 59903, -269, 20, 10));
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
@@ -157,7 +157,7 @@ public class Kelbim extends AbstractNpcAI
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -183,7 +183,7 @@ public class Kelbim extends AbstractNpcAI
 			case "stage_1_start":
 			{
 				_bossStage = 1;
-				GrandBossManager.getInstance().setBossStatus(KELBIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(KELBIM, FIGHTING);
 				playMovie(ZONE.getPlayersInside(), Movie.SC_KELBIM_OPENING);
 				startQuestTimer("stage_1_kelbim_spawn", 25000, null, null);
 				break;
@@ -307,7 +307,7 @@ public class Kelbim extends AbstractNpcAI
 	{
 		if (npc.getId() == ENTER_DEVICE)
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+			final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 			if (status > ALIVE)
 			{
 				return "34052-1.html";
@@ -349,7 +349,7 @@ public class Kelbim extends AbstractNpcAI
 				{
 					if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
 					{
-						GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
+						GrandBossManager.getInstance().setStatus(KELBIM, WAITING);
 						startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
 						member.teleToLocation(KELBIM_LOCATION, true);
 					}
@@ -430,7 +430,7 @@ public class Kelbim extends AbstractNpcAI
 		notifyEvent("cancel_timers", null, null);
 		closeDoor(DOOR1, 0);
 		closeDoor(DOOR2, 0);
-		GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD);
+		GrandBossManager.getInstance().setStatus(KELBIM, DEAD);
 		final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
 		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 40890fc9dc..5b16c333e2 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -53,12 +53,12 @@ public class KatoSicanus extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(LINDVIOR_LOCATION, true);
 				addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 60000, false);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 			}
 			else
 			{
@@ -115,7 +115,7 @@ public class KatoSicanus extends AbstractNpcAI
 					{
 						member.teleToLocation(LINDVIOR_LOCATION, true);
 						addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);
-						GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+						GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 05475517a1..32dc16c33f 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -223,7 +223,7 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
-		final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+		final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -235,14 +235,14 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 			}
 		}
 		else
 		{
 			_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -428,9 +428,9 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair.oustAllPlayers();
 		_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, false));
 		cancelQuestTimers("attack_generator");
-		if (GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID) != 3)
+		if (GrandBossManager.getInstance().getStatus(LINDVIOR_RAID) != 3)
 		{
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -660,7 +660,7 @@ public class Lindvior extends AbstractNpcAI
 				cancelQuestTimers("attack_generator");
 				_lindviorfake.setDead(true);
 				_lindviorfake.deleteMe();
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, FIGHTING);
 				_lionel = addSpawn(LIONEL_HUNTER, 42630, -48231, -792, 855, false, 0, false);
 				
 				_lindvior = (GrandBoss) addSpawn(LINDVIOR_GROUND, CENTER_LOCATION, false, 0, true);
@@ -682,7 +682,7 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 				break;
 			}
 			case "stage_1_activate_generator":
@@ -851,7 +851,7 @@ public class Lindvior extends AbstractNpcAI
 			_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, true));
 			_lionel.deleteMe();
 			
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, DEAD);
 			final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 9e51ccc325..598944f641 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -84,7 +84,7 @@ public class Orfen extends AbstractNpcAI
 		};
 		registerMobs(mobs);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -99,7 +99,7 @@ public class Orfen extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn Orfen.
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -146,7 +146,7 @@ public class Orfen extends AbstractNpcAI
 		if (event.equalsIgnoreCase("orfen_unlock"))
 		{
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_minion_loc"))
@@ -302,7 +302,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -315,7 +315,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 69f8397c06..db5f7dc5cd 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -47,7 +47,7 @@ public class QueenAnt extends AbstractNpcAI
 		addKillId(QUEEN_ANT);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN_ANT);
-		if (GrandBossManager.getInstance().getBossStatus(QUEEN_ANT) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(QUEEN_ANT) == DEAD)
 		{
 			// Load the unlock date and time for queen ant from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -58,7 +58,7 @@ public class QueenAnt extends AbstractNpcAI
 			else // The time has already expired while the server was offline. Immediately spawn queen ant.
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN_ANT, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN_ANT, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN_ANT, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -88,7 +88,7 @@ public class QueenAnt extends AbstractNpcAI
 		if ("queen_unlock".equals(event))
 		{
 			final GrandBoss queen = (GrandBoss) addSpawn(QUEEN_ANT, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(QUEEN_ANT, ALIVE);
+			GrandBossManager.getInstance().setStatus(QUEEN_ANT, ALIVE);
 			spawnBoss(queen);
 		}
 		return super.onAdvEvent(event, npc, player);
@@ -98,7 +98,7 @@ public class QueenAnt extends AbstractNpcAI
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
 		npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-		GrandBossManager.getInstance().setBossStatus(QUEEN_ANT, DEAD);
+		GrandBossManager.getInstance().setStatus(QUEEN_ANT, DEAD);
 		
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index ff34c76a64..70d36f9c61 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -54,11 +54,11 @@ public class Daichir extends AbstractNpcAI
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+			final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOCATION, true);
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+				GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 			}
 			else
 			{
@@ -107,7 +107,7 @@ public class Daichir extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOCATION, true);
-						GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+						GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 					}
 				}
 			}
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index 523bb946c7..f621e8786a 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -324,7 +324,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+		final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -334,12 +334,12 @@ public class Trasken extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 		}
 	}
 	
@@ -398,7 +398,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		_zoneLair.oustAllPlayers();
 		_zoneLair2.oustAllPlayers();
-		GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 	}
 	
 	@Override
@@ -575,7 +575,7 @@ public class Trasken extends AbstractNpcAI
 		{
 			case "unlock_trasken":
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 				break;
 			}
 			case "exitEarthWyrnCave":
@@ -604,7 +604,7 @@ public class Trasken extends AbstractNpcAI
 				ThreadPool.schedule(npc::decayMe, 10000);
 				cancelQuestTimer("finish", npc, null);
 				
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
+				GrandBossManager.getInstance().setStatus(TRASKEN, DEAD);
 				final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0528e31558..60ec4e0146 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = ZoneManager.getInstance().getZoneById(12010);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index add909d9b3..49319008fe 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index eeb7a402ea..036c52246f 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -159,7 +159,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(VALAKAS, BAIUM, QUEENANT, ORFEN, CORE, FAFURION).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 997b5ab5e5..ab16454461 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 342ddc4466..ec8e5d5ac8 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -48,7 +48,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			final GrandBoss boss = GrandBossManager.getInstance().getBoss(bossId);
 			if (boss == null)
 			{
-				final RaidBossStatus status = DBSpawnManager.getInstance().getNpcStatusId(bossId);
+				final RaidBossStatus status = DBSpawnManager.getInstance().getStatus(bossId);
 				if (status != RaidBossStatus.UNDEFINED)
 				{
 					final Npc npc = DBSpawnManager.getInstance().getNpc(bossId);
@@ -71,7 +71,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			{
 				if (boss.isDead() || !boss.isSpawned())
 				{
-					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0))
+					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getStatus(BAIUM) == 0))
 					{
 						_statuses.put(bossId, RaidBossStatus.ALIVE);
 					}
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
index 0aa8825973..36666c5e39 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java
@@ -53,11 +53,11 @@ public class Leona extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(ETINA_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(ETINA_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOC, true);
-				GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+				GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 			}
 			else
 			{
@@ -106,7 +106,7 @@ public class Leona extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOC, false);
-						GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+						GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
index ff1e43330f..50c14b79bb 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java
@@ -69,7 +69,7 @@ public class Kekropus extends AbstractNpcAI
 			}
 			case "helios":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -132,7 +132,7 @@ public class Kekropus extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS, WAITING);
+					GrandBossManager.getInstance().setStatus(HELIOS, WAITING);
 					heliosAI().startQuestTimer("beginning", Config.HELIOS_WAIT_TIME * 60000, null, null);
 				}
 				break;
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
index bf7ab3400a..92b4915758 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java
@@ -51,11 +51,11 @@ public class Erda extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(ETINA_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(ETINA_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOC, true);
-				GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+				GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 			}
 			else
 			{
@@ -104,7 +104,7 @@ public class Erda extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOC, false);
-						GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
+						GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index f4ae4aa580..5090a94ed4 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -642,7 +642,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -652,7 +652,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 8db07e79e9..36d70dc920 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI
 		addTalkId(STONE_COFFIN);
 		addFirstTalkId(ELF);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
-		final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
+		final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -115,12 +115,12 @@ public class Beleth extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 		}
 		DoorData.getInstance().getDoor(DOOR1).openMe();
 	}
@@ -132,7 +132,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			case "BELETH_UNLOCK":
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 				DoorData.getInstance().getDoor(DOOR1).openMe();
 				break;
 			}
@@ -509,7 +509,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				if ((_lastAttack + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+					GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -539,7 +539,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
-		if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) < FIGHT))
+		if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) < FIGHT))
 		{
 			if (_priest != null)
 			{
@@ -550,7 +550,7 @@ public class Beleth extends AbstractNpcAI
 				_stone.deleteMe();
 			}
 			
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
 			startQuestTimer("SPAWN1", Config.BELETH_WAIT_TIME * 60 * 1000, null, null);
 		}
 		
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			cancelQuestTimer("CHECK_ATTACK", null, null);
 			setBelethKiller(killer);
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
 			final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
index 9ac3657157..e2770b5bec 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java
@@ -53,7 +53,7 @@ public class Wormhole extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(BELETH);
+			final int status = GrandBossManager.getInstance().getStatus(BELETH);
 			if (status == 1)
 			{
 				return "33901-4.html";
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java
index de153239c4..344ad52a0a 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
 			
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index 072bfac22e..1000c576ba 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -328,7 +328,7 @@ public class EtisVanEtina extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
-		final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1);
+		final int status = GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -338,12 +338,12 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 			}
 		}
 		else
 		{
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 		}
 	}
 	
@@ -354,16 +354,16 @@ public class EtisVanEtina extends AbstractNpcAI
 		{
 			case "unlock_etina":
 			{
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 				break;
 			}
 			case "check_activity_task":
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE)
+					if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE)
 					{
-						GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+						GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 					}
 					for (Creature creature : BOSS_ZONE.getCharactersInside())
 					{
@@ -381,7 +381,7 @@ public class EtisVanEtina extends AbstractNpcAI
 					}
 					startQuestTimer("end_etina", 2000, null, null);
 				}
-				else if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == FIGHTING)
+				else if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == FIGHTING)
 				{
 					startQuestTimer("check_activity_task", 60000, null, null);
 				}
@@ -505,9 +505,9 @@ public class EtisVanEtina extends AbstractNpcAI
 		closeDoor(DOOR2, 0);
 		closeDoor(DOOR3, 0);
 		closeDoor(DOOR4, 0);
-		if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE))
+		if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE))
 		{
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
 		}
 	}
 	
@@ -680,7 +680,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				_collapseTask.cancel(true);
 				_collapseTask = null;
 			}
-			if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
+			if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
 			{
 				_spawned = true;
 				_spawns.clear();
@@ -696,7 +696,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				_paragon = (Monster) addSpawn(PARAGON, PARAGON_LOC);
 				_paragon.setInvul(true);
 				BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true)));
-				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING);
+				GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, FIGHTING);
 				_lastAction = System.currentTimeMillis();
 				startQuestTimer("check_activity_task", 60000, null, null);
 			}
@@ -726,7 +726,7 @@ public class EtisVanEtina extends AbstractNpcAI
 		{
 			notifyEvent("cancel_timers", null, null);
 			BOSS_ZONE.getPlayersInside().forEach(player -> playMovie(player, Movie.SC_ETIS_VAN_ETINA_ENDING));
-			GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD);
+			GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, DEAD);
 			final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
index 41fb0a71ed..40235b2693 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java
@@ -81,7 +81,7 @@ public class Fafurion extends AbstractNpcAI
 		addKillId(FAFURION_STAGE_1, FAFURION_STAGE_2, FAFURION_STAGE_3, FAFURION_STAGE_4, FAFURION_STAGE_5, FAFURION_STAGE_6, FAFURION_STAGE_7);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
-		final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+		final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -93,14 +93,14 @@ public class Fafurion extends AbstractNpcAI
 			{
 				final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(fafurion);
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 			}
 		}
 		else
 		{
 			final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(fafurion);
-			GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+			GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 		}
 	}
 	
@@ -114,7 +114,7 @@ public class Fafurion extends AbstractNpcAI
 			{
 				final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(fafurion);
-				GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+				GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 				break;
 			}
 			case "warning":
@@ -131,7 +131,7 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID) == WAITING)
 				{
 					// checking fafurion stage.
 					_stage = GlobalVariablesManager.getInstance().getInt("Fafurion_Stage", 1);
@@ -139,7 +139,7 @@ public class Fafurion extends AbstractNpcAI
 					{
 						playMovie(p, Movie.SC_FAFURION_INTRO);
 					});
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
 					switch (_stage)
 					{
 						case 1:
@@ -184,14 +184,14 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+				final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					for (Player plr : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 5000))
 					{
 						plr.sendPacket(new ExShowScreenMessage(NpcStringId.FAFURION_S_NEST_RAID_IS_OVER, ExShowScreenMessage.TOP_CENTER, 10000, true));
 					}
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
 					FAFURION_ZONE.oustAllPlayers();
 					npc.deleteMe();
 					if (_stage > 1)
@@ -204,7 +204,7 @@ public class Fafurion extends AbstractNpcAI
 			}
 			case "enter_area":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
+				final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
 				if (player.isGM())
 				{
 					player.teleToLocation(RAID_ENTER_LOC, true);
@@ -263,7 +263,7 @@ public class Fafurion extends AbstractNpcAI
 				}
 				if (status == ALIVE)
 				{
-					GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, WAITING);
+					GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, WAITING);
 					startQuestTimer("beginning", Config.FAFURION_WAIT_TIME * 60000, null, null);
 					startQuestTimer("warning", Config.FAFURION_WAIT_TIME > 0 ? (Config.FAFURION_WAIT_TIME * 60000) - 30000 : 0, null, player);
 				}
@@ -446,7 +446,7 @@ public class Fafurion extends AbstractNpcAI
 				p.sendPacket(new ExShowScreenMessage(NpcStringId.HONORED_WARRIORS_HAVE_DEFEATED_THE_WATER_DRAGON_FAFURION, ExShowScreenMessage.TOP_CENTER, 20000, true));
 			});
 			
-			GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD);
+			GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, DEAD);
 			final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java
index 0235b491b0..d6de973ec6 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java
@@ -147,7 +147,7 @@ public class Helios extends AbstractNpcAI
 		_bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
-		final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+		final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -159,14 +159,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 			}
 		}
 		else
 		{
 			_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_tempHelios);
-			GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+			GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 		}
 	}
 	
@@ -329,14 +329,14 @@ public class Helios extends AbstractNpcAI
 			{
 				_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_tempHelios);
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+				GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 				break;
 			}
 			case "beginning":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(HELIOS3) == WAITING)
+				if (GrandBossManager.getInstance().getStatus(HELIOS3) == WAITING)
 				{
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, FIGHTING);
+					GrandBossManager.getInstance().setStatus(HELIOS3, FIGHTING);
 					_bossInstance = addSpawn(HELIOS1, HELIOS_SPAWN_LOC.getX(), HELIOS_SPAWN_LOC.getY(), HELIOS_SPAWN_LOC.getZ(), HELIOS_SPAWN_LOC.getHeading(), false, 0, false);
 					for (SpawnHolder spawn : SPAWNS_MINIONS)
 					{
@@ -348,12 +348,12 @@ public class Helios extends AbstractNpcAI
 			}
 			case "resetRaid":
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
+				final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
 				if ((status > ALIVE) && (status < DEAD))
 				{
 					_bossZone.oustAllPlayers();
 					Broadcast.toAllOnlinePlayers(new ExShowScreenMessage(NpcStringId.THE_HEROES_DRAINED_OF_THEIR_POWERS_HAVE_BEEN_BANISHED_FROM_THE_THRONE_OF_HELIOS_BY_HELIOS_POWERS, ExShowScreenMessage.TOP_CENTER, 10000, true));
-					GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
+					GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
 					clean();
 				}
 				break;
@@ -481,7 +481,7 @@ public class Helios extends AbstractNpcAI
 			{
 				clean();
 				_bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true));
-				GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD);
+				GrandBossManager.getInstance().setStatus(HELIOS3, DEAD);
 				final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
index 27a44fc962..b94d17f47b 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java
@@ -117,7 +117,7 @@ public class Kelbim extends AbstractNpcAI
 		
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
-		final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+		final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -129,14 +129,14 @@ public class Kelbim extends AbstractNpcAI
 			{
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
 			openDoor(DOOR1, 0);
 			openDoor(DOOR2, 0);
-			GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+			GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 		}
 	}
 	
@@ -147,7 +147,7 @@ public class Kelbim extends AbstractNpcAI
 		{
 			case "unlock_kelbim":
 			{
-				GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+				GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 				Broadcast.toAllOnlinePlayers(new Earthquake(-55754, 59903, -269, 20, 10));
 				openDoor(DOOR1, 0);
 				openDoor(DOOR2, 0);
@@ -157,7 +157,7 @@ public class Kelbim extends AbstractNpcAI
 			{
 				if ((_lastAction + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
+					GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -183,7 +183,7 @@ public class Kelbim extends AbstractNpcAI
 			case "stage_1_start":
 			{
 				_bossStage = 1;
-				GrandBossManager.getInstance().setBossStatus(KELBIM, FIGHTING);
+				GrandBossManager.getInstance().setStatus(KELBIM, FIGHTING);
 				playMovie(ZONE.getPlayersInside(), Movie.SC_KELBIM_OPENING);
 				startQuestTimer("stage_1_kelbim_spawn", 25000, null, null);
 				break;
@@ -307,7 +307,7 @@ public class Kelbim extends AbstractNpcAI
 	{
 		if (npc.getId() == ENTER_DEVICE)
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
+			final int status = GrandBossManager.getInstance().getStatus(KELBIM);
 			if (status > ALIVE)
 			{
 				return "34052-1.html";
@@ -349,7 +349,7 @@ public class Kelbim extends AbstractNpcAI
 				{
 					if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
 					{
-						GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
+						GrandBossManager.getInstance().setStatus(KELBIM, WAITING);
 						startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
 						member.teleToLocation(KELBIM_LOCATION, true);
 					}
@@ -430,7 +430,7 @@ public class Kelbim extends AbstractNpcAI
 		notifyEvent("cancel_timers", null, null);
 		closeDoor(DOOR1, 0);
 		closeDoor(DOOR2, 0);
-		GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD);
+		GrandBossManager.getInstance().setStatus(KELBIM, DEAD);
 		final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
 		info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
index 40890fc9dc..5b16c333e2 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java
@@ -53,12 +53,12 @@ public class KatoSicanus extends AbstractNpcAI
 	{
 		if (event.equals("teleport"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+			final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 			if (player.isGM())
 			{
 				player.teleToLocation(LINDVIOR_LOCATION, true);
 				addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 60000, false);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 			}
 			else
 			{
@@ -115,7 +115,7 @@ public class KatoSicanus extends AbstractNpcAI
 					{
 						member.teleToLocation(LINDVIOR_LOCATION, true);
 						addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);
-						GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
+						GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
 					}
 				}
 			}
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
index 05475517a1..32dc16c33f 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java
@@ -223,7 +223,7 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
-		final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
+		final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -235,14 +235,14 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 			}
 		}
 		else
 		{
 			_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 			GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -428,9 +428,9 @@ public class Lindvior extends AbstractNpcAI
 		_zoneLair.oustAllPlayers();
 		_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, false));
 		cancelQuestTimers("attack_generator");
-		if (GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID) != 3)
+		if (GrandBossManager.getInstance().getStatus(LINDVIOR_RAID) != 3)
 		{
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 		}
 	}
 	
@@ -660,7 +660,7 @@ public class Lindvior extends AbstractNpcAI
 				cancelQuestTimers("attack_generator");
 				_lindviorfake.setDead(true);
 				_lindviorfake.deleteMe();
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, FIGHTING);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, FIGHTING);
 				_lionel = addSpawn(LIONEL_HUNTER, 42630, -48231, -792, 855, false, 0, false);
 				
 				_lindvior = (GrandBoss) addSpawn(LINDVIOR_GROUND, CENTER_LOCATION, false, 0, true);
@@ -682,7 +682,7 @@ public class Lindvior extends AbstractNpcAI
 			{
 				_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
 				GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
-				GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
+				GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
 				break;
 			}
 			case "stage_1_activate_generator":
@@ -851,7 +851,7 @@ public class Lindvior extends AbstractNpcAI
 			_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, true));
 			_lionel.deleteMe();
 			
-			GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
+			GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, DEAD);
 			final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 9e51ccc325..598944f641 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -84,7 +84,7 @@ public class Orfen extends AbstractNpcAI
 		};
 		registerMobs(mobs);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -99,7 +99,7 @@ public class Orfen extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn Orfen.
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -146,7 +146,7 @@ public class Orfen extends AbstractNpcAI
 		if (event.equalsIgnoreCase("orfen_unlock"))
 		{
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_minion_loc"))
@@ -302,7 +302,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -315,7 +315,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 69f8397c06..db5f7dc5cd 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -47,7 +47,7 @@ public class QueenAnt extends AbstractNpcAI
 		addKillId(QUEEN_ANT);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN_ANT);
-		if (GrandBossManager.getInstance().getBossStatus(QUEEN_ANT) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(QUEEN_ANT) == DEAD)
 		{
 			// Load the unlock date and time for queen ant from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -58,7 +58,7 @@ public class QueenAnt extends AbstractNpcAI
 			else // The time has already expired while the server was offline. Immediately spawn queen ant.
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN_ANT, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN_ANT, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN_ANT, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -88,7 +88,7 @@ public class QueenAnt extends AbstractNpcAI
 		if ("queen_unlock".equals(event))
 		{
 			final GrandBoss queen = (GrandBoss) addSpawn(QUEEN_ANT, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(QUEEN_ANT, ALIVE);
+			GrandBossManager.getInstance().setStatus(QUEEN_ANT, ALIVE);
 			spawnBoss(queen);
 		}
 		return super.onAdvEvent(event, npc, player);
@@ -98,7 +98,7 @@ public class QueenAnt extends AbstractNpcAI
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
 		npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-		GrandBossManager.getInstance().setBossStatus(QUEEN_ANT, DEAD);
+		GrandBossManager.getInstance().setStatus(QUEEN_ANT, DEAD);
 		
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
index ff34c76a64..70d36f9c61 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java
@@ -54,11 +54,11 @@ public class Daichir extends AbstractNpcAI
 	{
 		if (event.equals("enterEarthWyrnCave"))
 		{
-			final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+			final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 			if (player.isGM())
 			{
 				player.teleToLocation(ENTER_LOCATION, true);
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+				GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 			}
 			else
 			{
@@ -107,7 +107,7 @@ public class Daichir extends AbstractNpcAI
 					if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
 					{
 						member.teleToLocation(ENTER_LOCATION, true);
-						GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
+						GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
 					}
 				}
 			}
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
index 523bb946c7..f621e8786a 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java
@@ -324,7 +324,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		// Unlock
 		final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
+		final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -334,12 +334,12 @@ public class Trasken extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 		}
 	}
 	
@@ -398,7 +398,7 @@ public class Trasken extends AbstractNpcAI
 		}
 		_zoneLair.oustAllPlayers();
 		_zoneLair2.oustAllPlayers();
-		GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 	}
 	
 	@Override
@@ -575,7 +575,7 @@ public class Trasken extends AbstractNpcAI
 		{
 			case "unlock_trasken":
 			{
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
 				break;
 			}
 			case "exitEarthWyrnCave":
@@ -604,7 +604,7 @@ public class Trasken extends AbstractNpcAI
 				ThreadPool.schedule(npc::decayMe, 10000);
 				cancelQuestTimer("finish", npc, null);
 				
-				GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
+				GrandBossManager.getInstance().setStatus(TRASKEN, DEAD);
 				final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
 				final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
 				info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0528e31558..60ec4e0146 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = ZoneManager.getInstance().getZoneById(12010);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index add909d9b3..49319008fe 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index eeb7a402ea..036c52246f 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -159,7 +159,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(VALAKAS, BAIUM, QUEENANT, ORFEN, CORE, FAFURION).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 997b5ab5e5..ab16454461 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 342ddc4466..ec8e5d5ac8 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -48,7 +48,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			final GrandBoss boss = GrandBossManager.getInstance().getBoss(bossId);
 			if (boss == null)
 			{
-				final RaidBossStatus status = DBSpawnManager.getInstance().getNpcStatusId(bossId);
+				final RaidBossStatus status = DBSpawnManager.getInstance().getStatus(bossId);
 				if (status != RaidBossStatus.UNDEFINED)
 				{
 					final Npc npc = DBSpawnManager.getInstance().getNpc(bossId);
@@ -71,7 +71,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			{
 				if (boss.isDead() || !boss.isSpawned())
 				{
-					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0))
+					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getStatus(BAIUM) == 0))
 					{
 						_statuses.put(bossId, RaidBossStatus.ALIVE);
 					}
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java
index 18d4848f21..45dbb4314b 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java
@@ -206,7 +206,7 @@ public class Antharas extends Quest
 			LOGGER.warning(e.getMessage());
 		}
 		
-		Integer status = GrandBossManager.getInstance().getBossStatus(ANTHARAS_OLD);
+		Integer status = GrandBossManager.getInstance().getStatus(ANTHARAS_OLD);
 		if (FWA_OLDANTHARAS || (status == WAITING))
 		{
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS_OLD);
@@ -215,7 +215,7 @@ public class Antharas extends Quest
 			{
 				// The time has already expired while the server was offline. Immediately spawn antharas in his cave.
 				// Also, the status needs to be changed to DORMANT.
-				GrandBossManager.getInstance().setBossStatus(ANTHARAS_OLD, DORMANT);
+				GrandBossManager.getInstance().setStatus(ANTHARAS_OLD, DORMANT);
 				status = DORMANT;
 			}
 			else if (status == FIGHTING)
@@ -248,9 +248,9 @@ public class Antharas extends Quest
 		}
 		else
 		{
-			final Integer statusWeak = GrandBossManager.getInstance().getBossStatus(ANTHARAS_WEAK);
-			final Integer statusNormal = GrandBossManager.getInstance().getBossStatus(ANTHARAS_NORMAL);
-			final Integer statusStrong = GrandBossManager.getInstance().getBossStatus(ANTHARAS_STRONG);
+			final Integer statusWeak = GrandBossManager.getInstance().getStatus(ANTHARAS_WEAK);
+			final Integer statusNormal = GrandBossManager.getInstance().getStatus(ANTHARAS_NORMAL);
+			final Integer statusStrong = GrandBossManager.getInstance().getStatus(ANTHARAS_STRONG);
 			int antharasId = 0;
 			if ((statusWeak == FIGHTING) || (statusWeak == DEAD))
 			{
@@ -291,7 +291,7 @@ public class Antharas extends Quest
 				{
 					// The time has already expired while the server was offline. Immediately spawn antharas in his cave.
 					// Also, the status needs to be changed to DORMANT.
-					GrandBossManager.getInstance().setBossStatus(antharasId, DORMANT);
+					GrandBossManager.getInstance().setStatus(antharasId, DORMANT);
 					status = DORMANT;
 				}
 				else
@@ -334,7 +334,7 @@ public class Antharas extends Quest
 			{
 				if (_monsterSpawnTask == null)
 				{
-					GrandBossManager.getInstance().setBossStatus(ANTHARAS_OLD, WAITING);
+					GrandBossManager.getInstance().setStatus(ANTHARAS_OLD, WAITING);
 					_monsterSpawnTask = ThreadPool.schedule(new AntharasSpawn(1), 60000 * Config.ANTHARAS_WAIT_TIME);
 				}
 			}
@@ -418,8 +418,8 @@ public class Antharas extends Quest
 					GrandBossManager.getInstance().addBoss(_antharas);
 					_monsters.add(_antharas);
 					_antharas.setImmobilized(true);
-					GrandBossManager.getInstance().setBossStatus(ANTHARAS_OLD, DORMANT);
-					GrandBossManager.getInstance().setBossStatus(npcId, FIGHTING);
+					GrandBossManager.getInstance().setStatus(ANTHARAS_OLD, DORMANT);
+					GrandBossManager.getInstance().setStatus(npcId, FIGHTING);
 					_lastAction = System.currentTimeMillis();
 					// Start repeating timer to check for inactivity.
 					_activityCheckTask = ThreadPool.scheduleAtFixedRate(new CheckActivity(), 60000, 60000);
@@ -710,7 +710,7 @@ public class Antharas extends Quest
 			final Long temp = (System.currentTimeMillis() - _lastAction);
 			if (temp > (Config.ANTHARAS_DESPAWN_TIME * 60000))
 			{
-				GrandBossManager.getInstance().setBossStatus(_antharas.getNpcId(), DORMANT);
+				GrandBossManager.getInstance().setStatus(_antharas.getNpcId(), DORMANT);
 				finishRaid();
 			}
 		}
@@ -816,7 +816,7 @@ public class Antharas extends Quest
 		@Override
 		public void run()
 		{
-			GrandBossManager.getInstance().setBossStatus(_bossId, DORMANT);
+			GrandBossManager.getInstance().setStatus(_bossId, DORMANT);
 			if (FWA_DOSERVEREARTHQUAKE)
 			{
 				for (Player p : World.getInstance().getAllPlayers())
@@ -912,7 +912,7 @@ public class Antharas extends Quest
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS01_D", npc));
 			_cubeSpawnTask = ThreadPool.schedule(new CubeSpawn(0), 10000);
-			GrandBossManager.getInstance().setBossStatus(npc.getNpcId(), DEAD);
+			GrandBossManager.getInstance().setStatus(npc.getNpcId(), DEAD);
 			final long respawnTime = (Config.ANTHARAS_RESP_FIRST + getRandom(Config.ANTHARAS_RESP_SECOND)) * 3600000;
 			ThreadPool.schedule(new UnlockAntharas(npc.getNpcId()), respawnTime);
 			// Also save the respawn time so that the info is maintained past restarts.
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java
index 6b96934f27..5618d4bfd8 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java
@@ -103,7 +103,7 @@ public class Baium extends Quest
 		_zone = GrandBossManager.getInstance().getZone(113100, 14500, 10077);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LIVE_BAIUM);
-		final Integer status = GrandBossManager.getInstance().getBossStatus(LIVE_BAIUM);
+		final Integer status = GrandBossManager.getInstance().getStatus(LIVE_BAIUM);
 		if (status == DEAD)
 		{
 			// Load the unlock date and time for baium from DB.
@@ -118,7 +118,7 @@ public class Baium extends Quest
 			{
 				// The time has already expired while the server was offline. Delete the saved time and immediately spawn the stone-baium. Also the state need not be changed from ASLEEP.
 				addSpawn(STONE_BAIUM, 116033, 17447, 10104, 40188, false, 0);
-				GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, ASLEEP);
+				GrandBossManager.getInstance().setStatus(LIVE_BAIUM, ASLEEP);
 			}
 		}
 		else if (status == AWAKE)
@@ -158,7 +158,7 @@ public class Baium extends Quest
 	{
 		if (event.equals("baium_unlock"))
 		{
-			GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, ASLEEP);
+			GrandBossManager.getInstance().setStatus(LIVE_BAIUM, ASLEEP);
 			addSpawn(STONE_BAIUM, 116033, 17447, 10104, 40188, false, 0);
 		}
 		else if (event.equals("skill_range") && (npc != null))
@@ -237,7 +237,7 @@ public class Baium extends Quest
 					}
 					_minions.clear();
 					addSpawn(STONE_BAIUM, 116033, 17447, 10104, 40188, false, 0); // Spawn stone-baium.
-					GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, ASLEEP); // Mark that Baium is not awake any more.
+					GrandBossManager.getInstance().setStatus(LIVE_BAIUM, ASLEEP); // Mark that Baium is not awake any more.
 					_zone.oustAllPlayers();
 					cancelQuestTimer("baium_despawn", npc, null);
 				}
@@ -245,7 +245,7 @@ public class Baium extends Quest
 				{
 					npc.setTarget(npc);
 					npc.doCast(SkillTable.getInstance().getSkill(4135, 1));
-					if (GrandBossManager.getInstance().getBossStatus(LIVE_BAIUM) != AWAKE)
+					if (GrandBossManager.getInstance().getStatus(LIVE_BAIUM) != AWAKE)
 					{
 						cancelQuestTimer("baium_despawn", npc, null);
 					}
@@ -269,13 +269,13 @@ public class Baium extends Quest
 			return "<html><body>Angelic Vortex:<br>You may not enter while admin disabled this zone</body></html>";
 		}
 		
-		final Integer status = GrandBossManager.getInstance().getBossStatus(LIVE_BAIUM);
+		final Integer status = GrandBossManager.getInstance().getStatus(LIVE_BAIUM);
 		if ((npcId == STONE_BAIUM) && (status == ASLEEP))
 		{
 			if (Config.ALLOW_DIRECT_TP_TO_BOSS_ROOM || _zone.isPlayerAllowed(player))
 			{
 				// Once Baium is awaken, no more people may enter until he dies, the server reboots, or 30 minutes pass with no attacks made against Baium.
-				GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, AWAKE);
+				GrandBossManager.getInstance().setStatus(LIVE_BAIUM, AWAKE);
 				npc.deleteMe();
 				final GrandBoss baium = (GrandBoss) addSpawn(LIVE_BAIUM, npc);
 				GrandBossManager.getInstance().addBoss(baium);
@@ -385,7 +385,7 @@ public class Baium extends Quest
 		addSpawn(29055, 115203, 16620, 10078, 0, false, 900000); // Should we teleport everyone out if the cubic despawns??
 		// Lock baium for 5 days and 1 to 8 hours [i.e. 432,000,000 + 1*3,600,000 + random-less-than(8*3,600,000) millisecs]
 		final long respawnTime = (Config.BAIUM_RESP_FIRST + getRandom(Config.BAIUM_RESP_SECOND)) * 3600000;
-		GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, DEAD);
+		GrandBossManager.getInstance().setStatus(LIVE_BAIUM, DEAD);
 		startQuestTimer("baium_unlock", respawnTime, null, null);
 		// Also save the respawn time so that the info is maintained past reboots.
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LIVE_BAIUM);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Core.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Core.java
index ea963ff60f..4924208c3e 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Core.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Core.java
@@ -99,7 +99,7 @@ public class Core extends Quest
 		
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -112,7 +112,7 @@ public class Core extends Quest
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -151,11 +151,11 @@ public class Core extends Quest
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		final Integer status = GrandBossManager.getInstance().getBossStatus(CORE);
+		final Integer status = GrandBossManager.getInstance().getStatus(CORE);
 		if (event.equals("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (status == null)
@@ -216,7 +216,7 @@ public class Core extends Quest
 			_firstAttacked = false;
 			addSpawn(31842, 16502, 110165, -6394, 0, false, 900000);
 			addSpawn(31842, 18948, 110166, -6397, 0, false, 900000);
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_RESP_FIRST + getRandom(Config.CORE_RESP_SECOND)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -227,7 +227,7 @@ public class Core extends Quest
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", Config.CORE_RESP_MINION * 1000, npc, null);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java
index 62d389ae13..61dabdabf9 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java
@@ -54,7 +54,7 @@ public class Orfen extends Quest
 		super(-1, "ai/bosses");
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final Integer status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final Integer status = GrandBossManager.getInstance().getStatus(ORFEN);
 		
 		addEventId(ORFEN, EventType.ON_KILL);
 		addEventId(ORFEN, EventType.ON_ATTACK);
@@ -71,7 +71,7 @@ public class Orfen extends Quest
 				else
 				{
 					_orfen = (GrandBoss) addSpawn(ORFEN, 55024, 17368, -5412, 0, false, 0);
-					GrandBossManager.getInstance().setBossStatus(ORFEN, LIVE);
+					GrandBossManager.getInstance().setStatus(ORFEN, LIVE);
 					GrandBossManager.getInstance().addBoss(_orfen);
 				}
 				break;
@@ -92,7 +92,7 @@ public class Orfen extends Quest
 				final int loc_z = -5412;
 				final int heading = 0;
 				_orfen = (GrandBoss) addSpawn(ORFEN, loc_x, loc_y, loc_z, heading, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, LIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, LIVE);
 				GrandBossManager.getInstance().addBoss(_orfen);
 				break;
 			}
@@ -113,7 +113,7 @@ public class Orfen extends Quest
 				final int loc_z = -5412;
 				final int heading = 0;
 				_orfen = (GrandBoss) addSpawn(ORFEN, loc_x, loc_y, loc_z, heading, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, LIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, LIVE);
 				GrandBossManager.getInstance().addBoss(_orfen);
 				break;
 			}
@@ -210,7 +210,7 @@ public class Orfen extends Quest
 		if (npc.getNpcId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", npc));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Time is 48hour +/- 20hour.
 			final long respawnTime = (Config.ORFEN_RESP_FIRST + getRandom(Config.ORFEN_RESP_SECOND)) * 3600000;
 			cancelQuestTimer("ORFEN_REFRESH", npc, null);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java
index 61f9b693c2..f00d465fe5 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java
@@ -85,7 +85,7 @@ public class QueenAnt extends Quest
 		}
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final Integer status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final Integer status = GrandBossManager.getInstance().getStatus(QUEEN);
 		
 		switch (status)
 		{
@@ -99,7 +99,7 @@ public class QueenAnt extends Quest
 				else
 				{
 					final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, -21610, 181594, -5734, 0, false, 0);
-					GrandBossManager.getInstance().setBossStatus(QUEEN, LIVE);
+					GrandBossManager.getInstance().setStatus(QUEEN, LIVE);
 					GrandBossManager.getInstance().addBoss(queen);
 					spawnBoss(queen);
 				}
@@ -118,7 +118,7 @@ public class QueenAnt extends Quest
 			default:
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, -21610, 181594, -5734, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, LIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, LIVE);
 				GrandBossManager.getInstance().addBoss(queen);
 				spawnBoss(queen);
 				break;
@@ -151,7 +151,7 @@ public class QueenAnt extends Quest
 			case QUEEN_SPAWN:
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, -21610, 181594, -5734, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, LIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, LIVE);
 				GrandBossManager.getInstance().addBoss(queen);
 				spawnBoss(queen);
 				break;
@@ -334,11 +334,11 @@ public class QueenAnt extends Quest
 	public String onKill(Npc npc, Player killer, boolean isPet)
 	{
 		final int npcId = npc.getNpcId();
-		final Integer status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final Integer status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", npc));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Time is 36hour +/- 17hour.
 			final long respawnTime = (Config.QA_RESP_FIRST + getRandom(Config.QA_RESP_SECOND)) * 3600000;
 			startQuestTimer("QUEEN_SPAWN", respawnTime, null, null);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java
index cc638ca1e5..0d890cae6b 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java
@@ -87,7 +87,7 @@ public class Valakas extends Quest
 		_zone = GrandBossManager.getInstance().getZone(212852, -114842, -1632);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final Integer status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final Integer status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		if (status == DEAD)
 		{
 			// Load the unlock date and time for valakas from DB.
@@ -102,7 +102,7 @@ public class Valakas extends Quest
 			{
 				// The time has already expired while the server was offline.
 				// The status needs to be changed to DORMANT.
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 			}
 		}
 		else if (status == FIGHTING)
@@ -156,7 +156,7 @@ public class Valakas extends Quest
 							break;
 						}
 					}
-					final Integer status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+					final Integer status = GrandBossManager.getInstance().getStatus(VALAKAS);
 					if ((status == FIGHTING) && ((System.currentTimeMillis() - lastAttackTime) > (Config.VALAKAS_DESPAWN_TIME * 60000))) // 15 mins by default.
 					{
 						npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
@@ -164,7 +164,7 @@ public class Valakas extends Quest
 						// delete the actual boss
 						final GrandBoss boss = GrandBossManager.getInstance().deleteBoss(VALAKAS);
 						boss.decayMe();
-						GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+						GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 						// npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 						_zone.oustAllPlayers();
 						cancelQuestTimer("check_activity_and_do_actions", npc, null);
@@ -271,7 +271,7 @@ public class Valakas extends Quest
 				}
 				case "1110":
 				{
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+					GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 					startQuestTimer("check_activity_and_do_actions", 60000, npc, null, true);
 					npc.setInvul(false);
 					getRandomSkill(npc);
@@ -356,7 +356,7 @@ public class Valakas extends Quest
 		{
 			// GrandBoss valakas = (GrandBoss) addSpawn(VALAKAS, -105200, -253104, -15264, 32768, false, 0);
 			// GrandBossManager.getInstance().addBoss(valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equals("remove_players"))
 		{
@@ -589,7 +589,7 @@ public class Valakas extends Quest
 		npc.broadcastPacket(new SpecialCamera(npc.getObjectId(), 1700, 2000, 130, -1, 0));
 		npc.broadcastPacket(new PlaySound(1, "B03_D", npc));
 		startQuestTimer("1111", 500, npc, null);
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		final long respawnTime = (Config.VALAKAS_RESP_FIRST + getRandom(Config.VALAKAS_RESP_SECOND)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
 		// Also save the respawn time so that the info is maintained past restarts.
@@ -996,7 +996,7 @@ public class Valakas extends Quest
 	{
 		int i1 = 0;
 		
-		final Integer status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final Integer status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		if (status == FIGHTING)
 		{
 			if (npc.getCurrentHp() > ((npc.getMaxHp() * 1) / 4))
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java
index ea3912fe60..67cd19c6bc 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java
@@ -164,7 +164,7 @@ public class Zaken extends Quest
 		_zone = GrandBossManager.getInstance().getZone(55312, 219168, -3223);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
-		final Integer status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final Integer status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (status == DEAD)
 		{
 			// Load the unlock date and time for zaken from DB.
@@ -179,7 +179,7 @@ public class Zaken extends Quest
 			{
 				// The time has already expired while the server was offline. Immediately spawn Zaken.
 				final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, 55312, 219168, -3223, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 				spawnBoss(zaken);
 			}
 		}
@@ -575,10 +575,10 @@ public class Zaken extends Quest
 			}
 			case "zaken_unlock":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(ZAKEN) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(ZAKEN) != DEAD)
 				{
 					final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, 55312, 219168, -3223, 0, false, 0);
-					GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+					GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 					spawnBoss(zaken);
 				}
 				break;
@@ -827,11 +827,11 @@ public class Zaken extends Quest
 	public String onKill(Npc npc, Player killer, boolean isPet)
 	{
 		final int npcId = npc.getNpcId();
-		final Integer status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final Integer status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (npcId == ZAKEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", npc));
-			GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
 			// Time is 36hour +/- 17hour.
 			final long respawnTime = (Config.ZAKEN_RESP_FIRST + getRandom(Config.ZAKEN_RESP_SECOND)) * 3600000;
 			startQuestTimer("zaken_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java
index 32203966e2..ef8c1683a9 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java
@@ -93,10 +93,10 @@ public class GrandBossTeleporters extends Quest
 		{
 			if (antharasAI() != null)
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(29019);
-				final int statusW = GrandBossManager.getInstance().getBossStatus(29066);
-				final int statusN = GrandBossManager.getInstance().getBossStatus(29067);
-				final int statusS = GrandBossManager.getInstance().getBossStatus(29068);
+				final int status = GrandBossManager.getInstance().getStatus(29019);
+				final int statusW = GrandBossManager.getInstance().getStatus(29066);
+				final int statusN = GrandBossManager.getInstance().getStatus(29067);
+				final int statusS = GrandBossManager.getInstance().getStatus(29068);
 				if ((status == 2) || (statusW == 2) || (statusN == 2) || (statusS == 2))
 				{
 					htmltext = "13001-02.htm";
@@ -142,7 +142,7 @@ public class GrandBossTeleporters extends Quest
 			htmltext = "31385-01.htm";
 			if (valakasAI() != null)
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(29028);
+				final int status = GrandBossManager.getInstance().getStatus(29028);
 				if ((status == 0) || (status == 1)) // If entrance to see Valakas is unlocked (he is Dormant or Waiting)
 				{
 					final QuestState st = player.getQuestState(getName());
@@ -166,7 +166,7 @@ public class GrandBossTeleporters extends Quest
 						{
 							final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 							valakasAI().startQuestTimer("lock_entry_and_spawn_valakas", 60000 * Config.VALAKAS_WAIT_TIME, valakas, null);
-							GrandBossManager.getInstance().setBossStatus(29028, 1);
+							GrandBossManager.getInstance().setStatus(29028, 1);
 						}
 					}
 					else // player cheated, wasn't ported via npc Klein
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index bb8ca40d75..cde79872da 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -217,12 +217,12 @@ public class GrandBossManager
 		return temp.getZoneName().equalsIgnoreCase(zoneType);
 	}
 	
-	public Integer getBossStatus(int bossId)
+	public Integer getStatus(int bossId)
 	{
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info("Updated " + NpcTable.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status);
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java
index 18d4848f21..45dbb4314b 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java
@@ -206,7 +206,7 @@ public class Antharas extends Quest
 			LOGGER.warning(e.getMessage());
 		}
 		
-		Integer status = GrandBossManager.getInstance().getBossStatus(ANTHARAS_OLD);
+		Integer status = GrandBossManager.getInstance().getStatus(ANTHARAS_OLD);
 		if (FWA_OLDANTHARAS || (status == WAITING))
 		{
 			final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS_OLD);
@@ -215,7 +215,7 @@ public class Antharas extends Quest
 			{
 				// The time has already expired while the server was offline. Immediately spawn antharas in his cave.
 				// Also, the status needs to be changed to DORMANT.
-				GrandBossManager.getInstance().setBossStatus(ANTHARAS_OLD, DORMANT);
+				GrandBossManager.getInstance().setStatus(ANTHARAS_OLD, DORMANT);
 				status = DORMANT;
 			}
 			else if (status == FIGHTING)
@@ -248,9 +248,9 @@ public class Antharas extends Quest
 		}
 		else
 		{
-			final Integer statusWeak = GrandBossManager.getInstance().getBossStatus(ANTHARAS_WEAK);
-			final Integer statusNormal = GrandBossManager.getInstance().getBossStatus(ANTHARAS_NORMAL);
-			final Integer statusStrong = GrandBossManager.getInstance().getBossStatus(ANTHARAS_STRONG);
+			final Integer statusWeak = GrandBossManager.getInstance().getStatus(ANTHARAS_WEAK);
+			final Integer statusNormal = GrandBossManager.getInstance().getStatus(ANTHARAS_NORMAL);
+			final Integer statusStrong = GrandBossManager.getInstance().getStatus(ANTHARAS_STRONG);
 			int antharasId = 0;
 			if ((statusWeak == FIGHTING) || (statusWeak == DEAD))
 			{
@@ -291,7 +291,7 @@ public class Antharas extends Quest
 				{
 					// The time has already expired while the server was offline. Immediately spawn antharas in his cave.
 					// Also, the status needs to be changed to DORMANT.
-					GrandBossManager.getInstance().setBossStatus(antharasId, DORMANT);
+					GrandBossManager.getInstance().setStatus(antharasId, DORMANT);
 					status = DORMANT;
 				}
 				else
@@ -334,7 +334,7 @@ public class Antharas extends Quest
 			{
 				if (_monsterSpawnTask == null)
 				{
-					GrandBossManager.getInstance().setBossStatus(ANTHARAS_OLD, WAITING);
+					GrandBossManager.getInstance().setStatus(ANTHARAS_OLD, WAITING);
 					_monsterSpawnTask = ThreadPool.schedule(new AntharasSpawn(1), 60000 * Config.ANTHARAS_WAIT_TIME);
 				}
 			}
@@ -418,8 +418,8 @@ public class Antharas extends Quest
 					GrandBossManager.getInstance().addBoss(_antharas);
 					_monsters.add(_antharas);
 					_antharas.setImmobilized(true);
-					GrandBossManager.getInstance().setBossStatus(ANTHARAS_OLD, DORMANT);
-					GrandBossManager.getInstance().setBossStatus(npcId, FIGHTING);
+					GrandBossManager.getInstance().setStatus(ANTHARAS_OLD, DORMANT);
+					GrandBossManager.getInstance().setStatus(npcId, FIGHTING);
 					_lastAction = System.currentTimeMillis();
 					// Start repeating timer to check for inactivity.
 					_activityCheckTask = ThreadPool.scheduleAtFixedRate(new CheckActivity(), 60000, 60000);
@@ -710,7 +710,7 @@ public class Antharas extends Quest
 			final Long temp = (System.currentTimeMillis() - _lastAction);
 			if (temp > (Config.ANTHARAS_DESPAWN_TIME * 60000))
 			{
-				GrandBossManager.getInstance().setBossStatus(_antharas.getNpcId(), DORMANT);
+				GrandBossManager.getInstance().setStatus(_antharas.getNpcId(), DORMANT);
 				finishRaid();
 			}
 		}
@@ -816,7 +816,7 @@ public class Antharas extends Quest
 		@Override
 		public void run()
 		{
-			GrandBossManager.getInstance().setBossStatus(_bossId, DORMANT);
+			GrandBossManager.getInstance().setStatus(_bossId, DORMANT);
 			if (FWA_DOSERVEREARTHQUAKE)
 			{
 				for (Player p : World.getInstance().getAllPlayers())
@@ -912,7 +912,7 @@ public class Antharas extends Quest
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS01_D", npc));
 			_cubeSpawnTask = ThreadPool.schedule(new CubeSpawn(0), 10000);
-			GrandBossManager.getInstance().setBossStatus(npc.getNpcId(), DEAD);
+			GrandBossManager.getInstance().setStatus(npc.getNpcId(), DEAD);
 			final long respawnTime = (Config.ANTHARAS_RESP_FIRST + getRandom(Config.ANTHARAS_RESP_SECOND)) * 3600000;
 			ThreadPool.schedule(new UnlockAntharas(npc.getNpcId()), respawnTime);
 			// Also save the respawn time so that the info is maintained past restarts.
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java
index 6b96934f27..5618d4bfd8 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java
@@ -103,7 +103,7 @@ public class Baium extends Quest
 		_zone = GrandBossManager.getInstance().getZone(113100, 14500, 10077);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LIVE_BAIUM);
-		final Integer status = GrandBossManager.getInstance().getBossStatus(LIVE_BAIUM);
+		final Integer status = GrandBossManager.getInstance().getStatus(LIVE_BAIUM);
 		if (status == DEAD)
 		{
 			// Load the unlock date and time for baium from DB.
@@ -118,7 +118,7 @@ public class Baium extends Quest
 			{
 				// The time has already expired while the server was offline. Delete the saved time and immediately spawn the stone-baium. Also the state need not be changed from ASLEEP.
 				addSpawn(STONE_BAIUM, 116033, 17447, 10104, 40188, false, 0);
-				GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, ASLEEP);
+				GrandBossManager.getInstance().setStatus(LIVE_BAIUM, ASLEEP);
 			}
 		}
 		else if (status == AWAKE)
@@ -158,7 +158,7 @@ public class Baium extends Quest
 	{
 		if (event.equals("baium_unlock"))
 		{
-			GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, ASLEEP);
+			GrandBossManager.getInstance().setStatus(LIVE_BAIUM, ASLEEP);
 			addSpawn(STONE_BAIUM, 116033, 17447, 10104, 40188, false, 0);
 		}
 		else if (event.equals("skill_range") && (npc != null))
@@ -237,7 +237,7 @@ public class Baium extends Quest
 					}
 					_minions.clear();
 					addSpawn(STONE_BAIUM, 116033, 17447, 10104, 40188, false, 0); // Spawn stone-baium.
-					GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, ASLEEP); // Mark that Baium is not awake any more.
+					GrandBossManager.getInstance().setStatus(LIVE_BAIUM, ASLEEP); // Mark that Baium is not awake any more.
 					_zone.oustAllPlayers();
 					cancelQuestTimer("baium_despawn", npc, null);
 				}
@@ -245,7 +245,7 @@ public class Baium extends Quest
 				{
 					npc.setTarget(npc);
 					npc.doCast(SkillTable.getInstance().getSkill(4135, 1));
-					if (GrandBossManager.getInstance().getBossStatus(LIVE_BAIUM) != AWAKE)
+					if (GrandBossManager.getInstance().getStatus(LIVE_BAIUM) != AWAKE)
 					{
 						cancelQuestTimer("baium_despawn", npc, null);
 					}
@@ -269,13 +269,13 @@ public class Baium extends Quest
 			return "<html><body>Angelic Vortex:<br>You may not enter while admin disabled this zone</body></html>";
 		}
 		
-		final Integer status = GrandBossManager.getInstance().getBossStatus(LIVE_BAIUM);
+		final Integer status = GrandBossManager.getInstance().getStatus(LIVE_BAIUM);
 		if ((npcId == STONE_BAIUM) && (status == ASLEEP))
 		{
 			if (Config.ALLOW_DIRECT_TP_TO_BOSS_ROOM || _zone.isPlayerAllowed(player))
 			{
 				// Once Baium is awaken, no more people may enter until he dies, the server reboots, or 30 minutes pass with no attacks made against Baium.
-				GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, AWAKE);
+				GrandBossManager.getInstance().setStatus(LIVE_BAIUM, AWAKE);
 				npc.deleteMe();
 				final GrandBoss baium = (GrandBoss) addSpawn(LIVE_BAIUM, npc);
 				GrandBossManager.getInstance().addBoss(baium);
@@ -385,7 +385,7 @@ public class Baium extends Quest
 		addSpawn(29055, 115203, 16620, 10078, 0, false, 900000); // Should we teleport everyone out if the cubic despawns??
 		// Lock baium for 5 days and 1 to 8 hours [i.e. 432,000,000 + 1*3,600,000 + random-less-than(8*3,600,000) millisecs]
 		final long respawnTime = (Config.BAIUM_RESP_FIRST + getRandom(Config.BAIUM_RESP_SECOND)) * 3600000;
-		GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, DEAD);
+		GrandBossManager.getInstance().setStatus(LIVE_BAIUM, DEAD);
 		startQuestTimer("baium_unlock", respawnTime, null, null);
 		// Also save the respawn time so that the info is maintained past reboots.
 		final StatSet info = GrandBossManager.getInstance().getStatSet(LIVE_BAIUM);
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java
index c3955934db..923a32a6f1 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java
@@ -178,7 +178,7 @@ public class Benom extends Quest
 			}
 			case "BenomRaidRoomSpawn":
 			{
-				if ((_benomIsSpawned == 0) && (GrandBossManager.getInstance().getBossStatus(BENOM) == 0))
+				if ((_benomIsSpawned == 0) && (GrandBossManager.getInstance().getStatus(BENOM) == 0))
 				{
 					_benomInstance = addSpawn(BENOM, 12047, -49211, -3009, 0, false, 0);
 					_benomIsSpawned = 1;
@@ -187,7 +187,7 @@ public class Benom extends Quest
 			}
 			case "BenomRaidSiegeSpawn":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(BENOM) == 0)
+				if (GrandBossManager.getInstance().getStatus(BENOM) == 0)
 				{
 					if (_benomIsSpawned == 0)
 					{
@@ -288,7 +288,7 @@ public class Benom extends Quest
 			}
 			case "BenomBossDespawn":
 			{
-				GrandBossManager.getInstance().setBossStatus(BENOM, ALIVE);
+				GrandBossManager.getInstance().setStatus(BENOM, ALIVE);
 				_benomIsSpawned = 0;
 				_benomInstance.deleteMe();
 				break;
@@ -328,7 +328,7 @@ public class Benom extends Quest
 	@Override
 	public String onKill(Npc npc, Player killer, boolean isPet)
 	{
-		GrandBossManager.getInstance().setBossStatus(BENOM, DEAD);
+		GrandBossManager.getInstance().setStatus(BENOM, DEAD);
 		cancelQuestTimer("BenomWalk", npc, null);
 		cancelQuestTimer("BenomWalkFinish", npc, null);
 		cancelQuestTimer("BenomBossDespawn", npc, null);
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java
index ea963ff60f..4924208c3e 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java
@@ -99,7 +99,7 @@ public class Core extends Quest
 		
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -112,7 +112,7 @@ public class Core extends Quest
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -151,11 +151,11 @@ public class Core extends Quest
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)
 	{
-		final Integer status = GrandBossManager.getInstance().getBossStatus(CORE);
+		final Integer status = GrandBossManager.getInstance().getStatus(CORE);
 		if (event.equals("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (status == null)
@@ -216,7 +216,7 @@ public class Core extends Quest
 			_firstAttacked = false;
 			addSpawn(31842, 16502, 110165, -6394, 0, false, 900000);
 			addSpawn(31842, 18948, 110166, -6397, 0, false, 900000);
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_RESP_FIRST + getRandom(Config.CORE_RESP_SECOND)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -227,7 +227,7 @@ public class Core extends Quest
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", Config.CORE_RESP_MINION * 1000, npc, null);
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java
index d336647995..6cdff07654 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java
@@ -285,7 +285,7 @@ public class Frintezza extends Quest
 		addTalkId(CUBE);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(FRINTEZZA);
-		final Integer status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA);
+		final Integer status = GrandBossManager.getInstance().getStatus(FRINTEZZA);
 		if (status == DEAD)
 		{
 			final long temp = (info.getLong("respawn_time") - System.currentTimeMillis());
@@ -295,12 +295,12 @@ public class Frintezza extends Quest
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+				GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 			}
 		}
 		else if (status != DORMANT)
 		{
-			GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+			GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 		}
 		
 		// Tempfix for messed door cords.
@@ -517,7 +517,7 @@ public class Frintezza extends Quest
 			}
 			case "camera_1":
 			{
-				GrandBossManager.getInstance().setBossStatus(FRINTEZZA, FIGHTING);
+				GrandBossManager.getInstance().setStatus(FRINTEZZA, FIGHTING);
 				_frintezzaDummy = addSpawn(29052, 174240, -89805, -5022, 16048, false, 0);
 				_frintezzaDummy.setInvul(true);
 				_frintezzaDummy.setImmobilized(true);
@@ -1369,7 +1369,7 @@ public class Frintezza extends Quest
 				startQuestTimer("close", 1000, npc, null);
 				startQuestTimer("room1_del", 1000, npc, null);
 				startQuestTimer("room2_del", 1000, npc, null);
-				GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+				GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 				break;
 			}
 			case "frintezza_despawn":
@@ -1387,12 +1387,12 @@ public class Frintezza extends Quest
 					startQuestTimer("room2_del", 1000, npc, null);
 					startQuestTimer("room3_del", 1000, npc, null);
 					startQuestTimer("minions_despawn", 1000, npc, null);
-					GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+					GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 					cancelQuestTimers("frintezza_despawn");
 				}
 				else
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA);
+					final int status = GrandBossManager.getInstance().getStatus(FRINTEZZA);
 					if ((status != DORMANT) && (status != DEAD))
 					{
 						startQuestTimer("frintezza_despawn", 60000, npc, null);
@@ -1438,7 +1438,7 @@ public class Frintezza extends Quest
 			}
 			case "frintezza_unlock":
 			{
-				GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+				GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 				break;
 			}
 			case "remove_players":
@@ -1464,7 +1464,7 @@ public class Frintezza extends Quest
 		
 		String htmltext = "";
 		
-		final int status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA);
+		final int status = GrandBossManager.getInstance().getStatus(FRINTEZZA);
 		switch (status)
 		{
 			case DEAD:
@@ -1497,7 +1497,7 @@ public class Frintezza extends Quest
 					else
 					{
 						player.destroyItemByItemId("Quest", 8073, 1, player, true);
-						GrandBossManager.getInstance().setBossStatus(FRINTEZZA, WAITING);
+						GrandBossManager.getInstance().setStatus(FRINTEZZA, WAITING);
 						startQuestTimer("close", 0, npc, null);
 						startQuestTimer("room1_spawn", 5000, npc, null);
 						startQuestTimer("room_final", 2100000, npc, null);
@@ -1666,7 +1666,7 @@ public class Frintezza extends Quest
 			return null;
 		}
 		
-		final Integer status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA);
+		final Integer status = GrandBossManager.getInstance().getStatus(FRINTEZZA);
 		if ((npc.getNpcId() == SCARLET1) && (_secondMorph == 0) && (_thirdMorph == 0) && (_onMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75)) && (status == FIGHTING))
 		{
 			startQuestTimer("attack_stop", 0, _frintezza, null);
@@ -1710,7 +1710,7 @@ public class Frintezza extends Quest
 	@Override
 	public String onKill(Npc npc, Player killer, boolean isPet)
 	{
-		final int status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA);
+		final int status = GrandBossManager.getInstance().getStatus(FRINTEZZA);
 		switch (npc.getNpcId())
 		{
 			case FRINTEZZA:
@@ -1737,7 +1737,7 @@ public class Frintezza extends Quest
 						startQuestTimer("room3_del", 60000, npc, null);
 						startQuestTimer("minions_despawn", 60000, npc, null);
 						startQuestTimer("remove_players", 900000, npc, null);
-						GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DEAD);
+						GrandBossManager.getInstance().setStatus(FRINTEZZA, DEAD);
 						final long respawnTime = (Config.FRINTEZZA_RESP_FIRST + getRandom(Config.FRINTEZZA_RESP_SECOND)) * 3600000;
 						startQuestTimer("frintezza_unlock", respawnTime, npc, null);
 						// Also save the respawn time so that the info is maintained past restarts.
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java
index 62d389ae13..61dabdabf9 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java
@@ -54,7 +54,7 @@ public class Orfen extends Quest
 		super(-1, "ai/bosses");
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final Integer status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final Integer status = GrandBossManager.getInstance().getStatus(ORFEN);
 		
 		addEventId(ORFEN, EventType.ON_KILL);
 		addEventId(ORFEN, EventType.ON_ATTACK);
@@ -71,7 +71,7 @@ public class Orfen extends Quest
 				else
 				{
 					_orfen = (GrandBoss) addSpawn(ORFEN, 55024, 17368, -5412, 0, false, 0);
-					GrandBossManager.getInstance().setBossStatus(ORFEN, LIVE);
+					GrandBossManager.getInstance().setStatus(ORFEN, LIVE);
 					GrandBossManager.getInstance().addBoss(_orfen);
 				}
 				break;
@@ -92,7 +92,7 @@ public class Orfen extends Quest
 				final int loc_z = -5412;
 				final int heading = 0;
 				_orfen = (GrandBoss) addSpawn(ORFEN, loc_x, loc_y, loc_z, heading, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, LIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, LIVE);
 				GrandBossManager.getInstance().addBoss(_orfen);
 				break;
 			}
@@ -113,7 +113,7 @@ public class Orfen extends Quest
 				final int loc_z = -5412;
 				final int heading = 0;
 				_orfen = (GrandBoss) addSpawn(ORFEN, loc_x, loc_y, loc_z, heading, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, LIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, LIVE);
 				GrandBossManager.getInstance().addBoss(_orfen);
 				break;
 			}
@@ -210,7 +210,7 @@ public class Orfen extends Quest
 		if (npc.getNpcId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", npc));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Time is 48hour +/- 20hour.
 			final long respawnTime = (Config.ORFEN_RESP_FIRST + getRandom(Config.ORFEN_RESP_SECOND)) * 3600000;
 			cancelQuestTimer("ORFEN_REFRESH", npc, null);
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java
index 61f9b693c2..f00d465fe5 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java
@@ -85,7 +85,7 @@ public class QueenAnt extends Quest
 		}
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final Integer status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final Integer status = GrandBossManager.getInstance().getStatus(QUEEN);
 		
 		switch (status)
 		{
@@ -99,7 +99,7 @@ public class QueenAnt extends Quest
 				else
 				{
 					final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, -21610, 181594, -5734, 0, false, 0);
-					GrandBossManager.getInstance().setBossStatus(QUEEN, LIVE);
+					GrandBossManager.getInstance().setStatus(QUEEN, LIVE);
 					GrandBossManager.getInstance().addBoss(queen);
 					spawnBoss(queen);
 				}
@@ -118,7 +118,7 @@ public class QueenAnt extends Quest
 			default:
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, -21610, 181594, -5734, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, LIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, LIVE);
 				GrandBossManager.getInstance().addBoss(queen);
 				spawnBoss(queen);
 				break;
@@ -151,7 +151,7 @@ public class QueenAnt extends Quest
 			case QUEEN_SPAWN:
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, -21610, 181594, -5734, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, LIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, LIVE);
 				GrandBossManager.getInstance().addBoss(queen);
 				spawnBoss(queen);
 				break;
@@ -334,11 +334,11 @@ public class QueenAnt extends Quest
 	public String onKill(Npc npc, Player killer, boolean isPet)
 	{
 		final int npcId = npc.getNpcId();
-		final Integer status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final Integer status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", npc));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Time is 36hour +/- 17hour.
 			final long respawnTime = (Config.QA_RESP_FIRST + getRandom(Config.QA_RESP_SECOND)) * 3600000;
 			startQuestTimer("QUEEN_SPAWN", respawnTime, null, null);
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java
index cc638ca1e5..0d890cae6b 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java
@@ -87,7 +87,7 @@ public class Valakas extends Quest
 		_zone = GrandBossManager.getInstance().getZone(212852, -114842, -1632);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final Integer status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final Integer status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		if (status == DEAD)
 		{
 			// Load the unlock date and time for valakas from DB.
@@ -102,7 +102,7 @@ public class Valakas extends Quest
 			{
 				// The time has already expired while the server was offline.
 				// The status needs to be changed to DORMANT.
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 			}
 		}
 		else if (status == FIGHTING)
@@ -156,7 +156,7 @@ public class Valakas extends Quest
 							break;
 						}
 					}
-					final Integer status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+					final Integer status = GrandBossManager.getInstance().getStatus(VALAKAS);
 					if ((status == FIGHTING) && ((System.currentTimeMillis() - lastAttackTime) > (Config.VALAKAS_DESPAWN_TIME * 60000))) // 15 mins by default.
 					{
 						npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
@@ -164,7 +164,7 @@ public class Valakas extends Quest
 						// delete the actual boss
 						final GrandBoss boss = GrandBossManager.getInstance().deleteBoss(VALAKAS);
 						boss.decayMe();
-						GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+						GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 						// npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 						_zone.oustAllPlayers();
 						cancelQuestTimer("check_activity_and_do_actions", npc, null);
@@ -271,7 +271,7 @@ public class Valakas extends Quest
 				}
 				case "1110":
 				{
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+					GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 					startQuestTimer("check_activity_and_do_actions", 60000, npc, null, true);
 					npc.setInvul(false);
 					getRandomSkill(npc);
@@ -356,7 +356,7 @@ public class Valakas extends Quest
 		{
 			// GrandBoss valakas = (GrandBoss) addSpawn(VALAKAS, -105200, -253104, -15264, 32768, false, 0);
 			// GrandBossManager.getInstance().addBoss(valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equals("remove_players"))
 		{
@@ -589,7 +589,7 @@ public class Valakas extends Quest
 		npc.broadcastPacket(new SpecialCamera(npc.getObjectId(), 1700, 2000, 130, -1, 0));
 		npc.broadcastPacket(new PlaySound(1, "B03_D", npc));
 		startQuestTimer("1111", 500, npc, null);
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		final long respawnTime = (Config.VALAKAS_RESP_FIRST + getRandom(Config.VALAKAS_RESP_SECOND)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
 		// Also save the respawn time so that the info is maintained past restarts.
@@ -996,7 +996,7 @@ public class Valakas extends Quest
 	{
 		int i1 = 0;
 		
-		final Integer status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final Integer status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		if (status == FIGHTING)
 		{
 			if (npc.getCurrentHp() > ((npc.getMaxHp() * 1) / 4))
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java
index 0bd22e515a..e44cab6053 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java
@@ -239,14 +239,14 @@ public class VanHalter extends Quest
 		}
 		_setBleedTask = ThreadPool.schedule(new Bleeding(), 2000);
 		
-		final Integer status = GrandBossManager.getInstance().getBossStatus(29062);
+		final Integer status = GrandBossManager.getInstance().getStatus(29062);
 		if (status == INTERVAL)
 		{
 			enterInterval();
 		}
 		else
 		{
-			GrandBossManager.getInstance().setBossStatus(29062, NOTSPAWN);
+			GrandBossManager.getInstance().setStatus(29062, NOTSPAWN);
 		}
 	}
 	
@@ -1246,14 +1246,14 @@ public class VanHalter extends Quest
 			_intervalTask.cancel(false);
 		}
 		
-		final Integer status = GrandBossManager.getInstance().getBossStatus(29062);
+		final Integer status = GrandBossManager.getInstance().getStatus(29062);
 		if (status != INTERVAL)
 		{
 			final long interval = getRandom(Config.HPH_FIXINTERVALOFHALTER, Config.HPH_FIXINTERVALOFHALTER + Config.HPH_RANDOMINTERVALOFHALTER)/* * 3600000 */;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(29062);
 			info.set("respawn_time", (System.currentTimeMillis() + interval));
 			GrandBossManager.getInstance().setStatSet(29062, info);
-			GrandBossManager.getInstance().setBossStatus(29062, INTERVAL);
+			GrandBossManager.getInstance().setStatus(29062, INTERVAL);
 		}
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(29062);
@@ -1348,7 +1348,7 @@ public class VanHalter extends Quest
 		spawnRitualOffering();
 		spawnVanHalter();
 		
-		GrandBossManager.getInstance().setBossStatus(29062, NOTSPAWN);
+		GrandBossManager.getInstance().setStatus(29062, NOTSPAWN);
 		
 		// Set time up.
 		if (_timeUpTask != null)
@@ -1388,7 +1388,7 @@ public class VanHalter extends Quest
 			{
 				case 1:
 				{
-					GrandBossManager.getInstance().setBossStatus(29062, ALIVE);
+					GrandBossManager.getInstance().setStatus(29062, ALIVE);
 					// Set camera.
 					for (Player pc : _vanHalter.getKnownList().getKnownPlayers().values())
 					{
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java
index ea3912fe60..67cd19c6bc 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java
@@ -164,7 +164,7 @@ public class Zaken extends Quest
 		_zone = GrandBossManager.getInstance().getZone(55312, 219168, -3223);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
-		final Integer status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final Integer status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (status == DEAD)
 		{
 			// Load the unlock date and time for zaken from DB.
@@ -179,7 +179,7 @@ public class Zaken extends Quest
 			{
 				// The time has already expired while the server was offline. Immediately spawn Zaken.
 				final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, 55312, 219168, -3223, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 				spawnBoss(zaken);
 			}
 		}
@@ -575,10 +575,10 @@ public class Zaken extends Quest
 			}
 			case "zaken_unlock":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(ZAKEN) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(ZAKEN) != DEAD)
 				{
 					final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, 55312, 219168, -3223, 0, false, 0);
-					GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+					GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 					spawnBoss(zaken);
 				}
 				break;
@@ -827,11 +827,11 @@ public class Zaken extends Quest
 	public String onKill(Npc npc, Player killer, boolean isPet)
 	{
 		final int npcId = npc.getNpcId();
-		final Integer status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final Integer status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (npcId == ZAKEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", npc));
-			GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
 			// Time is 36hour +/- 17hour.
 			final long respawnTime = (Config.ZAKEN_RESP_FIRST + getRandom(Config.ZAKEN_RESP_SECOND)) * 3600000;
 			startQuestTimer("zaken_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java
index 32203966e2..ef8c1683a9 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java
@@ -93,10 +93,10 @@ public class GrandBossTeleporters extends Quest
 		{
 			if (antharasAI() != null)
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(29019);
-				final int statusW = GrandBossManager.getInstance().getBossStatus(29066);
-				final int statusN = GrandBossManager.getInstance().getBossStatus(29067);
-				final int statusS = GrandBossManager.getInstance().getBossStatus(29068);
+				final int status = GrandBossManager.getInstance().getStatus(29019);
+				final int statusW = GrandBossManager.getInstance().getStatus(29066);
+				final int statusN = GrandBossManager.getInstance().getStatus(29067);
+				final int statusS = GrandBossManager.getInstance().getStatus(29068);
 				if ((status == 2) || (statusW == 2) || (statusN == 2) || (statusS == 2))
 				{
 					htmltext = "13001-02.htm";
@@ -142,7 +142,7 @@ public class GrandBossTeleporters extends Quest
 			htmltext = "31385-01.htm";
 			if (valakasAI() != null)
 			{
-				final int status = GrandBossManager.getInstance().getBossStatus(29028);
+				final int status = GrandBossManager.getInstance().getStatus(29028);
 				if ((status == 0) || (status == 1)) // If entrance to see Valakas is unlocked (he is Dormant or Waiting)
 				{
 					final QuestState st = player.getQuestState(getName());
@@ -166,7 +166,7 @@ public class GrandBossTeleporters extends Quest
 						{
 							final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 							valakasAI().startQuestTimer("lock_entry_and_spawn_valakas", 60000 * Config.VALAKAS_WAIT_TIME, valakas, null);
-							GrandBossManager.getInstance().setBossStatus(29028, 1);
+							GrandBossManager.getInstance().setStatus(29028, 1);
 						}
 					}
 					else // player cheated, wasn't ported via npc Klein
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index bb8ca40d75..cde79872da 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -217,12 +217,12 @@ public class GrandBossManager
 		return temp.getZoneName().equalsIgnoreCase(zoneType);
 	}
 	
-	public Integer getBossStatus(int bossId)
+	public Integer getStatus(int bossId)
 	{
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info("Updated " + NpcTable.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index 9535d6ae11..76b5361ff7 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -752,7 +752,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -762,7 +762,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 24a3453a9c..4d18ba73e8 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -644,7 +644,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -654,7 +654,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java
index eb7e6b2a9a..7b6c38ef6e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastPacket(new NpcSay(objId, ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN));
 			npc.broadcastPacket(new NpcSay(objId, ChatType.NPC_GENERAL, npc.getId(), NpcStringId.EMPTY));
 			_firstAttacked = false;
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
index f58312bd19..297550c554 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
@@ -62,7 +62,7 @@ public class DrChaos extends AbstractNpcAI
 		addAttackId(CHAOS_GOLEM); // Random messages when he attacks.
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM);
-		final int status = GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM);
+		final int status = GrandBossManager.getInstance().getStatus(CHAOS_GOLEM);
 		
 		// Load the reset date and time for Dr. Chaos from DB.
 		if (status == DEAD)
@@ -77,7 +77,7 @@ public class DrChaos extends AbstractNpcAI
 				// The time has already expired while the server was offline. Delete the saved time and
 				// immediately spawn Dr. Chaos. Also the state need to be changed for NORMAL
 				addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
-				GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL);
+				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
 			}
 		}
 		// Spawn the war golem.
@@ -111,7 +111,7 @@ public class DrChaos extends AbstractNpcAI
 	{
 		if (event.equalsIgnoreCase("reset_drchaos"))
 		{
-			GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL);
+			GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
 			addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
 		}
 		// despawn the live Dr. Chaos after 30 minutes of inactivity
@@ -120,7 +120,7 @@ public class DrChaos extends AbstractNpcAI
 			if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis()))
 			{
 				final Npc chaos = addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false); // spawn Dr. Chaos
-				GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
+				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
 				cancelQuestTimer("golem_despawn", chaos, null);
 				
 				// Despawn the war golem.
@@ -162,7 +162,7 @@ public class DrChaos extends AbstractNpcAI
 			npc.deleteMe();
 		}
 		// Check every sec if someone is in range, if found, launch one task to decrease the timer.
-		else if (event.equalsIgnoreCase("paranoia_activity") && (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL))
+		else if (event.equalsIgnoreCase("paranoia_activity") && (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL))
 		{
 			for (Player obj : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 500))
 			{
@@ -194,7 +194,7 @@ public class DrChaos extends AbstractNpcAI
 	public String onFirstTalk(Npc npc, Player player)
 	{
 		String htmltext = "";
-		if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL)
+		if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
 		{
 			_pissedOffTimer -= 1 + getRandom(5); // remove 1-5 secs.
 			if ((_pissedOffTimer > 20) && (_pissedOffTimer <= 30))
@@ -236,7 +236,7 @@ public class DrChaos extends AbstractNpcAI
 		
 		// "lock" Dr. Chaos for regular RB time (36H fixed +- 24H random)
 		final long respawnTime = (36 + getRandom(-24, 24)) * 3600000;
-		GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, DEAD);
+		GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, DEAD);
 		startQuestTimer("reset_drchaos", respawnTime, null, null, false);
 		
 		// also save the respawn time so that the info is maintained past reboots
@@ -286,10 +286,10 @@ public class DrChaos extends AbstractNpcAI
 	 */
 	private void crazyMidgetBecomesAngry(Npc npc)
 	{
-		if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL)
+		if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
 		{
 			// Set the status to "crazy".
-			GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, CRAZY);
+			GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, CRAZY);
 			
 			// Cancels the paranoia timer.
 			cancelQuestTimer("paranoia_activity", npc, null);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
index c7ee2e52a8..4f91194895 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
@@ -290,7 +290,7 @@ public class Frintezza extends AbstractNpcAI
 		addStartNpc(CUBE);
 		addTalkId(CUBE);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(FRINTEZZA);
-		final int status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA);
+		final int status = GrandBossManager.getInstance().getStatus(FRINTEZZA);
 		if (status == DEAD)
 		{
 			final long temp = (info.getLong("respawn_time") - System.currentTimeMillis());
@@ -300,12 +300,12 @@ public class Frintezza extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+				GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 			}
 		}
 		else if (status != DORMANT)
 		{
-			GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+			GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 		}
 		
 		// tempfix for messed door cords
@@ -489,7 +489,7 @@ public class Frintezza extends AbstractNpcAI
 		}
 		else if (event.equalsIgnoreCase("loc_check"))
 		{
-			if (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING)
+			if (GrandBossManager.getInstance().getStatus(FRINTEZZA) == FIGHTING)
 			{
 				if (!_zone.isInsideZone(npc))
 				{
@@ -503,7 +503,7 @@ public class Frintezza extends AbstractNpcAI
 		}
 		else if (event.equalsIgnoreCase("camera_1"))
 		{
-			GrandBossManager.getInstance().setBossStatus(FRINTEZZA, FIGHTING);
+			GrandBossManager.getInstance().setStatus(FRINTEZZA, FIGHTING);
 			_frintezzaDummy = addSpawn(29052, 174240, -89805, -5022, 16048, false, 0);
 			_frintezzaDummy.setInvul(true);
 			_frintezzaDummy.setImmobilized(true);
@@ -1230,7 +1230,7 @@ public class Frintezza extends AbstractNpcAI
 			startQuestTimer("close", 1000, npc, null);
 			startQuestTimer("room1_del", 1000, npc, null);
 			startQuestTimer("room2_del", 1000, npc, null);
-			GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+			GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("frintezza_despawn"))
 		{
@@ -1250,7 +1250,7 @@ public class Frintezza extends AbstractNpcAI
 				startQuestTimer("room2_del", 1000, npc, null);
 				startQuestTimer("room3_del", 1000, npc, null);
 				startQuestTimer("minions_despawn", 1000, npc, null);
-				GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+				GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 				cancelQuestTimers("frintezza_despawn");
 			}
 		}
@@ -1283,7 +1283,7 @@ public class Frintezza extends AbstractNpcAI
 		}
 		else if (event.equalsIgnoreCase("frintezza_unlock"))
 		{
-			GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+			GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -1305,15 +1305,15 @@ public class Frintezza extends AbstractNpcAI
 		}
 		
 		String htmltext = "";
-		if (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(FRINTEZZA) == DEAD)
 		{
 			htmltext = "<html><body>There is nothing beyond the Magic Force Field. Come back later.<br>(You may not enter because Frintezza is not inside the Imperial Tomb.)</body></html>";
 		}
-		else if (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == DORMANT)
+		else if (GrandBossManager.getInstance().getStatus(FRINTEZZA) == DORMANT)
 		{
 			if (player.isGM() && (player.getParty() == null)) // For single GM testing. Will lock boss for all other players.
 			{
-				GrandBossManager.getInstance().setBossStatus(FRINTEZZA, WAITING);
+				GrandBossManager.getInstance().setStatus(FRINTEZZA, WAITING);
 				startQuestTimer("close", 0, npc, null);
 				startQuestTimer("room1_spawn", 5000, npc, null);
 				startQuestTimer("room_final", 2100000, npc, null);
@@ -1341,7 +1341,7 @@ public class Frintezza extends AbstractNpcAI
 				{
 					player.destroyItemByItemId("Quest", 8073, 1, player, true);
 					final CommandChannel cc = player.getParty().getCommandChannel();
-					GrandBossManager.getInstance().setBossStatus(FRINTEZZA, WAITING);
+					GrandBossManager.getInstance().setStatus(FRINTEZZA, WAITING);
 					startQuestTimer("close", 0, npc, null);
 					startQuestTimer("room1_spawn", 5000, npc, null);
 					startQuestTimer("room_final", 2100000, npc, null);
@@ -1403,7 +1403,7 @@ public class Frintezza extends AbstractNpcAI
 			npc.setCurrentHpMp(npc.getMaxHp(), 0);
 			return null;
 		}
-		if ((npc.getId() == SCARLET1) && (_secondMorph == 0) && (_thirdMorph == 0) && (_onMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75)) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+		if ((npc.getId() == SCARLET1) && (_secondMorph == 0) && (_thirdMorph == 0) && (_onMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75)) && (GrandBossManager.getInstance().getStatus(FRINTEZZA) == FIGHTING))
 		{
 			startQuestTimer("attack_stop", 0, _frintezza, null);
 			_secondMorph = 1;
@@ -1412,7 +1412,7 @@ public class Frintezza extends AbstractNpcAI
 			startQuestTimer("stop_npc", 1000, npc, null);
 			startQuestTimer("morph_01", 1100, npc, null);
 		}
-		else if ((npc.getId() == SCARLET1) && (_secondMorph == 1) && (_thirdMorph == 0) && (_onMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.5)) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+		else if ((npc.getId() == SCARLET1) && (_secondMorph == 1) && (_thirdMorph == 0) && (_onMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.5)) && (GrandBossManager.getInstance().getStatus(FRINTEZZA) == FIGHTING))
 		{
 			startQuestTimer("attack_stop", 0, _frintezza, null);
 			_thirdMorph = 1;
@@ -1422,7 +1422,7 @@ public class Frintezza extends AbstractNpcAI
 			startQuestTimer("morph_05a", 2000, npc, null);
 			startQuestTimer("morph_05", 2100, npc, null);
 		}
-		else if ((npc.getId() == SCARLET2) && (_secondMorph == 1) && (_thirdMorph == 1) && (_onCheck == 0) && (damage >= npc.getCurrentHp()) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+		else if ((npc.getId() == SCARLET2) && (_secondMorph == 1) && (_thirdMorph == 1) && (_onCheck == 0) && (damage >= npc.getCurrentHp()) && (GrandBossManager.getInstance().getStatus(FRINTEZZA) == FIGHTING))
 		{
 			_onCheck = 1;
 			startQuestTimer("check_hp", 0, npc, null);
@@ -1449,14 +1449,14 @@ public class Frintezza extends AbstractNpcAI
 		{
 			return null;
 		}
-		else if ((npc.getId() == SCARLET2) && (_onCheck == 0) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+		else if ((npc.getId() == SCARLET2) && (_onCheck == 0) && (GrandBossManager.getInstance().getStatus(FRINTEZZA) == FIGHTING))
 		{
 			_onCheck = 1;
 			startQuestTimer("stop_pc", 0, npc, null);
 			startQuestTimer("stop_npc", 0, npc, null);
 			startQuestTimer("morph_16", 0, npc, null);
 		}
-		else if ((npc.getId() == SCARLET2) && (_onCheck == 1) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+		else if ((npc.getId() == SCARLET2) && (_onCheck == 1) && (GrandBossManager.getInstance().getStatus(FRINTEZZA) == FIGHTING))
 		{
 			cancelQuestTimers("loc_check");
 			cancelQuestTimers("spawn_minion");
@@ -1466,7 +1466,7 @@ public class Frintezza extends AbstractNpcAI
 			startQuestTimer("room3_del", 60000, npc, null);
 			startQuestTimer("minions_despawn", 60000, npc, null);
 			startQuestTimer("remove_players", 900000, npc, null);
-			GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DEAD);
+			GrandBossManager.getInstance().setStatus(FRINTEZZA, DEAD);
 			long respawnTime = Config.FRINTEZZA_SPAWN_INTERVAL + getRandom(-Config.FRINTEZZA_SPAWN_RANDOM, Config.FRINTEZZA_SPAWN_RANDOM);
 			respawnTime *= 3600000;
 			startQuestTimer("frintezza_unlock", respawnTime, npc, null);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index a7a3b7fdd9..c7f5dd7fb4 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -88,7 +88,7 @@ public class Orfen extends AbstractNpcAI
 		_hasTeleported = false;
 		ZONE = GrandBossManager.getInstance().getZone(POS[0]);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		if (GrandBossManager.getInstance().getBossStatus(ORFEN) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(ORFEN) == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -116,7 +116,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -187,7 +187,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -319,7 +319,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("orfen_unlock", respawnTime, null, null);
@@ -332,7 +332,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			MINIONS.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 58b872a5a1..42fc5a0994 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -90,7 +90,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = GrandBossManager.getInstance().getZone(QUEEN_X, QUEEN_Y, QUEEN_Z);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		if (GrandBossManager.getInstance().getBossStatus(QUEEN) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(QUEEN) == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -104,7 +104,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -212,7 +212,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -346,7 +346,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0a30150197..fa8b3eadc9 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -123,7 +123,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = GrandBossManager.getInstance().getZone(212852, -114842, -1632);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -139,7 +139,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -219,12 +219,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -312,7 +312,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -371,7 +371,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -403,7 +403,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -440,7 +440,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index b373e50f3d..dcda98b75a 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -163,7 +163,7 @@ public class Zaken extends AbstractNpcAI
 		_zone = GrandBossManager.getInstance().getZone(55312, 219168, -3223);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
-		final Integer status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final Integer status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (status == DEAD)
 		{
 			// Load the unlock date and time for zaken from DB.
@@ -178,7 +178,7 @@ public class Zaken extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Zaken.
 				final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, 55312, 219168, -3223, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 				spawnBoss(zaken);
 			}
 		}
@@ -574,10 +574,10 @@ public class Zaken extends AbstractNpcAI
 			}
 			case "zaken_unlock":
 			{
-				if (GrandBossManager.getInstance().getBossStatus(ZAKEN) != DEAD)
+				if (GrandBossManager.getInstance().getStatus(ZAKEN) != DEAD)
 				{
 					final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, 55312, 219168, -3223, 0, false, 0);
-					GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+					GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 					spawnBoss(zaken);
 				}
 				break;
@@ -826,11 +826,11 @@ public class Zaken extends AbstractNpcAI
 	public String onKill(Npc npc, Player killer, boolean isPet)
 	{
 		final int npcId = npc.getId();
-		final Integer status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final Integer status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (npcId == ZAKEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
 			// Time is 36hour +/- 17hour.
 			final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("zaken_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index c9ed5c36a1..f8d5844f1e 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -91,7 +91,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -114,7 +114,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 12ed26c814..75e9b92aed 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -204,7 +204,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index 5d2aa5282a..1e1b8b450b 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -200,12 +200,12 @@ public class GrandBossManager implements IStorable
 		return (player != null) && (getZone(player.getX(), player.getY(), player.getZ()) != null);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index 9535d6ae11..76b5361ff7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -752,7 +752,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -762,7 +762,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 24a3453a9c..4d18ba73e8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -644,7 +644,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -654,7 +654,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index caebf5f9b5..c15f483c20 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -106,7 +106,7 @@ public class Beleth extends AbstractNpcAI
 		addTalkId(STONE_COFFIN);
 		addFirstTalkId(ELF);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
-		final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
+		final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -116,12 +116,12 @@ public class Beleth extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 		}
 		DoorData.getInstance().getDoor(DOOR1).openMe();
 	}
@@ -133,7 +133,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			case "BELETH_UNLOCK":
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 				DoorData.getInstance().getDoor(DOOR1).openMe();
 				break;
 			}
@@ -510,7 +510,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				if ((_lastAttack + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+					GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -540,7 +540,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
-		if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) == INIT))
+		if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) == INIT))
 		{
 			if (_priest != null)
 			{
@@ -551,7 +551,7 @@ public class Beleth extends AbstractNpcAI
 				_stone.deleteMe();
 			}
 			
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
 			startQuestTimer("SPAWN1", 300000, null, null);
 		}
 		
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			cancelQuestTimer("CHECK_ATTACK", null, null);
 			setBelethKiller(killer);
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
 			final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java
index eb7e6b2a9a..7b6c38ef6e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastPacket(new NpcSay(objId, ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN));
 			npc.broadcastPacket(new NpcSay(objId, ChatType.NPC_GENERAL, npc.getId(), NpcStringId.EMPTY));
 			_firstAttacked = false;
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
index f58312bd19..297550c554 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
@@ -62,7 +62,7 @@ public class DrChaos extends AbstractNpcAI
 		addAttackId(CHAOS_GOLEM); // Random messages when he attacks.
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM);
-		final int status = GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM);
+		final int status = GrandBossManager.getInstance().getStatus(CHAOS_GOLEM);
 		
 		// Load the reset date and time for Dr. Chaos from DB.
 		if (status == DEAD)
@@ -77,7 +77,7 @@ public class DrChaos extends AbstractNpcAI
 				// The time has already expired while the server was offline. Delete the saved time and
 				// immediately spawn Dr. Chaos. Also the state need to be changed for NORMAL
 				addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
-				GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL);
+				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
 			}
 		}
 		// Spawn the war golem.
@@ -111,7 +111,7 @@ public class DrChaos extends AbstractNpcAI
 	{
 		if (event.equalsIgnoreCase("reset_drchaos"))
 		{
-			GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL);
+			GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
 			addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
 		}
 		// despawn the live Dr. Chaos after 30 minutes of inactivity
@@ -120,7 +120,7 @@ public class DrChaos extends AbstractNpcAI
 			if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis()))
 			{
 				final Npc chaos = addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false); // spawn Dr. Chaos
-				GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
+				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
 				cancelQuestTimer("golem_despawn", chaos, null);
 				
 				// Despawn the war golem.
@@ -162,7 +162,7 @@ public class DrChaos extends AbstractNpcAI
 			npc.deleteMe();
 		}
 		// Check every sec if someone is in range, if found, launch one task to decrease the timer.
-		else if (event.equalsIgnoreCase("paranoia_activity") && (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL))
+		else if (event.equalsIgnoreCase("paranoia_activity") && (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL))
 		{
 			for (Player obj : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 500))
 			{
@@ -194,7 +194,7 @@ public class DrChaos extends AbstractNpcAI
 	public String onFirstTalk(Npc npc, Player player)
 	{
 		String htmltext = "";
-		if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL)
+		if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
 		{
 			_pissedOffTimer -= 1 + getRandom(5); // remove 1-5 secs.
 			if ((_pissedOffTimer > 20) && (_pissedOffTimer <= 30))
@@ -236,7 +236,7 @@ public class DrChaos extends AbstractNpcAI
 		
 		// "lock" Dr. Chaos for regular RB time (36H fixed +- 24H random)
 		final long respawnTime = (36 + getRandom(-24, 24)) * 3600000;
-		GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, DEAD);
+		GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, DEAD);
 		startQuestTimer("reset_drchaos", respawnTime, null, null, false);
 		
 		// also save the respawn time so that the info is maintained past reboots
@@ -286,10 +286,10 @@ public class DrChaos extends AbstractNpcAI
 	 */
 	private void crazyMidgetBecomesAngry(Npc npc)
 	{
-		if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL)
+		if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
 		{
 			// Set the status to "crazy".
-			GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, CRAZY);
+			GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, CRAZY);
 			
 			// Cancels the paranoia timer.
 			cancelQuestTimer("paranoia_activity", npc, null);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
index c7ee2e52a8..4f91194895 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
@@ -290,7 +290,7 @@ public class Frintezza extends AbstractNpcAI
 		addStartNpc(CUBE);
 		addTalkId(CUBE);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(FRINTEZZA);
-		final int status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA);
+		final int status = GrandBossManager.getInstance().getStatus(FRINTEZZA);
 		if (status == DEAD)
 		{
 			final long temp = (info.getLong("respawn_time") - System.currentTimeMillis());
@@ -300,12 +300,12 @@ public class Frintezza extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+				GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 			}
 		}
 		else if (status != DORMANT)
 		{
-			GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+			GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 		}
 		
 		// tempfix for messed door cords
@@ -489,7 +489,7 @@ public class Frintezza extends AbstractNpcAI
 		}
 		else if (event.equalsIgnoreCase("loc_check"))
 		{
-			if (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING)
+			if (GrandBossManager.getInstance().getStatus(FRINTEZZA) == FIGHTING)
 			{
 				if (!_zone.isInsideZone(npc))
 				{
@@ -503,7 +503,7 @@ public class Frintezza extends AbstractNpcAI
 		}
 		else if (event.equalsIgnoreCase("camera_1"))
 		{
-			GrandBossManager.getInstance().setBossStatus(FRINTEZZA, FIGHTING);
+			GrandBossManager.getInstance().setStatus(FRINTEZZA, FIGHTING);
 			_frintezzaDummy = addSpawn(29052, 174240, -89805, -5022, 16048, false, 0);
 			_frintezzaDummy.setInvul(true);
 			_frintezzaDummy.setImmobilized(true);
@@ -1230,7 +1230,7 @@ public class Frintezza extends AbstractNpcAI
 			startQuestTimer("close", 1000, npc, null);
 			startQuestTimer("room1_del", 1000, npc, null);
 			startQuestTimer("room2_del", 1000, npc, null);
-			GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+			GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("frintezza_despawn"))
 		{
@@ -1250,7 +1250,7 @@ public class Frintezza extends AbstractNpcAI
 				startQuestTimer("room2_del", 1000, npc, null);
 				startQuestTimer("room3_del", 1000, npc, null);
 				startQuestTimer("minions_despawn", 1000, npc, null);
-				GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+				GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 				cancelQuestTimers("frintezza_despawn");
 			}
 		}
@@ -1283,7 +1283,7 @@ public class Frintezza extends AbstractNpcAI
 		}
 		else if (event.equalsIgnoreCase("frintezza_unlock"))
 		{
-			GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
+			GrandBossManager.getInstance().setStatus(FRINTEZZA, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -1305,15 +1305,15 @@ public class Frintezza extends AbstractNpcAI
 		}
 		
 		String htmltext = "";
-		if (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(FRINTEZZA) == DEAD)
 		{
 			htmltext = "<html><body>There is nothing beyond the Magic Force Field. Come back later.<br>(You may not enter because Frintezza is not inside the Imperial Tomb.)</body></html>";
 		}
-		else if (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == DORMANT)
+		else if (GrandBossManager.getInstance().getStatus(FRINTEZZA) == DORMANT)
 		{
 			if (player.isGM() && (player.getParty() == null)) // For single GM testing. Will lock boss for all other players.
 			{
-				GrandBossManager.getInstance().setBossStatus(FRINTEZZA, WAITING);
+				GrandBossManager.getInstance().setStatus(FRINTEZZA, WAITING);
 				startQuestTimer("close", 0, npc, null);
 				startQuestTimer("room1_spawn", 5000, npc, null);
 				startQuestTimer("room_final", 2100000, npc, null);
@@ -1341,7 +1341,7 @@ public class Frintezza extends AbstractNpcAI
 				{
 					player.destroyItemByItemId("Quest", 8073, 1, player, true);
 					final CommandChannel cc = player.getParty().getCommandChannel();
-					GrandBossManager.getInstance().setBossStatus(FRINTEZZA, WAITING);
+					GrandBossManager.getInstance().setStatus(FRINTEZZA, WAITING);
 					startQuestTimer("close", 0, npc, null);
 					startQuestTimer("room1_spawn", 5000, npc, null);
 					startQuestTimer("room_final", 2100000, npc, null);
@@ -1403,7 +1403,7 @@ public class Frintezza extends AbstractNpcAI
 			npc.setCurrentHpMp(npc.getMaxHp(), 0);
 			return null;
 		}
-		if ((npc.getId() == SCARLET1) && (_secondMorph == 0) && (_thirdMorph == 0) && (_onMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75)) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+		if ((npc.getId() == SCARLET1) && (_secondMorph == 0) && (_thirdMorph == 0) && (_onMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75)) && (GrandBossManager.getInstance().getStatus(FRINTEZZA) == FIGHTING))
 		{
 			startQuestTimer("attack_stop", 0, _frintezza, null);
 			_secondMorph = 1;
@@ -1412,7 +1412,7 @@ public class Frintezza extends AbstractNpcAI
 			startQuestTimer("stop_npc", 1000, npc, null);
 			startQuestTimer("morph_01", 1100, npc, null);
 		}
-		else if ((npc.getId() == SCARLET1) && (_secondMorph == 1) && (_thirdMorph == 0) && (_onMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.5)) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+		else if ((npc.getId() == SCARLET1) && (_secondMorph == 1) && (_thirdMorph == 0) && (_onMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.5)) && (GrandBossManager.getInstance().getStatus(FRINTEZZA) == FIGHTING))
 		{
 			startQuestTimer("attack_stop", 0, _frintezza, null);
 			_thirdMorph = 1;
@@ -1422,7 +1422,7 @@ public class Frintezza extends AbstractNpcAI
 			startQuestTimer("morph_05a", 2000, npc, null);
 			startQuestTimer("morph_05", 2100, npc, null);
 		}
-		else if ((npc.getId() == SCARLET2) && (_secondMorph == 1) && (_thirdMorph == 1) && (_onCheck == 0) && (damage >= npc.getCurrentHp()) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+		else if ((npc.getId() == SCARLET2) && (_secondMorph == 1) && (_thirdMorph == 1) && (_onCheck == 0) && (damage >= npc.getCurrentHp()) && (GrandBossManager.getInstance().getStatus(FRINTEZZA) == FIGHTING))
 		{
 			_onCheck = 1;
 			startQuestTimer("check_hp", 0, npc, null);
@@ -1449,14 +1449,14 @@ public class Frintezza extends AbstractNpcAI
 		{
 			return null;
 		}
-		else if ((npc.getId() == SCARLET2) && (_onCheck == 0) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+		else if ((npc.getId() == SCARLET2) && (_onCheck == 0) && (GrandBossManager.getInstance().getStatus(FRINTEZZA) == FIGHTING))
 		{
 			_onCheck = 1;
 			startQuestTimer("stop_pc", 0, npc, null);
 			startQuestTimer("stop_npc", 0, npc, null);
 			startQuestTimer("morph_16", 0, npc, null);
 		}
-		else if ((npc.getId() == SCARLET2) && (_onCheck == 1) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+		else if ((npc.getId() == SCARLET2) && (_onCheck == 1) && (GrandBossManager.getInstance().getStatus(FRINTEZZA) == FIGHTING))
 		{
 			cancelQuestTimers("loc_check");
 			cancelQuestTimers("spawn_minion");
@@ -1466,7 +1466,7 @@ public class Frintezza extends AbstractNpcAI
 			startQuestTimer("room3_del", 60000, npc, null);
 			startQuestTimer("minions_despawn", 60000, npc, null);
 			startQuestTimer("remove_players", 900000, npc, null);
-			GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DEAD);
+			GrandBossManager.getInstance().setStatus(FRINTEZZA, DEAD);
 			long respawnTime = Config.FRINTEZZA_SPAWN_INTERVAL + getRandom(-Config.FRINTEZZA_SPAWN_RANDOM, Config.FRINTEZZA_SPAWN_RANDOM);
 			respawnTime *= 3600000;
 			startQuestTimer("frintezza_unlock", respawnTime, npc, null);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index a7a3b7fdd9..c7f5dd7fb4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -88,7 +88,7 @@ public class Orfen extends AbstractNpcAI
 		_hasTeleported = false;
 		ZONE = GrandBossManager.getInstance().getZone(POS[0]);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		if (GrandBossManager.getInstance().getBossStatus(ORFEN) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(ORFEN) == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -116,7 +116,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -187,7 +187,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -319,7 +319,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("orfen_unlock", respawnTime, null, null);
@@ -332,7 +332,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			MINIONS.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 58b872a5a1..42fc5a0994 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -90,7 +90,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = GrandBossManager.getInstance().getZone(QUEEN_X, QUEEN_Y, QUEEN_Z);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		if (GrandBossManager.getInstance().getBossStatus(QUEEN) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(QUEEN) == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -104,7 +104,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -212,7 +212,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -346,7 +346,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0a30150197..fa8b3eadc9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -123,7 +123,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = GrandBossManager.getInstance().getZone(212852, -114842, -1632);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -139,7 +139,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -219,12 +219,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -312,7 +312,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -371,7 +371,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -403,7 +403,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -440,7 +440,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SteelCitadelTeleport/SteelCitadelTeleport.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SteelCitadelTeleport/SteelCitadelTeleport.java
index a0d5b4602c..ab1248b1b0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SteelCitadelTeleport/SteelCitadelTeleport.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SteelCitadelTeleport/SteelCitadelTeleport.java
@@ -49,7 +49,7 @@ public class SteelCitadelTeleport extends AbstractNpcAI
 	@Override
 	public String onTalk(Npc npc, Player player)
 	{
-		final int belethStatus = GrandBossManager.getInstance().getBossStatus(BELETH);
+		final int belethStatus = GrandBossManager.getInstance().getStatus(BELETH);
 		if (belethStatus == 3)
 		{
 			return "32376-02.htm";
@@ -69,7 +69,7 @@ public class SteelCitadelTeleport extends AbstractNpcAI
 		final BossZone zone = (BossZone) ZoneManager.getInstance().getZoneById(12018);
 		if (zone != null)
 		{
-			GrandBossManager.getInstance().setBossStatus(BELETH, 1);
+			GrandBossManager.getInstance().setStatus(BELETH, 1);
 			for (Party party : channel.getParties())
 			{
 				if (party == null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index c9ed5c36a1..f8d5844f1e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -91,7 +91,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -114,7 +114,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 12ed26c814..75e9b92aed 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -204,7 +204,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index 5d2aa5282a..1e1b8b450b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -200,12 +200,12 @@ public class GrandBossManager implements IStorable
 		return (player != null) && (getZone(player.getX(), player.getY(), player.getZ()) != null);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index 8983cae070..85977063c0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -751,7 +751,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -761,7 +761,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 24a3453a9c..4d18ba73e8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -644,7 +644,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -654,7 +654,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index caebf5f9b5..c15f483c20 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -106,7 +106,7 @@ public class Beleth extends AbstractNpcAI
 		addTalkId(STONE_COFFIN);
 		addFirstTalkId(ELF);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
-		final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
+		final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
 		if (status == DEAD)
 		{
 			final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -116,12 +116,12 @@ public class Beleth extends AbstractNpcAI
 			}
 			else
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 			}
 		}
 		else if (status != ALIVE)
 		{
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 		}
 		DoorData.getInstance().getDoor(DOOR1).openMe();
 	}
@@ -133,7 +133,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			case "BELETH_UNLOCK":
 			{
-				GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+				GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 				DoorData.getInstance().getDoor(DOOR1).openMe();
 				break;
 			}
@@ -510,7 +510,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				if ((_lastAttack + 900000) < System.currentTimeMillis())
 				{
-					GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
+					GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
 					for (Creature creature : ZONE.getCharactersInside())
 					{
 						if (creature != null)
@@ -540,7 +540,7 @@ public class Beleth extends AbstractNpcAI
 	@Override
 	public String onEnterZone(Creature creature, ZoneType zone)
 	{
-		if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) == INIT))
+		if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) == INIT))
 		{
 			if (_priest != null)
 			{
@@ -551,7 +551,7 @@ public class Beleth extends AbstractNpcAI
 				_stone.deleteMe();
 			}
 			
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
 			startQuestTimer("SPAWN1", 300000, null, null);
 		}
 		
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
 		{
 			cancelQuestTimer("CHECK_ATTACK", null, null);
 			setBelethKiller(killer);
-			GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
+			GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
 			final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
 			final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
 			info.set("respawn_time", System.currentTimeMillis() + respawnTime);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java
index eb7e6b2a9a..7b6c38ef6e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
 		registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastPacket(new NpcSay(objId, ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN));
 			npc.broadcastPacket(new NpcSay(objId, ChatType.NPC_GENERAL, npc.getId(), NpcStringId.EMPTY));
 			_firstAttacked = false;
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
index f58312bd19..297550c554 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
@@ -62,7 +62,7 @@ public class DrChaos extends AbstractNpcAI
 		addAttackId(CHAOS_GOLEM); // Random messages when he attacks.
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM);
-		final int status = GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM);
+		final int status = GrandBossManager.getInstance().getStatus(CHAOS_GOLEM);
 		
 		// Load the reset date and time for Dr. Chaos from DB.
 		if (status == DEAD)
@@ -77,7 +77,7 @@ public class DrChaos extends AbstractNpcAI
 				// The time has already expired while the server was offline. Delete the saved time and
 				// immediately spawn Dr. Chaos. Also the state need to be changed for NORMAL
 				addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
-				GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL);
+				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
 			}
 		}
 		// Spawn the war golem.
@@ -111,7 +111,7 @@ public class DrChaos extends AbstractNpcAI
 	{
 		if (event.equalsIgnoreCase("reset_drchaos"))
 		{
-			GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL);
+			GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
 			addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
 		}
 		// despawn the live Dr. Chaos after 30 minutes of inactivity
@@ -120,7 +120,7 @@ public class DrChaos extends AbstractNpcAI
 			if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis()))
 			{
 				final Npc chaos = addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false); // spawn Dr. Chaos
-				GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
+				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
 				cancelQuestTimer("golem_despawn", chaos, null);
 				
 				// Despawn the war golem.
@@ -162,7 +162,7 @@ public class DrChaos extends AbstractNpcAI
 			npc.deleteMe();
 		}
 		// Check every sec if someone is in range, if found, launch one task to decrease the timer.
-		else if (event.equalsIgnoreCase("paranoia_activity") && (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL))
+		else if (event.equalsIgnoreCase("paranoia_activity") && (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL))
 		{
 			for (Player obj : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 500))
 			{
@@ -194,7 +194,7 @@ public class DrChaos extends AbstractNpcAI
 	public String onFirstTalk(Npc npc, Player player)
 	{
 		String htmltext = "";
-		if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL)
+		if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
 		{
 			_pissedOffTimer -= 1 + getRandom(5); // remove 1-5 secs.
 			if ((_pissedOffTimer > 20) && (_pissedOffTimer <= 30))
@@ -236,7 +236,7 @@ public class DrChaos extends AbstractNpcAI
 		
 		// "lock" Dr. Chaos for regular RB time (36H fixed +- 24H random)
 		final long respawnTime = (36 + getRandom(-24, 24)) * 3600000;
-		GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, DEAD);
+		GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, DEAD);
 		startQuestTimer("reset_drchaos", respawnTime, null, null, false);
 		
 		// also save the respawn time so that the info is maintained past reboots
@@ -286,10 +286,10 @@ public class DrChaos extends AbstractNpcAI
 	 */
 	private void crazyMidgetBecomesAngry(Npc npc)
 	{
-		if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL)
+		if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
 		{
 			// Set the status to "crazy".
-			GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, CRAZY);
+			GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, CRAZY);
 			
 			// Cancels the paranoia timer.
 			cancelQuestTimer("paranoia_activity", npc, null);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index a7a3b7fdd9..c7f5dd7fb4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -88,7 +88,7 @@ public class Orfen extends AbstractNpcAI
 		_hasTeleported = false;
 		ZONE = GrandBossManager.getInstance().getZone(POS[0]);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		if (GrandBossManager.getInstance().getBossStatus(ORFEN) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(ORFEN) == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -116,7 +116,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -187,7 +187,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -319,7 +319,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("orfen_unlock", respawnTime, null, null);
@@ -332,7 +332,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			MINIONS.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 58b872a5a1..42fc5a0994 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -90,7 +90,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = GrandBossManager.getInstance().getZone(QUEEN_X, QUEEN_Y, QUEEN_Z);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		if (GrandBossManager.getInstance().getBossStatus(QUEEN) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(QUEEN) == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -104,7 +104,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -212,7 +212,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -346,7 +346,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 0a30150197..fa8b3eadc9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -123,7 +123,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = GrandBossManager.getInstance().getZone(212852, -114842, -1632);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -139,7 +139,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -219,12 +219,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -312,7 +312,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -371,7 +371,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -403,7 +403,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -440,7 +440,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SteelCitadelTeleport/SteelCitadelTeleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SteelCitadelTeleport/SteelCitadelTeleport.java
index a0d5b4602c..ab1248b1b0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SteelCitadelTeleport/SteelCitadelTeleport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SteelCitadelTeleport/SteelCitadelTeleport.java
@@ -49,7 +49,7 @@ public class SteelCitadelTeleport extends AbstractNpcAI
 	@Override
 	public String onTalk(Npc npc, Player player)
 	{
-		final int belethStatus = GrandBossManager.getInstance().getBossStatus(BELETH);
+		final int belethStatus = GrandBossManager.getInstance().getStatus(BELETH);
 		if (belethStatus == 3)
 		{
 			return "32376-02.htm";
@@ -69,7 +69,7 @@ public class SteelCitadelTeleport extends AbstractNpcAI
 		final BossZone zone = (BossZone) ZoneManager.getInstance().getZoneById(12018);
 		if (zone != null)
 		{
-			GrandBossManager.getInstance().setBossStatus(BELETH, 1);
+			GrandBossManager.getInstance().setStatus(BELETH, 1);
 			for (Party party : channel.getParties())
 			{
 				if (party == null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index c9ed5c36a1..f8d5844f1e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -91,7 +91,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -114,7 +114,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 12ed26c814..75e9b92aed 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -204,7 +204,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index 5d2aa5282a..1e1b8b450b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -200,12 +200,12 @@ public class GrandBossManager implements IStorable
 		return (player != null) && (getZone(player.getX(), player.getY(), player.getZ()) != null);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 2c851b0828..09e0896db2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java
index ddb6b20c93..71150c1323 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -83,7 +83,7 @@ public class Core extends AbstractNpcAI
 		registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -96,7 +96,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -147,7 +147,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -196,7 +196,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -207,7 +207,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0b685d633b..c5153f516d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 163d9db57f..d9538fa98f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -200,7 +200,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index bea872a334..106815dd10 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,12 +107,12 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 2c851b0828..09e0896db2 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java
index ddb6b20c93..71150c1323 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -83,7 +83,7 @@ public class Core extends AbstractNpcAI
 		registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -96,7 +96,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -147,7 +147,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -196,7 +196,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -207,7 +207,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0b685d633b..c5153f516d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index 9ddee40d1e..c26bb52f9c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -49,7 +49,7 @@ public class Zaken extends AbstractNpcAI
 		addKillId(ZAKEN);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final int status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time from DB
@@ -82,7 +82,7 @@ public class Zaken extends AbstractNpcAI
 	private void spawnBoss()
 	{
 		final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, ZAKEN_X, ZAKEN_Y, ZAKEN_Z, 0, false, 0);
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 		GrandBossManager.getInstance().addBoss(zaken);
 		zaken.broadcastPacket(new PlaySound(1, "BS01_A", 1, zaken.getObjectId(), zaken.getX(), zaken.getY(), zaken.getZ()));
 	}
@@ -91,7 +91,7 @@ public class Zaken extends AbstractNpcAI
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
 		npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
+		GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("zaken_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 163d9db57f..d9538fa98f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -200,7 +200,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 2f64b979bf..e685806718 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -41,11 +41,11 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 		for (int i = 0; i < count; i++)
 		{
 			final int bossId = packet.readD();
-			if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == RaidBossStatus.ALIVE)
+			if (DBSpawnManager.getInstance().getStatus(bossId) == RaidBossStatus.ALIVE)
 			{
 				_bossIds.add(bossId);
 			}
-			else if (GrandBossManager.getInstance().getBossStatus(bossId) == 0)
+			else if (GrandBossManager.getInstance().getStatus(bossId) == 0)
 			{
 				_bossIds.add(bossId);
 			}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 2c851b0828..09e0896db2 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java
index ddb6b20c93..71150c1323 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -83,7 +83,7 @@ public class Core extends AbstractNpcAI
 		registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -96,7 +96,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -147,7 +147,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -196,7 +196,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -207,7 +207,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0b685d633b..c5153f516d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index 9ddee40d1e..c26bb52f9c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -49,7 +49,7 @@ public class Zaken extends AbstractNpcAI
 		addKillId(ZAKEN);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final int status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time from DB
@@ -82,7 +82,7 @@ public class Zaken extends AbstractNpcAI
 	private void spawnBoss()
 	{
 		final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, ZAKEN_X, ZAKEN_Y, ZAKEN_Z, 0, false, 0);
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 		GrandBossManager.getInstance().addBoss(zaken);
 		zaken.broadcastPacket(new PlaySound(1, "BS01_A", 1, zaken.getObjectId(), zaken.getX(), zaken.getY(), zaken.getZ()));
 	}
@@ -91,7 +91,7 @@ public class Zaken extends AbstractNpcAI
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
 		npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
+		GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("zaken_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 163d9db57f..d9538fa98f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -200,7 +200,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 2f64b979bf..e685806718 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -41,11 +41,11 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 		for (int i = 0; i < count; i++)
 		{
 			final int bossId = packet.readD();
-			if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == RaidBossStatus.ALIVE)
+			if (DBSpawnManager.getInstance().getStatus(bossId) == RaidBossStatus.ALIVE)
 			{
 				_bossIds.add(bossId);
 			}
-			else if (GrandBossManager.getInstance().getBossStatus(bossId) == 0)
+			else if (GrandBossManager.getInstance().getStatus(bossId) == 0)
 			{
 				_bossIds.add(bossId);
 			}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 2c851b0828..09e0896db2 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java
index ddb6b20c93..71150c1323 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -83,7 +83,7 @@ public class Core extends AbstractNpcAI
 		registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -96,7 +96,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -147,7 +147,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -196,7 +196,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -207,7 +207,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0032eee89b..1d3732e60e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index 9ddee40d1e..c26bb52f9c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -49,7 +49,7 @@ public class Zaken extends AbstractNpcAI
 		addKillId(ZAKEN);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final int status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time from DB
@@ -82,7 +82,7 @@ public class Zaken extends AbstractNpcAI
 	private void spawnBoss()
 	{
 		final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, ZAKEN_X, ZAKEN_Y, ZAKEN_Z, 0, false, 0);
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 		GrandBossManager.getInstance().addBoss(zaken);
 		zaken.broadcastPacket(new PlaySound(1, "BS01_A", 1, zaken.getObjectId(), zaken.getX(), zaken.getY(), zaken.getZ()));
 	}
@@ -91,7 +91,7 @@ public class Zaken extends AbstractNpcAI
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
 		npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
+		GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("zaken_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 163d9db57f..d9538fa98f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -200,7 +200,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 2f64b979bf..e685806718 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -41,11 +41,11 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 		for (int i = 0; i < count; i++)
 		{
 			final int bossId = packet.readD();
-			if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == RaidBossStatus.ALIVE)
+			if (DBSpawnManager.getInstance().getStatus(bossId) == RaidBossStatus.ALIVE)
 			{
 				_bossIds.add(bossId);
 			}
-			else if (GrandBossManager.getInstance().getBossStatus(bossId) == 0)
+			else if (GrandBossManager.getInstance().getStatus(bossId) == 0)
 			{
 				_bossIds.add(bossId);
 			}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 2c851b0828..09e0896db2 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java
index ddb6b20c93..71150c1323 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -83,7 +83,7 @@ public class Core extends AbstractNpcAI
 		registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -96,7 +96,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -147,7 +147,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -196,7 +196,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -207,7 +207,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0032eee89b..1d3732e60e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index 9ddee40d1e..c26bb52f9c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -49,7 +49,7 @@ public class Zaken extends AbstractNpcAI
 		addKillId(ZAKEN);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final int status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time from DB
@@ -82,7 +82,7 @@ public class Zaken extends AbstractNpcAI
 	private void spawnBoss()
 	{
 		final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, ZAKEN_X, ZAKEN_Y, ZAKEN_Z, 0, false, 0);
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 		GrandBossManager.getInstance().addBoss(zaken);
 		zaken.broadcastPacket(new PlaySound(1, "BS01_A", 1, zaken.getObjectId(), zaken.getX(), zaken.getY(), zaken.getZ()));
 	}
@@ -91,7 +91,7 @@ public class Zaken extends AbstractNpcAI
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
 		npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
+		GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("zaken_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 163d9db57f..d9538fa98f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -200,7 +200,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 2f64b979bf..e685806718 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -41,11 +41,11 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 		for (int i = 0; i < count; i++)
 		{
 			final int bossId = packet.readD();
-			if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == RaidBossStatus.ALIVE)
+			if (DBSpawnManager.getInstance().getStatus(bossId) == RaidBossStatus.ALIVE)
 			{
 				_bossIds.add(bossId);
 			}
-			else if (GrandBossManager.getInstance().getBossStatus(bossId) == 0)
+			else if (GrandBossManager.getInstance().getStatus(bossId) == 0)
 			{
 				_bossIds.add(bossId);
 			}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 2c851b0828..09e0896db2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java
index ddb6b20c93..71150c1323 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -83,7 +83,7 @@ public class Core extends AbstractNpcAI
 		registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -96,7 +96,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -147,7 +147,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -196,7 +196,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -207,7 +207,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0032eee89b..1d3732e60e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index 9ddee40d1e..c26bb52f9c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -49,7 +49,7 @@ public class Zaken extends AbstractNpcAI
 		addKillId(ZAKEN);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final int status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time from DB
@@ -82,7 +82,7 @@ public class Zaken extends AbstractNpcAI
 	private void spawnBoss()
 	{
 		final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, ZAKEN_X, ZAKEN_Y, ZAKEN_Z, 0, false, 0);
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 		GrandBossManager.getInstance().addBoss(zaken);
 		zaken.broadcastPacket(new PlaySound(1, "BS01_A", 1, zaken.getObjectId(), zaken.getX(), zaken.getY(), zaken.getZ()));
 	}
@@ -91,7 +91,7 @@ public class Zaken extends AbstractNpcAI
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
 		npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
+		GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("zaken_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 163d9db57f..d9538fa98f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -200,7 +200,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 2f64b979bf..e685806718 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -41,11 +41,11 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 		for (int i = 0; i < count; i++)
 		{
 			final int bossId = packet.readD();
-			if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == RaidBossStatus.ALIVE)
+			if (DBSpawnManager.getInstance().getStatus(bossId) == RaidBossStatus.ALIVE)
 			{
 				_bossIds.add(bossId);
 			}
-			else if (GrandBossManager.getInstance().getBossStatus(bossId) == 0)
+			else if (GrandBossManager.getInstance().getStatus(bossId) == 0)
 			{
 				_bossIds.add(bossId);
 			}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 2c851b0828..09e0896db2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java
index ddb6b20c93..71150c1323 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -83,7 +83,7 @@ public class Core extends AbstractNpcAI
 		registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -96,7 +96,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -147,7 +147,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -196,7 +196,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -207,7 +207,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
index 0e47b53bf6..e74d685ebd 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
@@ -63,7 +63,7 @@ public class DrChaos extends AbstractNpcAI
 		addAttackId(CHAOS_GOLEM); // Random messages when he attacks.
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM);
-		final int status = GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM);
+		final int status = GrandBossManager.getInstance().getStatus(CHAOS_GOLEM);
 		
 		// Load the reset date and time for Dr. Chaos from DB.
 		if (status == DEAD)
@@ -78,7 +78,7 @@ public class DrChaos extends AbstractNpcAI
 				// The time has already expired while the server was offline. Delete the saved time and
 				// immediately spawn Dr. Chaos. Also the state need to be changed for NORMAL
 				addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
-				GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL);
+				GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
 			}
 		}
 		// Spawn the war golem.
@@ -112,7 +112,7 @@ public class DrChaos extends AbstractNpcAI
 	{
 		if (event.equalsIgnoreCase("reset_drchaos"))
 		{
-			GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL);
+			GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
 			addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
 		}
 		// despawn the live Dr. Chaos after 30 minutes of inactivity
@@ -126,7 +126,7 @@ public class DrChaos extends AbstractNpcAI
 					npc.deleteMe();
 					
 					addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false); // spawn Dr. Chaos
-					GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
+					GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
 					cancelQuestTimer("golem_despawn", npc, null);
 				}
 			}
@@ -168,7 +168,7 @@ public class DrChaos extends AbstractNpcAI
 		// Check every sec if someone is in range, if found, launch one task to decrease the timer.
 		else if (event.equalsIgnoreCase("paranoia_activity"))
 		{
-			if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL)
+			if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
 			{
 				for (Player obj : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 500))
 				{
@@ -201,7 +201,7 @@ public class DrChaos extends AbstractNpcAI
 	public String onFirstTalk(Npc npc, Player player)
 	{
 		String htmltext = "";
-		if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL)
+		if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
 		{
 			_pissedOffTimer -= 1 + Rnd.get(5); // remove 1-5 secs.
 			if ((_pissedOffTimer > 20) && (_pissedOffTimer <= 30))
@@ -243,7 +243,7 @@ public class DrChaos extends AbstractNpcAI
 		
 		// "lock" Dr. Chaos for regular RB time (36H fixed +- 24H random)
 		final long respawnTime = (36 + Rnd.get(-24, 24)) * 3600000;
-		GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, DEAD);
+		GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, DEAD);
 		startQuestTimer("reset_drchaos", respawnTime, null, null, false);
 		
 		// also save the respawn time so that the info is maintained past reboots
@@ -293,10 +293,10 @@ public class DrChaos extends AbstractNpcAI
 	 */
 	private void crazyMidgetBecomesAngry(Npc npc)
 	{
-		if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL)
+		if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
 		{
 			// Set the status to "crazy".
-			GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, CRAZY);
+			GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, CRAZY);
 			
 			// Cancels the paranoia timer.
 			cancelQuestTimer("paranoia_activity", npc, null);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0b685d633b..c5153f516d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index bf0db534b2..f61e444368 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
 		
 		ZONE = ZoneManager.getInstance().getZoneById(12010);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
-		final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
+		final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
 		
 		if (status == DEAD)
 		{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
 				// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
 				final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
 				valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+				GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 				GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
 				
 				valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
 			else if (event.equalsIgnoreCase("regen_task"))
 			{
 				// Inactivity task - 15min
-				if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
+				if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
 				{
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 					npc.teleToLocation(VALAKAS_REGENERATION_LOC);
 					
-					GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+					GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 					npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
 					
 					// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
 			}
 			else if (event.equalsIgnoreCase("spawn_10"))
 			{
-				GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
+				GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
 				npc.setInvul(false);
 				
 				startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
 			valakas.setRunning();
 			valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 			GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
-			GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
+			GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
 		}
 		else if (event.equalsIgnoreCase("remove_players"))
 		{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
 			return null;
 		}
 		
-		if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
+		if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
 		{
 			attacker.teleToLocation(ATTACKER_REMOVE);
 			return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
 		startQuestTimer("die_7", 14000, npc, null); // 700
 		startQuestTimer("die_8", 16500, npc, null); // 2500
 		
-		GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
+		GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("valakas_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index 9ddee40d1e..c26bb52f9c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -49,7 +49,7 @@ public class Zaken extends AbstractNpcAI
 		addKillId(ZAKEN);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final int status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time from DB
@@ -82,7 +82,7 @@ public class Zaken extends AbstractNpcAI
 	private void spawnBoss()
 	{
 		final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, ZAKEN_X, ZAKEN_Y, ZAKEN_Z, 0, false, 0);
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 		GrandBossManager.getInstance().addBoss(zaken);
 		zaken.broadcastPacket(new PlaySound(1, "BS01_A", 1, zaken.getObjectId(), zaken.getX(), zaken.getY(), zaken.getZ()));
 	}
@@ -91,7 +91,7 @@ public class Zaken extends AbstractNpcAI
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
 		npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
+		GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("zaken_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
index add909d9b3..49319008fe 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java
@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 			{
 				if (valakasAI() != null)
 				{
-					final int status = GrandBossManager.getInstance().getBossStatus(29028);
+					final int status = GrandBossManager.getInstance().getStatus(29028);
 					if ((status == 0) || (status == 1))
 					{
 						if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
 							{
 								final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
 								valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
-								GrandBossManager.getInstance().setBossStatus(29028, 1);
+								GrandBossManager.getInstance().setStatus(29028, 1);
 							}
 						}
 						else
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 163d9db57f..d9538fa98f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -200,7 +200,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 1a8ca676d3..02955b2f9e 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 2c851b0828..09e0896db2 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Core/Core.java
index ddb6b20c93..71150c1323 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -83,7 +83,7 @@ public class Core extends AbstractNpcAI
 		registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -96,7 +96,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -147,7 +147,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -196,7 +196,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -207,7 +207,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0032eee89b..1d3732e60e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 5061d4fc27..a005142f7c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index 9214fdb028..539094a886 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -50,7 +50,7 @@ public class Zaken extends AbstractNpcAI
 		addKillId(ZAKEN);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final int status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time from DB
@@ -83,7 +83,7 @@ public class Zaken extends AbstractNpcAI
 	private void spawnBoss()
 	{
 		final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, ZAKEN_X, ZAKEN_Y, ZAKEN_Z, ZAKEN_HEADING, false, 0);
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 		GrandBossManager.getInstance().addBoss(zaken);
 		zaken.broadcastPacket(new PlaySound(1, "BS01_A", 1, zaken.getObjectId(), zaken.getX(), zaken.getY(), zaken.getZ()));
 	}
@@ -92,7 +92,7 @@ public class Zaken extends AbstractNpcAI
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
 		npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
+		GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("zaken_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 163d9db57f..d9538fa98f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -200,7 +200,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 997b5ab5e5..ab16454461 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 342ddc4466..ec8e5d5ac8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -48,7 +48,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			final GrandBoss boss = GrandBossManager.getInstance().getBoss(bossId);
 			if (boss == null)
 			{
-				final RaidBossStatus status = DBSpawnManager.getInstance().getNpcStatusId(bossId);
+				final RaidBossStatus status = DBSpawnManager.getInstance().getStatus(bossId);
 				if (status != RaidBossStatus.UNDEFINED)
 				{
 					final Npc npc = DBSpawnManager.getInstance().getNpc(bossId);
@@ -71,7 +71,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			{
 				if (boss.isDead() || !boss.isSpawned())
 				{
-					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0))
+					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getStatus(BAIUM) == 0))
 					{
 						_statuses.put(bossId, RaidBossStatus.ALIVE);
 					}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
index 3aa9e905a0..8cc3a42674 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
@@ -77,12 +77,12 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket
 		}
 		
 		final NpcTemplate template = NpcData.getInstance().getTemplate(_raidId);
-		if (template.isType("GrandBoss") && (GrandBossManager.getInstance().getBossStatus(_raidId) != 0))
+		if (template.isType("GrandBoss") && (GrandBossManager.getInstance().getStatus(_raidId) != 0))
 		{
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_RIGHT_NOW);
 			return;
 		}
-		else if (template.isType("RaidBoss") && (DBSpawnManager.getInstance().getNpcStatusId(_raidId) != RaidBossStatus.ALIVE))
+		else if (template.isType("RaidBoss") && (DBSpawnManager.getInstance().getStatus(_raidId) != RaidBossStatus.ALIVE))
 		{
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_RIGHT_NOW);
 			return;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 2c851b0828..09e0896db2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Core/Core.java
index ddb6b20c93..71150c1323 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -83,7 +83,7 @@ public class Core extends AbstractNpcAI
 		registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -96,7 +96,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -147,7 +147,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -196,7 +196,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -207,7 +207,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 0032eee89b..1d3732e60e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 6c23250016..6fb7958de2 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index 9214fdb028..539094a886 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -50,7 +50,7 @@ public class Zaken extends AbstractNpcAI
 		addKillId(ZAKEN);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final int status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time from DB
@@ -83,7 +83,7 @@ public class Zaken extends AbstractNpcAI
 	private void spawnBoss()
 	{
 		final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, ZAKEN_X, ZAKEN_Y, ZAKEN_Z, ZAKEN_HEADING, false, 0);
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 		GrandBossManager.getInstance().addBoss(zaken);
 		zaken.broadcastPacket(new PlaySound(1, "BS01_A", 1, zaken.getObjectId(), zaken.getX(), zaken.getY(), zaken.getZ()));
 	}
@@ -92,7 +92,7 @@ public class Zaken extends AbstractNpcAI
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
 		npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
+		GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("zaken_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 163d9db57f..d9538fa98f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -200,7 +200,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 997b5ab5e5..ab16454461 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 342ddc4466..ec8e5d5ac8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -48,7 +48,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			final GrandBoss boss = GrandBossManager.getInstance().getBoss(bossId);
 			if (boss == null)
 			{
-				final RaidBossStatus status = DBSpawnManager.getInstance().getNpcStatusId(bossId);
+				final RaidBossStatus status = DBSpawnManager.getInstance().getStatus(bossId);
 				if (status != RaidBossStatus.UNDEFINED)
 				{
 					final Npc npc = DBSpawnManager.getInstance().getNpc(bossId);
@@ -71,7 +71,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			{
 				if (boss.isDead() || !boss.isSpawned())
 				{
-					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0))
+					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getStatus(BAIUM) == 0))
 					{
 						_statuses.put(bossId, RaidBossStatus.ALIVE);
 					}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
index 3aa9e905a0..8cc3a42674 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
@@ -77,12 +77,12 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket
 		}
 		
 		final NpcTemplate template = NpcData.getInstance().getTemplate(_raidId);
-		if (template.isType("GrandBoss") && (GrandBossManager.getInstance().getBossStatus(_raidId) != 0))
+		if (template.isType("GrandBoss") && (GrandBossManager.getInstance().getStatus(_raidId) != 0))
 		{
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_RIGHT_NOW);
 			return;
 		}
-		else if (template.isType("RaidBoss") && (DBSpawnManager.getInstance().getNpcStatusId(_raidId) != RaidBossStatus.ALIVE))
+		else if (template.isType("RaidBoss") && (DBSpawnManager.getInstance().getStatus(_raidId) != RaidBossStatus.ALIVE))
 		{
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_RIGHT_NOW);
 			return;
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 2c851b0828..09e0896db2 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Core/Core.java
index ddb6b20c93..71150c1323 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -83,7 +83,7 @@ public class Core extends AbstractNpcAI
 		registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -96,7 +96,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -147,7 +147,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -196,7 +196,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -207,7 +207,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 03cd485ffd..24284fbd19 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 6c23250016..6fb7958de2 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index 9214fdb028..539094a886 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -50,7 +50,7 @@ public class Zaken extends AbstractNpcAI
 		addKillId(ZAKEN);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final int status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time from DB
@@ -83,7 +83,7 @@ public class Zaken extends AbstractNpcAI
 	private void spawnBoss()
 	{
 		final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, ZAKEN_X, ZAKEN_Y, ZAKEN_Z, ZAKEN_HEADING, false, 0);
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 		GrandBossManager.getInstance().addBoss(zaken);
 		zaken.broadcastPacket(new PlaySound(1, "BS01_A", 1, zaken.getObjectId(), zaken.getX(), zaken.getY(), zaken.getZ()));
 	}
@@ -92,7 +92,7 @@ public class Zaken extends AbstractNpcAI
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
 		npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
+		GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("zaken_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 163d9db57f..d9538fa98f 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -200,7 +200,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 997b5ab5e5..ab16454461 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 342ddc4466..ec8e5d5ac8 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -48,7 +48,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			final GrandBoss boss = GrandBossManager.getInstance().getBoss(bossId);
 			if (boss == null)
 			{
-				final RaidBossStatus status = DBSpawnManager.getInstance().getNpcStatusId(bossId);
+				final RaidBossStatus status = DBSpawnManager.getInstance().getStatus(bossId);
 				if (status != RaidBossStatus.UNDEFINED)
 				{
 					final Npc npc = DBSpawnManager.getInstance().getNpc(bossId);
@@ -71,7 +71,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			{
 				if (boss.isDead() || !boss.isSpawned())
 				{
-					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0))
+					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getStatus(BAIUM) == 0))
 					{
 						_statuses.put(bossId, RaidBossStatus.ALIVE);
 					}
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
index 3aa9e905a0..8cc3a42674 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
@@ -77,12 +77,12 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket
 		}
 		
 		final NpcTemplate template = NpcData.getInstance().getTemplate(_raidId);
-		if (template.isType("GrandBoss") && (GrandBossManager.getInstance().getBossStatus(_raidId) != 0))
+		if (template.isType("GrandBoss") && (GrandBossManager.getInstance().getStatus(_raidId) != 0))
 		{
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_RIGHT_NOW);
 			return;
 		}
-		else if (template.isType("RaidBoss") && (DBSpawnManager.getInstance().getNpcStatusId(_raidId) != RaidBossStatus.ALIVE))
+		else if (template.isType("RaidBoss") && (DBSpawnManager.getInstance().getStatus(_raidId) != RaidBossStatus.ALIVE))
 		{
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_RIGHT_NOW);
 			return;
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index e6f9dc42cc..d1174bf10a 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
+		return GrandBossManager.getInstance().getStatus(ANTHARAS);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
+		GrandBossManager.getInstance().setStatus(ANTHARAS, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 2c851b0828..09e0896db2 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
 	
 	private int getStatus()
 	{
-		return GrandBossManager.getInstance().getBossStatus(BAIUM);
+		return GrandBossManager.getInstance().getStatus(BAIUM);
 	}
 	
 	private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
 	
 	private void setStatus(int status)
 	{
-		GrandBossManager.getInstance().setBossStatus(BAIUM, status);
+		GrandBossManager.getInstance().setStatus(BAIUM, status);
 	}
 	
 	private void setRespawn(long respawnTime)
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Core/Core.java
index ddb6b20c93..71150c1323 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -83,7 +83,7 @@ public class Core extends AbstractNpcAI
 		registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
 		_firstAttacked = false;
 		final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
-		if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
+		if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
 		{
 			// Load the unlock date and time for Core from DB.
 			final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -96,7 +96,7 @@ public class Core extends AbstractNpcAI
 			{
 				// The time has already expired while the server was offline. Immediately spawn Core.
 				final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+				GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 				spawnBoss(core);
 			}
 		}
@@ -147,7 +147,7 @@ public class Core extends AbstractNpcAI
 		if (event.equalsIgnoreCase("core_unlock"))
 		{
 			final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
-			GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
+			GrandBossManager.getInstance().setStatus(CORE, ALIVE);
 			spawnBoss(core);
 		}
 		else if (event.equalsIgnoreCase("spawn_minion"))
@@ -196,7 +196,7 @@ public class Core extends AbstractNpcAI
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN);
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
 			_firstAttacked = false;
-			GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
+			GrandBossManager.getInstance().setStatus(CORE, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("core_unlock", respawnTime, null, null);
@@ -207,7 +207,7 @@ public class Core extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
+		else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 60000, npc, null);
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 03cd485ffd..24284fbd19 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
 		_isTeleported = false;
 		_zone = ZoneManager.getInstance().getZoneById(12013);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
+		final int status = GrandBossManager.getInstance().getStatus(ORFEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
 					loc = POS[3];
 				}
 				final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-				GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 				spawnBoss(orfen);
 			}
 		}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
 				loc = POS[3];
 			}
 			final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
-			GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
+			GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
 			spawnBoss(orfen);
 		}
 		else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
 		if (npc.getId() == ORFEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
+			GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
 			respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
 			startQuestTimer("despawn_minions", 20000, null, null);
 			cancelQuestTimers("spawn_minion");
 		}
-		else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
+		else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
 		{
 			_minions.remove(npc);
 			startQuestTimer("spawn_minion", 360000, npc, null);
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index 6c23250016..6fb7958de2 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
 		
 		_zone = ZoneManager.getInstance().getZoneById(12012);
 		final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
+		final int status = GrandBossManager.getInstance().getStatus(QUEEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
 			{
 				// the time has already expired while the server was offline. Immediately spawn queen ant.
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 			}
 		}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
 			case "queen_unlock":
 			{
 				final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
-				GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
+				GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
 				spawnBoss(queen);
 				break;
 			}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (npcId == QUEEN)
 		{
 			npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-			GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
+			GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
 			// Calculate Min and Max respawn times randomly.
 			final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
 			startQuestTimer("queen_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
index 9214fdb028..539094a886 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java
@@ -50,7 +50,7 @@ public class Zaken extends AbstractNpcAI
 		addKillId(ZAKEN);
 		
 		final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
-		final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
+		final int status = GrandBossManager.getInstance().getStatus(ZAKEN);
 		if (status == DEAD)
 		{
 			// load the unlock date and time from DB
@@ -83,7 +83,7 @@ public class Zaken extends AbstractNpcAI
 	private void spawnBoss()
 	{
 		final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, ZAKEN_X, ZAKEN_Y, ZAKEN_Z, ZAKEN_HEADING, false, 0);
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
+		GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
 		GrandBossManager.getInstance().addBoss(zaken);
 		zaken.broadcastPacket(new PlaySound(1, "BS01_A", 1, zaken.getObjectId(), zaken.getX(), zaken.getY(), zaken.getZ()));
 	}
@@ -92,7 +92,7 @@ public class Zaken extends AbstractNpcAI
 	public String onKill(Npc npc, Player killer, boolean isSummon)
 	{
 		npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
-		GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
+		GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
 		// Calculate Min and Max respawn times randomly.
 		final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000;
 		startQuestTimer("zaken_unlock", respawnTime, null, null);
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 163d9db57f..d9538fa98f 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -200,7 +200,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
 	{
 		if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
 		{
-			final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
+			final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
 			NoRestartZone bossZone = null;
 			String textColor = null;
 			String text = null;
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
index 997b5ab5e5..ab16454461 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
@@ -505,11 +505,11 @@ public class DBSpawnManager
 	}
 	
 	/**
-	 * Gets the raid npc status id.
+	 * Gets the raid npc status.
 	 * @param npcId the npc id
-	 * @return the raid npc status id
+	 * @return the raid npc status
 	 */
-	public RaidBossStatus getNpcStatusId(int npcId)
+	public RaidBossStatus getStatus(int npcId)
 	{
 		if (_npcs.containsKey(npcId))
 		{
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
index c033e7c186..c9c89e2b20 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
 		ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
 	}
 	
-	public int getBossStatus(int bossId)
+	public int getStatus(int bossId)
 	{
 		if (!_bossStatus.containsKey(bossId))
 		{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
 		return _bossStatus.get(bossId);
 	}
 	
-	public void setBossStatus(int bossId, int status)
+	public void setStatus(int bossId, int status)
 	{
 		_bossStatus.put(bossId, status);
 		LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
index 342ddc4466..ec8e5d5ac8 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
@@ -48,7 +48,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			final GrandBoss boss = GrandBossManager.getInstance().getBoss(bossId);
 			if (boss == null)
 			{
-				final RaidBossStatus status = DBSpawnManager.getInstance().getNpcStatusId(bossId);
+				final RaidBossStatus status = DBSpawnManager.getInstance().getStatus(bossId);
 				if (status != RaidBossStatus.UNDEFINED)
 				{
 					final Npc npc = DBSpawnManager.getInstance().getNpc(bossId);
@@ -71,7 +71,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
 			{
 				if (boss.isDead() || !boss.isSpawned())
 				{
-					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0))
+					if ((bossId == BAIUM) && (GrandBossManager.getInstance().getStatus(BAIUM) == 0))
 					{
 						_statuses.put(bossId, RaidBossStatus.ALIVE);
 					}
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
index 3aa9e905a0..8cc3a42674 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
@@ -77,12 +77,12 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket
 		}
 		
 		final NpcTemplate template = NpcData.getInstance().getTemplate(_raidId);
-		if (template.isType("GrandBoss") && (GrandBossManager.getInstance().getBossStatus(_raidId) != 0))
+		if (template.isType("GrandBoss") && (GrandBossManager.getInstance().getStatus(_raidId) != 0))
 		{
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_RIGHT_NOW);
 			return;
 		}
-		else if (template.isType("RaidBoss") && (DBSpawnManager.getInstance().getNpcStatusId(_raidId) != RaidBossStatus.ALIVE))
+		else if (template.isType("RaidBoss") && (DBSpawnManager.getInstance().getStatus(_raidId) != RaidBossStatus.ALIVE))
 		{
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_RIGHT_NOW);
 			return;