diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
index 1e592bdc02356b33088f942f83657e41a8285f88..e160888c4b656d7bf65853e629163c3bb3f6459c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
@@ -178,7 +178,7 @@ public class Q00021_HiddenTruth extends Quest
 				{
 					if (!st.isCond(5))
 					{
-						st.playSound(QuestSound.ITEMSOUND_ED_CHIMES);
+						st.playSound(QuestSound.AMDSOUND_ED_CHIMES);
 						st.setCond(5);
 						htmltext = event;
 					}
@@ -317,7 +317,7 @@ public class Q00021_HiddenTruth extends Quest
 						case 4:
 						{
 							st.setCond(5);
-							st.playSound(QuestSound.ITEMSOUND_ED_CHIMES);
+							st.playSound(QuestSound.AMDSOUND_ED_CHIMES);
 							htmltext = "31526-10.html";
 							break;
 						}
@@ -437,7 +437,7 @@ public class Q00021_HiddenTruth extends Quest
 	{
 		if (creature.isPlayer())
 		{
-			playSound((L2PcInstance) creature, QuestSound.ITEMSOUND_DD_HORROR_01);
+			playSound((L2PcInstance) creature, QuestSound.HORROR_01);
 		}
 		return super.onSeeCreature(npc, creature, isSummon);
 	}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
index b0c56480ff55386b0ffce9f32544a2772e69ea1b..956859d0e20c3b90e37eb204a155a76b6a94df3f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
@@ -88,7 +88,7 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
 				st.unset("var");
 				break;
 			case "31389-18.html":
-				st.playSound(QuestSound.INTERFACESOUND_CHARSTAT_OPEN_01);
+				st.playSound(QuestSound.INTERFACESOUND_CHARSTAT_OPEN);
 				break;
 			case "31389-19.html":
 				if (!st.hasQuestItems(BROKEN_SILVER_CROSS_OF_EINHASAD))
@@ -294,7 +294,7 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
 				{
 					if (st.isCond(1))
 					{
-						st.playSound(QuestSound.AMDSOUND_D_WIND_LOOT_02);
+						st.playSound(QuestSound.AMDSOUND_WIND_LOOT);
 						htmltext = "31531-01.html";
 					}
 					else if (st.isCond(2))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index 0852741aece0f59fde37f53aec7a5e0c5f5e9fdc..2ac5a4cfa07cb32c4d17ddb9c6dbfc94544c9b2d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -132,7 +132,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
 				if (st.isCond(4))
 				{
 					st.setCond(5, true);
-					st.playSound(QuestSound.AMBSOUND_T_WINGFLAP_04);
+					st.playSound(QuestSound.AMBSOUND_WINGFLAP);
 					htmltext = event;
 				}
 				break;
@@ -161,7 +161,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
 					{
 						st.setCond(11, true);
 						htmltext = "32020-26.html";
-						st.playSound(QuestSound.AMBSOUND_THUNDER_02);
+						st.playSound(QuestSound.AMBSOUND_THUNDER);
 					}
 				}
 				break;
@@ -181,7 +181,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
 					{
 						st.setCond(11, true);
 						htmltext = "32020-28.html";
-						st.playSound(QuestSound.AMBSOUND_THUNDER_02);
+						st.playSound(QuestSound.AMBSOUND_THUNDER);
 					}
 				}
 				break;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index 9e412e244d6eae0ab87314389c1902023a3ae241..fa1541612e0ce6e2200f46f110f741a0e3f6b94c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -89,7 +89,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
 				break;
 			case "32119-4a.html":
 			case "32119-5b.html":
-				st.playSound(QuestSound.ETCSOUND_ELROKI_SOUND_1ST);
+				st.playSound(QuestSound.ETCSOUND_ELROKI_SONG_1ST);
 				break;
 			case "32119-5.html":
 				if (st.isCond(4))
@@ -111,7 +111,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
 				break;
 			case "32120-4a.html":
 			case "32120-5b.html":
-				st.playSound(QuestSound.ETCSOUND_ELROKI_SOUND_2ND);
+				st.playSound(QuestSound.ETCSOUND_ELROKI_SONG_2ND);
 				break;
 			case "32120-5.html":
 				if (st.isCond(7))
@@ -133,7 +133,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
 				break;
 			case "32121-4a.html":
 			case "32121-5b.html":
-				st.playSound(QuestSound.ETCSOUND_ELROKI_SOUND_3RD);
+				st.playSound(QuestSound.ETCSOUND_ELROKI_SONG_3RD);
 				break;
 			case "32121-5.html":
 				if (st.isCond(10))
@@ -282,7 +282,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
 				break;
 			case "32122-7.html":
 				st.giveItems(BONE_POWDER, 1);
-				st.playSound(QuestSound.ETCSOUND_ELROKI_SOUND_FULL);
+				st.playSound(QuestSound.ETCSOUND_ELROKI_SONG_FULL);
 				npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0));
 				break;
 			case "32122-8.html":