diff --git a/env/locales_deDE.lua b/env/locales_deDE.lua
index 9eaa8b6e..b30380bd 100644
--- a/env/locales_deDE.lua
+++ b/env/locales_deDE.lua
@@ -1,16 +1,5 @@
 pfUI_locale["deDE"] = {}
 
-pfUI_locale["deDE"]["class"] = {
-  ["Hexenmeister"] = "WARLOCK",
-  ["Krieger"] = "WARRIOR",
-  ["Jäger"] = "HUNTER",
-  ["Magier"] = "MAGE",
-  ["Priester"] = "PRIEST",
-  ["Druide"] = "DRUID",
-  ["Paladin"] = "PALADIN",
-  ["Schamane"] = "SHAMAN",
-  ["Schurke"] = "ROGUE",
-}
 
 pfUI_locale["deDE"]["healduration"] = {
   ["Rejuvenation"] = "Erhöht die Dauer Eures Zaubers 'Verjüngung' um 3 Sek.",
diff --git a/env/locales_enUS.lua b/env/locales_enUS.lua
index 6f56c00d..261f08ca 100644
--- a/env/locales_enUS.lua
+++ b/env/locales_enUS.lua
@@ -1,16 +1,5 @@
 pfUI_locale["enUS"] = {}
 
-pfUI_locale["enUS"]["class"] = {
-  ["Warlock"] = "WARLOCK",
-  ["Warrior"] = "WARRIOR",
-  ["Hunter"] = "HUNTER",
-  ["Mage"] = "MAGE",
-  ["Priest"] = "PRIEST",
-  ["Druid"] = "DRUID",
-  ["Paladin"] = "PALADIN",
-  ["Shaman"] = "SHAMAN",
-  ["Rogue"] = "ROGUE",
-}
 
 pfUI_locale["enUS"]["healduration"] = {
   ["Rejuvenation"] = "Increases the duration of your Rejuvenation spell by 3 sec.",
diff --git a/env/locales_esES.lua b/env/locales_esES.lua
index 2dcc6422..2a9bdc08 100644
--- a/env/locales_esES.lua
+++ b/env/locales_esES.lua
@@ -1,16 +1,5 @@
 pfUI_locale["esES"] = {}
 
-pfUI_locale["esES"]["class"] = {
-  ["Brujo"] = "WARLOCK",
-  ["Guerrero"] = "WARRIOR",
-  ["Cazador"] = "HUNTER",
-  ["Mago"] = "MAGE",
-  ["Sacerdote"] = "PRIEST",
-  ["Druida"] = "DRUID",
-  ["Paladín"] = "PALADIN",
-  ["Chamán"] = "SHAMAN",
-  ["Pícaro"] = "ROGUE",
-}
 
 pfUI_locale["esES"]["healduration"] = {
   ["Rejuvenation"] = "Aumenta 3 s la duración de tu hechizo Rejuvenecimiento.",
diff --git a/env/locales_frFR.lua b/env/locales_frFR.lua
index e3090e96..b2cf186c 100644
--- a/env/locales_frFR.lua
+++ b/env/locales_frFR.lua
@@ -1,16 +1,5 @@
 pfUI_locale["frFR"] = {}
 
-pfUI_locale["frFR"]["class"] = {
-  ["Démoniste"] = "WARLOCK",
-  ["Guerrier"] = "WARRIOR",
-  ["Chasseur"] = "HUNTER",
-  ["Mage"] = "MAGE",
-  ["Prêtre"] = "PRIEST",
-  ["Druide"] = "DRUID",
-  ["Paladin"] = "PALADIN",
-  ["Chaman"] = "SHAMAN",
-  ["Voleur"] = "ROGUE",
-}
 
 pfUI_locale["frFR"]["healduration"] = {
   ["Rejuvenation"] = "Augmente la durée de votre sort Récupération de 3 sec.",
diff --git a/env/locales_koKR.lua b/env/locales_koKR.lua
index 9d1f0377..b724661e 100644
--- a/env/locales_koKR.lua
+++ b/env/locales_koKR.lua
@@ -1,16 +1,5 @@
 pfUI_locale["koKR"] = {}
 
-pfUI_locale["koKR"]["class"] = {
-  ["흑마법사"] = "WARLOCK",
-  ["전사"] = "WARRIOR",
-  ["사냥꾼"] = "HUNTER",
-  ["마법사"] = "MAGE",
-  ["사제"] = "PRIEST",
-  ["드루이드"] = "DRUID",
-  ["성기사"] = "PALADIN",
-  ["주술사"] = "SHAMAN",
-  ["도적"] = "ROGUE",
-}
 
 pfUI_locale["koKR"]["healduration"] = {
   ["Rejuvenation"] = "회복의 지속시간이 3초만큼 증가합니다.",
diff --git a/env/locales_ruRU.lua b/env/locales_ruRU.lua
index 85ee40cf..9cac15df 100644
--- a/env/locales_ruRU.lua
+++ b/env/locales_ruRU.lua
@@ -1,16 +1,5 @@
 pfUI_locale["ruRU"] = {}
 
-pfUI_locale["ruRU"]["class"] = {
-  ["Чернокнижник"] = "WARLOCK",
-  ["Воин"] = "WARRIOR",
-  ["Охотник"] = "HUNTER",
-  ["Маг"] = "MAGE",
-  ["Жрец"] = "PRIEST",
-  ["Друид"] = "DRUID",
-  ["Паладин"] = "PALADIN",
-  ["Шаман"] = "SHAMAN",
-  ["Разбойник"] = "ROGUE",
-}
 
 pfUI_locale["ruRU"]["healduration"] = {
   ["Rejuvenation"] = "Увеличивает время действия \"Омоложения\" на 3 сек.",
diff --git a/env/locales_zhCN.lua b/env/locales_zhCN.lua
index 94cfeb66..851d6504 100644
--- a/env/locales_zhCN.lua
+++ b/env/locales_zhCN.lua
@@ -1,16 +1,5 @@
 pfUI_locale["zhCN"] = {}
 
-pfUI_locale["zhCN"]["class"] = {
-  ["术士"] = "WARLOCK",
-  ["战士"] = "WARRIOR",
-  ["猎人"] = "HUNTER",
-  ["法师"] = "MAGE",
-  ["牧师"] = "PRIEST",
-  ["德鲁伊"] = "DRUID",
-  ["圣骑士"] = "PALADIN",
-  ["萨满祭司"] = "SHAMAN",
-  ["盗贼"] = "ROGUE",
-}
 
 pfUI_locale["zhCN"]["healduration"] = {
   ["Rejuvenation"] = "使你的回春术的持续时间延长3秒。",
diff --git a/pfUI.lua b/pfUI.lua
index 79cfe8e3..b8d6532b 100644
--- a/pfUI.lua
+++ b/pfUI.lua
@@ -292,6 +292,7 @@ function pfUI:GetEnvironment()
   pfUI.env.C = pfUI_config
   pfUI.env.pfUI_throttle = _G.pfUI_throttle
   pfUI.env.L = (pfUI_locale[GetLocale()] or pfUI_locale["enUS"])
+  pfUI.env.L["class"] = pfUI.env.L["class"] or tInvert(LOCALIZED_CLASS_NAMES_MALE)
 
   return pfUI.env
 end