diff --git a/TheNoiseClock.xcodeproj/project.pbxproj b/TheNoiseClock.xcodeproj/project.pbxproj
index 1fccc17..000e6ec 100644
--- a/TheNoiseClock.xcodeproj/project.pbxproj
+++ b/TheNoiseClock.xcodeproj/project.pbxproj
@@ -545,7 +545,7 @@
 				);
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_IDENTIFIER)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = "$(PRODUCT_NAME)";
 				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_APPROACHABLE_CONCURRENCY = YES;
 				SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
@@ -579,7 +579,7 @@
 				);
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_IDENTIFIER)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = "$(PRODUCT_NAME)";
 				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_APPROACHABLE_CONCURRENCY = YES;
 				SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
diff --git a/TheNoiseClock.xcodeproj/xcuserdata/mattbruce.xcuserdatad/xcschemes/xcschememanagement.plist b/TheNoiseClock.xcodeproj/xcuserdata/mattbruce.xcuserdatad/xcschemes/xcschememanagement.plist
index 528733b..79358ba 100644
--- a/TheNoiseClock.xcodeproj/xcuserdata/mattbruce.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/TheNoiseClock.xcodeproj/xcuserdata/mattbruce.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
 		<key>TheNoiseClock.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>3</integer>
 		</dict>
 		<key>TheNoiseClockWidget.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>2</integer>
 		</dict>
 	</dict>
 </dict>
diff --git a/TheNoiseClock/Configuration/AppIdentifiers.swift b/TheNoiseClock/Configuration/AppIdentifiers.swift
index 7787fe9..b2b50ac 100644
--- a/TheNoiseClock/Configuration/AppIdentifiers.swift
+++ b/TheNoiseClock/Configuration/AppIdentifiers.swift
@@ -23,6 +23,11 @@ enum AppIdentifiers {
             ?? "thenoiseclock.app"
     }()
 
+    static let publicAppName: String = {
+        Bundle.main.object(forInfoDictionaryKey: "PublicAppName") as? String
+            ?? "The Noise Clock"
+    }()
+
     static var bundleIdentifier: String {
         Bundle.main.bundleIdentifier ?? "com.mbrucedogs.TheNoiseClock"
     }
diff --git a/TheNoiseClock/Configuration/Base.xcconfig b/TheNoiseClock/Configuration/Base.xcconfig
index d2c9e4d..7d59c74 100644
--- a/TheNoiseClock/Configuration/Base.xcconfig
+++ b/TheNoiseClock/Configuration/Base.xcconfig
@@ -6,22 +6,23 @@
 // =============================================================================
 
 COMPANY_IDENTIFIER = com.mbrucedogs
-APP_NAME = TheNoiseClock
+BUNDLE_ID_NAME = TheNoiseClock
+PRODUCT_NAME = The Noise Clock
 DEVELOPMENT_TEAM = 6R7KLBPBLZ
 
 // =============================================================================
 // DERIVED IDENTIFIERS - DO NOT EDIT
 // =============================================================================
 
-APP_BUNDLE_IDENTIFIER = $(COMPANY_IDENTIFIER).$(APP_NAME)
+APP_BUNDLE_IDENTIFIER = $(COMPANY_IDENTIFIER).$(BUNDLE_ID_NAME)
 WATCH_BUNDLE_IDENTIFIER = $(APP_BUNDLE_IDENTIFIER).watchkitapp
 APPCLIP_BUNDLE_IDENTIFIER = $(APP_BUNDLE_IDENTIFIER).Clip
 WIDGET_BUNDLE_IDENTIFIER = $(APP_BUNDLE_IDENTIFIER).Widget
 INTENT_BUNDLE_IDENTIFIER = $(APP_BUNDLE_IDENTIFIER).Intent
-TESTS_BUNDLE_IDENTIFIER = $(COMPANY_IDENTIFIER).$(APP_NAME)Tests
-UITESTS_BUNDLE_IDENTIFIER = $(COMPANY_IDENTIFIER).$(APP_NAME)UITests
+TESTS_BUNDLE_IDENTIFIER = $(COMPANY_IDENTIFIER).$(BUNDLE_ID_NAME)Tests
+UITESTS_BUNDLE_IDENTIFIER = $(COMPANY_IDENTIFIER).$(BUNDLE_ID_NAME)UITests
 
-APP_GROUP_IDENTIFIER = group.$(COMPANY_IDENTIFIER).$(APP_NAME)
-CLOUDKIT_CONTAINER_IDENTIFIER = iCloud.$(COMPANY_IDENTIFIER).$(APP_NAME)
+APP_GROUP_IDENTIFIER = group.$(COMPANY_IDENTIFIER).$(BUNDLE_ID_NAME)
+CLOUDKIT_CONTAINER_IDENTIFIER = iCloud.$(COMPANY_IDENTIFIER).$(BUNDLE_ID_NAME)
 
 APPCLIP_DOMAIN = thenoiseclock.app
diff --git a/TheNoiseClock/Info.plist b/TheNoiseClock/Info.plist
index 6656aed..dfb8b3b 100644
--- a/TheNoiseClock/Info.plist
+++ b/TheNoiseClock/Info.plist
@@ -12,9 +12,13 @@
 	<string>$(CLOUDKIT_CONTAINER_IDENTIFIER)</string>
 	<key>AppClipDomain</key>
 	<string>$(APPCLIP_DOMAIN)</string>
+	<key>PublicAppName</key>
+	<string>$(PRODUCT_NAME)</string>
 	<key>NSSupportsLiveActivities</key>
 	<true/>
 	<key>NSAlarmKitUsageDescription</key>
 	<string>TheNoiseClock uses alarms to wake you up at your scheduled time, even when your device is in silent mode or Focus mode.</string>
+	<key>CFBundleDisplayName</key>
+	<string>$(PRODUCT_NAME)</string>
 </dict>
 </plist>