diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java
index 96dc4c3f1c1ae3f4a03868463041f93419b8c8d9..12ee07de347c04532f711bbc189215b8e4c4a219 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java
@@ -22,6 +22,8 @@ import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.util.Util;
 
+import custom.Validators.SubClassSkills;
+
 /**
  * Avant-Garde AI.<br>
  * Sub-Class Certification system, skill learning and certification canceling.<br>
@@ -167,10 +169,10 @@ public class AvantGarde extends AbstractNpcAI
 				}
 				else
 				{
-					QuestState st = player.getQuestState("SubClassSkills");
+					QuestState st = player.getQuestState(SubClassSkills.class.getSimpleName());
 					if (st == null)
 					{
-						st = QuestManager.getInstance().getQuest("SubClassSkills").newQuestState(player);
+						st = QuestManager.getInstance().getQuest(SubClassSkills.class.getSimpleName()).newQuestState(player);
 					}
 					
 					int activeCertifications = 0;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
index 5d8bf589b4c68ca21096a90c6ae0c0cbf47c1c76..2f28dc0f4a82f4802089217fdc6aaee193aae2ae 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
@@ -112,8 +112,8 @@ public class AdminReload implements IAdminCommandHandler
 					}
 					else
 					{
-						QuestManager.getInstance().reloadAllQuests();
-						activeChar.sendMessage("All Quests have been reloaded.");
+						QuestManager.getInstance().reloadAllScripts();
+						activeChar.sendMessage("All scripts have been reloaded.");
 						AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Quests.");
 					}
 					break;
@@ -121,7 +121,7 @@ public class AdminReload implements IAdminCommandHandler
 				case "walker":
 				{
 					WalkingManager.getInstance().load();
-					activeChar.sendMessage("All Walkers have been reloaded");
+					activeChar.sendMessage("All walkers have been reloaded");
 					AdminTable.getInstance().broadcastMessageToGMs(activeChar.getName() + ": Reloaded Walkers.");
 					break;
 				}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index e4512c0b476b35cb3fcd3013ea2f6b386a6aaab7..c562b4f1f1d092af539741c77ccac07597764757 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -242,7 +242,7 @@ public class AdminSpawn implements IAdminCommandHandler
 			RaidBossSpawnManager.getInstance().load();
 			AutoSpawnHandler.getInstance().reload();
 			SevenSigns.getInstance().spawnSevenSignsNPC();
-			QuestManager.getInstance().reloadAllQuests();
+			QuestManager.getInstance().reloadAllScripts();
 			AdminTable.getInstance().broadcastMessageToGMs("NPC Respawn completed!");
 		}
 		else if (command.startsWith("admin_spawn_monster") || command.startsWith("admin_spawn"))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/ReloadHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/ReloadHandler.java
index 8948154008f867b51d1ec98252f50c7dcb4f0d78..246222dd55adc74c0c941fbd279f82ead8e6be21 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/ReloadHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/ReloadHandler.java
@@ -76,7 +76,7 @@ public class ReloadHandler implements ITelnetHandler
 				{
 					_print.print("Reloading npc templates... ");
 					NpcData.getInstance().load();
-					QuestManager.getInstance().reloadAllQuests();
+					QuestManager.getInstance().reloadAllScripts();
 					_print.println("done");
 				}
 				else if (type.equals("html"))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
index 5f5e89ee88a43075368b2fc094e45c0ef8ea7e22..78f3258b38f593a32d148356062dae0dae296291 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/SagasScripts/SagasSuperClass.java
@@ -1011,7 +1011,7 @@ public class SagasSuperClass extends Quest
 			{
 				continue;
 			}
-			QuestManager.getInstance().removeQuest(script);
+			QuestManager.getInstance().removeScript(script);
 		}
 		_scripts.clear();
 		return super.unload();