diff --git a/Config.xcconfig b/Config.xcconfig
index 266012d65..bb30a2fa0 100644
--- a/Config.xcconfig
+++ b/Config.xcconfig
@@ -1,12 +1,12 @@
-APP_DISPLAY_NAME = OiAPS
-APP_VERSION = 2.3.3
+APP_DISPLAY_NAME = Open-iAPS
+APP_VERSION = 0.1.0
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE =
 DEVELOPER_TEAM = ##TEAM_ID##
-BUNDLE_IDENTIFIER = ru.artpancreas.$(DEVELOPMENT_TEAM).FreeAPS
+BUNDLE_IDENTIFIER = org.nightscout.$(DEVELOPMENT_TEAM).openiaps
 APP_GROUP_ID = group.com.$(DEVELOPMENT_TEAM).loopkit.LoopGroup
 APP_ICON = OiAPS_Icon
-APP_URL_SCHEME = freeaps-x
+APP_URL_SCHEME = Open-iAPS
 
 #include? "../../ConfigOverride.xcconfig"
 #include? "ConfigOverride.xcconfig"
diff --git a/FreeAPS.xcodeproj/project.pbxproj b/FreeAPS.xcodeproj/project.pbxproj
index 1766186d0..038ce58df 100644
--- a/FreeAPS.xcodeproj/project.pbxproj
+++ b/FreeAPS.xcodeproj/project.pbxproj
@@ -3161,7 +3161,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				IBSC_MODULE = FreeAPSWatch_WatchKit_Extension;
 				INFOPLIST_FILE = FreeAPSWatch/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = iAPS;
+				INFOPLIST_KEY_CFBundleDisplayName = Open-iAPS;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = "$(BUNDLE_IDENTIFIER)";
 				MARKETING_VERSION = "$(APP_VERSION)";
@@ -3196,7 +3196,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				IBSC_MODULE = FreeAPSWatch_WatchKit_Extension;
 				INFOPLIST_FILE = FreeAPSWatch/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = iAPS;
+				INFOPLIST_KEY_CFBundleDisplayName = Open-iAPS;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = "$(BUNDLE_IDENTIFIER)";
 				MARKETING_VERSION = "$(APP_VERSION)";
@@ -3226,7 +3226,7 @@
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "FreeAPSWatch WatchKit Extension/Info.plist";
-				INFOPLIST_KEY_CFBundleDisplayName = "iAPS WatchKit Extension";
+				INFOPLIST_KEY_CFBundleDisplayName = "Open-iAPS WatchKit Extension";
 				INFOPLIST_KEY_CLKComplicationPrincipalClass = FreeAPSWatch_WatchKit_Extension.ComplicationController;
 				INFOPLIST_KEY_NSHealthClinicalHealthRecordsShareUsageDescription = "Bla bla Record Health";
 				INFOPLIST_KEY_NSHealthShareUsageDescription = "Bla bla Share Health";
@@ -3266,7 +3266,7 @@
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "FreeAPSWatch WatchKit Extension/Info.plist";
-				INFOPLIST_KEY_CFBundleDisplayName = "iAPS WatchKit Extension";
+				INFOPLIST_KEY_CFBundleDisplayName = "Open-iAPS WatchKit Extension";
 				INFOPLIST_KEY_CLKComplicationPrincipalClass = FreeAPSWatch_WatchKit_Extension.ComplicationController;
 				INFOPLIST_KEY_NSHealthClinicalHealthRecordsShareUsageDescription = "Bla bla Record Health";
 				INFOPLIST_KEY_NSHealthShareUsageDescription = "Bla bla Share Health";
@@ -3304,7 +3304,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = ru.artpancreas.FreeAPSTests;
+				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER).FreeAPSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -3325,7 +3325,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = ru.artpancreas.FreeAPSTests;
+				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER).FreeAPSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/FreeAPS/Resources/Info.plist b/FreeAPS/Resources/Info.plist
index c6cde9750..7d1f0d6d4 100644
--- a/FreeAPS/Resources/Info.plist
+++ b/FreeAPS/Resources/Info.plist
@@ -36,7 +36,6 @@
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>$(APP_URL_SCHEME)</string>
-				<string>freeaps-x</string>
 			</array>
 		</dict>
 	</array>
diff --git a/FreeAPS/Sources/APS/CGM/CGMType.swift b/FreeAPS/Sources/APS/CGM/CGMType.swift
index 260d569e9..a77810cc9 100644
--- a/FreeAPS/Sources/APS/CGM/CGMType.swift
+++ b/FreeAPS/Sources/APS/CGM/CGMType.swift
@@ -54,7 +54,7 @@ enum CGMType: String, JSON, CaseIterable, Identifiable {
         case .simulator:
             return nil
         case .libreTransmitter:
-            return URL(string: "freeaps-x://libre-transmitter")!
+            return URL(string: "Open-iAPS://libre-transmitter")!
         }
     }
 
diff --git a/FreeAPS/Sources/Models/AlertEntry.swift b/FreeAPS/Sources/Models/AlertEntry.swift
index 4a7b3263e..96c7ca3cc 100644
--- a/FreeAPS/Sources/Models/AlertEntry.swift
+++ b/FreeAPS/Sources/Models/AlertEntry.swift
@@ -15,7 +15,7 @@ struct AlertEntry: JSON, Codable, Hashable {
     let contentBody: String?
     var errorMessage: String?
 
-    static let manual = "freeaps-x"
+    static let manual = "Open-iAPS"
 
     static func == (lhs: AlertEntry, rhs: AlertEntry) -> Bool {
         lhs.issuedDate == rhs.issuedDate
diff --git a/FreeAPS/Sources/Models/CarbsEntry.swift b/FreeAPS/Sources/Models/CarbsEntry.swift
index 4dd549ca3..5bbf45a8b 100644
--- a/FreeAPS/Sources/Models/CarbsEntry.swift
+++ b/FreeAPS/Sources/Models/CarbsEntry.swift
@@ -11,7 +11,7 @@ struct CarbsEntry: JSON, Equatable, Hashable {
     let isFPU: Bool?
     let fpuID: String?
 
-    static let manual = "freeaps-x"
+    static let manual = "Open-iAPS"
     static let appleHealth = "applehealth"
 
     static func == (lhs: CarbsEntry, rhs: CarbsEntry) -> Bool {
diff --git a/FreeAPS/Sources/Models/NightscoutTreatment.swift b/FreeAPS/Sources/Models/NightscoutTreatment.swift
index 281818055..d025b9e1e 100644
--- a/FreeAPS/Sources/Models/NightscoutTreatment.swift
+++ b/FreeAPS/Sources/Models/NightscoutTreatment.swift
@@ -19,7 +19,7 @@ struct NigtscoutTreatment: JSON, Hashable, Equatable {
     let targetTop: Decimal?
     let targetBottom: Decimal?
 
-    static let local = "freeaps-x"
+    static let local = "Open-iAPS"
 
     static let empty = NigtscoutTreatment(from: "{}")!
 
diff --git a/FreeAPS/Sources/Models/TempTarget.swift b/FreeAPS/Sources/Models/TempTarget.swift
index 3e38bfff9..1f77d6404 100644
--- a/FreeAPS/Sources/Models/TempTarget.swift
+++ b/FreeAPS/Sources/Models/TempTarget.swift
@@ -10,7 +10,7 @@ struct TempTarget: JSON, Identifiable, Equatable, Hashable {
     let enteredBy: String?
     let reason: String?
 
-    static let manual = "freeaps-x"
+    static let manual = "Open-iAPS"
     static let custom = "Temp target"
     static let cancel = "Cancel"
 
diff --git a/FreeAPS/Sources/Modules/Settings/View/SettingsRootView.swift b/FreeAPS/Sources/Modules/Settings/View/SettingsRootView.swift
index 7a8450b4f..1417eb212 100644
--- a/FreeAPS/Sources/Modules/Settings/View/SettingsRootView.swift
+++ b/FreeAPS/Sources/Modules/Settings/View/SettingsRootView.swift
@@ -16,12 +16,12 @@ extension Settings {
                 header: {
                     if let expirationDate = Bundle.main.profileExpiration {
                         Text(
-                            "iAPS v\(state.versionNumber) (\(state.buildNumber))\nBranch: \(state.branch) \(state.copyrightNotice)" +
+                            "Open-iAPS v\(state.versionNumber) (\(state.buildNumber))\nBranch: \(state.branch) \(state.copyrightNotice)" +
                                 "\nBuild Expires: " + expirationDate
                         ).textCase(nil)
                     } else {
                         Text(
-                            "iAPS v\(state.versionNumber) (\(state.buildNumber))\nBranch: \(state.branch) \(state.copyrightNotice)"
+                            "Open-iAPS v\(state.versionNumber) (\(state.buildNumber))\nBranch: \(state.branch) \(state.copyrightNotice)"
                         )
                     }
                 }
diff --git a/FreeAPS/Sources/Services/Network/NightscoutAPI.swift b/FreeAPS/Sources/Services/Network/NightscoutAPI.swift
index 5beff1f94..b218f2de3 100644
--- a/FreeAPS/Sources/Services/Network/NightscoutAPI.swift
+++ b/FreeAPS/Sources/Services/Network/NightscoutAPI.swift
@@ -37,8 +37,8 @@ extension NightscoutAPI {
     func checkConnection() -> AnyPublisher<Void, Swift.Error> {
         struct Check: Codable, Equatable {
             var eventType = "Note"
-            var enteredBy = "freeaps-x"
-            var notes = "iAPS connected"
+            var enteredBy = "Open-iAPS"
+            var notes = "Open-iAPS connected"
         }
         let check = Check()
         var request = URLRequest(url: url.appendingPathComponent(Config.treatmentsPath))
diff --git a/FreeAPS/Sources/Services/WatchManager/GarminManager.swift b/FreeAPS/Sources/Services/WatchManager/GarminManager.swift
index 15612f9f4..0d1336c53 100644
--- a/FreeAPS/Sources/Services/WatchManager/GarminManager.swift
+++ b/FreeAPS/Sources/Services/WatchManager/GarminManager.swift
@@ -63,7 +63,7 @@ final class BaseGarminManager: NSObject, GarminManager, Injectable {
 
     init(resolver: Resolver) {
         super.init()
-        connectIQ?.initialize(withUrlScheme: "freeaps-x", uiOverrideDelegate: self)
+        connectIQ?.initialize(withUrlScheme: "Open-iAPS", uiOverrideDelegate: self)
         injectServices(resolver)
         restoreDevices()
         subscribeToOpenFromGarminConnect()
diff --git a/fastlane/testflight.md b/fastlane/testflight.md
index 5187168a9..6783d99e6 100644
--- a/fastlane/testflight.md
+++ b/fastlane/testflight.md
@@ -142,7 +142,8 @@ If you have created a Open-iAPS app in App Store Connect before, you can skip th
     * Select "iOS".
     * Select a name: this will have to be unique, so you may have to try a few different names here, but it will not be the name you see on your phone, so it's not that important.
     * Select your primary language.
-    * Choose the bundle ID that matches `ru.artpancreas.TEAMID.FreeAPS`, with TEAMID matching your team id.
+    * Choose the bundle ID that matches the `BUNDLE_IDENTIFIER` in your `Config.xcconfig` file
+       * this is typically `org.nightscout.TEAMID.openiaps` with `TEAMID` matching your team id
     * SKU can be anything; e.g. "123".
     * Select "Full Access".
 1. Click Create