diff --git a/lang/en-ES.yml b/lang/en_ES.yml
similarity index 91%
rename from lang/en-ES.yml
rename to lang/en_ES.yml
index 7c8fd795..8e8cfc5f 100644
--- a/lang/en-ES.yml
+++ b/lang/en_ES.yml
@@ -1,4 +1,4 @@
-en-ES:
+en_ES:
   AssetAdmin:
   CMSMain:
   CMSMain_left.ss:
diff --git a/lang/en-GB.yml b/lang/en_GB.yml
similarity index 99%
rename from lang/en-GB.yml
rename to lang/en_GB.yml
index 5ff2cf0c..86ee6e39 100644
--- a/lang/en-GB.yml
+++ b/lang/en_GB.yml
@@ -1,4 +1,4 @@
-en-GB:
+en_GB:
   AdvancedSearchForm:
     ALLWORDS: "All Words"
     ATLEAST: "At Least One Of the Words"
diff --git a/lang/es-419.yml b/lang/es_419.yml
similarity index 100%
rename from lang/es-419.yml
rename to lang/es_419.yml
diff --git a/lang/es-AR.yml b/lang/es_AR.yml
similarity index 99%
rename from lang/es-AR.yml
rename to lang/es_AR.yml
index 9ee9b2a1..7fb7ce5c 100644
--- a/lang/es-AR.yml
+++ b/lang/es_AR.yml
@@ -1,4 +1,4 @@
-es-AR:
+es_AR:
   AdvancedSearchForm:
     ALLWORDS: "Todas las Palabras"
     ATLEAST: "Al Menos Una de las Palabras"
diff --git a/lang/es-MX.yml b/lang/es_MX.yml
similarity index 99%
rename from lang/es-MX.yml
rename to lang/es_MX.yml
index b8b02394..d245e5c8 100644
--- a/lang/es-MX.yml
+++ b/lang/es_MX.yml
@@ -1,4 +1,4 @@
-es-MX:
+es_MX:
   AdvancedSearchForm:
     ALLWORDS: "Todas las palabras"
     ATLEAST: "Al menos Una de las Palabras"
diff --git a/lang/et-EE.yml b/lang/et_EE.yml
similarity index 99%
rename from lang/et-EE.yml
rename to lang/et_EE.yml
index d90767f7..8213c11f 100644
--- a/lang/et-EE.yml
+++ b/lang/et_EE.yml
@@ -1,4 +1,4 @@
-et-EE:
+et_EE:
   AdvancedSearchForm:
     ALLWORDS: "Kõigide sõnade järgi"
     ATLEAST: "Vähemalt ühe kirjutatud sõna järgi"
diff --git a/lang/eu-ES.yml b/lang/eu_ES.yml
similarity index 94%
rename from lang/eu-ES.yml
rename to lang/eu_ES.yml
index f6e12d43..47de8f86 100644
--- a/lang/eu-ES.yml
+++ b/lang/eu_ES.yml
@@ -1,4 +1,4 @@
-eu-ES:
+eu_ES:
   AssetAdmin:
   CMSMain:
     NEW: "Berria"
diff --git a/lang/fa-IR.yml b/lang/fa_IR.yml
similarity index 99%
rename from lang/fa-IR.yml
rename to lang/fa_IR.yml
index 83f4331b..c4c9dd9a 100644
--- a/lang/fa-IR.yml
+++ b/lang/fa_IR.yml
@@ -1,4 +1,4 @@
-fa-IR:
+fa_IR:
   AdvancedSearchForm:
     ALLWORDS: "همه کلمات"
     FROM: "از"
diff --git a/lang/he-IL.yml b/lang/he_IL.yml
similarity index 99%
rename from lang/he-IL.yml
rename to lang/he_IL.yml
index 9734a1c6..c2c06ed6 100644
--- a/lang/he-IL.yml
+++ b/lang/he_IL.yml
@@ -1,8 +1,8 @@
-he-IL:
+he_IL:
   AssetAdmin:
     CHOOSEFILE: "בחר קובץ"
     DELETEDX: |
-                %s קבצים נמחקו.%s
+                %s קבצים נמחקו.%s
                    FILESREADY: "קבצים המוכנים להעלאה"
     MOVEDX: "%s קבצים הועברו"
     NEWFOLDER: "תיקיהחדשה"
diff --git a/lang/hi-IN.yml b/lang/hi_IN.yml
similarity index 98%
rename from lang/hi-IN.yml
rename to lang/hi_IN.yml
index 69d6f24d..71458e90 100644
--- a/lang/hi-IN.yml
+++ b/lang/hi_IN.yml
@@ -1,4 +1,4 @@
-hi-IN:
+hi_IN:
   CMSMain:
     NEW: "नया"
     PAGENOTEXISTS: "यह पृष नहीं है"
diff --git a/lang/hy-AM.yml b/lang/hy_AM.yml
similarity index 97%
rename from lang/hy-AM.yml
rename to lang/hy_AM.yml
index ba026ec1..080d5e3b 100644
--- a/lang/hy-AM.yml
+++ b/lang/hy_AM.yml
@@ -1,4 +1,4 @@
-hy-AM:
+hy_AM:
   AssetAdmin:
   AssetAdmin_left.ss:
   CMSMain:
diff --git a/lang/ja-JP.yml b/lang/ja_JP.yml
similarity index 99%
rename from lang/ja-JP.yml
rename to lang/ja_JP.yml
index 02aa4db7..a9623fb8 100644
--- a/lang/ja-JP.yml
+++ b/lang/ja_JP.yml
@@ -1,4 +1,4 @@
-ja-JP:
+ja_JP:
   AdvancedSearchForm:
     ALLWORDS: "全ての単語"
     ATLEAST: "あいまい検索"
diff --git a/lang/kn-IN.yml b/lang/kn_IN.yml
similarity index 93%
rename from lang/kn-IN.yml
rename to lang/kn_IN.yml
index cff8a0d6..5043fbd8 100644
--- a/lang/kn-IN.yml
+++ b/lang/kn_IN.yml
@@ -1,4 +1,4 @@
-kn-IN:
+kn_IN:
   AssetAdmin:
   CMSMain:
   CMSMain_left.ss:
diff --git a/lang/lc-XX.yml b/lang/lc_XX.yml
similarity index 99%
rename from lang/lc-XX.yml
rename to lang/lc_XX.yml
index 37f95af1..27dc5b6c 100644
--- a/lang/lc-XX.yml
+++ b/lang/lc_XX.yml
@@ -1,4 +1,4 @@
-lc-XX:
+lc_XX:
   AssetAdmin:
     CHOOSEFILE: "CHOOSE FIEL"
     DELETEDX: "DELETD %s FILEZ.%s"
diff --git a/lang/mi-NZ.yml b/lang/mi_NZ.yml
similarity index 99%
rename from lang/mi-NZ.yml
rename to lang/mi_NZ.yml
index 8c4b33ad..e56fc776 100644
--- a/lang/mi-NZ.yml
+++ b/lang/mi_NZ.yml
@@ -1,4 +1,4 @@
-mi-NZ:
+mi_NZ:
   AssetAdmin:
   AssetAdmin_left.ss:
   AssetTableField:
diff --git a/lang/pt-BR.yml b/lang/pt_BR.yml
similarity index 99%
rename from lang/pt-BR.yml
rename to lang/pt_BR.yml
index 9c05421e..cfdf6b76 100644
--- a/lang/pt-BR.yml
+++ b/lang/pt_BR.yml
@@ -1,4 +1,4 @@
-pt-BR:
+pt_BR:
   AdvancedSearchForm:
     ALLWORDS: "Todas as palavras"
     ATLEAST: "Pelo menos uma destas palavras"
diff --git a/lang/vi-US.yml b/lang/vi_US.yml
similarity index 96%
rename from lang/vi-US.yml
rename to lang/vi_US.yml
index 92e4d460..ad5e5156 100644
--- a/lang/vi-US.yml
+++ b/lang/vi_US.yml
@@ -1,4 +1,4 @@
-vi-US:
+vi_US:
   AssetAdmin:
   AssetAdmin_left.ss:
   CMSMain:
diff --git a/lang/vi-VN.yml b/lang/vi_VN.yml
similarity index 99%
rename from lang/vi-VN.yml
rename to lang/vi_VN.yml
index 7f4311de..0479d9ad 100644
--- a/lang/vi-VN.yml
+++ b/lang/vi_VN.yml
@@ -1,4 +1,4 @@
-vi-VN:
+vi_VN:
   AssetAdmin:
   AssetAdmin_left.ss:
   CMSMain:
diff --git a/lang/zh-CN.yml b/lang/zh_CN.yml
similarity index 99%
rename from lang/zh-CN.yml
rename to lang/zh_CN.yml
index 11e6d122..603f7493 100644
--- a/lang/zh-CN.yml
+++ b/lang/zh_CN.yml
@@ -1,4 +1,4 @@
-zh-CN:
+zh_CN:
   AssetAdmin:
     CHOOSEFILE: "选择文件"
     DELETEDX: "删除%s个文件。"
diff --git a/lang/zh-TW.yml b/lang/zh_TW.yml
similarity index 99%
rename from lang/zh-TW.yml
rename to lang/zh_TW.yml
index ae2d2027..a4f33dba 100644
--- a/lang/zh-TW.yml
+++ b/lang/zh_TW.yml
@@ -1,4 +1,4 @@
-zh-TW:
+zh_TW:
   AssetAdmin:
     CHOOSEFILE: "選擇檔案"
     DELETEDX: "刪除 %s 檔案. %s"