diff --git a/langpacks.spec b/langpacks.spec
index 0b80c2f..9087f24 100644
--- a/langpacks.spec
+++ b/langpacks.spec
@@ -1,6 +1,6 @@
 Name:      langpacks
 Version:   4.0
-Release:   0.16%{?dist}
+Release:   0.17%{?dist}
 Summary:   Langpacks meta-package
 
 License:   GPL-2.0-or-later
@@ -10,7 +10,7 @@ BuildRequires: python3 fontconfig
 Source0:   org.fedoraproject.LangPacks.xml
 Source1:   org.fedoraproject.LangPacks-Core.xml
 Source2:   org.fedoraproject.default-fonts.xml
-Source3:   org.fedoraproject.langpacks-font.xml
+Source3:   org.fedoraproject.langpacks-fonts.xml
 Source4:   normlang.py
 
 # to split up the AppStream file
@@ -1386,7 +1386,7 @@ local function defmetapkg(lang, fontlang, langname, deps)
 %package %{_lang}
 Summary: %{_langname} langpacks meta-package
 Requires: %{name}-core-%{_lang}
-Requires: %{name}-font-%{_fontlang}
+Requires: %{name}-fonts-%{_fontlang}
 %{?_req}
 
 %description %{_lang}
@@ -1418,7 +1418,7 @@ local core_deps = {}
 for i = 1, #langpacks_package_list do
   -- dependency list for default-fonts-<lang>
   local default_deps = {}
-  -- dependency list for langpacks-font-<lang>
+  -- dependency list for langpacks-fonts-<lang>
   local extra_deps = {}
   local lang = langpacks_package_list[i]["lang"]
   rpm.define("langcode " .. lang .. "\n")
@@ -1455,7 +1455,7 @@ for i = 1, #langpacks_package_list do
         for k = 1, #current do
           table.insert(default_deps, current[k])
         end
-        -- Make sure default-fonts-<language code> pulled in by langpacks-font-<language code>
+        -- Make sure default-fonts-<language code> pulled in by langpacks-fonts-<language code>
         table.insert(extra_deps, "default-fonts-" .. string.gsub(fclang, "-", "_") .. " = %{version}-%{release}")
         -- Provide font(:lang=) deps for default face only
         prov = append_fontprov("", lowerorth)
@@ -1501,7 +1501,7 @@ for i = 1, #langpacks_package_list do
     else
       deffontpkg("default-fonts-" .. lang, "default fonts", langname, append_obsolete(default_deps, "langpacks-core-font-" .. lang))
     end
-    deffontpkg("langpacks-font-" .. lang, "extra fonts", langname, append_obsolete(extra_deps, "default-fonts-extra-" .. lang))
+    deffontpkg("langpacks-fonts-" .. lang, "extra fonts", langname, append_obsolete(extra_deps, "default-fonts-extra-" .. lang))
   end
   defcorepkg(lang, fclang, langname, im)
 
diff --git a/org.fedoraproject.langpacks-font.xml b/org.fedoraproject.langpacks-fonts.xml
similarity index 84%
rename from org.fedoraproject.langpacks-font.xml
rename to org.fedoraproject.langpacks-fonts.xml
index dea0ee8..32faa79 100644
--- a/org.fedoraproject.langpacks-font.xml
+++ b/org.fedoraproject.langpacks-fonts.xml
@@ -3,7 +3,7 @@
 <components origin="langpacks">
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-af</id>
+    <id>org.fedoraproject.langpacks-fonts-af</id>
     <name>Afrikaans</name>
     <summary>Localization Font support for Afrikaans</summary>
     <description>
@@ -14,7 +14,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-am</id>
+    <id>org.fedoraproject.langpacks-fonts-am</id>
     <name>Amharic</name>
     <summary>Localization Font support for Amharic</summary>
     <description>
@@ -25,7 +25,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ar</id>
+    <id>org.fedoraproject.langpacks-fonts-ar</id>
     <name>Arabic</name>
     <summary>Localization Font support for Arabic</summary>
     <description>
@@ -36,7 +36,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-as</id>
+    <id>org.fedoraproject.langpacks-fonts-as</id>
     <name>Assamese</name>
     <summary>Localization Font support for Assamese</summary>
     <description>
@@ -47,7 +47,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ast</id>
+    <id>org.fedoraproject.langpacks-fonts-ast</id>
     <name>Asturian</name>
     <summary>Localization Font support for Asturian</summary>
     <description>
@@ -58,7 +58,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-be</id>
+    <id>org.fedoraproject.langpacks-fonts-be</id>
     <name>Belarusian</name>
     <summary>Localization Font support for Belarusian</summary>
     <description>
@@ -69,7 +69,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-bg</id>
+    <id>org.fedoraproject.langpacks-fonts-bg</id>
     <name>Bulgarian</name>
     <summary>Localization Font support for Bulgarian</summary>
     <description>
@@ -80,7 +80,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-bn</id>
+    <id>org.fedoraproject.langpacks-fonts-bn</id>
     <name>Bengali</name>
     <summary>Localization Font support for Bengali</summary>
     <description>
@@ -91,7 +91,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-bo</id>
+    <id>org.fedoraproject.langpacks-fonts-bo</id>
     <name>Tibetan</name>
     <summary>Localization Font support for Tibetan</summary>
     <description>
@@ -102,7 +102,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-br</id>
+    <id>org.fedoraproject.langpacks-fonts-br</id>
     <name>Breton</name>
     <summary>Localization Font support for Breton</summary>
     <description>
@@ -113,7 +113,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-bs</id>
+    <id>org.fedoraproject.langpacks-fonts-bs</id>
     <name>Bosnian</name>
     <summary>Localization Font support for Bosnian</summary>
     <description>
@@ -124,7 +124,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ca</id>
+    <id>org.fedoraproject.langpacks-fonts-ca</id>
     <name>Catalan</name>
     <summary>Localization Font support for Catalan</summary>
     <description>
@@ -135,7 +135,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-chr</id>
+    <id>org.fedoraproject.langpacks-fonts-chr</id>
     <name>Cherokee</name>
     <summary>Localization Font support for Cherokee</summary>
     <description>
@@ -146,7 +146,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-cs</id>
+    <id>org.fedoraproject.langpacks-fonts-cs</id>
     <name>Czech</name>
     <summary>Localization Font support for Czech</summary>
     <description>
@@ -157,7 +157,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-cy</id>
+    <id>org.fedoraproject.langpacks-fonts-cy</id>
     <name>Welsh</name>
     <summary>Localization Font support for Welsh</summary>
     <description>
@@ -168,7 +168,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-da</id>
+    <id>org.fedoraproject.langpacks-fonts-da</id>
     <name>Danish</name>
     <summary>Localization Font support for Danish</summary>
     <description>
@@ -179,7 +179,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-de</id>
+    <id>org.fedoraproject.langpacks-fonts-de</id>
     <name>German</name>
     <summary>Localization Font support for German</summary>
     <description>
@@ -190,7 +190,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-dv</id>
+    <id>org.fedoraproject.langpacks-fonts-dv</id>
     <name>Divehi</name>
     <summary>Localization Font support for Divehi</summary>
     <description>
@@ -201,7 +201,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-dz</id>
+    <id>org.fedoraproject.langpacks-fonts-dz</id>
     <name>Bhutanese</name>
     <summary>Localization Font support for Bhutanese</summary>
     <description>
@@ -212,7 +212,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-el</id>
+    <id>org.fedoraproject.langpacks-fonts-el</id>
     <name>Greek</name>
     <summary>Localization Font support for Greek</summary>
     <description>
@@ -223,7 +223,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-en</id>
+    <id>org.fedoraproject.langpacks-fonts-en</id>
     <name>English</name>
     <summary>Localization Font support for English</summary>
     <description>
@@ -234,7 +234,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-eo</id>
+    <id>org.fedoraproject.langpacks-fonts-eo</id>
     <name>Esperanto</name>
     <summary>Localization Font support for Esperanto</summary>
     <description>
@@ -245,7 +245,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-es</id>
+    <id>org.fedoraproject.langpacks-fonts-es</id>
     <name>Spanish</name>
     <summary>Localization Font support for Spanish</summary>
     <description>
@@ -256,7 +256,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-et</id>
+    <id>org.fedoraproject.langpacks-fonts-et</id>
     <name>Estonian</name>
     <summary>Localization Font support for Estonian</summary>
     <description>
@@ -267,7 +267,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-eu</id>
+    <id>org.fedoraproject.langpacks-fonts-eu</id>
     <name>Basque</name>
     <summary>Localization Font support for Basque</summary>
     <description>
@@ -278,7 +278,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-fa</id>
+    <id>org.fedoraproject.langpacks-fonts-fa</id>
     <name>Persian</name>
     <summary>Localization Font support for Persian</summary>
     <description>
@@ -289,7 +289,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-fi</id>
+    <id>org.fedoraproject.langpacks-fonts-fi</id>
     <name>Finnish</name>
     <summary>Localization Font support for Finnish</summary>
     <description>
@@ -300,7 +300,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-fr</id>
+    <id>org.fedoraproject.langpacks-fonts-fr</id>
     <name>French</name>
     <summary>Localization Font support for French</summary>
     <description>
@@ -311,7 +311,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ga</id>
+    <id>org.fedoraproject.langpacks-fonts-ga</id>
     <name>Irish</name>
     <summary>Localization Font support for Irish</summary>
     <description>
@@ -322,7 +322,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-gl</id>
+    <id>org.fedoraproject.langpacks-fonts-gl</id>
     <name>Galician</name>
     <summary>Localization Font support for Galician</summary>
     <description>
@@ -333,7 +333,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-gu</id>
+    <id>org.fedoraproject.langpacks-fonts-gu</id>
     <name>Gujarati</name>
     <summary>Localization Font support for Gujarati</summary>
     <description>
@@ -344,7 +344,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-he</id>
+    <id>org.fedoraproject.langpacks-fonts-he</id>
     <name>Hebrew</name>
     <summary>Localization Font support for Hebrew</summary>
     <description>
@@ -355,7 +355,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-hi</id>
+    <id>org.fedoraproject.langpacks-fonts-hi</id>
     <name>Hindi</name>
     <summary>Localization Font support for Hindi</summary>
     <description>
@@ -366,7 +366,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-hr</id>
+    <id>org.fedoraproject.langpacks-fonts-hr</id>
     <name>Croatian</name>
     <summary>Localization Font support for Croatian</summary>
     <description>
@@ -377,7 +377,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-hu</id>
+    <id>org.fedoraproject.langpacks-fonts-hu</id>
     <name>Hungarian</name>
     <summary>Localization Font support for Hungarian</summary>
     <description>
@@ -388,7 +388,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-hy</id>
+    <id>org.fedoraproject.langpacks-fonts-hy</id>
     <name>Armenian</name>
     <summary>Localization Font support for Armenian</summary>
     <description>
@@ -399,7 +399,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ia</id>
+    <id>org.fedoraproject.langpacks-fonts-ia</id>
     <name>Interlingua</name>
     <summary>Localization Font support for Interlingua</summary>
     <description>
@@ -410,7 +410,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-id</id>
+    <id>org.fedoraproject.langpacks-fonts-id</id>
     <name>Indonesian</name>
     <summary>Localization Font support for Indonesian</summary>
     <description>
@@ -421,7 +421,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-is</id>
+    <id>org.fedoraproject.langpacks-fonts-is</id>
     <name>Icelandic</name>
     <summary>Localization Font support for Icelandic</summary>
     <description>
@@ -432,7 +432,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-it</id>
+    <id>org.fedoraproject.langpacks-fonts-it</id>
     <name>Italian</name>
     <summary>Localization Font support for Italian</summary>
     <description>
@@ -443,7 +443,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-iu</id>
+    <id>org.fedoraproject.langpacks-fonts-iu</id>
     <name>Inuktitut</name>
     <summary>Localization Font support for Inuktitut</summary>
     <description>
@@ -454,7 +454,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ja</id>
+    <id>org.fedoraproject.langpacks-fonts-ja</id>
     <name>Japanese</name>
     <summary>Localization Font support for Japanese</summary>
     <description>
@@ -465,7 +465,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ka</id>
+    <id>org.fedoraproject.langpacks-fonts-ka</id>
     <name>Georgian</name>
     <summary>Localization Font support for Georgian</summary>
     <description>
@@ -476,7 +476,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-kk</id>
+    <id>org.fedoraproject.langpacks-fonts-kk</id>
     <name>Kazakh</name>
     <summary>Localization Font support for Kazakh</summary>
     <description>
@@ -487,7 +487,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-km</id>
+    <id>org.fedoraproject.langpacks-fonts-km</id>
     <name>Khmer</name>
     <summary>Localization Font support for Khmer</summary>
     <description>
@@ -498,7 +498,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-kn</id>
+    <id>org.fedoraproject.langpacks-fonts-kn</id>
     <name>Kannada</name>
     <summary>Localization Font support for Kannada</summary>
     <description>
@@ -509,7 +509,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ko</id>
+    <id>org.fedoraproject.langpacks-fonts-ko</id>
     <name>Korean</name>
     <summary>Localization Font support for Korean</summary>
     <description>
@@ -520,7 +520,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ku</id>
+    <id>org.fedoraproject.langpacks-fonts-ku</id>
     <name>Kurdish</name>
     <summary>Localization Font support for Kurdish</summary>
     <description>
@@ -531,7 +531,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-lo</id>
+    <id>org.fedoraproject.langpacks-fonts-lo</id>
     <name>Lao</name>
     <summary>Localization Font support for Lao</summary>
     <description>
@@ -542,7 +542,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-lt</id>
+    <id>org.fedoraproject.langpacks-fonts-lt</id>
     <name>Lithuanian</name>
     <summary>Localization Font support for Lithuanian</summary>
     <description>
@@ -553,7 +553,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-lv</id>
+    <id>org.fedoraproject.langpacks-fonts-lv</id>
     <name>Latvian</name>
     <summary>Localization Font support for Latvian</summary>
     <description>
@@ -564,7 +564,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-mai</id>
+    <id>org.fedoraproject.langpacks-fonts-mai</id>
     <name>Maithili</name>
     <summary>Localization Font support for Maithili</summary>
     <description>
@@ -575,7 +575,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-mk</id>
+    <id>org.fedoraproject.langpacks-fonts-mk</id>
     <name>Macedonian</name>
     <summary>Localization Font support for Macedonian</summary>
     <description>
@@ -586,7 +586,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ml</id>
+    <id>org.fedoraproject.langpacks-fonts-ml</id>
     <name>Malayalam</name>
     <summary>Localization Font support for Malayalam</summary>
     <description>
@@ -597,7 +597,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-mr</id>
+    <id>org.fedoraproject.langpacks-fonts-mr</id>
     <name>Marathi</name>
     <summary>Localization Font support for Marathi</summary>
     <description>
@@ -608,7 +608,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ms</id>
+    <id>org.fedoraproject.langpacks-fonts-ms</id>
     <name>Malay</name>
     <summary>Localization Font support for Malay</summary>
     <description>
@@ -619,7 +619,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-my</id>
+    <id>org.fedoraproject.langpacks-fonts-my</id>
     <name>Burmese</name>
     <summary>Localization Font support for Burmese</summary>
     <description>
@@ -630,7 +630,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-nb</id>
+    <id>org.fedoraproject.langpacks-fonts-nb</id>
     <name>Norwegian Bokmål</name>
     <summary>Localization Font support for Norwegian Bokmål</summary>
     <description>
@@ -641,7 +641,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ne</id>
+    <id>org.fedoraproject.langpacks-fonts-ne</id>
     <name>Nepali</name>
     <summary>Localization Font support for Nepali</summary>
     <description>
@@ -652,7 +652,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-nl</id>
+    <id>org.fedoraproject.langpacks-fonts-nl</id>
     <name>Dutch</name>
     <summary>Localization Font support for Dutch</summary>
     <description>
@@ -663,7 +663,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-nn</id>
+    <id>org.fedoraproject.langpacks-fonts-nn</id>
     <name>Nynorsk</name>
     <summary>Localization Font support for Nynorsk</summary>
     <description>
@@ -674,7 +674,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-nr</id>
+    <id>org.fedoraproject.langpacks-fonts-nr</id>
     <name>Southern Ndebele</name>
     <summary>Localization Font support for Southern Ndebele</summary>
     <description>
@@ -685,7 +685,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-nso</id>
+    <id>org.fedoraproject.langpacks-fonts-nso</id>
     <name>Northern Sotho</name>
     <summary>Localization Font support for Northern Sotho</summary>
     <description>
@@ -696,7 +696,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-or</id>
+    <id>org.fedoraproject.langpacks-fonts-or</id>
     <name>Oriya</name>
     <summary>Localization Font support for Oriya</summary>
     <description>
@@ -707,7 +707,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-pa</id>
+    <id>org.fedoraproject.langpacks-fonts-pa</id>
     <name>Punjabi</name>
     <summary>Localization Font support for Punjabi</summary>
     <description>
@@ -718,7 +718,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-pl</id>
+    <id>org.fedoraproject.langpacks-fonts-pl</id>
     <name>Polish</name>
     <summary>Localization Font support for Polish</summary>
     <description>
@@ -729,7 +729,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-pt</id>
+    <id>org.fedoraproject.langpacks-fonts-pt</id>
     <name>Portuguese</name>
     <summary>Localization Font support for Portuguese</summary>
     <description>
@@ -740,7 +740,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ro</id>
+    <id>org.fedoraproject.langpacks-fonts-ro</id>
     <name>Romanian</name>
     <summary>Localization Font support for Romanian</summary>
     <description>
@@ -751,7 +751,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ru</id>
+    <id>org.fedoraproject.langpacks-fonts-ru</id>
     <name>Russian</name>
     <summary>Localization Font support for Russian</summary>
     <description>
@@ -762,7 +762,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-si</id>
+    <id>org.fedoraproject.langpacks-fonts-si</id>
     <name>Sinhala</name>
     <summary>Localization Font support for Sinhala</summary>
     <description>
@@ -773,7 +773,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-sk</id>
+    <id>org.fedoraproject.langpacks-fonts-sk</id>
     <name>Slovak</name>
     <summary>Localization Font support for Slovak</summary>
     <description>
@@ -784,7 +784,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-sl</id>
+    <id>org.fedoraproject.langpacks-fonts-sl</id>
     <name>Slovenian</name>
     <summary>Localization Font support for Slovenian</summary>
     <description>
@@ -795,7 +795,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-sq</id>
+    <id>org.fedoraproject.langpacks-fonts-sq</id>
     <name>Albanian</name>
     <summary>Localization Font support for Albanian</summary>
     <description>
@@ -806,7 +806,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ss</id>
+    <id>org.fedoraproject.langpacks-fonts-ss</id>
     <name>Swati</name>
     <summary>Localization Font support for Swati</summary>
     <description>
@@ -817,7 +817,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-sr</id>
+    <id>org.fedoraproject.langpacks-fonts-sr</id>
     <name>Serbian</name>
     <summary>Localization Font support for Serbian</summary>
     <description>
@@ -828,7 +828,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-sv</id>
+    <id>org.fedoraproject.langpacks-fonts-sv</id>
     <name>Swedish</name>
     <summary>Localization Font support for Swedish</summary>
     <description>
@@ -839,7 +839,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ta</id>
+    <id>org.fedoraproject.langpacks-fonts-ta</id>
     <name>Tamil</name>
     <summary>Localization Font support for Tamil</summary>
     <description>
@@ -850,7 +850,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-te</id>
+    <id>org.fedoraproject.langpacks-fonts-te</id>
     <name>Telugu</name>
     <summary>Localization Font support for Telugu</summary>
     <description>
@@ -861,7 +861,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-th</id>
+    <id>org.fedoraproject.langpacks-fonts-th</id>
     <name>Thai</name>
     <summary>Localization Font support for Thai</summary>
     <description>
@@ -872,7 +872,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-tn</id>
+    <id>org.fedoraproject.langpacks-fonts-tn</id>
     <name>Tswana</name>
     <summary>Localization Font support for Tswana</summary>
     <description>
@@ -883,7 +883,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-tr</id>
+    <id>org.fedoraproject.langpacks-fonts-tr</id>
     <name>Turkish</name>
     <summary>Localization Font support for Turkish</summary>
     <description>
@@ -894,7 +894,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ts</id>
+    <id>org.fedoraproject.langpacks-fonts-ts</id>
     <name>Tsonga</name>
     <summary>Localization Font support for Tsonga</summary>
     <description>
@@ -905,7 +905,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-uk</id>
+    <id>org.fedoraproject.langpacks-fonts-uk</id>
     <name>Ukrainian</name>
     <summary>Localization Font support for Ukrainian</summary>
     <description>
@@ -916,7 +916,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ur</id>
+    <id>org.fedoraproject.langpacks-fonts-ur</id>
     <name>Urdu</name>
     <summary>Localization Font support for Urdu</summary>
     <description>
@@ -927,7 +927,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-ve</id>
+    <id>org.fedoraproject.langpacks-fonts-ve</id>
     <name>Venda</name>
     <summary>Localization Font support for Venda</summary>
     <description>
@@ -938,7 +938,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-vi</id>
+    <id>org.fedoraproject.langpacks-fonts-vi</id>
     <name>Vietnamese</name>
     <summary>Localization Font support for Vietnamese</summary>
     <description>
@@ -949,7 +949,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-xh</id>
+    <id>org.fedoraproject.langpacks-fonts-xh</id>
     <name>Xhosa</name>
     <summary>Localization Font support for Xhosa</summary>
     <description>
@@ -960,7 +960,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-yi</id>
+    <id>org.fedoraproject.langpacks-fonts-yi</id>
     <name>Yiddish</name>
     <summary>Localization Font support for Yiddish</summary>
     <description>
@@ -971,7 +971,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-zh_CN</id>
+    <id>org.fedoraproject.langpacks-fonts-zh_CN</id>
     <name>Simplified Chinese</name>
     <summary>Localization Font support for Simplified Chinese</summary>
     <description>
@@ -982,7 +982,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-zh_HK</id>
+    <id>org.fedoraproject.langpacks-fonts-zh_HK</id>
     <name>Hong Kong Traditional Chinese</name>
     <summary>Localization Font support for Hong Kong Traditional Chinese</summary>
     <description>
@@ -993,7 +993,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-zh_TW</id>
+    <id>org.fedoraproject.langpacks-fonts-zh_TW</id>
     <name>Taiwan Traditional Chinese</name>
     <summary>Localization Font support for Taiwan Traditional Chinese</summary>
     <description>
@@ -1004,7 +1004,7 @@
   </component>
   <component type="font">
     <metadata_license>CC0-1.0</metadata_license>
-    <id>org.fedoraproject.langpacks-font-zu</id>
+    <id>org.fedoraproject.langpacks-fonts-zu</id>
     <name>Zulu</name>
     <summary>Localization Font support for Zulu</summary>
     <description>