diff --git a/CMakeLists.txt b/CMakeLists.txt
index ade6ca1f5..4d17da42b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ set(APP_NAME "RSS Guard")
 set(APP_EMAIL "rotter.martinos@gmail.com")
 set(APP_AUTHOR "Martin Rotter")
 set(APP_COPYRIGHT "\\251 2011-${YEAR} ${APP_AUTHOR}")
-set(APP_REVERSE_NAME "com.github.rssguard")
+set(APP_REVERSE_NAME "io.github.martinrotter.rssguard")
 set(APP_DONATE_URL "https://github.com/sponsors/martinrotter")
 set(APP_VERSION "4.2.5")
 
diff --git a/resources/desktop/com.github.rssguard.desktop.autostart b/resources/desktop/io.github.martinrotter.rssguard.autostart
similarity index 100%
rename from resources/desktop/com.github.rssguard.desktop.autostart
rename to resources/desktop/io.github.martinrotter.rssguard.autostart
diff --git a/resources/desktop/com.github.rssguard.desktop b/resources/desktop/io.github.martinrotter.rssguard.desktop
similarity index 100%
rename from resources/desktop/com.github.rssguard.desktop
rename to resources/desktop/io.github.martinrotter.rssguard.desktop
diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/io.github.martinrotter.rssguard.metainfo.xml
similarity index 95%
rename from resources/desktop/com.github.rssguard.appdata.xml
rename to resources/desktop/io.github.martinrotter.rssguard.metainfo.xml
index 4815063b8..cf4f9e423 100644
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/io.github.martinrotter.rssguard.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2017-2022 Martin Rotter <rotter.martinos@gmail.com> -->
 <component type="desktop-application">
-  <id>com.github.rssguard.desktop</id>
+  <id>io.github.martinrotter.rssguard</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
   <name>RSS Guard</name>
@@ -13,7 +13,7 @@
       RSS Guard is simple (yet powerful) feed reader. It is able to fetch the most known feed formats, including RSS/RDF and ATOM. RSS Guard is developed on top of the Qt library.
     </p>
   </description>
-  <launchable type="desktop-id">com.github.rssguard.desktop</launchable>
+  <launchable type="desktop-id">io.github.martinrotter.rssguard.desktop</launchable>
   <screenshots>
   <screenshot type="default">
       <image>https://raw.githubusercontent.com/martinrotter/rssguard/master/resources/docs/images/rssguard-window.png</image>
diff --git a/resources/rssguard.qrc b/resources/rssguard.qrc
index 5b5e4770f..ade75da99 100644
--- a/resources/rssguard.qrc
+++ b/resources/rssguard.qrc
@@ -87,8 +87,8 @@
 
     <file>initial_feeds/feeds-en_US.opml</file>
 
-    <file>desktop/com.github.rssguard.desktop</file>
-    <file>desktop/com.github.rssguard.desktop.autostart</file>
+    <file>desktop/io.github.martinrotter.rssguard.desktop</file>
+    <file>desktop/io.github.martinrotter.rssguard.autostart</file>
 
     <file>../localization/rssguard_cs.qm</file>
     <file>../localization/rssguard_da.qm</file>
diff --git a/resources/scripts/hooks/pre-commit b/resources/scripts/hooks/pre-commit
index 2dc4a82ab..d3be8269e 100755
--- a/resources/scripts/hooks/pre-commit
+++ b/resources/scripts/hooks/pre-commit
@@ -4,7 +4,7 @@ changelog_file="resources/text/CHANGELOG"
 datestring="$(date +%F)"
 versionstring="$(head -n 1 "$changelog_file")"
 
-for appdata_file in resources/desktop/*.appdata.xml; do
+for appdata_file in resources/desktop/*.metainfo.xml; do
   appdata_file_n="${appdata_file}.n"
 
   # Set version and date.
diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h
index 3371d2ca9..2bfaf4fac 100644
--- a/src/librssguard/definitions/definitions.h
+++ b/src/librssguard/definitions/definitions.h
@@ -337,8 +337,8 @@
 #define APP_LANG_PATH QSL(":/localization")
 
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
-#define APP_DESKTOP_SOURCE_ENTRY_FILE "com.github.rssguard.desktop.autostart"
-#define APP_DESKTOP_ENTRY_FILE "com.github.rssguard.desktop"
+#define APP_DESKTOP_SOURCE_ENTRY_FILE "io.github.martinrotter.rssguard.autostart"
+#define APP_DESKTOP_ENTRY_FILE "io.github.martinrotter.rssguard.desktop"
 
 #define APP_DESKTOP_ENTRY_PATH QSL(":/desktop")
 #endif
diff --git a/src/rssguard/CMakeLists.txt b/src/rssguard/CMakeLists.txt
index ce274ae3f..fd2caf8be 100644
--- a/src/rssguard/CMakeLists.txt
+++ b/src/rssguard/CMakeLists.txt
@@ -66,7 +66,7 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID)
   install(FILES ${CMAKE_SOURCE_DIR}/resources/desktop/${APP_REVERSE_NAME}.desktop
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
   )
-  install(FILES ${CMAKE_SOURCE_DIR}/resources/desktop/${APP_REVERSE_NAME}.appdata.xml
+  install(FILES ${CMAKE_SOURCE_DIR}/resources/desktop/${APP_REVERSE_NAME}.metainfo.xml
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
   )
   install(FILES ${CMAKE_SOURCE_DIR}/resources/graphics/${CMAKE_PROJECT_NAME}.png