diff --git a/src/administrator/language/en-GB/en-GB.com_externallogin.ini b/src/administrator/language/en-GB/com_externallogin.ini
similarity index 100%
rename from src/administrator/language/en-GB/en-GB.com_externallogin.ini
rename to src/administrator/language/en-GB/com_externallogin.ini
diff --git a/src/administrator/language/en-GB/en-GB.com_externallogin.sys.ini b/src/administrator/language/en-GB/com_externallogin.sys.ini
similarity index 100%
rename from src/administrator/language/en-GB/en-GB.com_externallogin.sys.ini
rename to src/administrator/language/en-GB/com_externallogin.sys.ini
diff --git a/src/administrator/modules/mod_externallogin_admin/language/en-GB/en-GB.mod_externallogin_admin.ini b/src/administrator/modules/mod_externallogin_admin/language/en-GB/mod_externallogin_admin.ini
similarity index 100%
rename from src/administrator/modules/mod_externallogin_admin/language/en-GB/en-GB.mod_externallogin_admin.ini
rename to src/administrator/modules/mod_externallogin_admin/language/en-GB/mod_externallogin_admin.ini
diff --git a/src/administrator/modules/mod_externallogin_admin/language/en-GB/en-GB.mod_externallogin_admin.sys.ini b/src/administrator/modules/mod_externallogin_admin/language/en-GB/mod_externallogin_admin.sys.ini
similarity index 100%
rename from src/administrator/modules/mod_externallogin_admin/language/en-GB/en-GB.mod_externallogin_admin.sys.ini
rename to src/administrator/modules/mod_externallogin_admin/language/en-GB/mod_externallogin_admin.sys.ini
diff --git a/src/administrator/modules/mod_externallogin_admin/mod_externallogin_admin.xml b/src/administrator/modules/mod_externallogin_admin/mod_externallogin_admin.xml
index 1f7dd908..bcbf0bb8 100644
--- a/src/administrator/modules/mod_externallogin_admin/mod_externallogin_admin.xml
+++ b/src/administrator/modules/mod_externallogin_admin/mod_externallogin_admin.xml
@@ -22,8 +22,8 @@
- language/en-GB/en-GB.mod_externallogin_admin.ini
- language/en-GB/en-GB.mod_externallogin_admin.sys.ini
+ language/en-GB/mod_externallogin_admin.ini
+ language/en-GB/mod_externallogin_admin.sys.ini
diff --git a/src/com_externallogin.xml b/src/com_externallogin.xml
index 60df8046..eb1719d7 100644
--- a/src/com_externallogin.xml
+++ b/src/com_externallogin.xml
@@ -48,7 +48,7 @@
- language/en-GB/en-GB.com_externallogin.ini
+ language/en-GB/com_externallogin.ini
@@ -102,8 +102,8 @@
- language/en-GB/en-GB.com_externallogin.ini
- language/en-GB/en-GB.com_externallogin.sys.ini
+ language/en-GB/com_externallogin.ini
+ language/en-GB/com_externallogin.sys.ini
diff --git a/src/language/en-GB/en-GB.com_externallogin.ini b/src/language/en-GB/com_externallogin.ini
similarity index 100%
rename from src/language/en-GB/en-GB.com_externallogin.ini
rename to src/language/en-GB/com_externallogin.ini
diff --git a/src/language/en-GB/en-GB.pkg_externallogin.sys.ini b/src/language/en-GB/pkg_externallogin.sys.ini
similarity index 100%
rename from src/language/en-GB/en-GB.pkg_externallogin.sys.ini
rename to src/language/en-GB/pkg_externallogin.sys.ini
diff --git a/src/modules/mod_externallogin_site/language/en-GB/en-GB.mod_externallogin_site.ini b/src/modules/mod_externallogin_site/language/en-GB/mod_externallogin_site.ini
similarity index 100%
rename from src/modules/mod_externallogin_site/language/en-GB/en-GB.mod_externallogin_site.ini
rename to src/modules/mod_externallogin_site/language/en-GB/mod_externallogin_site.ini
diff --git a/src/modules/mod_externallogin_site/language/en-GB/en-GB.mod_externallogin_site.sys.ini b/src/modules/mod_externallogin_site/language/en-GB/mod_externallogin_site.sys.ini
similarity index 100%
rename from src/modules/mod_externallogin_site/language/en-GB/en-GB.mod_externallogin_site.sys.ini
rename to src/modules/mod_externallogin_site/language/en-GB/mod_externallogin_site.sys.ini
diff --git a/src/modules/mod_externallogin_site/mod_externallogin_site.xml b/src/modules/mod_externallogin_site/mod_externallogin_site.xml
index 36be4fd8..aeaa9c51 100644
--- a/src/modules/mod_externallogin_site/mod_externallogin_site.xml
+++ b/src/modules/mod_externallogin_site/mod_externallogin_site.xml
@@ -22,8 +22,8 @@
- language/en-GB/en-GB.mod_externallogin_site.ini
- language/en-GB/en-GB.mod_externallogin_site.sys.ini
+ language/en-GB/mod_externallogin_site.ini
+ language/en-GB/mod_externallogin_site.sys.ini
diff --git a/src/pkg_externallogin.xml b/src/pkg_externallogin.xml
index 4fb14539..677e0787 100644
--- a/src/pkg_externallogin.xml
+++ b/src/pkg_externallogin.xml
@@ -19,7 +19,7 @@
externallogin
- en-GB/en-GB.pkg_externallogin.sys.ini
+ en-GB/pkg_externallogin.sys.ini
diff --git a/src/plugins/authentication/externallogin/externallogin.xml b/src/plugins/authentication/externallogin/externallogin.xml
index 9812be67..d9f2c17a 100644
--- a/src/plugins/authentication/externallogin/externallogin.xml
+++ b/src/plugins/authentication/externallogin/externallogin.xml
@@ -20,8 +20,8 @@
- language/en-GB/en-GB.plg_authentication_externallogin.ini
- language/en-GB/en-GB.plg_authentication_externallogin.sys.ini
+ language/en-GB/plg_authentication_externallogin.ini
+ language/en-GB/plg_authentication_externallogin.sys.ini
diff --git a/src/plugins/authentication/externallogin/language/en-GB/en-GB.plg_authentication_externallogin.ini b/src/plugins/authentication/externallogin/language/en-GB/plg_authentication_externallogin.ini
similarity index 100%
rename from src/plugins/authentication/externallogin/language/en-GB/en-GB.plg_authentication_externallogin.ini
rename to src/plugins/authentication/externallogin/language/en-GB/plg_authentication_externallogin.ini
diff --git a/src/plugins/authentication/externallogin/language/en-GB/en-GB.plg_authentication_externallogin.sys.ini b/src/plugins/authentication/externallogin/language/en-GB/plg_authentication_externallogin.sys.ini
similarity index 100%
rename from src/plugins/authentication/externallogin/language/en-GB/en-GB.plg_authentication_externallogin.sys.ini
rename to src/plugins/authentication/externallogin/language/en-GB/plg_authentication_externallogin.sys.ini
diff --git a/src/plugins/system/caslogin/caslogin.xml b/src/plugins/system/caslogin/caslogin.xml
index 4757264a..797f1b9b 100644
--- a/src/plugins/system/caslogin/caslogin.xml
+++ b/src/plugins/system/caslogin/caslogin.xml
@@ -25,8 +25,8 @@
- language/en-GB/en-GB.plg_system_caslogin.ini
- language/en-GB/en-GB.plg_system_caslogin.sys.ini
+ language/en-GB/plg_system_caslogin.ini
+ language/en-GB/plg_system_caslogin.sys.ini
diff --git a/src/plugins/system/caslogin/language/en-GB/en-GB.plg_system_caslogin.ini b/src/plugins/system/caslogin/language/en-GB/plg_system_caslogin.ini
similarity index 100%
rename from src/plugins/system/caslogin/language/en-GB/en-GB.plg_system_caslogin.ini
rename to src/plugins/system/caslogin/language/en-GB/plg_system_caslogin.ini
diff --git a/src/plugins/system/caslogin/language/en-GB/en-GB.plg_system_caslogin.sys.ini b/src/plugins/system/caslogin/language/en-GB/plg_system_caslogin.sys.ini
similarity index 100%
rename from src/plugins/system/caslogin/language/en-GB/en-GB.plg_system_caslogin.sys.ini
rename to src/plugins/system/caslogin/language/en-GB/plg_system_caslogin.sys.ini
diff --git a/src/plugins/system/externallogin/externallogin.xml b/src/plugins/system/externallogin/externallogin.xml
index 4c7a1ae9..b3a01bea 100644
--- a/src/plugins/system/externallogin/externallogin.xml
+++ b/src/plugins/system/externallogin/externallogin.xml
@@ -20,8 +20,8 @@
- language/en-GB/en-GB.plg_system_externallogin.ini
- language/en-GB/en-GB.plg_system_externallogin.sys.ini
+ language/en-GB/plg_system_externallogin.ini
+ language/en-GB/plg_system_externallogin.sys.ini
diff --git a/src/plugins/system/externallogin/language/en-GB/en-GB.plg_system_externallogin.ini b/src/plugins/system/externallogin/language/en-GB/plg_system_externallogin.ini
similarity index 100%
rename from src/plugins/system/externallogin/language/en-GB/en-GB.plg_system_externallogin.ini
rename to src/plugins/system/externallogin/language/en-GB/plg_system_externallogin.ini
diff --git a/src/plugins/system/externallogin/language/en-GB/en-GB.plg_system_externallogin.sys.ini b/src/plugins/system/externallogin/language/en-GB/plg_system_externallogin.sys.ini
similarity index 100%
rename from src/plugins/system/externallogin/language/en-GB/en-GB.plg_system_externallogin.sys.ini
rename to src/plugins/system/externallogin/language/en-GB/plg_system_externallogin.sys.ini
diff --git a/src/plugins/user/cbexternallogin/cbexternallogin.xml b/src/plugins/user/cbexternallogin/cbexternallogin.xml
index b111a621..262d760a 100644
--- a/src/plugins/user/cbexternallogin/cbexternallogin.xml
+++ b/src/plugins/user/cbexternallogin/cbexternallogin.xml
@@ -20,8 +20,8 @@
- language/en-GB/en-GB.plg_user_cbexternallogin.ini
- language/en-GB/en-GB.plg_user_cbexternallogin.sys.ini
+ language/en-GB/plg_user_cbexternallogin.ini
+ language/en-GB/plg_user_cbexternallogin.sys.ini
diff --git a/src/plugins/user/cbexternallogin/language/en-GB/en-GB.plg_user_cbexternallogin.ini b/src/plugins/user/cbexternallogin/language/en-GB/plg_user_cbexternallogin.ini
similarity index 100%
rename from src/plugins/user/cbexternallogin/language/en-GB/en-GB.plg_user_cbexternallogin.ini
rename to src/plugins/user/cbexternallogin/language/en-GB/plg_user_cbexternallogin.ini
diff --git a/src/plugins/user/cbexternallogin/language/en-GB/en-GB.plg_user_cbexternallogin.sys.ini b/src/plugins/user/cbexternallogin/language/en-GB/plg_user_cbexternallogin.sys.ini
similarity index 100%
rename from src/plugins/user/cbexternallogin/language/en-GB/en-GB.plg_user_cbexternallogin.sys.ini
rename to src/plugins/user/cbexternallogin/language/en-GB/plg_user_cbexternallogin.sys.ini