diff --git a/sql/updates/world/3.3.5/2018_08_16_00_world_335.sql b/sql/updates/world/3.3.5/2018_08_16_00_world_335.sql
deleted file mode 100644
index 8ff55fa6cff..00000000000
--- a/sql/updates/world/3.3.5/2018_08_16_00_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
---
-UPDATE `npc_text` SET `BroadcastTextID0`=0 WHERE `ID`=7790;
diff --git a/sql/updates/world/3.3.5/2018_08_19_05_world_335.sql b/sql/updates/world/3.3.5/2018_08_19_05_world_335.sql
deleted file mode 100644
index 7c445aecbc3..00000000000
--- a/sql/updates/world/3.3.5/2018_08_19_05_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
---
-UPDATE `npc_text` SET `em0_0`=20, `em0_1`=0 WHERE `id`=3094;
diff --git a/sql/updates/world/4.3.4/2018_08_15_00.sql b/sql/updates/world/4.3.4/2018_08_15_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2018_08_15_00.sql
rename to sql/updates/world/4.3.4/2018_08_15_00_world.sql
diff --git a/sql/updates/world/3.3.5/2018_08_15_00_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_00_world_from_335_was_2018_08_15_00_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_08_15_00_world_335.sql
rename to sql/updates/world/4.3.4/2018_08_20_00_world_from_335_was_2018_08_15_00_world_335.sql
index 754192f01cf..687f5821905 100644
--- a/sql/updates/world/3.3.5/2018_08_15_00_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_08_20_00_world_from_335_was_2018_08_15_00_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- 
 DELETE FROM `gameobject` WHERE `guid` IN (5111,5117,5122,5126,5131,5140,5144,5155);
 INSERT INTO `gameobject` (`guid`, `id`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES
@@ -58,3 +59,4 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,
 (22,6,180867,1,0,6,0,67,0,0,0,0,'','Lunar Festival SAI the player Must Must Be Horde'),
 (22,7,180867,1,0,29,0,15719,5,0,0,0,'','Lunar Festival Execute sai if near npc 15719'),
 (22,7,180867,1,0,6,0,67,0,0,0,0,'','Lunar Festival SAI the player Must Must Be Horde');
+*/
diff --git a/sql/updates/world/3.3.5/2018_08_15_01_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_01_world_from_335_was_2018_08_15_01_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_08_15_01_world_335.sql
rename to sql/updates/world/4.3.4/2018_08_20_01_world_from_335_was_2018_08_15_01_world_335.sql
index dcaa9039f06..c50f34baba8 100644
--- a/sql/updates/world/3.3.5/2018_08_15_01_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_08_20_01_world_from_335_was_2018_08_15_01_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Witchbane Torch
 SET @GUID := 5160;
 DELETE FROM `gameobject` WHERE `guid`=@GUID;
@@ -46,3 +47,4 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type
 DELETE FROM `waypoints` WHERE `entry`=23864;
 INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
 (23864,1,-2965.74,-3873.83,33.3183,"");
+*/
diff --git a/sql/updates/world/3.3.5/2018_08_15_02_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_02_world_from_335_was_2018_08_15_02_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_08_15_02_world_335.sql
rename to sql/updates/world/4.3.4/2018_08_20_02_world_from_335_was_2018_08_15_02_world_335.sql
index 4ebfb5ceaa4..319d1717626 100644
--- a/sql/updates/world/3.3.5/2018_08_15_02_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_08_20_02_world_from_335_was_2018_08_15_02_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Quest "The Missing Diplomat (Part 16)"
 UPDATE `quest_template_addon` SET `SpecialFlags`=2 WHERE `ID`=1324; -- Prevents quest from auto completing
 
@@ -100,3 +101,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (496700,9,9,0,0,0,100,0,2000,2000,0,0,0,15,1324,0,0,0,0,0,12,1,0,0,0,0,0,0,"Archmage Tervosh - On Script - Complete Quest 'The Missing Diplomat (Part 16)'"),
 (496700,9,10,0,0,0,100,0,1000,1000,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Archmage Tervosh - On Script - Say Line 2"),
 (496700,9,11,0,0,0,100,0,6000,6000,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Archmage Tervosh - On Script - Say Line 3");
+*/
diff --git a/sql/updates/world/4.3.4/2018_08_20_03_world_from_335_was_2018_08_16_00_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_03_world_from_335_was_2018_08_16_00_world_335.sql
new file mode 100644
index 00000000000..a7cafb3a123
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_08_20_03_world_from_335_was_2018_08_16_00_world_335.sql
@@ -0,0 +1,2 @@
+--
+-- UPDATE `npc_text` SET `BroadcastTextID0`=0 WHERE `ID`=7790;
diff --git a/sql/updates/world/3.3.5/2018_08_16_01_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_04_world_from_335_was_2018_08_16_01_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_08_16_01_world_335.sql
rename to sql/updates/world/4.3.4/2018_08_20_04_world_from_335_was_2018_08_16_01_world_335.sql
index 7b736664d87..1cd2c8fb79d 100644
--- a/sql/updates/world/3.3.5/2018_08_16_01_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_08_20_04_world_from_335_was_2018_08_16_01_world_335.sql
@@ -1,3 +1,4 @@
+/*
 --
 UPDATE `gossip_menu_option` SET `OptionText`='How do I use the cannon?', `OptionBroadcastTextID`= 10769 WHERE `MenuID`= 6575;
 UPDATE `gossip_menu_option` SET `OptionText`='Tonks?', `OptionBroadcastTextID`= 11934 WHERE `MenuID`= 6581 AND `OptionID`= 0;
@@ -17,3 +18,4 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry
 (14,7095,8348,0,0,22,0,0,0,0,0,0,0,"","Show text 8348 on map 0"),
 (14,7095,8349,0,0,22,0,1,0,0,0,0,0,"","Show text 8349 on map 1"),
 (14,7095,11743,0,0,22,0,530,0,0,0,0,0,"","Show text 11743 on map 530");
+*/
diff --git a/sql/updates/world/3.3.5/2018_08_16_02_world.sql b/sql/updates/world/4.3.4/2018_08_20_05_world_from_335_was_2018_08_16_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2018_08_16_02_world.sql
rename to sql/updates/world/4.3.4/2018_08_20_05_world_from_335_was_2018_08_16_02_world.sql
diff --git a/sql/updates/world/3.3.5/2018_08_17_00_world.sql b/sql/updates/world/4.3.4/2018_08_20_06_world_from_335_was_2018_08_17_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2018_08_17_00_world.sql
rename to sql/updates/world/4.3.4/2018_08_20_06_world_from_335_was_2018_08_17_00_world.sql
diff --git a/sql/updates/world/3.3.5/2018_08_19_00_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_07_world_from_335_was_2018_08_19_00_world_335.sql
similarity index 97%
rename from sql/updates/world/3.3.5/2018_08_19_00_world_335.sql
rename to sql/updates/world/4.3.4/2018_08_20_07_world_from_335_was_2018_08_19_00_world_335.sql
index 9e9730a0d1f..a5c0fe75e65 100644
--- a/sql/updates/world/3.3.5/2018_08_19_00_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_08_20_07_world_from_335_was_2018_08_19_00_world_335.sql
@@ -1,3 +1,5 @@
+/*
 --
 UPDATE `quest_template_addon` SET `ExclusiveGroup`=-11144, `NextQuestID`=11149 WHERE `ID` IN (11144,11148); -- Quests "Confirming the Suspicion" / "Arms of the Grimtotems"
 UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID`=11149; -- Quest "Tabetha's Assistance"
+*/
diff --git a/sql/updates/world/3.3.5/2018_08_19_01_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_08_world_from_335_was_2018_08_19_01_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_08_19_01_world_335.sql
rename to sql/updates/world/4.3.4/2018_08_20_08_world_from_335_was_2018_08_19_01_world_335.sql
index 0fe973b52bc..bc29be6d6fb 100644
--- a/sql/updates/world/3.3.5/2018_08_19_01_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_08_20_08_world_from_335_was_2018_08_19_01_world_335.sql
@@ -1,3 +1,4 @@
+/*
 --
 DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (8123,8160,8161,8162,8299,8300,8298,8124,8081,8163,8157,8164,8159,8165,8158);
 INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES
@@ -16,3 +17,4 @@ INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`,
 (1,8159,0,"","","Deprecated quest"),
 (1,8165,0,"","","Deprecated quest"),
 (1,8158,0,"","","Deprecated quest");
+*/
diff --git a/sql/updates/world/3.3.5/2018_08_19_02_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_09_world_from_335_was_2018_08_19_02_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_08_19_02_world_335.sql
rename to sql/updates/world/4.3.4/2018_08_20_09_world_from_335_was_2018_08_19_02_world_335.sql
index 02d8a6b207f..b5ef13f42e3 100644
--- a/sql/updates/world/3.3.5/2018_08_19_02_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_08_20_09_world_from_335_was_2018_08_19_02_world_335.sql
@@ -1,3 +1,4 @@
+/*
 --
 -- Quest "To Steal From Thieves"
 UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5 WHERE `ID`=1164;
@@ -271,3 +272,4 @@ DELETE FROM `quest_details` WHERE `ID`=667;
 INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
 (667,5,0,0,0,0,0,0,0,0);
 UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=667;
+*/
diff --git a/sql/updates/world/3.3.5/2018_08_19_03_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_10_world_from_335_was_2018_08_19_03_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_08_19_03_world_335.sql
rename to sql/updates/world/4.3.4/2018_08_20_10_world_from_335_was_2018_08_19_03_world_335.sql
index 600693083d1..a757ba3638d 100644
--- a/sql/updates/world/3.3.5/2018_08_19_03_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_08_20_10_world_from_335_was_2018_08_19_03_world_335.sql
@@ -1,3 +1,4 @@
+/*
 --
 -- Apprentice Morlann
 DELETE FROM `creature_text` WHERE `CreatureID` IN (23600,23601);
@@ -36,3 +37,4 @@ UPDATE `creature` SET `MovementType`=0 WHERE `guid`=18604;
 UPDATE `creature_addon` SET `path_id`=0 WHERE `guid`=18604;
 DELETE FROM `waypoint_data` WHERE `id`=186040;
 DELETE FROM `waypoint_scripts` WHERE `id` IN (1006,1007,1008);
+*/
diff --git a/sql/updates/world/3.3.5/2018_08_19_04_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_11_world_from_335_was_2018_08_19_04_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_08_19_04_world_335.sql
rename to sql/updates/world/4.3.4/2018_08_20_11_world_from_335_was_2018_08_19_04_world_335.sql
index 84ef50cb52b..e564218f2da 100644
--- a/sql/updates/world/3.3.5/2018_08_19_04_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_08_20_11_world_from_335_was_2018_08_19_04_world_335.sql
@@ -1,3 +1,4 @@
+/*
 --
 -- Stonemaul Spirit
 UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=23786;
@@ -16,3 +17,4 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan
 (23786,0,3,"Raaar!!! Me smash $r!",12,0,100,15,0,0,1925,0,"Stonemaul Spirit"),
 (23786,0,4,"Me smash! You die!",12,0,100,15,0,0,1926,0,"Stonemaul Spirit"),
 (23786,0,5,"I'll crush you!",12,0,100,15,0,0,1927,0,"Stonemaul Spirit");
+*/
diff --git a/sql/updates/world/4.3.4/2018_08_20_12_world_from_335_was_2018_08_19_05_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_12_world_from_335_was_2018_08_19_05_world_335.sql
new file mode 100644
index 00000000000..8fe8883650c
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_08_20_12_world_from_335_was_2018_08_19_05_world_335.sql
@@ -0,0 +1,2 @@
+--
+-- UPDATE `npc_text` SET `em0_0`=20, `em0_1`=0 WHERE `id`=3094;
diff --git a/sql/updates/world/3.3.5/2018_08_19_06_world.sql b/sql/updates/world/4.3.4/2018_08_20_13_world_from_335_was_2018_08_19_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2018_08_19_06_world.sql
rename to sql/updates/world/4.3.4/2018_08_20_13_world_from_335_was_2018_08_19_06_world.sql
diff --git a/sql/updates/world/3.3.5/2018_08_20_00_world_335.sql b/sql/updates/world/4.3.4/2018_08_20_14_world_from_335_was_2018_08_20_00_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_08_20_00_world_335.sql
rename to sql/updates/world/4.3.4/2018_08_20_14_world_from_335_was_2018_08_20_00_world_335.sql
index 7c1a1d28026..71deab4a215 100644
--- a/sql/updates/world/3.3.5/2018_08_20_00_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_08_20_14_world_from_335_was_2018_08_20_00_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Suntara Stones
 UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN (8284,8338,8337);
 UPDATE `creature_addon` SET `bytes1`= 0 WHERE `guid`= 6823;
@@ -142,3 +143,4 @@ INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z
 (82840, 49, -6389.20, -1978.71, 247.48),
 (82840, 50, -6388.39, -1983.85, 246.72),
 (82840, 51, -6388.39, -1983.85, 246.72);
+*/