diff --git a/gamecore/lang.lua b/gamecore/lang.lua
index 0e0f33d..95cfd85 100644
--- a/gamecore/lang.lua
+++ b/gamecore/lang.lua
@@ -60,14 +60,20 @@ function LanguageManager:getStringList(library, file)
   return require(self.lang .. "." .. library .. "." .. file)
 end
 
+function LanguageManager:getLangMetadata(lang)
+  local langfilepath = self.data.path .. lang
+
+  return require(langfilepath)
+end
+
 function LanguageManager:getLangName(lang)
-  local   langnames = langs.available_langs
-  return  langnames[lang]
+  local metadata = self:getLangMetadata(lang)
+
+  return metadata.name
 end
 
 function LanguageManager:getCurrentLangName()
-  local   langnames = langs.available_langs
-  return  langnames[self.lang]
+  return self:getLangName(self.data.current)
 end
 
 return LanguageManager