diff --git a/appstream-data.spec b/appstream-data.spec
index 833cf46..c974df5 100644
--- a/appstream-data.spec
+++ b/appstream-data.spec
@@ -50,6 +50,7 @@ fi
 %changelog
 * Mon Apr 01 2019 Kalev Lember <klember@redhat.com> - 30-3
 - New metadata version
+- Update fedora-categories.xml and fedora-popular.xml with changed app IDs
 
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 30-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/fedora-categories.xml b/fedora-categories.xml
index 1caad07..a88ff05 100644
--- a/fedora-categories.xml
+++ b/fedora-categories.xml
@@ -24,7 +24,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>pitivi.desktop</id>
+    <id>org.pitivi.Pitivi</id>
     <categories>
       <category>AudioVideo</category>
       <category>Featured</category>
@@ -101,7 +101,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.gnome.Builder.desktop</id>
+    <id>org.gnome.Builder</id>
     <categories>
       <category>Development</category>
       <category>Featured</category>
@@ -192,49 +192,49 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>gnome-chess.desktop</id>
+    <id>org.gnome.Chess</id>
     <categories>
       <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
-    <id>gnome-mahjongg.desktop</id>
+    <id>org.gnome.Mahjongg</id>
     <categories>
       <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
-    <id>gnome-mines.desktop</id>
+    <id>org.gnome.Mines</id>
     <categories>
       <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
-    <id>gnome-sudoku.desktop</id>
+    <id>org.gnome.Sudoku</id>
     <categories>
       <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
-    <id>gnome-tetravex.desktop</id>
+    <id>org.gnome.Tetravex</id>
     <categories>
       <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
-    <id>iagno.desktop</id>
+    <id>org.gnome.Reversi</id>
     <categories>
       <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
-    <id>lightsoff.desktop</id>
+    <id>org.gnome.LightsOff</id>
     <categories>
       <category>Game</category>
       <category>Featured</category>
@@ -255,7 +255,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>quadrapassel.desktop</id>
+    <id>org.gnome.Quadrapassel</id>
     <categories>
       <category>Game</category>
       <category>Featured</category>
@@ -283,7 +283,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>swell-foop.desktop</id>
+    <id>org.gnome.SwellFoop.desktop</id>
     <categories>
       <category>Game</category>
       <category>Featured</category>
@@ -416,7 +416,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.gnome.Polari.desktop</id>
+    <id>org.gnome.Polari</id>
     <categories>
       <category>Network</category>
       <category>Featured</category>
@@ -521,14 +521,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>www.octave.org-octave.desktop</id>
-    <categories>
-      <category>Education</category>
-      <category>Featured</category>
-    </categories>
-  </component>
-  <component type="desktop">
-    <id>saoimage.desktop</id>
+    <id>org.octave.Octave.desktop</id>
     <categories>
       <category>Education</category>
       <category>Featured</category>
@@ -556,7 +549,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.gnome.Boxes.desktop</id>
+    <id>org.gnome.Boxes</id>
     <categories>
       <category>Utility</category>
       <category>Featured</category>
@@ -570,14 +563,14 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.gnome.bijiben.desktop</id>
+    <id>org.gnome.Notes.desktop</id>
     <categories>
       <category>Utility</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
-    <id>org.gnome.clocks.desktop</id>
+    <id>org.gnome.clocks</id>
     <categories>
       <category>Utility</category>
       <category>Featured</category>
diff --git a/fedora-popular.xml b/fedora-popular.xml
index 0a7c4fb..f8a0105 100644
--- a/fedora-popular.xml
+++ b/fedora-popular.xml
@@ -3,7 +3,7 @@
 
   <!-- Apps for the GNOME Software "Editor's Picks" list -->
   <component type="desktop">
-    <id>org.gnome.bijiben.desktop</id>
+    <id>org.gnome.Notes.desktop</id>
     <kudos>
       <kudo>GnomeSoftware::popular</kudo>
     </kudos>