diff --git a/.forgejo/workflows/appstream-check.yaml b/.forgejo/workflows/appstream-check.yaml
index 35f40e124..42627a743 100644
--- a/.forgejo/workflows/appstream-check.yaml
+++ b/.forgejo/workflows/appstream-check.yaml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - packaging/app.comaps.qt.metainfo.xml
+      - packaging/app.comaps.comaps.metainfo.xml
       - .forgejo/workflows/appstream-check.yaml # Run check on self change
 
 jobs:
@@ -16,7 +16,7 @@ jobs:
         with:
           fetch-depth: 1
           sparse-checkout: |
-            packaging/app.comaps.qt.metainfo.xml
+            packaging/app.comaps.comaps.metainfo.xml
 
       - name: Install appstream validator and flatpak Builder
         shell: bash
@@ -29,8 +29,8 @@ jobs:
 
       - name: Lint appstream data with flatpak Builder
         shell: bash
-        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.qt.metainfo.xml
+        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.comaps.comaps.metainfo.xml
 
       - name: Run appstreamcli in pedantic mode
         shell: bash
-        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.qt.metainfo.xml
+        run: flatpak run --command=appstreamcli org.flatpak.Builder validate --pedantic packaging/app.comaps.comaps.metainfo.xml
diff --git a/.forgejo/workflows/desktop-file-check.yaml b/.forgejo/workflows/desktop-file-check.yaml
index 75eb77e06..20c694add 100644
--- a/.forgejo/workflows/desktop-file-check.yaml
+++ b/.forgejo/workflows/desktop-file-check.yaml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - qt/res/app.comaps.qt.desktop
+      - qt/res/app.comaps.comaps.desktop
       - .forgejo/workflows/desktop-file-check.yaml # Run check on self change
 
 jobs:
@@ -16,7 +16,7 @@ jobs:
         with:
           fetch-depth: 1
           sparse-checkout: |
-            qt/res/app.comaps.qt.desktop
+            qt/res/app.comaps.comaps.desktop
 
       - name: Install desktop-file-validate tool
         shell: bash
@@ -27,4 +27,4 @@ jobs:
 
       - name: Validate desktop file
         shell: bash
-        run: desktop-file-validate qt/res/app.comaps.qt.desktop && echo "Successfully validated .desktop file"
+        run: desktop-file-validate qt/res/app.comaps.comaps.desktop && echo "Successfully validated .desktop file"
diff --git a/packaging/app.comaps.qt.metainfo.xml b/packaging/app.comaps.comaps.metainfo.xml
similarity index 96%
rename from packaging/app.comaps.qt.metainfo.xml
rename to packaging/app.comaps.comaps.metainfo.xml
index fbf7a145d..41c1e8e02 100644
--- a/packaging/app.comaps.qt.metainfo.xml
+++ b/packaging/app.comaps.comaps.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2025 The CoMaps Community -->
 <component type="desktop-application">
-  <id>app.comaps.qt</id>
+  <id>app.comaps.comaps</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>Apache-2.0</project_license>
   <content_rating type="oars-1.1" />
@@ -12,7 +12,7 @@
     <name>The CoMaps Community</name>
   </developer>
 
-  <launchable type="desktop-id">app.comaps.qt.desktop</launchable>
+  <launchable type="desktop-id">app.comaps.comaps.desktop</launchable>
 
   <supports>
     <control>pointing</control>
diff --git a/platform/location_service/qt_location_service.cpp b/platform/location_service/qt_location_service.cpp
index 67b039c99..d794d29b5 100644
--- a/platform/location_service/qt_location_service.cpp
+++ b/platform/location_service/qt_location_service.cpp
@@ -61,7 +61,7 @@ static location::TLocationSource qStringToTLocationSource(QString const & source
 QtLocationService::QtLocationService(location::LocationObserver & observer, std::string const & sourceName) : LocationService(observer)
 {
   QVariantMap params;
-  params["desktopId"] = "app.comaps.qt";
+  params["desktopId"] = "app.comaps.comaps";
   m_positionSource = QGeoPositionInfoSource::createSource(QString::fromStdString(sourceName), params, this);
 
   if (!m_positionSource)
diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index e13a3a760..0a4f93edc 100644
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -137,8 +137,8 @@ install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/)
 install(DIRECTORY ${OMIM_ROOT}/data DESTINATION ${CMAKE_INSTALL_PREFIX}/share/comaps/)
 
 if (PLATFORM_LINUX)
-  install(FILES ${OMIM_ROOT}/packaging/app.comaps.qt.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo/)
-  install(FILES ${OMIM_ROOT}/qt/res/app.comaps.qt.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/)
+  install(FILES ${OMIM_ROOT}/packaging/app.comaps.comaps.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo/)
+  install(FILES ${OMIM_ROOT}/qt/res/app.comaps.comaps.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/)
   install(FILES ${OMIM_ROOT}/qt/res/logo.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/512x512/apps/ RENAME comaps.png)
 endif()
 
diff --git a/qt/main.cpp b/qt/main.cpp
index 3e3f02ffd..56c048320 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -133,7 +133,7 @@ int main(int argc, char * argv[])
   UNUSED_VALUE(mainGuard);
 
   QApplication app(argc, argv);
-  app.setDesktopFileName("app.comaps.qt");
+  app.setDesktopFileName("app.comaps.comaps");
   platform.SetupMeasurementSystem();
 
 
diff --git a/qt/res/Info.plist.in b/qt/res/Info.plist.in
index 1b510396d..e690e711a 100644
--- a/qt/res/Info.plist.in
+++ b/qt/res/Info.plist.in
@@ -24,7 +24,7 @@
     <string>@BUNDLE_EXECUTABLE@</string>
 
     <key>CFBundleIdentifier</key>
-    <string>app.comaps.qt</string>
+    <string>app.comaps.comaps</string>
 
     <key>NSPrincipalClass</key>
     <string>NSApplication</string>
@@ -38,14 +38,14 @@
       <true/>
       <key>NSExceptionDomains</key>
       <dict>
-        <key>omaps.app</key>
+        <key>comaps.app</key>
         <dict>
           <key>NSExceptionAllowsInsecureHTTPLoads</key>
           <true/>
           <key>NSIncludesSubdomains</key>
           <true/>
         </dict>
-        <key>organicmaps.app</key>
+        <key>comaps.at</key>
         <dict>
           <key>NSExceptionAllowsInsecureHTTPLoads</key>
           <true/>
diff --git a/qt/res/app.comaps.qt.desktop b/qt/res/app.comaps.comaps.desktop
similarity index 100%
rename from qt/res/app.comaps.qt.desktop
rename to qt/res/app.comaps.comaps.desktop