diff --git a/data/sql/base/characters/battleground_deserters.sql b/data/sql/base/characters/battleground_deserters.sql
index 5a9e58427..f9830d769 100644
--- a/data/sql/base/characters/battleground_deserters.sql
+++ b/data/sql/base/characters/battleground_deserters.sql
@@ -9,9 +9,9 @@ DROP TABLE IF EXISTS `battleground_deserters`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `battleground_deserters` 
 (
-  `guid` int(10) unsigned NOT NULL COMMENT 'characters.guid',
-  `type` tinyint(3) unsigned NOT NULL COMMENT 'type of the desertion',
-  `datetime` datetime NOT NULL COMMENT 'datetime of the desertion'
+ 	`guid` INT(10) UNSIGNED NOT NULL COMMENT 'characters.guid',
+ 	`type` TINYINT(3) UNSIGNED NOT NULL COMMENT 'type of the desertion',
+ 	`datetime` DATETIME NOT NULL COMMENT 'datetime of the desertion'
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
diff --git a/data/sql/base/characters/character_aura.sql b/data/sql/base/characters/character_aura.sql
index 7e2b27a8f..645269a31 100644
--- a/data/sql/base/characters/character_aura.sql
+++ b/data/sql/base/characters/character_aura.sql
@@ -10,22 +10,22 @@ DROP TABLE IF EXISTS `character_aura`;
 CREATE TABLE `character_aura` 
 (
   `guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
-  `caster_guid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Full Global Unique Identifier',
-  `item_guid` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `casterGuid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Full Global Unique Identifier',
+  `itemGuid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `spell` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `effect_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `recalculate_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stackcount` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `effectMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `recalculateMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `stackCount` tinyint(3) unsigned NOT NULL DEFAULT '1',
   `amount0` int(11) NOT NULL DEFAULT '0',
   `amount1` int(11) NOT NULL DEFAULT '0',
   `amount2` int(11) NOT NULL DEFAULT '0',
   `base_amount0` int(11) NOT NULL DEFAULT '0',
   `base_amount1` int(11) NOT NULL DEFAULT '0',
   `base_amount2` int(11) NOT NULL DEFAULT '0',
-  `maxduration` int(11) NOT NULL DEFAULT '0',
-  `remaintime` int(11) NOT NULL DEFAULT '0',
-  `remaincharges` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`guid`,`caster_guid`,`item_guid`,`spell`,`effect_mask`)
+  `maxDuration` int(11) NOT NULL DEFAULT '0',
+  `remainTime` int(11) NOT NULL DEFAULT '0',
+  `remainCharges` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guid`,`casterGuid`,`itemGuid`,`spell`,`effectMask`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
diff --git a/data/sql/base/characters/character_glyphs.sql b/data/sql/base/characters/character_glyphs.sql
index b373090da..9786a0c22 100644
--- a/data/sql/base/characters/character_glyphs.sql
+++ b/data/sql/base/characters/character_glyphs.sql
@@ -10,14 +10,14 @@ DROP TABLE IF EXISTS `character_glyphs`;
 CREATE TABLE `character_glyphs` 
 (
   `guid` int(10) unsigned NOT NULL,
-  `spec` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `talentGroup` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `glyph1` smallint(5) unsigned DEFAULT '0',
   `glyph2` smallint(5) unsigned DEFAULT '0',
   `glyph3` smallint(5) unsigned DEFAULT '0',
   `glyph4` smallint(5) unsigned DEFAULT '0',
   `glyph5` smallint(5) unsigned DEFAULT '0',
   `glyph6` smallint(5) unsigned DEFAULT '0',
-  PRIMARY KEY (`guid`,`spec`)
+  PRIMARY KEY (`guid`,`talentGroup`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
diff --git a/data/sql/base/characters/characters.sql b/data/sql/base/characters/characters.sql
index 8d68377f9..37b9f3802 100644
--- a/data/sql/base/characters/characters.sql
+++ b/data/sql/base/characters/characters.sql
@@ -69,8 +69,8 @@ CREATE TABLE `characters`
   `power6` int(10) unsigned NOT NULL DEFAULT '0',
   `power7` int(10) unsigned NOT NULL DEFAULT '0',
   `latency` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `speccount` tinyint(3) unsigned NOT NULL DEFAULT '1',
-  `activespec` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `talentGroupsCount` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `activeTalentGroup` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `exploredZones` longtext,
   `equipmentCache` longtext,
   `ammoId` int(10) unsigned NOT NULL DEFAULT '0',
diff --git a/data/sql/base/characters/characters_db_version.sql b/data/sql/base/characters/characters_db_version.sql
index 8e2ea118b..082e41fe3 100644
--- a/data/sql/base/characters/characters_db_version.sql
+++ b/data/sql/base/characters/characters_db_version.sql
@@ -9,7 +9,7 @@ DROP TABLE IF EXISTS `characters_db_version`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `characters_db_version` 
 (
-  `2016_07_10_00` bit(1) DEFAULT NULL
+  `2016_08_12_00` bit(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Last applied sql update to DB';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
diff --git a/data/sql/base/characters/gm_subsurveys.sql b/data/sql/base/characters/gm_subsurveys.sql
index 59d1260c4..745571a1a 100644
--- a/data/sql/base/characters/gm_subsurveys.sql
+++ b/data/sql/base/characters/gm_subsurveys.sql
@@ -4,22 +4,22 @@
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-DROP TABLE IF EXISTS `gm_subsurveys`;
+DROP TABLE IF EXISTS `gm_subsurvey`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `gm_subsurveys` 
+CREATE TABLE `gm_subsurvey` 
 (
   `surveyId` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `subsurveyId` int(10) unsigned NOT NULL DEFAULT '0',
-  `rank` int(10) unsigned NOT NULL DEFAULT '0',
-  `comment` text NOT NULL,
-  PRIMARY KEY (`surveyId`,`subsurveyId`)
+  `questionId` int(10) unsigned NOT NULL DEFAULT '0',
+  `answer` int(10) unsigned NOT NULL DEFAULT '0',
+  `answerComment` text NOT NULL,
+  PRIMARY KEY (`surveyId`,`questionId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
-LOCK TABLES `gm_subsurveys` WRITE;
-/*!40000 ALTER TABLE `gm_subsurveys` DISABLE KEYS */;
-/*!40000 ALTER TABLE `gm_subsurveys` ENABLE KEYS */;
+LOCK TABLES `gm_subsurvey` WRITE;
+/*!40000 ALTER TABLE `gm_subsurvey` DISABLE KEYS */;
+/*!40000 ALTER TABLE `gm_subsurvey` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
diff --git a/data/sql/base/characters/gm_surveys.sql b/data/sql/base/characters/gm_survey.sql
similarity index 82%
rename from data/sql/base/characters/gm_surveys.sql
rename to data/sql/base/characters/gm_survey.sql
index e30a81c7e..7366c40e5 100644
--- a/data/sql/base/characters/gm_surveys.sql
+++ b/data/sql/base/characters/gm_survey.sql
@@ -4,24 +4,24 @@
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-DROP TABLE IF EXISTS `gm_surveys`;
+DROP TABLE IF EXISTS `gm_survey`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `gm_surveys` 
+CREATE TABLE `gm_survey` 
 (
   `surveyId` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `guid` int(10) unsigned NOT NULL DEFAULT '0',
   `mainSurvey` int(10) unsigned NOT NULL DEFAULT '0',
-  `overallComment` longtext NOT NULL,
+  `comment` longtext NOT NULL,
   `createTime` int(10) unsigned NOT NULL DEFAULT '0',
   `maxMMR` smallint(5) NOT NULL,
   PRIMARY KEY (`surveyId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
-LOCK TABLES `gm_surveys` WRITE;
-/*!40000 ALTER TABLE `gm_surveys` DISABLE KEYS */;
-/*!40000 ALTER TABLE `gm_surveys` ENABLE KEYS */;
+LOCK TABLES `gm_survey` WRITE;
+/*!40000 ALTER TABLE `gm_survey` DISABLE KEYS */;
+/*!40000 ALTER TABLE `gm_survey` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
diff --git a/data/sql/base/characters/groups.sql b/data/sql/base/characters/groups.sql
index d99c5ab56..68e29b9bf 100644
--- a/data/sql/base/characters/groups.sql
+++ b/data/sql/base/characters/groups.sql
@@ -24,7 +24,7 @@ CREATE TABLE `groups`
   `icon8` int(10) unsigned NOT NULL,
   `groupType` tinyint(3) unsigned NOT NULL,
   `difficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `raiddifficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `raidDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `masterLooterGuid` int(10) unsigned NOT NULL,
   `MaxlevelGroup` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`),
diff --git a/data/sql/base/characters/pet_aura.sql b/data/sql/base/characters/pet_aura.sql
index fa99d140a..ec1776109 100644
--- a/data/sql/base/characters/pet_aura.sql
+++ b/data/sql/base/characters/pet_aura.sql
@@ -10,21 +10,21 @@ DROP TABLE IF EXISTS `pet_aura`;
 CREATE TABLE `pet_aura` 
 (
   `guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
-  `caster_guid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Full Global Unique Identifier',
+  `casterGuid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Full Global Unique Identifier',
   `spell` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `effect_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `recalculate_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stackcount` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `effectMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `recalculateMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `stackCount` tinyint(3) unsigned NOT NULL DEFAULT '1',
   `amount0` mediumint(8) NOT NULL,
   `amount1` mediumint(8) NOT NULL,
   `amount2` mediumint(8) NOT NULL,
   `base_amount0` mediumint(8) NOT NULL,
   `base_amount1` mediumint(8) NOT NULL,
   `base_amount2` mediumint(8) NOT NULL,
-  `maxduration` int(11) NOT NULL DEFAULT '0',
-  `remaintime` int(11) NOT NULL DEFAULT '0',
-  `remaincharges` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`guid`,`spell`,`effect_mask`)
+  `maxDuration` int(11) NOT NULL DEFAULT '0',
+  `remainTime` int(11) NOT NULL DEFAULT '0',
+  `remainCharges` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guid`,`spell`,`effectMask`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Pet System';
 /*!40101 SET character_set_client = @saved_cs_client */;