diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index 514823b9cf817febdc2bfdf53b6b3f7f0ac52595..b78e88e21697386aac4a75a286d76e374ef3d9d3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -14,6 +14,8 @@
  */
 package quests.Q00193_SevenSignsDyingMessage;
 
+import quests.Q00192_SevenSignSeriesOfDoubt.Q00192_SevenSignSeriesOfDoubt;
+
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
@@ -241,7 +243,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
 			{
 				if (npc.getNpcId() == HOLLINT)
 				{
-					st = player.getQuestState("Q00192_SevenSignSeriesOfDoubt");
+					st = player.getQuestState(Q00192_SevenSignSeriesOfDoubt.class.getSimpleName());
 					htmltext = ((player.getLevel() >= MIN_LEVEL) && (st != null) && (st.isCompleted())) ? "30191-01.htm" : "30191-03.html";
 				}
 				break;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
index 80e991d0df7ddbf86875576f3f8754a9e144f2ce..3a0e9bb12f193efbb61154f3e2dcb7320d8b1a9a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
@@ -14,6 +14,8 @@
  */
 package quests.Q00194_SevenSignsMammonsContract;
 
+import quests.Q00193_SevenSignsDyingMessage.Q00193_SevenSignsDyingMessage;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
@@ -380,7 +382,7 @@ public class Q00194_SevenSignsMammonsContract extends Quest
 			{
 				if (npc.getNpcId() == SIR_GUSTAV_ATHEBALDT)
 				{
-					st = player.getQuestState("Q00193_SevenSignsDyingMessage");
+					st = player.getQuestState(Q00193_SevenSignsDyingMessage.class.getSimpleName());
 					htmltext = ((player.getLevel() >= MIN_LEVEL) && (st != null) && (st.isCompleted())) ? "30760-01.htm" : "30760-05.html";
 				}
 				break;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
index 479433277de7a9d729dc01181de799e7bac61ab2..1f2a457b1caaac68186f3452caf09d8365984c19 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
@@ -14,6 +14,8 @@
  */
 package quests.Q00197_SevenSignsTheSacredBookOfSeal;
 
+import quests.Q00196_SevenSignsSealOfTheEmperor.Q00196_SevenSignsSealOfTheEmperor;
+
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
@@ -279,7 +281,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
 			{
 				if (npc.getNpcId() == WOOD)
 				{
-					st = player.getQuestState("Q00196_SevenSignsSealOfTheEmperor");
+					st = player.getQuestState(Q00196_SevenSignsSealOfTheEmperor.class.getSimpleName());
 					htmltext = ((player.getLevel() >= MIN_LEVEL) && (st != null) && (st.isCompleted())) ? "32593-01.htm" : "32593-05.html";
 				}
 				break;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index 395bcd28ac74be2dec2cf9078f8ea5b641c397ee..7140d81ae1396aea5578cb4b720214e9931ac0ae 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -14,6 +14,8 @@
  */
 package quests.Q00198_SevenSignsEmbryo;
 
+import quests.Q00197_SevenSignsTheSacredBookOfSeal.Q00197_SevenSignsTheSacredBookOfSeal;
+
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
@@ -213,7 +215,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
 			{
 				if (npc.getNpcId() == WOOD)
 				{
-					st = player.getQuestState("Q00197_SevenSignsTheSacredBookOfSeal");
+					st = player.getQuestState(Q00197_SevenSignsTheSacredBookOfSeal.class.getSimpleName());
 					htmltext = ((player.getLevel() >= MIN_LEVEL) && (st != null) && (st.isCompleted())) ? "32593-01.htm" : "32593-03.html";
 				}
 				break;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
index 04493993961e99e5049f238414afdf1e5fb2f0f4..e69b6b81a4c4095182afb2aa04385a9a9f985c71 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
@@ -34,7 +34,7 @@ public class Q00290_ThreatRemoval extends Quest
 {
 	// NPC
 	private static final int PINAPS = 30201;
-	// Item
+	// Items
 	private static final int ENCHANT_WEAPON_S = 959;
 	private static final int ENCHANT_ARMOR_S = 960;
 	private static final int FIRE_CRYSTAL = 9552;