diff --git a/comps-f11.xml.in b/comps-f11.xml.in
index 32b7c70c..2d78364d 100644
--- a/comps-f11.xml.in
+++ b/comps-f11.xml.in
@@ -122,7 +122,7 @@
     <uservisible>false</uservisible>
     <langonly>as</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-bengali</packagereq>
+      <packagereq type="mandatory">lohit-bengali-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-assamese</packagereq>
       <packagereq type="mandatory">m17n-db-assamese</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
@@ -419,7 +419,7 @@
     <uservisible>false</uservisible>
     <langonly>bn</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-bengali</packagereq>
+      <packagereq type="mandatory">lohit-bengali-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-bengali</packagereq>
       <packagereq type="mandatory">m17n-db-bengali</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-bn</packagereq>
@@ -1487,15 +1487,15 @@
       <packagereq type="default">liberation-sans-fonts</packagereq>
       <packagereq type="default">liberation-serif-fonts</packagereq>
       <packagereq type="default">lklug-fonts</packagereq>
-      <packagereq type="default">lohit-fonts-bengali</packagereq>
-      <packagereq type="default">lohit-fonts-gujarati</packagereq>
-      <packagereq type="default">lohit-fonts-hindi</packagereq>
-      <packagereq type="default">lohit-fonts-kannada</packagereq>
-      <packagereq type="default">lohit-fonts-maithili</packagereq>
-      <packagereq type="default">lohit-fonts-oriya</packagereq>
-      <packagereq type="default">lohit-fonts-punjabi</packagereq>
-      <packagereq type="default">lohit-fonts-tamil</packagereq>
-      <packagereq type="default">lohit-fonts-telugu</packagereq>
+      <packagereq type="default">lohit-bengali-fonts</packagereq>
+      <packagereq type="default">lohit-gujarati-fonts</packagereq>
+      <packagereq type="default">lohit-hindi-fonts</packagereq>
+      <packagereq type="default">lohit-kannada-fonts</packagereq>
+      <packagereq type="default">lohit-maithili-fonts</packagereq>
+      <packagereq type="default">lohit-oriya-fonts</packagereq>
+      <packagereq type="default">lohit-punjabi-fonts</packagereq>
+      <packagereq type="default">lohit-tamil-fonts</packagereq>
+      <packagereq type="default">lohit-telugu-fonts</packagereq>
       <packagereq type="default">padauk-fonts</packagereq>
       <packagereq type="default">paktype-fonts</packagereq>
       <packagereq type="default">smc-meera-fonts</packagereq>
@@ -1574,12 +1574,12 @@
       <packagereq type="optional">lilypond-century-schoolbook-l-fonts</packagereq>
       <packagereq type="optional">lilypond-emmentaler-fonts</packagereq>
       <packagereq type="optional">linux-libertine-fonts</packagereq>
-      <packagereq type="optional">lohit-fonts-kashmiri</packagereq>
-      <packagereq type="optional">lohit-fonts-konkani</packagereq>
-      <packagereq type="optional">lohit-fonts-malayalam</packagereq>
-      <packagereq type="optional">lohit-fonts-marathi</packagereq>
-      <packagereq type="optional">lohit-fonts-nepali</packagereq>
-      <packagereq type="optional">lohit-fonts-sindhi</packagereq>
+      <packagereq type="optional">lohit-kashmiri-fonts</packagereq>
+      <packagereq type="optional">lohit-konkani-fonts</packagereq>
+      <packagereq type="optional">lohit-malayalam-fonts</packagereq>
+      <packagereq type="optional">lohit-marathi-fonts</packagereq>
+      <packagereq type="optional">lohit-nepali-fonts</packagereq>
+      <packagereq type="optional">lohit-sindhi-fonts</packagereq>
       <packagereq type="optional">madan-fonts</packagereq>
       <packagereq type="optional">mathml-fonts</packagereq>
       <packagereq type="optional">mgopen-canonica-fonts</packagereq>
@@ -2479,7 +2479,7 @@
     <uservisible>false</uservisible>
     <langonly>gu</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-gujarati</packagereq>
+      <packagereq type="mandatory">lohit-gujarati-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-gujarati</packagereq>
       <packagereq type="mandatory">m17n-db-gujarati</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-gu</packagereq>
@@ -2596,7 +2596,7 @@
     <uservisible>false</uservisible>
     <langonly>hi</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-hindi</packagereq>
+      <packagereq type="mandatory">lohit-hindi-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-hindi</packagereq>
       <packagereq type="mandatory">m17n-db-hindi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-hi</packagereq>
@@ -3042,7 +3042,7 @@
     <uservisible>false</uservisible>
     <langonly>kn</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-kannada</packagereq>
+      <packagereq type="mandatory">lohit-kannada-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-kannada</packagereq>
       <packagereq type="mandatory">m17n-db-kannada</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
@@ -3059,7 +3059,7 @@
     <uservisible>false</uservisible>
     <langonly>ks</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-kashmiri</packagereq>
+      <packagereq type="mandatory">lohit-kashmiri-fonts</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">m17n-contrib-hindi</packagereq>
@@ -3246,7 +3246,7 @@
     <uservisible>false</uservisible>
     <langonly>kok</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-konkani</packagereq>
+      <packagereq type="mandatory">lohit-konkani-fonts</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">m17n-contrib-hindi</packagereq>
@@ -3557,7 +3557,7 @@
     <packagelist>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
-      <packagereq type="default">lohit-fonts-maithili</packagereq>
+      <packagereq type="default">lohit-maithili-fonts</packagereq>
       <packagereq type="default">m17n-contrib-hindi</packagereq>
       <packagereq type="default">m17n-db-hindi</packagereq>
     </packagelist>
@@ -3603,7 +3603,7 @@
       <packagereq type="conditional" requires="moodle">moodle-ml</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ml_IN</packagereq>
       <packagereq type="default">iok</packagereq>
-      <packagereq type="default">lohit-fonts-malayalam</packagereq>
+      <packagereq type="default">lohit-malayalam-fonts</packagereq>
       <packagereq type="default">samyak-malayalam-fonts</packagereq>
       <packagereq type="default">smc-anjalioldlipi-fonts</packagereq>
       <packagereq type="default">smc-dyuthi-fonts</packagereq>
@@ -3635,7 +3635,7 @@
     <uservisible>false</uservisible>
     <langonly>mr</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-marathi</packagereq>
+      <packagereq type="mandatory">lohit-marathi-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-marathi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-mr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-mr</packagereq>
@@ -3690,7 +3690,7 @@
     <uservisible>false</uservisible>
     <langonly>ne</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-nepali</packagereq>
+      <packagereq type="mandatory">lohit-nepali-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-nepali</packagereq>
       <packagereq type="mandatory">madan-fonts</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ne</packagereq>
@@ -3909,7 +3909,7 @@
     <uservisible>false</uservisible>
     <langonly>or</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-oriya</packagereq>
+      <packagereq type="mandatory">lohit-oriya-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-oriya</packagereq>
       <packagereq type="mandatory">m17n-db-oriya</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-or</packagereq>
@@ -4007,7 +4007,7 @@
     <uservisible>false</uservisible>
     <langonly>pa</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-punjabi</packagereq>
+      <packagereq type="mandatory">lohit-punjabi-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-punjabi</packagereq>
       <packagereq type="mandatory">m17n-db-punjabi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-pa</packagereq>
@@ -4142,7 +4142,7 @@
     <uservisible>false</uservisible>
     <langonly>sd</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-sindhi</packagereq>
+      <packagereq type="mandatory">lohit-sindhi-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-sindhi</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
@@ -4705,7 +4705,7 @@
     <uservisible>false</uservisible>
     <langonly>ta</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-tamil</packagereq>
+      <packagereq type="mandatory">lohit-tamil-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-tamil</packagereq>
       <packagereq type="mandatory">m17n-db-tamil</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-ta</packagereq>
@@ -4729,7 +4729,7 @@
     <uservisible>false</uservisible>
     <langonly>te</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-fonts-telugu</packagereq>
+      <packagereq type="mandatory">lohit-telugu-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-telugu</packagereq>
       <packagereq type="mandatory">m17n-db-telugu</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-te</packagereq>