diff --git a/.forgejo/workflows/ios-check.yaml b/.forgejo/workflows/ios-check.yaml
index 495cf4acd..b8b1c3352 100644
--- a/.forgejo/workflows/ios-check.yaml
+++ b/.forgejo/workflows/ios-check.yaml
@@ -74,7 +74,7 @@ jobs:
         shell: bash
         run: |
           xcodebuild test \
-            -workspace xcode/omim.xcworkspace \
+            -workspace xcode/CoMaps.xcworkspace \
             -scheme CoMaps \
             -configuration Debug \
             -sdk iphonesimulator \
@@ -97,7 +97,7 @@ jobs:
         shell: bash
         run: |
           xcodebuild build \
-            -workspace xcode/omim.xcworkspace \
+            -workspace xcode/CoMaps.xcworkspace \
             -scheme CoMaps \
             -configuration Release \
             -destination 'generic/platform=iOS' \
diff --git a/.github/workflows/ios-check.yaml b/.github/workflows/ios-check.yaml
index b619a625f..a732a887c 100644
--- a/.github/workflows/ios-check.yaml
+++ b/.github/workflows/ios-check.yaml
@@ -55,7 +55,7 @@ jobs:
           xcrun simctl boot "${{ env.SIMULATOR_DEVICE }}" || true
           xcrun simctl bootstatus "${{ env.SIMULATOR_DEVICE }}" -b
           xcodebuild test \
-            -workspace xcode/omim.xcworkspace \
+            -workspace xcode/CoMaps.xcworkspace \
             -scheme CoMaps \
             -configuration Debug \
             -sdk iphonesimulator \
@@ -78,7 +78,7 @@ jobs:
         shell: bash
         run: |
           xcodebuild build \
-            -workspace xcode/omim.xcworkspace \
+            -workspace xcode/CoMaps.xcworkspace \
             -scheme CoMaps \
             -configuration Release \
             -destination 'generic/platform=iOS' \
diff --git a/.gitignore b/.gitignore
index 550688797..f3b1d23d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,7 @@ iphone/*/build/*
 tools/emacsmode/build
 **/DerivedData/*
 **/xcshareddata/*
-!iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/OMaps.xcscheme
+!iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/CoMaps.xcscheme
 **/xcuserdata
 **/xcschemes
 iphone/**/*.moved-aside
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index 1fb435b02..6885f1d0c 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -386,25 +386,25 @@ Set up your developer account and add certificates:
 
 Reconfigure the project to use your developer signing keys:
 
-- Open `xcode/omim.xcworkspace` in Xcode.
-- Click on the "Maps" project and select the "OMaps" target.
+- Open `xcode/CoMaps.xcworkspace` in Xcode.
+- Click on the "Maps" project and select the "CoMaps" target.
 - Open "Signing & Capabilities" tab.
-- Choose a unique bundle identifier (not app.organicmaps.debug) and your team.
+- Choose a unique bundle identifier (not app.comaps.debug) and your team.
 - Select "Automatically manage signing".
-- Click on "OMapsTests" target.
+- Click on "CoMapsTests" target.
 - Choose a unique bundle identifier based on the one you chose previously (e.g. app.comapsdev.tests) and your team.
-- Click on "OMapsWidgetExtension" target.
+- Click on "CoMapsWidgetExtension" target.
 - Choose a unique bundle identifier based on the one you chose previously (e.g. app.comapsdev.debug.widgetextension) and your team.
 
-If you want to run CoMaps on a real device, you have to remove the CarPlay entitlement. Open `iphone/Maps/OMaps-Debug.entitlements`
+If you want to run CoMaps on a real device, you have to remove the CarPlay entitlement. Open `iphone/Maps/CoMaps-Debug.entitlements`
 and remove the `com.apple.developer.carplay-maps` entry. Now you can sign your app again in the "Signing & Capabilities" tab. Testing CarPlay
 on a real device requires [requesting entitlements from Apple](https://developer.apple.com/documentation/carplay/requesting_carplay_entitlements).
 
 ### Building and running
 
-Open `xcode/omim.xcworkspace` in Xcode.
+Open `xcode/CoMaps.xcworkspace` in Xcode.
 
-Select "OMaps" product scheme.
+Select "CoMaps" product scheme.
 
 - Choose "Your Mac (Designed for iPad)" to run on Mac without using Simulator.
 - Choose either "iPhone _" or "iPad _" to run in the Simulator.
diff --git a/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/CoMaps.xcscheme b/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/CoMaps.xcscheme
new file mode 100644
index 000000000..fa87d91d8
--- /dev/null
+++ b/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/CoMaps.xcscheme
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1620"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6741A93D1BF340DE002C974C"
+               BuildableName = "CoMaps (Debug).app"
+               BlueprintName = "CoMaps"
+               ReferencedContainer = "container:Maps.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "NO">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "ED097E752BB80C320006ED01"
+            BuildableName = "CoMapsTests.xctest"
+            BlueprintName = "CoMapsTests"
+            ReferencedContainer = "container:Maps.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-IsTests"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "ED097E752BB80C320006ED01"
+               BuildableName = "CoMapsTests.xctest"
+               BlueprintName = "CoMapsTests"
+               ReferencedContainer = "container:Maps.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6741A93D1BF340DE002C974C"
+            BuildableName = "CoMaps (Debug).app"
+            BlueprintName = "CoMaps"
+            ReferencedContainer = "container:Maps.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6741A93D1BF340DE002C974C"
+            BuildableName = "CoMaps (Debug).app"
+            BlueprintName = "CoMaps"
+            ReferencedContainer = "container:Maps.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/iphone/upload_to_appstore.sh b/iphone/upload_to_appstore.sh
index 18309b058..536460179 100755
--- a/iphone/upload_to_appstore.sh
+++ b/iphone/upload_to_appstore.sh
@@ -21,7 +21,7 @@ rm -rf "$ARCHIVE_PATH"
 
 # Build release archive.
 xcodebuild archive \
-    -workspace "$SCRIPT_DIR/../xcode/omim.xcworkspace" \
+    -workspace "$SCRIPT_DIR/../xcode/CoMaps.xcworkspace" \
     -configuration Release \
     -scheme CoMaps \
     -destination generic/platform=iOS \
@@ -42,7 +42,7 @@ cat > "$PLIST" <<EOM
   <key>method</key>
   <string>app-store</string>
   <key>teamID</key>
-  <string>9Z6432XD7L</string>
+  <string>534D2KJBUK</string>
   <key>provisioningProfiles</key>
   <dict>
     <key>app.comaps</key>
diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/CoMaps.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from xcode/omim.xcworkspace/contents.xcworkspacedata
rename to xcode/CoMaps.xcworkspace/contents.xcworkspacedata
diff --git a/xcode/omim.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/xcode/CoMaps.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
similarity index 100%
rename from xcode/omim.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
rename to xcode/CoMaps.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/xcode/fastlane/Fastfile b/xcode/fastlane/Fastfile
index f3c4fe80f..a354e24a8 100644
--- a/xcode/fastlane/Fastfile
+++ b/xcode/fastlane/Fastfile
@@ -121,7 +121,7 @@ platform :ios do
       build_configurations: "Release",
       use_automatic_signing: false,
       code_sign_identity: "Apple Distribution",
-      team_id: "9Z6432XD7L",
+      team_id: "534D2KJBUK",
       profile_name: "App Distribution (Fastlane)",
     )
     update_code_signing_settings(
@@ -130,11 +130,11 @@ platform :ios do
       build_configurations: "Release",
       use_automatic_signing: false,
       code_sign_identity: "Apple Distribution",
-      team_id: "9Z6432XD7L",
+      team_id: "534D2KJBUK",
       profile_name: "WidgetExtension Distribution (Fastlane)",
     )
     build_ios_app(
-      workspace: 'omim.xcworkspace',
+      workspace: 'CoMaps.xcworkspace',
       scheme: 'CoMaps',
       configuration: 'Release',
       destination: 'generic/platform=iOS',