diff --git a/client/client_main.cpp b/client/client_main.cpp
index 2cc59a7f4a..921e08edd0 100644
--- a/client/client_main.cpp
+++ b/client/client_main.cpp
@@ -310,6 +310,7 @@ int client_main(int argc, char *argv[])
 #endif
   QApplication app(argc, argv);
   QCoreApplication::setApplicationVersion(freeciv21_version());
+  app.setDesktopFileName(QStringLiteral("net.longturn.freeciv21"));
 
   i_am_client(); // Tell to libfreeciv that we are client
 
diff --git a/cmake/FreecivInstall.cmake b/cmake/FreecivInstall.cmake
index 888e2df5ef..8e0a7cb407 100644
--- a/cmake/FreecivInstall.cmake
+++ b/cmake/FreecivInstall.cmake
@@ -171,21 +171,21 @@ if(UNIX AND NOT APPLE)
 
   # Install MetaInfo and Desktop files for the applications asked for at configure
   if(FREECIV_ENABLE_CLIENT)
-    configure_file(${CMAKE_SOURCE_DIR}/dist/net.longturn.freeciv21.client.desktop.in
-                   net.longturn.freeciv21.client.desktop
+    configure_file(${CMAKE_SOURCE_DIR}/dist/net.longturn.freeciv21.desktop.in
+                   net.longturn.freeciv21.desktop
                    @ONLY NEWLINE_STYLE UNIX)
-    configure_file(${CMAKE_SOURCE_DIR}/dist/net.longturn.freeciv21.client.metainfo.xml.in
-                   net.longturn.freeciv21.client.metainfo.xml
+    configure_file(${CMAKE_SOURCE_DIR}/dist/net.longturn.freeciv21.metainfo.xml.in
+                   net.longturn.freeciv21.metainfo.xml
                    @ONLY NEWLINE_STYLE UNIX)
     install(
       FILES
-      ${CMAKE_BINARY_DIR}/net.longturn.freeciv21.client.desktop
+      ${CMAKE_BINARY_DIR}/net.longturn.freeciv21.desktop
       DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
       COMPONENT freeciv21
     )
     install(
       FILES
-      ${CMAKE_BINARY_DIR}/net.longturn.freeciv21.client.metainfo.xml
+      ${CMAKE_BINARY_DIR}/net.longturn.freeciv21.metainfo.xml
       DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
       COMPONENT freeciv21
     )
diff --git a/dist/net.longturn.freeciv21.client.desktop.in b/dist/net.longturn.freeciv21.desktop.in
similarity index 100%
rename from dist/net.longturn.freeciv21.client.desktop.in
rename to dist/net.longturn.freeciv21.desktop.in
diff --git a/dist/net.longturn.freeciv21.client.metainfo.xml.in b/dist/net.longturn.freeciv21.metainfo.xml.in
similarity index 94%
rename from dist/net.longturn.freeciv21.client.metainfo.xml.in
rename to dist/net.longturn.freeciv21.metainfo.xml.in
index e1144b34b4..b2b21a6573 100644
--- a/dist/net.longturn.freeciv21.client.metainfo.xml.in
+++ b/dist/net.longturn.freeciv21.metainfo.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-    <id type="desktop">net.longturn.freeciv21.client</id>
+    <id type="desktop">net.longturn.freeciv21</id>
     <metadata_license>CC0</metadata_license>
     <project_license>GPL-3.0+</project_license>
     <name>Freeciv21 Client</name>
@@ -11,7 +11,7 @@
       <p>Freeciv21 takes its roots in the well-known FOSS game Freeciv and extends it for more fun, with a revived focus on competitive multiplayer environments. Players can choose from over 500 nations and can play against the computer or other people in an active online community.</p>
       <p>The code is maintained by the team over at Longturn.net and is based on the QT framework. The game supports both hex and square tiles and is easily modified to create custom rules.</p>
     </description>
-    <launchable type="desktop-id">net.longturn.freeciv21.client.desktop</launchable>
+    <launchable type="desktop-id">net.longturn.freeciv21.desktop</launchable>
     <icon type="remote">https://raw.githubusercontent.com/longturn/freeciv21/master/data/icons/128x128/freeciv21-client.png</icon>
     <url type="homepage">https://longturn.net/</url>
     <url type="bugtracker">https://github.com/longturn/freeciv21/issues</url>
diff --git a/dist/snapcraft.yaml b/dist/snapcraft.yaml
index 2433dd341c..130fd1840d 100644
--- a/dist/snapcraft.yaml
+++ b/dist/snapcraft.yaml
@@ -79,15 +79,15 @@ parts:
       - libsdl2-mixer-2.0-0
       - libsqlite3-0
     parse-info:
-      - usr/share/metainfo/net.longturn.freeciv21.client.metainfo.xml
+      - usr/share/metainfo/net.longturn.freeciv21.metainfo.xml
       - usr/share/metainfo/net.longturn.freeciv21.modpack.metainfo.xml
       - usr/share/metainfo/net.longturn.freeciv21.ruledit.metainfo.xml
       - usr/share/metainfo/net.longturn.freeciv21.server.metainfo.xml
 
 apps:
   freeciv21-client:
-    common-id: net.longturn.freeciv21.client
-    desktop: usr/share/applications/net.longturn.freeciv21.client.desktop
+    common-id: net.longturn.freeciv21
+    desktop: usr/share/applications/net.longturn.freeciv21.desktop
     command: usr/bin/freeciv21-client
     extensions:
       - kde-neon
diff --git a/tools/fcmp/mpgui_qt.cpp b/tools/fcmp/mpgui_qt.cpp
index a3ea355319..60549b5433 100644
--- a/tools/fcmp/mpgui_qt.cpp
+++ b/tools/fcmp/mpgui_qt.cpp
@@ -80,6 +80,7 @@ int main(int argc, char **argv)
 {
   QApplication app(argc, argv);
   QCoreApplication::setApplicationVersion(freeciv21_version());
+  app.setDesktopFileName(QStringLiteral("net.longturn.freeciv21.modpack"));
 
   // Delegate option parsing to the common function.
   fcmp_parse_cmdline(app);
diff --git a/tools/ruledit/ruledit.cpp b/tools/ruledit/ruledit.cpp
index 5c1ce5c875..404ec1cff6 100644
--- a/tools/ruledit/ruledit.cpp
+++ b/tools/ruledit/ruledit.cpp
@@ -57,6 +57,7 @@ int main(int argc, char **argv)
 {
   QApplication app(argc, argv);
   QCoreApplication::setApplicationVersion(freeciv21_version());
+  app.setDesktopFileName(QStringLiteral("net.longturn.freeciv21.ruledit"));
 
   log_init();