diff --git a/appstream-data.spec b/appstream-data.spec
index 46fc269..7dffff5 100644
--- a/appstream-data.spec
+++ b/appstream-data.spec
@@ -1,7 +1,7 @@
 Summary:   Fedora AppStream metadata
 Name:      appstream-data
 Version:   31
-Release:   3%{?dist}
+Release:   4%{?dist}
 BuildArch: noarch
 License:   CC0 and CC-BY and CC-BY-SA and GFDL
 URL:       https://github.com/hughsie/appstream-glib
@@ -46,6 +46,9 @@ fi
 %dir %{_datadir}/app-info/xmls
 
 %changelog
+* Wed Sep 18 2019 Kalev Lember <klember@redhat.com> - 31-4
+- Update categories and popular xmls with renamed app ids
+
 * Wed Sep 18 2019 Kalev Lember <klember@redhat.com> - 31-3
 - New metadata version
 
diff --git a/fedora-categories.xml b/fedora-categories.xml
index 4d66378..ab29729 100644
--- a/fedora-categories.xml
+++ b/fedora-categories.xml
@@ -73,7 +73,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.gnome.Music</id>
+    <id>org.gnome.Music.desktop</id>
     <categories>
       <category>AudioVideo</category>
       <category>Featured</category>
@@ -129,7 +129,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>gitg.desktop</id>
+    <id>org.gnome.gitg</id>
     <categories>
       <category>Development</category>
       <category>Featured</category>
@@ -297,7 +297,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>wesnoth.desktop</id>
+    <id>org.wesnoth.Wesnoth.desktop</id>
     <categories>
       <category>Game</category>
       <category>Featured</category>
@@ -332,7 +332,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>inkscape.desktop</id>
+    <id>org.inkscape.Inkscape</id>
     <categories>
       <category>Graphics</category>
       <category>Featured</category>
@@ -402,7 +402,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.gnome.Geary</id>
+    <id>org.gnome.Geary.desktop</id>
     <categories>
       <category>Network</category>
       <category>Featured</category>
@@ -465,7 +465,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.gnome.Geary</id>
+    <id>org.gnome.Geary.desktop</id>
     <categories>
       <category>Office</category>
       <category>Featured</category>
@@ -486,7 +486,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>gramps.desktop</id>
+    <id>org.gramps.gramps</id>
     <categories>
       <category>Office</category>
       <category>Featured</category>
@@ -549,7 +549,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.gnome.Boxes</id>
+    <id>org.gnome.Boxes.desktop</id>
     <categories>
       <category>Utility</category>
       <category>Featured</category>
@@ -570,7 +570,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.gnome.clocks</id>
+    <id>org.gnome.clocks.desktop</id>
     <categories>
       <category>Utility</category>
       <category>Featured</category>
diff --git a/fedora-popular.xml b/fedora-popular.xml
index 9cd9f6a..79c003f 100644
--- a/fedora-popular.xml
+++ b/fedora-popular.xml
@@ -21,7 +21,7 @@
     </kudos>
   </component>
   <component type="desktop">
-    <id>inkscape.desktop</id>
+    <id>org.inkscape.Inkscape</id>
     <kudos>
       <kudo>GnomeSoftware::popular</kudo>
     </kudos>
@@ -39,7 +39,7 @@
     </kudos>
   </component>
   <component type="desktop">
-    <id>org.gnome.Geary</id>
+    <id>org.gnome.Geary.desktop</id>
     <kudos>
       <kudo>GnomeSoftware::popular</kudo>
     </kudos>