diff --git a/sql/updates/world/2014_12_30_00_world.sql b/sql/updates/world/2014_12_30_00_world.sql
index e36451b625c..9fafa25dab3 100644
--- a/sql/updates/world/2014_12_30_00_world.sql
+++ b/sql/updates/world/2014_12_30_00_world.sql
@@ -1,10 +1,19 @@
-DELETE FROM `terrain_map_info` WHERE `MapId` IN (656, 655);
-INSERT INTO `terrain_map_info` (MapId, TerrainSwapMap, Comment) VALUES 
-(655, 677, 'Gilneas_terrain1'),
-(656, 679, 'Gilneas_terrain2');
+DROP TABLE IF EXISTS `phase_definitions`;
+DROP TABLE IF EXISTS `phase_info`;
+DROP TABLE IF EXISTS `terrain_phase_info`;
+DROP TABLE IF EXISTS `terrain_map_info`;
+
+CREATE TABLE `terrain_phase_info`(  
+  `Id` INT(10) unsigned NOT NULL,
+  `TerrainSwapMap` INT(10) unsigned NOT NULL,
+  `Comment` VARCHAR(255),
+  PRIMARY KEY (`Id`, `TerrainSwapMap`)
+);
+
+CREATE TABLE `terrain_map_info`(
+  `MapId` INT(10) unsigned NOT NULL,
+  `TerrainSwapMap` INT(10) unsigned NOT NULL,
+  `Comment` VARCHAR(255),
+  PRIMARY KEY (`MapId`, `TerrainSwapMap`)
+);
 
-DELETE FROM `terrain_phase_info` WHERE `Id` IN (182, 186);
-INSERT INTO `terrain_phase_info` (Id, TerrainSwapMap, Comment) VALUES 
-(182, 655, 'Quest Zone-Specific 07'),
-(186, 656, 'Quest Zone-Specific 11');
-DELETE FROM `disables` WHERE `entry` IN (10068, 10069) AND `sourceType` = 4;
diff --git a/sql/updates/world/2014_12_30_01_world.sql b/sql/updates/world/2014_12_30_01_world.sql
index 7bee8bc3bab..e36451b625c 100644
--- a/sql/updates/world/2014_12_30_01_world.sql
+++ b/sql/updates/world/2014_12_30_01_world.sql
@@ -1,44 +1,10 @@
-DROP TABLE IF EXISTS `terrain_phase_info`;
-DROP TABLE IF EXISTS `terrain_map_info`;
-DROP TABLE IF EXISTS `terrain_swap_defaults`;
-DROP TABLE IF EXISTS `terrain_worldmap`;
-
-CREATE TABLE `terrain_phase_info`(  
-  `Id` INT(10) unsigned NOT NULL,
-  `TerrainSwapMap` INT(10) unsigned NOT NULL,
-  `Comment` VARCHAR(255),
-  PRIMARY KEY (`Id`, `TerrainSwapMap`)
-);
-
-CREATE TABLE `terrain_swap_defaults`(  
-  `MapId` INT(10) unsigned NOT NULL,
-  `TerrainSwapMap` INT(10) unsigned NOT NULL,
-  `Comment` VARCHAR(255),
-  PRIMARY KEY (`MapId`, `TerrainSwapMap`)
-);
-
-CREATE TABLE `terrain_worldmap`(  
-  `TerrainSwapMap` INT(10) unsigned NOT NULL,
-  `WorldMapArea` INT(10) unsigned NOT NULL,
-  `Comment` VARCHAR(255),
-  PRIMARY KEY (`TerrainSwapMap`, `WorldMapArea`)
-);
+DELETE FROM `terrain_map_info` WHERE `MapId` IN (656, 655);
+INSERT INTO `terrain_map_info` (MapId, TerrainSwapMap, Comment) VALUES 
+(655, 677, 'Gilneas_terrain1'),
+(656, 679, 'Gilneas_terrain2');
 
+DELETE FROM `terrain_phase_info` WHERE `Id` IN (182, 186);
 INSERT INTO `terrain_phase_info` (Id, TerrainSwapMap, Comment) VALUES 
 (182, 655, 'Quest Zone-Specific 07'),
 (186, 656, 'Quest Zone-Specific 11');
-
-INSERT INTO `terrain_worldmap` (TerrainSwapMap, WorldMapArea, Comment) VALUES 
-(638, 545, 'Gilneas'),
-(655, 678, 'Gilneas_terrain1'),
-(719, 683, 'Hyjal_terrain1'),
-(656, 679, 'Gilneas_terrain2');
-
-INSERT INTO `terrain_swap_defaults` (MapId, TerrainSwapMap, Comment) VALUES 
-(1, 719, 'Mount Hyjal default terrain'),
-(654, 638, 'Gilneas default terrain');
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=25 AND `SourceEntry`=719;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
-(25, 0, 719, 0, 0, 8, 0, 25372, 0, 0, 1, 0, 0, '', 'Hyjal terrain swap if Aessina''s Miracle quest is not rewarded');
-
+DELETE FROM `disables` WHERE `entry` IN (10068, 10069) AND `sourceType` = 4;
diff --git a/sql/updates/world/2014_12_30_02_world.sql b/sql/updates/world/2014_12_30_02_world.sql
index 25565893771..025fc49386d 100644
--- a/sql/updates/world/2014_12_30_02_world.sql
+++ b/sql/updates/world/2014_12_30_02_world.sql
@@ -1,7 +1,3 @@
-DROP TABLE IF EXISTS `phase_area`;
-CREATE TABLE `phase_area` (
-  `AreaId` int(10) unsigned NOT NULL,
-  `PhaseId` int(10) unsigned NOT NULL,
-  `Comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`AreaId`,`PhaseId`)
-);
+DELETE FROM `terrain_phase_info` WHERE `Id` = 0;
+INSERT INTO `terrain_phase_info` (Id, TerrainSwapMap, Comment) VALUES 
+(0, 638, 'Gilneas default terrain swap');
diff --git a/sql/updates/world/2014_12_30_03_world.sql b/sql/updates/world/2014_12_30_03_world.sql
new file mode 100644
index 00000000000..7bee8bc3bab
--- /dev/null
+++ b/sql/updates/world/2014_12_30_03_world.sql
@@ -0,0 +1,44 @@
+DROP TABLE IF EXISTS `terrain_phase_info`;
+DROP TABLE IF EXISTS `terrain_map_info`;
+DROP TABLE IF EXISTS `terrain_swap_defaults`;
+DROP TABLE IF EXISTS `terrain_worldmap`;
+
+CREATE TABLE `terrain_phase_info`(  
+  `Id` INT(10) unsigned NOT NULL,
+  `TerrainSwapMap` INT(10) unsigned NOT NULL,
+  `Comment` VARCHAR(255),
+  PRIMARY KEY (`Id`, `TerrainSwapMap`)
+);
+
+CREATE TABLE `terrain_swap_defaults`(  
+  `MapId` INT(10) unsigned NOT NULL,
+  `TerrainSwapMap` INT(10) unsigned NOT NULL,
+  `Comment` VARCHAR(255),
+  PRIMARY KEY (`MapId`, `TerrainSwapMap`)
+);
+
+CREATE TABLE `terrain_worldmap`(  
+  `TerrainSwapMap` INT(10) unsigned NOT NULL,
+  `WorldMapArea` INT(10) unsigned NOT NULL,
+  `Comment` VARCHAR(255),
+  PRIMARY KEY (`TerrainSwapMap`, `WorldMapArea`)
+);
+
+INSERT INTO `terrain_phase_info` (Id, TerrainSwapMap, Comment) VALUES 
+(182, 655, 'Quest Zone-Specific 07'),
+(186, 656, 'Quest Zone-Specific 11');
+
+INSERT INTO `terrain_worldmap` (TerrainSwapMap, WorldMapArea, Comment) VALUES 
+(638, 545, 'Gilneas'),
+(655, 678, 'Gilneas_terrain1'),
+(719, 683, 'Hyjal_terrain1'),
+(656, 679, 'Gilneas_terrain2');
+
+INSERT INTO `terrain_swap_defaults` (MapId, TerrainSwapMap, Comment) VALUES 
+(1, 719, 'Mount Hyjal default terrain'),
+(654, 638, 'Gilneas default terrain');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=25 AND `SourceEntry`=719;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(25, 0, 719, 0, 0, 8, 0, 25372, 0, 0, 1, 0, 0, '', 'Hyjal terrain swap if Aessina''s Miracle quest is not rewarded');
+
diff --git a/sql/updates/world/2014_12_30_04_world.sql b/sql/updates/world/2014_12_30_04_world.sql
index 9fafa25dab3..25565893771 100644
--- a/sql/updates/world/2014_12_30_04_world.sql
+++ b/sql/updates/world/2014_12_30_04_world.sql
@@ -1,19 +1,7 @@
-DROP TABLE IF EXISTS `phase_definitions`;
-DROP TABLE IF EXISTS `phase_info`;
-DROP TABLE IF EXISTS `terrain_phase_info`;
-DROP TABLE IF EXISTS `terrain_map_info`;
-
-CREATE TABLE `terrain_phase_info`(  
-  `Id` INT(10) unsigned NOT NULL,
-  `TerrainSwapMap` INT(10) unsigned NOT NULL,
-  `Comment` VARCHAR(255),
-  PRIMARY KEY (`Id`, `TerrainSwapMap`)
+DROP TABLE IF EXISTS `phase_area`;
+CREATE TABLE `phase_area` (
+  `AreaId` int(10) unsigned NOT NULL,
+  `PhaseId` int(10) unsigned NOT NULL,
+  `Comment` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`AreaId`,`PhaseId`)
 );
-
-CREATE TABLE `terrain_map_info`(
-  `MapId` INT(10) unsigned NOT NULL,
-  `TerrainSwapMap` INT(10) unsigned NOT NULL,
-  `Comment` VARCHAR(255),
-  PRIMARY KEY (`MapId`, `TerrainSwapMap`)
-);
-
diff --git a/sql/updates/world/2014_12_30_05_world.sql b/sql/updates/world/2014_12_30_05_world.sql
deleted file mode 100644
index 025fc49386d..00000000000
--- a/sql/updates/world/2014_12_30_05_world.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `terrain_phase_info` WHERE `Id` = 0;
-INSERT INTO `terrain_phase_info` (Id, TerrainSwapMap, Comment) VALUES 
-(0, 638, 'Gilneas default terrain swap');