diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 86bdadc49..59f3da573 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -120,7 +120,7 @@
 
         <data android:scheme="http"/>
         <data android:scheme="https"/>
-        <data android:host="omaps.app"/>
+        <data android:host="comaps.app"/>
       </intent-filter>
 
       <intent-filter>
diff --git a/android/app/src/main/java/app/organicmaps/util/Config.java b/android/app/src/main/java/app/organicmaps/util/Config.java
index d5799736a..2eb47fe8b 100644
--- a/android/app/src/main/java/app/organicmaps/util/Config.java
+++ b/android/app/src/main/java/app/organicmaps/util/Config.java
@@ -329,9 +329,9 @@ public final class Config
   public static String getDonateUrl(@NonNull Context context)
   {
     final String url = getString(KEY_DONATE_URL);
-    // Enable donations by default if not Google or Huawei. Replace organicmaps.app/donate/ with localized page.
+    // Enable donations by default if not Google or Huawei. Replace comaps.app/donate/ with localized page.
     if ((url.isEmpty() && !BuildConfig.FLAVOR.equals("google") && !BuildConfig.FLAVOR.equals("huawei")) ||
-        url.endsWith("organicmaps.app/donate/"))
+        url.endsWith("comaps.app/donate/"))
       return context.getString(R.string.app_site_url) + "donate/";
     return url;
   }
diff --git a/android/app/src/main/res/xml/network_security_config.xml b/android/app/src/main/res/xml/network_security_config.xml
index 768520426..8860e7f7e 100644
--- a/android/app/src/main/res/xml/network_security_config.xml
+++ b/android/app/src/main/res/xml/network_security_config.xml
@@ -14,7 +14,6 @@
     </trust-anchors>
   </base-config>
   <domain-config cleartextTrafficPermitted="true">
-    <domain includeSubdomains="true">organicmaps.app</domain>
-    <domain includeSubdomains="true">omaps.app</domain>
+    <domain includeSubdomains="true">comaps.app</domain>
   </domain-config>
 </network-security-config>
diff --git a/ge0/parser.hpp b/ge0/parser.hpp
index 7c0dbc241..b53b934b4 100644
--- a/ge0/parser.hpp
+++ b/ge0/parser.hpp
@@ -12,7 +12,7 @@ class Ge0Parser
 public:
   // Used by map/mwm_url.cpp.
   static constexpr std::array<std::string_view, 6> kGe0Prefixes = {{
-      "https://omaps.app/", "om://", "http://omaps.app/",
+      "https://comaps.app/", "om://", "http://comaps.app/",
       "ge0://", "http://ge0.me/", "https://ge0.me/"
   }};
 
diff --git a/tools/unix/build_omim.sh b/tools/unix/build_omim.sh
index e45f9cfb4..ff622cfe7 100755
--- a/tools/unix/build_omim.sh
+++ b/tools/unix/build_omim.sh
@@ -31,7 +31,7 @@ while getopts ":cdrxtagjlp:n:" opt; do
     r) OPT_RELEASE=1 ;;
     t) OPT_DESIGNER=1 ;;
     *)
-      echo "This tool builds Organic Maps"
+      echo "Build the desktop app and other C++ targets (tests, tools...)"
       echo "Usage: $0 [-d] [-r] [-c] [-x] [-s] [-t] [-a] [-g] [-j] [-l] [-p PATH] [-n NUM] [target1 target2 ...]"
       echo
       echo "By default both debug and release versions are built in ../omim-build-<buildtype> dir."