diff --git a/Source/Framework/Database/Databases/HotfixDatabase.cs b/Source/Framework/Database/Databases/HotfixDatabase.cs
index 1b4baf24b..42912bdde 100644
--- a/Source/Framework/Database/Databases/HotfixDatabase.cs
+++ b/Source/Framework/Database/Databases/HotfixDatabase.cs
@@ -221,7 +221,7 @@ namespace Framework.Database
                 "MaleCharacterCreationIdleVisualFallback, FemaleCharacterCreationVisualFallback, FemaleCharacterCreationIdleVisualFallback, " +
                 "CharacterCreationIdleGroundVisualFallback, CharacterCreationGroundVisualFallback, AlteredFormCharacterCreationIdleVisualFallback, " +
                 "CharacterCreationAnimLoopWaitTimeMsFallback, CinematicSequenceID, DefaultSpec, PrimaryStatPriority, DisplayPower, " +
-                "RangedAttackPowerPerAgility, AttackPowerPerAgility, AttackPowerPerStrength, SpellClassSet, ChatColorR, ChatColorG, ChatColorB FROM chr_classes");
+                "RangedAttackPowerPerAgility, AttackPowerPerAgility, AttackPowerPerStrength, SpellClassSet, ClassColorR, ClassColorG, ClassColorB FROM chr_classes");
             PrepareStatement(HotfixStatements.SEL_CHR_CLASSES_LOCALE, "SELECT ID, Name_lang, NameMale_lang, NameFemale_lang, Description_lang, RoleInfoString_lang, " +
                 "DisabledString_lang, HyphenatedNameMale_lang, HyphenatedNameFemale_lang FROM chr_classes_locale WHERE locale = ?");
 
@@ -263,8 +263,8 @@ namespace Framework.Database
             PrepareStatement(HotfixStatements.SEL_CHR_RACE_X_CHR_MODEL, "SELECT ID, ChrRacesID, ChrModelID FROM chr_race_x_chr_model");
 
             // ChrRaces.db2
-            PrepareStatement(HotfixStatements.SEL_CHR_RACES, "SELECT ID, ClientPrefix, ClientFileString, Name, NameFemale, NameLowercase, NameFemaleLowercase, NameS, " +
-                "NameFemaleS, NameLowercaseS, NameFemaleLowercaseS, RaceFantasyDescription, NameL, NameFemaleL, NameLowercaseL, NameFemaleLowercaseL, Flags, " +
+            PrepareStatement(HotfixStatements.SEL_CHR_RACES, "SELECT ID, ClientPrefix, ClientFileString, Name, NameFemale, NameLowercase, NameFemaleLowercase, LoreName, " +
+                "LoreNameFemale, LoreNameLower, LoreNameLowerFemale, LoreDescription, ShortName, ShortNameFemale, ShortNameLower, ShortNameLowerFemale, Flags, " +
                 "FactionID, CinematicSequenceID, ResSicknessSpellID, SplashSoundID, Alliance, RaceRelated, UnalteredVisualRaceID, DefaultClassID, " +
                 "CreateScreenFileDataID, SelectScreenFileDataID, NeutralRaceID, LowResScreenFileDataID, AlteredFormStartVisualKitID1, " +
                 "AlteredFormStartVisualKitID2, AlteredFormStartVisualKitID3, AlteredFormFinishVisualKitID1, AlteredFormFinishVisualKitID2, " +
diff --git a/Source/Game/DataStorage/Structs/C_Records.cs b/Source/Game/DataStorage/Structs/C_Records.cs
index 4ce51afb2..5a39ae44d 100644
--- a/Source/Game/DataStorage/Structs/C_Records.cs
+++ b/Source/Game/DataStorage/Structs/C_Records.cs
@@ -113,9 +113,9 @@ namespace Game.DataStorage
         public byte AttackPowerPerAgility;
         public byte AttackPowerPerStrength;
         public byte SpellClassSet;
-        public byte ChatColorR;
-        public byte ChatColorG;
-        public byte ChatColorB;
+        public byte ClassColorR;
+        public byte ClassColorG;
+        public byte ClassColorB;
     }
 
     public sealed class ChrClassesXPowerTypesRecord
@@ -234,15 +234,15 @@ namespace Game.DataStorage
         public string NameFemale;
         public string NameLowercase;
         public string NameFemaleLowercase;
-        public string NameS;
-        public string NameFemaleS;
-        public string NameLowercaseS;
-        public string NameFemaleLowercaseS;
-        public string RaceFantasyDescription;
-        public string NameL;
-        public string NameFemaleL;
-        public string NameLowercaseL;
-        public string NameFemaleLowercaseL;
+        public string LoreName;
+        public string LoreNameFemale;
+        public string LoreNameLower;
+        public string LoreNameLowerFemale;
+        public string LoreDescription;
+        public string ShortName;
+        public string ShortNameFemale;
+        public string ShortNameLower;
+        public string ShortNameLowerFemale;
         public int Flags;
         public int FactionID;
         public uint CinematicSequenceID;
diff --git a/sql/updates/hotfixes/master/2021_11_07_11_hotfixes.sql b/sql/updates/hotfixes/master/2021_11_07_11_hotfixes.sql
new file mode 100644
index 000000000..6b45fad98
--- /dev/null
+++ b/sql/updates/hotfixes/master/2021_11_07_11_hotfixes.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `chr_races` CHANGE COLUMN `NameS` `LoreName` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `NameFemaleLowercase`, CHANGE COLUMN `NameFemaleS` `LoreNameFemale` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `LoreName`, CHANGE COLUMN `NameLowercaseS` `LoreNameLower` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `LoreNameFemale`, CHANGE COLUMN `NameFemaleLowercaseS` `LoreNameLowerFemale` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `LoreNameLower`, CHANGE COLUMN `RaceFantasyDescription` `LoreDescription` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `LoreNameLowerFemale`, CHANGE COLUMN `NameL` `ShortName` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `LoreDescription`, CHANGE COLUMN `NameFemaleL` `ShortNameFemale` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `ShortName`, CHANGE COLUMN `NameLowercaseL` `ShortNameLower` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `ShortNameFemale`, CHANGE COLUMN `NameFemaleLowercaseL` `ShortNameLowerFemale` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci' AFTER `ShortNameLower`; 
+
+ALTER TABLE `chr_classes` CHANGE COLUMN `ChatColorR` `ClassColorR` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `SpellClassSet`, CHANGE COLUMN `ChatColorG` `ClassColorG` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `ClassColorR`, CHANGE COLUMN `ChatColorB` `ClassColorB` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `ClassColorG`;