diff --git a/src/admin/language/all/manifests/com_kunena_ar-AA.xml b/src/admin/language/all/manifests/com_kunena_ar-AA.xml
index c0ac1e58a0..821bde543c 100644
--- a/src/admin/language/all/manifests/com_kunena_ar-AA.xml
+++ b/src/admin/language/all/manifests/com_kunena_ar-AA.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_az-AZ.xml b/src/admin/language/all/manifests/com_kunena_az-AZ.xml
index 40b627f8df..057e22caab 100644
--- a/src/admin/language/all/manifests/com_kunena_az-AZ.xml
+++ b/src/admin/language/all/manifests/com_kunena_az-AZ.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_bg-BG.xml b/src/admin/language/all/manifests/com_kunena_bg-BG.xml
index 93e56d7d72..f48559be38 100644
--- a/src/admin/language/all/manifests/com_kunena_bg-BG.xml
+++ b/src/admin/language/all/manifests/com_kunena_bg-BG.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_bs-BA.xml b/src/admin/language/all/manifests/com_kunena_bs-BA.xml
index 7a0dee3248..e5ed22c01e 100644
--- a/src/admin/language/all/manifests/com_kunena_bs-BA.xml
+++ b/src/admin/language/all/manifests/com_kunena_bs-BA.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_ca-ES.xml b/src/admin/language/all/manifests/com_kunena_ca-ES.xml
index df66c51128..f302aa4263 100644
--- a/src/admin/language/all/manifests/com_kunena_ca-ES.xml
+++ b/src/admin/language/all/manifests/com_kunena_ca-ES.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_ckb-IQ.xml b/src/admin/language/all/manifests/com_kunena_ckb-IQ.xml
index 21fbdcd0db..b13c746caa 100644
--- a/src/admin/language/all/manifests/com_kunena_ckb-IQ.xml
+++ b/src/admin/language/all/manifests/com_kunena_ckb-IQ.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_cs-CZ.xml b/src/admin/language/all/manifests/com_kunena_cs-CZ.xml
index b6902badbc..dd11230a1b 100644
--- a/src/admin/language/all/manifests/com_kunena_cs-CZ.xml
+++ b/src/admin/language/all/manifests/com_kunena_cs-CZ.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_cy-GB.xml b/src/admin/language/all/manifests/com_kunena_cy-GB.xml
index 701bb664c4..7eebc15040 100644
--- a/src/admin/language/all/manifests/com_kunena_cy-GB.xml
+++ b/src/admin/language/all/manifests/com_kunena_cy-GB.xml
@@ -16,7 +16,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_da-DK.xml b/src/admin/language/all/manifests/com_kunena_da-DK.xml
index 4ff8dd4305..773d4b0a95 100644
--- a/src/admin/language/all/manifests/com_kunena_da-DK.xml
+++ b/src/admin/language/all/manifests/com_kunena_da-DK.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_de-DE.xml b/src/admin/language/all/manifests/com_kunena_de-DE.xml
index 37e9e5b699..fd4a78af12 100644
--- a/src/admin/language/all/manifests/com_kunena_de-DE.xml
+++ b/src/admin/language/all/manifests/com_kunena_de-DE.xml
@@ -16,7 +16,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_el-GR.xml b/src/admin/language/all/manifests/com_kunena_el-GR.xml
index 2f2ef3f4ff..7c90288a55 100644
--- a/src/admin/language/all/manifests/com_kunena_el-GR.xml
+++ b/src/admin/language/all/manifests/com_kunena_el-GR.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_en-GB.xml b/src/admin/language/all/manifests/com_kunena_en-GB.xml
index 9140114588..5108032caf 100644
--- a/src/admin/language/all/manifests/com_kunena_en-GB.xml
+++ b/src/admin/language/all/manifests/com_kunena_en-GB.xml
@@ -16,7 +16,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_eo-XX.xml b/src/admin/language/all/manifests/com_kunena_eo-XX.xml
index 31697e034f..7d6c08a2e1 100644
--- a/src/admin/language/all/manifests/com_kunena_eo-XX.xml
+++ b/src/admin/language/all/manifests/com_kunena_eo-XX.xml
@@ -16,7 +16,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_es-ES.xml b/src/admin/language/all/manifests/com_kunena_es-ES.xml
index f568953e9b..6ee793ae4e 100644
--- a/src/admin/language/all/manifests/com_kunena_es-ES.xml
+++ b/src/admin/language/all/manifests/com_kunena_es-ES.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_et-EE.xml b/src/admin/language/all/manifests/com_kunena_et-EE.xml
index aa4ce62aed..13e1e4d1bf 100644
--- a/src/admin/language/all/manifests/com_kunena_et-EE.xml
+++ b/src/admin/language/all/manifests/com_kunena_et-EE.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_eu-ES.xml b/src/admin/language/all/manifests/com_kunena_eu-ES.xml
index 9606ae4f5d..38dfc51203 100644
--- a/src/admin/language/all/manifests/com_kunena_eu-ES.xml
+++ b/src/admin/language/all/manifests/com_kunena_eu-ES.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_fa-IR.xml b/src/admin/language/all/manifests/com_kunena_fa-IR.xml
index 47323493f7..3eeb15b7a4 100644
--- a/src/admin/language/all/manifests/com_kunena_fa-IR.xml
+++ b/src/admin/language/all/manifests/com_kunena_fa-IR.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_fi-FI.xml b/src/admin/language/all/manifests/com_kunena_fi-FI.xml
index 06c3fbe280..950111b9e7 100644
--- a/src/admin/language/all/manifests/com_kunena_fi-FI.xml
+++ b/src/admin/language/all/manifests/com_kunena_fi-FI.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_fr-FR.xml b/src/admin/language/all/manifests/com_kunena_fr-FR.xml
index a94c88ba43..b2a648876a 100644
--- a/src/admin/language/all/manifests/com_kunena_fr-FR.xml
+++ b/src/admin/language/all/manifests/com_kunena_fr-FR.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_he-IL.xml b/src/admin/language/all/manifests/com_kunena_he-IL.xml
index de098a964d..a395885e76 100644
--- a/src/admin/language/all/manifests/com_kunena_he-IL.xml
+++ b/src/admin/language/all/manifests/com_kunena_he-IL.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_hi-IN.xml b/src/admin/language/all/manifests/com_kunena_hi-IN.xml
index 5c7a8b5110..4a2b8cddfd 100644
--- a/src/admin/language/all/manifests/com_kunena_hi-IN.xml
+++ b/src/admin/language/all/manifests/com_kunena_hi-IN.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_hr-HR.xml b/src/admin/language/all/manifests/com_kunena_hr-HR.xml
index c3320d86b1..c0cf35a7f2 100644
--- a/src/admin/language/all/manifests/com_kunena_hr-HR.xml
+++ b/src/admin/language/all/manifests/com_kunena_hr-HR.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_hu-HU.xml b/src/admin/language/all/manifests/com_kunena_hu-HU.xml
index 510ee3f805..cf0c8caabd 100644
--- a/src/admin/language/all/manifests/com_kunena_hu-HU.xml
+++ b/src/admin/language/all/manifests/com_kunena_hu-HU.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_id-ID.xml b/src/admin/language/all/manifests/com_kunena_id-ID.xml
index 62c87c0591..ea175ec1a7 100644
--- a/src/admin/language/all/manifests/com_kunena_id-ID.xml
+++ b/src/admin/language/all/manifests/com_kunena_id-ID.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_it-IT.xml b/src/admin/language/all/manifests/com_kunena_it-IT.xml
index f9a3476bba..5795cf1679 100644
--- a/src/admin/language/all/manifests/com_kunena_it-IT.xml
+++ b/src/admin/language/all/manifests/com_kunena_it-IT.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_ja-JP.xml b/src/admin/language/all/manifests/com_kunena_ja-JP.xml
index 1a427631e5..d0fa707334 100644
--- a/src/admin/language/all/manifests/com_kunena_ja-JP.xml
+++ b/src/admin/language/all/manifests/com_kunena_ja-JP.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_km-KH.xml b/src/admin/language/all/manifests/com_kunena_km-KH.xml
index f290b8f9d9..873c35e8e9 100644
--- a/src/admin/language/all/manifests/com_kunena_km-KH.xml
+++ b/src/admin/language/all/manifests/com_kunena_km-KH.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_ko-KR.xml b/src/admin/language/all/manifests/com_kunena_ko-KR.xml
index 770a429054..d1217e01ff 100644
--- a/src/admin/language/all/manifests/com_kunena_ko-KR.xml
+++ b/src/admin/language/all/manifests/com_kunena_ko-KR.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_kz-KZ.xml b/src/admin/language/all/manifests/com_kunena_kz-KZ.xml
index 742d78a973..da551213c7 100644
--- a/src/admin/language/all/manifests/com_kunena_kz-KZ.xml
+++ b/src/admin/language/all/manifests/com_kunena_kz-KZ.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_lt-LT.xml b/src/admin/language/all/manifests/com_kunena_lt-LT.xml
index e46863bb57..7f92770553 100644
--- a/src/admin/language/all/manifests/com_kunena_lt-LT.xml
+++ b/src/admin/language/all/manifests/com_kunena_lt-LT.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_lv-LV.xml b/src/admin/language/all/manifests/com_kunena_lv-LV.xml
index 3309c2a79d..fdc4defcad 100644
--- a/src/admin/language/all/manifests/com_kunena_lv-LV.xml
+++ b/src/admin/language/all/manifests/com_kunena_lv-LV.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_mk-MK.xml b/src/admin/language/all/manifests/com_kunena_mk-MK.xml
index 035ab56bf9..d0caf6019c 100644
--- a/src/admin/language/all/manifests/com_kunena_mk-MK.xml
+++ b/src/admin/language/all/manifests/com_kunena_mk-MK.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_nb-NO.xml b/src/admin/language/all/manifests/com_kunena_nb-NO.xml
index 61fe7b149a..9c58787c9a 100644
--- a/src/admin/language/all/manifests/com_kunena_nb-NO.xml
+++ b/src/admin/language/all/manifests/com_kunena_nb-NO.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_nl-NL.xml b/src/admin/language/all/manifests/com_kunena_nl-NL.xml
index eee6cc51c8..0bb0d28d84 100644
--- a/src/admin/language/all/manifests/com_kunena_nl-NL.xml
+++ b/src/admin/language/all/manifests/com_kunena_nl-NL.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_pl-PL.xml b/src/admin/language/all/manifests/com_kunena_pl-PL.xml
index 7b6fa73ffe..f09a47bfc0 100644
--- a/src/admin/language/all/manifests/com_kunena_pl-PL.xml
+++ b/src/admin/language/all/manifests/com_kunena_pl-PL.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_pt-BR.xml b/src/admin/language/all/manifests/com_kunena_pt-BR.xml
index 67cd997306..c58bd52301 100644
--- a/src/admin/language/all/manifests/com_kunena_pt-BR.xml
+++ b/src/admin/language/all/manifests/com_kunena_pt-BR.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_pt-PT.xml b/src/admin/language/all/manifests/com_kunena_pt-PT.xml
index 67f2de04b4..c4f27a1def 100644
--- a/src/admin/language/all/manifests/com_kunena_pt-PT.xml
+++ b/src/admin/language/all/manifests/com_kunena_pt-PT.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_ro-RO.xml b/src/admin/language/all/manifests/com_kunena_ro-RO.xml
index c2b2b62056..5e3d854abb 100644
--- a/src/admin/language/all/manifests/com_kunena_ro-RO.xml
+++ b/src/admin/language/all/manifests/com_kunena_ro-RO.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_ru-RU.xml b/src/admin/language/all/manifests/com_kunena_ru-RU.xml
index 98b06912ac..71e72f895b 100644
--- a/src/admin/language/all/manifests/com_kunena_ru-RU.xml
+++ b/src/admin/language/all/manifests/com_kunena_ru-RU.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_sk-SK.xml b/src/admin/language/all/manifests/com_kunena_sk-SK.xml
index 16d2deb470..88bb72b098 100644
--- a/src/admin/language/all/manifests/com_kunena_sk-SK.xml
+++ b/src/admin/language/all/manifests/com_kunena_sk-SK.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_sl-SI.xml b/src/admin/language/all/manifests/com_kunena_sl-SI.xml
index b398ae0f30..6273acc609 100644
--- a/src/admin/language/all/manifests/com_kunena_sl-SI.xml
+++ b/src/admin/language/all/manifests/com_kunena_sl-SI.xml
@@ -16,7 +16,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_sq-AL.xml b/src/admin/language/all/manifests/com_kunena_sq-AL.xml
index f4313c551b..ae8b0f8370 100644
--- a/src/admin/language/all/manifests/com_kunena_sq-AL.xml
+++ b/src/admin/language/all/manifests/com_kunena_sq-AL.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_sr-RS.xml b/src/admin/language/all/manifests/com_kunena_sr-RS.xml
index fbe575743e..ac0bb60788 100644
--- a/src/admin/language/all/manifests/com_kunena_sr-RS.xml
+++ b/src/admin/language/all/manifests/com_kunena_sr-RS.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_sr-YU.xml b/src/admin/language/all/manifests/com_kunena_sr-YU.xml
index c8a21fb6b5..c9fbd22b10 100644
--- a/src/admin/language/all/manifests/com_kunena_sr-YU.xml
+++ b/src/admin/language/all/manifests/com_kunena_sr-YU.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_sv-SE.xml b/src/admin/language/all/manifests/com_kunena_sv-SE.xml
index 376f04ddad..924a942d35 100644
--- a/src/admin/language/all/manifests/com_kunena_sv-SE.xml
+++ b/src/admin/language/all/manifests/com_kunena_sv-SE.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_th-TH.xml b/src/admin/language/all/manifests/com_kunena_th-TH.xml
index 3af6deb298..f00d15a46d 100644
--- a/src/admin/language/all/manifests/com_kunena_th-TH.xml
+++ b/src/admin/language/all/manifests/com_kunena_th-TH.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_tr-TR.xml b/src/admin/language/all/manifests/com_kunena_tr-TR.xml
index 270776baf3..407ca69965 100644
--- a/src/admin/language/all/manifests/com_kunena_tr-TR.xml
+++ b/src/admin/language/all/manifests/com_kunena_tr-TR.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_ug-CN.xml b/src/admin/language/all/manifests/com_kunena_ug-CN.xml
index 6fa633a074..39f5274b18 100644
--- a/src/admin/language/all/manifests/com_kunena_ug-CN.xml
+++ b/src/admin/language/all/manifests/com_kunena_ug-CN.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_uk-UA.xml b/src/admin/language/all/manifests/com_kunena_uk-UA.xml
index 42f1149d30..687d3664fe 100644
--- a/src/admin/language/all/manifests/com_kunena_uk-UA.xml
+++ b/src/admin/language/all/manifests/com_kunena_uk-UA.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_ur-PK.xml b/src/admin/language/all/manifests/com_kunena_ur-PK.xml
index ff3cd8365e..033fe82fc1 100644
--- a/src/admin/language/all/manifests/com_kunena_ur-PK.xml
+++ b/src/admin/language/all/manifests/com_kunena_ur-PK.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_vi-VN.xml b/src/admin/language/all/manifests/com_kunena_vi-VN.xml
index 4e4d010b71..e9744e5ecf 100644
--- a/src/admin/language/all/manifests/com_kunena_vi-VN.xml
+++ b/src/admin/language/all/manifests/com_kunena_vi-VN.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_zh-CN.xml b/src/admin/language/all/manifests/com_kunena_zh-CN.xml
index eee419489c..d8db0b6504 100644
--- a/src/admin/language/all/manifests/com_kunena_zh-CN.xml
+++ b/src/admin/language/all/manifests/com_kunena_zh-CN.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>
diff --git a/src/admin/language/all/manifests/com_kunena_zh-TW.xml b/src/admin/language/all/manifests/com_kunena_zh-TW.xml
index 72ea3a22e9..798dd412b9 100644
--- a/src/admin/language/all/manifests/com_kunena_zh-TW.xml
+++ b/src/admin/language/all/manifests/com_kunena_zh-TW.xml
@@ -17,7 +17,7 @@
             <filename>com_kunena.controllers.ini</filename>
             <filename>com_kunena.ini</filename>
             <filename>com_kunena.models.ini</filename>
-            <filename>com_kunena.models.ini</filename>
+            <filename>com_kunena.libraries.ini</filename>
             <filename>com_kunena.sys.ini</filename>
             <filename>com_kunena.views.ini</filename>
             <filename>com_kunena.install.ini</filename>