diff --git a/sql/mangos.sql b/sql/mangos.sql
index 397bbb73d..bc60c912d 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -24,7 +24,7 @@ CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
   `creature_ai_version` varchar(120) default NULL,
   `cache_id` int(10) default '0',
-  `required_10299_01_mangos_event_id_scripts` bit(1) default NULL
+  `required_10307_03_mangos_scripted_event_id` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -106,26 +106,6 @@ LOCK TABLES `areatrigger_involvedrelation` WRITE;
 /*!40000 ALTER TABLE `areatrigger_involvedrelation` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `areatrigger_scripts`
---
-
-DROP TABLE IF EXISTS `areatrigger_scripts`;
-CREATE TABLE `areatrigger_scripts` (
-    `entry` MEDIUMINT( 8 ) NOT NULL ,
-    `ScriptName` CHAR( 64 ) NOT NULL ,
-    PRIMARY KEY ( `entry` )
-) ENGINE = MYISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `areatrigger_scripts`
---
-
-LOCK TABLES `areatrigger_scripts` WRITE;
-/*!40000 ALTER TABLE `areatrigger_scripts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `areatrigger_scripts` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `areatrigger_tavern`
 --
@@ -1417,26 +1397,6 @@ LOCK TABLES `creature_ai_texts` WRITE;
 /*!40000 ALTER TABLE `creature_ai_texts` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `event_id_scripts`
---
-
-DROP TABLE IF EXISTS `event_id_scripts`;
-CREATE TABLE `event_id_scripts` (
-  `id` mediumint(8) NOT NULL,
-  `ScriptName` char(64) NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Script library scripted events';
-
---
--- Dumping data for table `event_id_scripts`
---
-
-LOCK TABLES `event_id_scripts` WRITE;
-/*!40000 ALTER TABLE `event_id_scripts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `event_id_scripts` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `event_scripts`
 --
@@ -2130,7 +2090,7 @@ CREATE TABLE `instance_template` (
   `parent` smallint(5) unsigned NOT NULL default '0',
   `levelMin` tinyint(3) unsigned NOT NULL default '0',
   `levelMax` tinyint(3) unsigned NOT NULL default '0',
-  `script` varchar(128) NOT NULL default '',
+  `ScriptName` varchar(128) NOT NULL default '',
   PRIMARY KEY  (`map`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
@@ -14103,6 +14063,46 @@ LOCK TABLES `reserved_name` WRITE;
 /*!40000 ALTER TABLE `reserved_name` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `scripted_areatrigger`
+--
+
+DROP TABLE IF EXISTS `scripted_areatrigger`;
+CREATE TABLE `scripted_areatrigger` (
+  `entry` MEDIUMINT( 8 ) NOT NULL ,
+  `ScriptName` CHAR( 64 ) NOT NULL ,
+  PRIMARY KEY ( `entry` )
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `scripted_areatrigger`
+--
+
+LOCK TABLES `scripted_areatrigger` WRITE;
+/*!40000 ALTER TABLE `scripted_areatrigger` DISABLE KEYS */;
+/*!40000 ALTER TABLE `scripted_areatrigger` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `scripted_event_id`
+--
+
+DROP TABLE IF EXISTS `scripted_event_id`;
+CREATE TABLE `event_id_scripts` (
+  `id` mediumint(8) NOT NULL,
+  `ScriptName` char(64) NOT NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Script library scripted events';
+
+--
+-- Dumping data for table `scripted_event_id`
+--
+
+LOCK TABLES `scripted_event_id` WRITE;
+/*!40000 ALTER TABLE `scripted_event_id` DISABLE KEYS */;
+/*!40000 ALTER TABLE `scripted_event_id` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `skill_discovery_template`
 --
diff --git a/sql/updates/10307_01_mangos_instance_template.sql b/sql/updates/10307_01_mangos_instance_template.sql
new file mode 100644
index 000000000..5b9fe187b
--- /dev/null
+++ b/sql/updates/10307_01_mangos_instance_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_10299_01_mangos_event_id_scripts required_10307_01_mangos_instance_template bit;
+
+ALTER TABLE instance_template CHANGE COLUMN `script` `ScriptName` varchar(128) NOT NULL default '';
diff --git a/sql/updates/10307_02_mangos_scripted_areatrigger.sql b/sql/updates/10307_02_mangos_scripted_areatrigger.sql
new file mode 100644
index 000000000..ff5e1a15b
--- /dev/null
+++ b/sql/updates/10307_02_mangos_scripted_areatrigger.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_10307_01_mangos_instance_template required_10307_02_mangos_scripted_areatrigger bit;
+
+RENAME TABLE areatrigger_scripts TO scripted_areatrigger;
diff --git a/sql/updates/10307_03_mangos_scripted_event_id.sql b/sql/updates/10307_03_mangos_scripted_event_id.sql
new file mode 100644
index 000000000..74e4b46e4
--- /dev/null
+++ b/sql/updates/10307_03_mangos_scripted_event_id.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_10307_02_mangos_scripted_areatrigger required_10307_03_mangos_scripted_event_id bit;
+
+RENAME TABLE event_id_scripts TO scripted_event_id;
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
index 3789ec946..67aaad532 100644
--- a/sql/updates/Makefile.am
+++ b/sql/updates/Makefile.am
@@ -61,6 +61,9 @@ pkgdata_DATA = \
 	10289_01_mangos_creature_template.sql \
 	10289_02_mangos_creature_model_info.sql \
 	10299_01_mangos_event_id_scripts.sql \
+	10307_01_mangos_instance_template.sql \
+	10307_02_mangos_scripted_areatrigger.sql \
+	10307_03_mangos_scripted_event_id.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -102,4 +105,7 @@ EXTRA_DIST = \
 	10289_01_mangos_creature_template.sql \
 	10289_02_mangos_creature_model_info.sql \
 	10299_01_mangos_event_id_scripts.sql \
+	10307_01_mangos_instance_template.sql \
+	10307_02_mangos_scripted_areatrigger.sql \
+	10307_03_mangos_scripted_event_id.sql \
 	README
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 14747ba81..2e5f2af62 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -5200,7 +5200,7 @@ void ObjectMgr::LoadTavernAreaTriggers()
 void ObjectMgr::LoadAreaTriggerScripts()
 {
     mAreaTriggerScripts.clear();                            // need for reload case
-    QueryResult *result = WorldDatabase.Query("SELECT entry, ScriptName FROM areatrigger_scripts");
+    QueryResult *result = WorldDatabase.Query("SELECT entry, ScriptName FROM scripted_areatrigger");
 
     uint32 count = 0;
 
@@ -5210,7 +5210,7 @@ void ObjectMgr::LoadAreaTriggerScripts()
         bar.step();
 
         sLog.outString();
-        sLog.outString( ">> Loaded %u areatrigger scripts", count );
+        sLog.outString( ">> Loaded %u scripted areatrigger", count );
         return;
     }
 
@@ -5229,7 +5229,7 @@ void ObjectMgr::LoadAreaTriggerScripts()
         AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
         if (!atEntry)
         {
-            sLog.outErrorDb("Table `areatrigger_scripts` has area trigger (ID:%u) not listed in `AreaTrigger.dbc`.", Trigger_ID);
+            sLog.outErrorDb("Table `scripted_areatrigger` has area trigger (ID:%u) not listed in `AreaTrigger.dbc`.", Trigger_ID);
             continue;
         }
 
@@ -5245,7 +5245,7 @@ void ObjectMgr::LoadAreaTriggerScripts()
 void ObjectMgr::LoadEventIdScripts()
 {
     mEventIdScripts.clear();                            // need for reload case
-    QueryResult *result = WorldDatabase.Query("SELECT id, ScriptName FROM event_id_scripts");
+    QueryResult *result = WorldDatabase.Query("SELECT id, ScriptName FROM scripted_event_id");
 
     uint32 count = 0;
 
@@ -5255,7 +5255,7 @@ void ObjectMgr::LoadEventIdScripts()
         bar.step();
 
         sLog.outString();
-        sLog.outString( ">> Loaded %u event id scripts", count );
+        sLog.outString( ">> Loaded %u scripted event id", count );
         return;
     }
 
@@ -5314,7 +5314,7 @@ void ObjectMgr::LoadEventIdScripts()
 
         std::set<uint32>::const_iterator itr = evt_scripts.find(eventId);
         if (itr == evt_scripts.end())
-            sLog.outErrorDb("Table `event_id_scripts` has id %u not referring to any gameobject_template type 10 data2 field, type 3 data6 field, type 13 data 2 field or any spell effect %u or path taxi node data",
+            sLog.outErrorDb("Table `scripted_event_id` has id %u not referring to any gameobject_template type 10 data2 field, type 3 data6 field, type 13 data 2 field or any spell effect %u or path taxi node data",
                 eventId, SPELL_EFFECT_SEND_EVENT);
 
         mEventIdScripts[eventId] = GetScriptId(scriptName);
@@ -5323,7 +5323,7 @@ void ObjectMgr::LoadEventIdScripts()
     delete result;
 
     sLog.outString();
-    sLog.outString( ">> Loaded %u event id scripts", count );
+    sLog.outString( ">> Loaded %u scripted event id", count );
 }
 
 uint32 ObjectMgr::GetNearestTaxiNode( float x, float y, float z, uint32 mapid, uint32 team )
@@ -8859,11 +8859,11 @@ void ObjectMgr::LoadScriptNames()
       "UNION "
       "SELECT DISTINCT(ScriptName) FROM item_template WHERE ScriptName <> '' "
       "UNION "
-      "SELECT DISTINCT(ScriptName) FROM areatrigger_scripts WHERE ScriptName <> '' "
+      "SELECT DISTINCT(ScriptName) FROM scripted_areatrigger WHERE ScriptName <> '' "
       "UNION "
-      "SELECT DISTINCT(ScriptName) FROM event_id_scripts WHERE ScriptName <> '' "
+      "SELECT DISTINCT(ScriptName) FROM scripted_event_id WHERE ScriptName <> '' "
       "UNION "
-      "SELECT DISTINCT(script) FROM instance_template WHERE script <> ''");
+      "SELECT DISTINCT(ScriptName) FROM instance_template WHERE ScriptName <> ''");
 
     if( !result )
     {
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index eb5a350ac..4cfe69500 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10306"
+ #define REVISION_NR "10307"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h
index 6e3de8355..65e058042 100644
--- a/src/shared/revision_sql.h
+++ b/src/shared/revision_sql.h
@@ -1,6 +1,6 @@
 #ifndef __REVISION_SQL_H__
 #define __REVISION_SQL_H__
  #define REVISION_DB_CHARACTERS "required_10254_01_characters_auctionhouse"
- #define REVISION_DB_MANGOS "required_10299_01_mangos_event_id_scripts"
+ #define REVISION_DB_MANGOS "required_10307_03_mangos_scripted_event_id"
  #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version"
 #endif // __REVISION_SQL_H__