diff --git a/HelperXPCShared/HelperXPCShared.swift b/HelperXPCShared/HelperXPCShared.swift
index d3825af7..80f89b86 100644
--- a/HelperXPCShared/HelperXPCShared.swift
+++ b/HelperXPCShared/HelperXPCShared.swift
@@ -1,7 +1,7 @@
 import Foundation
 
-let machServiceName = "com.robotsandpencils.XcodesApp.Helper"
-let clientBundleID = "com.robotsandpencils.XcodesApp"
+let machServiceName = "com.xcodesorg.xcodesapp.Helper"
+let clientBundleID = "com.xcodesorg.xcodesapp"
 let subjectOrganizationalUnit = Bundle.main.infoDictionary!["CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT"] as! String
 
 @objc(HelperXPCProtocol)
diff --git a/README.md b/README.md
index c2bfa13d..d04f8fcd 100644
--- a/README.md
+++ b/README.md
@@ -97,8 +97,8 @@ Follow the steps below to build and release a new version of Xcodes.app. For any
 # Update the version number in Xcode and commit the change, if necessary
 
 # Question: Did anything in XPCHelper change?
-# - com.robotsandpencils.XcodesApp.Helper folder and HelperXPCShared
-# - if so, bump the version number in com.robotsandpencils.XcodesApp.Helper target.
+# - com.xcodesorg.xcodesapp.Helper folder and HelperXPCShared
+# - if so, bump the version number in com.xcodesorg.xcodesapp.Helper target.
 # Note: you do not have to bump the version number if nothing has changed.
 # Note2: If you do bump the version, the end user, must re-install the XPCHelper and give permission again.
 
diff --git a/Scripts/uninstall_privileged_helper.sh b/Scripts/uninstall_privileged_helper.sh
index c3ce84b0..dc726eb2 100755
--- a/Scripts/uninstall_privileged_helper.sh
+++ b/Scripts/uninstall_privileged_helper.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-PRIVILEGED_HELPER_LABEL=com.robotsandpencils.XcodesApp.Helper
+PRIVILEGED_HELPER_LABEL=com.xcodesorg.xcodesapp.Helper
 
 sudo rm /Library/PrivilegedHelperTools/$PRIVILEGED_HELPER_LABEL
 sudo rm /Library/LaunchDaemons/$PRIVILEGED_HELPER_LABEL.plist
diff --git a/Xcodes.xcodeproj/project.pbxproj b/Xcodes.xcodeproj/project.pbxproj
index 4d34652d..31e21420 100644
--- a/Xcodes.xcodeproj/project.pbxproj
+++ b/Xcodes.xcodeproj/project.pbxproj
@@ -49,7 +49,6 @@
 		CA9FF88125955C7000E47BAF /* AvailableXcode.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9FF88025955C7000E47BAF /* AvailableXcode.swift */; };
 		CA9FF8872595607900E47BAF /* InstalledXcode.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9FF8862595607900E47BAF /* InstalledXcode.swift */; };
 		CA9FF8B12595967A00E47BAF /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9FF8B02595967A00E47BAF /* main.swift */; };
-		CA9FF8BC259596CB00E47BAF /* com.robotsandpencils.XcodesApp.Helper in Copy Helper */ = {isa = PBXBuildFile; fileRef = CA9FF8AE2595967A00E47BAF /* com.robotsandpencils.XcodesApp.Helper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		CA9FF8CF25959A9700E47BAF /* HelperXPCShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9FF8CE25959A9700E47BAF /* HelperXPCShared.swift */; };
 		CA9FF8D025959A9700E47BAF /* HelperXPCShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9FF8CE25959A9700E47BAF /* HelperXPCShared.swift */; };
 		CA9FF8DB25959B4000E47BAF /* XPCDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA9FF8DA25959B4000E47BAF /* XPCDelegate.swift */; };
@@ -135,6 +134,7 @@
 		E8E98A9025D8631800EC89A0 /* InstallationStepRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFBC3FF259AC17F00E2A3D8 /* InstallationStepRowView.swift */; };
 		E8E98A9625D863D700EC89A0 /* InstallationStepDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8E98A9525D863D700EC89A0 /* InstallationStepDetailView.swift */; };
 		E8F44A1E296B4CD7002D6592 /* Path in Frameworks */ = {isa = PBXBuildFile; productRef = E8F44A1D296B4CD7002D6592 /* Path */; };
+		E8FA00542B5B109800769CE0 /* com.xcodesorg.xcodesapp.Helper in Copy Helper */ = {isa = PBXBuildFile; fileRef = CA9FF8AE2595967A00E47BAF /* com.xcodesorg.xcodesapp.Helper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		E8FD5727291EE4AC001E004C /* AsyncNetworkService in Frameworks */ = {isa = PBXBuildFile; productRef = E8FD5726291EE4AC001E004C /* AsyncNetworkService */; };
 /* End PBXBuildFile section */
 
@@ -171,7 +171,7 @@
 			dstPath = Contents/Library/LaunchServices;
 			dstSubfolderSpec = 1;
 			files = (
-				CA9FF8BC259596CB00E47BAF /* com.robotsandpencils.XcodesApp.Helper in Copy Helper */,
+				E8FA00542B5B109800769CE0 /* com.xcodesorg.xcodesapp.Helper in Copy Helper */,
 			);
 			name = "Copy Helper";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -236,7 +236,7 @@
 		CA9FF87A2595293E00E47BAF /* DataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataSource.swift; sourceTree = "<group>"; };
 		CA9FF88025955C7000E47BAF /* AvailableXcode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvailableXcode.swift; sourceTree = "<group>"; };
 		CA9FF8862595607900E47BAF /* InstalledXcode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstalledXcode.swift; sourceTree = "<group>"; };
-		CA9FF8AE2595967A00E47BAF /* com.robotsandpencils.XcodesApp.Helper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = com.robotsandpencils.XcodesApp.Helper; sourceTree = BUILT_PRODUCTS_DIR; };
+		CA9FF8AE2595967A00E47BAF /* com.xcodesorg.xcodesapp.Helper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = com.xcodesorg.xcodesapp.Helper; sourceTree = BUILT_PRODUCTS_DIR; };
 		CA9FF8B02595967A00E47BAF /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
 		CA9FF8C22595988B00E47BAF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CA9FF8C32595989800E47BAF /* launchd.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = launchd.plist; sourceTree = "<group>"; };
@@ -245,8 +245,8 @@
 		CA9FF8DF25959BAA00E47BAF /* ConnectionVerifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionVerifier.swift; sourceTree = "<group>"; };
 		CA9FF8E425959BB800E47BAF /* AuditTokenHack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AuditTokenHack.h; sourceTree = "<group>"; };
 		CA9FF8E525959BB800E47BAF /* AuditTokenHack.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AuditTokenHack.m; sourceTree = "<group>"; };
-		CA9FF8EA25959BDD00E47BAF /* com.robotsandpencils.XcodesApp.Helper-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "com.robotsandpencils.XcodesApp.Helper-Bridging-Header.h"; sourceTree = "<group>"; };
-		CA9FF9052595A28400E47BAF /* com.robotsandpencils.XcodesApp.HelperTest.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = com.robotsandpencils.XcodesApp.HelperTest.entitlements; sourceTree = "<group>"; };
+		CA9FF8EA25959BDD00E47BAF /* com.xcodesorg.xcodesapp.Helper-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "com.xcodesorg.xcodesapp.Helper-Bridging-Header.h"; sourceTree = "<group>"; };
+		CA9FF9052595A28400E47BAF /* com.xcodesorg.xcodesapp.HelperTest.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = com.xcodesorg.xcodesapp.HelperTest.entitlements; sourceTree = "<group>"; };
 		CA9FF9252595A7EB00E47BAF /* Scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Scripts; sourceTree = "<group>"; };
 		CA9FF9352595B44700E47BAF /* HelperClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelperClient.swift; sourceTree = "<group>"; };
 		CAA1CB34255A5AD5003FD669 /* SignInCredentialsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInCredentialsView.swift; sourceTree = "<group>"; };
@@ -419,22 +419,22 @@
 			path = About;
 			sourceTree = "<group>";
 		};
-		CA9FF8AF2595967A00E47BAF /* com.robotsandpencils.XcodesApp.Helper */ = {
+		CA9FF8AF2595967A00E47BAF /* com.xcodesorg.xcodesapp.Helper */ = {
 			isa = PBXGroup;
 			children = (
 				CA9FF8E425959BB800E47BAF /* AuditTokenHack.h */,
 				CA9FF8E525959BB800E47BAF /* AuditTokenHack.m */,
-				CA9FF8EA25959BDD00E47BAF /* com.robotsandpencils.XcodesApp.Helper-Bridging-Header.h */,
+				CA9FF8EA25959BDD00E47BAF /* com.xcodesorg.xcodesapp.Helper-Bridging-Header.h */,
 				CA9FF8DF25959BAA00E47BAF /* ConnectionVerifier.swift */,
 				CA42DD7225AEB04300BC0B0C /* Logger.swift */,
 				CA9FF8B02595967A00E47BAF /* main.swift */,
 				CA9FF8DA25959B4000E47BAF /* XPCDelegate.swift */,
 				CA9FF8C22595988B00E47BAF /* Info.plist */,
 				CA9FF8C32595989800E47BAF /* launchd.plist */,
-				CA9FF9052595A28400E47BAF /* com.robotsandpencils.XcodesApp.HelperTest.entitlements */,
+				CA9FF9052595A28400E47BAF /* com.xcodesorg.xcodesapp.HelperTest.entitlements */,
 				CAFBDBA525990C76003DCC5A /* SimpleXPCApp.LICENSE */,
 			);
-			path = com.robotsandpencils.XcodesApp.Helper;
+			path = com.xcodesorg.xcodesapp.Helper;
 			sourceTree = "<group>";
 		};
 		CA9FF8CD25959A7600E47BAF /* HelperXPCShared */ = {
@@ -571,7 +571,7 @@
 				CA538A0C255A4F1A00E64DD7 /* AppleAPI */,
 				CAD2E7A02449574E00113D76 /* Xcodes */,
 				CAD2E7B62449575100113D76 /* XcodesTests */,
-				CA9FF8AF2595967A00E47BAF /* com.robotsandpencils.XcodesApp.Helper */,
+				CA9FF8AF2595967A00E47BAF /* com.xcodesorg.xcodesapp.Helper */,
 				CA9FF8CD25959A7600E47BAF /* HelperXPCShared */,
 				CAD2E79F2449574E00113D76 /* Products */,
 				CA538A12255A4F7C00E64DD7 /* Frameworks */,
@@ -584,7 +584,7 @@
 			children = (
 				CAD2E79E2449574E00113D76 /* Xcodes.app */,
 				CAD2E7B32449575100113D76 /* XcodesTests.xctest */,
-				CA9FF8AE2595967A00E47BAF /* com.robotsandpencils.XcodesApp.Helper */,
+				CA9FF8AE2595967A00E47BAF /* com.xcodesorg.xcodesapp.Helper */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -663,9 +663,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		CA9FF8AD2595967A00E47BAF /* com.robotsandpencils.XcodesApp.Helper */ = {
+		CA9FF8AD2595967A00E47BAF /* com.xcodesorg.xcodesapp.Helper */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = CA9FF8B52595967A00E47BAF /* Build configuration list for PBXNativeTarget "com.robotsandpencils.XcodesApp.Helper" */;
+			buildConfigurationList = CA9FF8B52595967A00E47BAF /* Build configuration list for PBXNativeTarget "com.xcodesorg.xcodesapp.Helper" */;
 			buildPhases = (
 				CA9FF8AA2595967A00E47BAF /* Sources */,
 				CA9FF8AB2595967A00E47BAF /* Frameworks */,
@@ -675,9 +675,9 @@
 			);
 			dependencies = (
 			);
-			name = com.robotsandpencils.XcodesApp.Helper;
+			name = com.xcodesorg.xcodesapp.Helper;
 			productName = com.robotsandpencils.XcodesApp.Helper;
-			productReference = CA9FF8AE2595967A00E47BAF /* com.robotsandpencils.XcodesApp.Helper */;
+			productReference = CA9FF8AE2595967A00E47BAF /* com.xcodesorg.xcodesapp.Helper */;
 			productType = "com.apple.product-type.tool";
 		};
 		CAD2E79D2449574E00113D76 /* Xcodes */ = {
@@ -805,7 +805,7 @@
 			targets = (
 				CAD2E79D2449574E00113D76 /* Xcodes */,
 				CAD2E7B22449575100113D76 /* XcodesTests */,
-				CA9FF8AD2595967A00E47BAF /* com.robotsandpencils.XcodesApp.Helper */,
+				CA9FF8AD2595967A00E47BAF /* com.xcodesorg.xcodesapp.Helper */,
 			);
 		};
 /* End PBXProject section */
@@ -990,7 +990,7 @@
 /* Begin PBXTargetDependency section */
 		CA9FF8BA259596A000E47BAF /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = CA9FF8AD2595967A00E47BAF /* com.robotsandpencils.XcodesApp.Helper */;
+			target = CA9FF8AD2595967A00E47BAF /* com.xcodesorg.xcodesapp.Helper */;
 			targetProxy = CA9FF8B9259596A000E47BAF /* PBXContainerItemProxy */;
 		};
 		CAD2E7B52449575100113D76 /* PBXTargetDependency */ = {
@@ -1034,7 +1034,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT = PBH8V487HB;
+				CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT = ZU6GR6B2FY;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1069,6 +1069,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT = ZU6GR6B2FY;
 				CODE_SIGN_ENTITLEMENTS = Xcodes/Resources/XcodesTest.entitlements;
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
@@ -1120,22 +1121,23 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT = ZU6GR6B2FY;
 				CODE_SIGN_STYLE = Automatic;
 				CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
 				DEVELOPMENT_TEAM = ZU6GR6B2FY;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/$(TARGET_NAME)/Info.plist";
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 2.0.0;
 				OTHER_LDFLAGS = (
 					"-sectcreate",
 					__TEXT,
 					__launchd_plist,
 					"$(SRCROOT)/${TARGET_NAME}/launchd.plist",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.robotsandpencils.XcodesApp.Helper;
+				PRODUCT_BUNDLE_IDENTIFIER = com.xcodesorg.xcodesapp.Helper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = "com.robotsandpencils.XcodesApp.Helper/com.robotsandpencils.XcodesApp.Helper-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "com.xcodesorg.xcodesapp.Helper/com.xcodesorg.xcodesapp.Helper-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
@@ -1144,24 +1146,25 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CODE_SIGN_ENTITLEMENTS = com.robotsandpencils.XcodesApp.Helper/com.robotsandpencils.XcodesApp.HelperTest.entitlements;
+				CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT = ZU6GR6B2FY;
+				CODE_SIGN_ENTITLEMENTS = com.xcodesorg.xcodesapp.Helper/com.xcodesorg.xcodesapp.HelperTest.entitlements;
 				CODE_SIGN_STYLE = Manual;
 				CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/$(TARGET_NAME)/Info.plist";
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 2.0.0;
 				OTHER_LDFLAGS = (
 					"-sectcreate",
 					__TEXT,
 					__launchd_plist,
 					"$(SRCROOT)/${TARGET_NAME}/launchd.plist",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.robotsandpencils.XcodesApp.Helper;
+				PRODUCT_BUNDLE_IDENTIFIER = com.xcodesorg.xcodesapp.Helper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = "com.robotsandpencils.XcodesApp.Helper/com.robotsandpencils.XcodesApp.Helper-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "com.xcodesorg.xcodesapp.Helper/com.xcodesorg.xcodesapp.Helper-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Test;
@@ -1170,22 +1173,23 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT = ZU6GR6B2FY;
 				CODE_SIGN_STYLE = Automatic;
 				CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
 				DEVELOPMENT_TEAM = ZU6GR6B2FY;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/$(TARGET_NAME)/Info.plist";
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 2.0.0;
 				OTHER_LDFLAGS = (
 					"-sectcreate",
 					__TEXT,
 					__launchd_plist,
 					"$(SRCROOT)/${TARGET_NAME}/launchd.plist",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.robotsandpencils.XcodesApp.Helper;
+				PRODUCT_BUNDLE_IDENTIFIER = com.xcodesorg.xcodesapp.Helper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = "com.robotsandpencils.XcodesApp.Helper/com.robotsandpencils.XcodesApp.Helper-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "com.xcodesorg.xcodesapp.Helper/com.xcodesorg.xcodesapp.Helper-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
@@ -1223,7 +1227,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT = PBH8V487HB;
+				CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT = ZU6GR6B2FY;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1287,7 +1291,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT = PBH8V487HB;
+				CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT = ZU6GR6B2FY;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
@@ -1315,7 +1319,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT = ZU6GR6B2FY;
 				CODE_SIGN_ENTITLEMENTS = Xcodes/Resources/Xcodes.entitlements;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 19;
@@ -1340,7 +1346,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT = ZU6GR6B2FY;
 				CODE_SIGN_ENTITLEMENTS = Xcodes/Resources/Xcodes.entitlements;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 19;
@@ -1398,7 +1406,7 @@
 					"@loader_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.robotsandpencils.XcodesAppTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.xcodesorg.xcodesapp.XcodesAppTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Xcodes.app/Contents/MacOS/Xcodes";
@@ -1408,7 +1416,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		CA9FF8B52595967A00E47BAF /* Build configuration list for PBXNativeTarget "com.robotsandpencils.XcodesApp.Helper" */ = {
+		CA9FF8B52595967A00E47BAF /* Build configuration list for PBXNativeTarget "com.xcodesorg.xcodesapp.Helper" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				CA9FF8B22595967A00E47BAF /* Debug */,
diff --git a/Xcodes.xcodeproj/xcshareddata/xcschemes/com.robotsandpencils.XcodesApp.Helper.xcscheme b/Xcodes.xcodeproj/xcshareddata/xcschemes/com.robotsandpencils.XcodesApp.Helper.xcscheme
new file mode 100644
index 00000000..19ae1c91
--- /dev/null
+++ b/Xcodes.xcodeproj/xcshareddata/xcschemes/com.robotsandpencils.XcodesApp.Helper.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CA9FF8AD2595967A00E47BAF"
+               BuildableName = "com.xcodesorg.xcodesapp.Helper"
+               BlueprintName = "com.xcodesorg.xcodesapp.Helper"
+               ReferencedContainer = "container:Xcodes.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </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"
+      viewDebuggingEnabled = "No">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CA9FF8AD2595967A00E47BAF"
+            BuildableName = "com.xcodesorg.xcodesapp.Helper"
+            BlueprintName = "com.xcodesorg.xcodesapp.Helper"
+            ReferencedContainer = "container:Xcodes.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CA9FF8AD2595967A00E47BAF"
+            BuildableName = "com.xcodesorg.xcodesapp.Helper"
+            BlueprintName = "com.xcodesorg.xcodesapp.Helper"
+            ReferencedContainer = "container:Xcodes.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Xcodes/Resources/Info.plist b/Xcodes/Resources/Info.plist
index 733c89a7..8e15e9d1 100644
--- a/Xcodes/Resources/Info.plist
+++ b/Xcodes/Resources/Info.plist
@@ -34,8 +34,8 @@
 	<true/>
 	<key>SMPrivilegedExecutables</key>
 	<dict>
-		<key>com.robotsandpencils.XcodesApp.Helper</key>
-		<string>identifier &quot;com.robotsandpencils.XcodesApp.Helper&quot; and info [CFBundleShortVersionString] &gt;= &quot;1.0.0&quot; and anchor apple generic and certificate leaf[subject.OU] = &quot;$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)&quot;</string>
+		<key>com.xcodesorg.xcodesapp.Helper</key>
+		<string>identifier &quot;com.xcodesorg.xcodesapp.Helper&quot; and info [CFBundleShortVersionString] &gt;= &quot;1.0.0&quot; and anchor apple generic and certificate leaf[subject.OU] = &quot;$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)&quot;</string>
 	</dict>
 	<key>SUFeedURL</key>
 	<string>https://www.xcodes.app/appcast.xml</string>
diff --git a/com.robotsandpencils.XcodesApp.Helper/AuditTokenHack.h b/com.xcodesorg.xcodesapp.Helper/AuditTokenHack.h
similarity index 100%
rename from com.robotsandpencils.XcodesApp.Helper/AuditTokenHack.h
rename to com.xcodesorg.xcodesapp.Helper/AuditTokenHack.h
diff --git a/com.robotsandpencils.XcodesApp.Helper/AuditTokenHack.m b/com.xcodesorg.xcodesapp.Helper/AuditTokenHack.m
similarity index 100%
rename from com.robotsandpencils.XcodesApp.Helper/AuditTokenHack.m
rename to com.xcodesorg.xcodesapp.Helper/AuditTokenHack.m
diff --git a/com.robotsandpencils.XcodesApp.Helper/ConnectionVerifier.swift b/com.xcodesorg.xcodesapp.Helper/ConnectionVerifier.swift
similarity index 100%
rename from com.robotsandpencils.XcodesApp.Helper/ConnectionVerifier.swift
rename to com.xcodesorg.xcodesapp.Helper/ConnectionVerifier.swift
diff --git a/com.robotsandpencils.XcodesApp.Helper/Info.plist b/com.xcodesorg.xcodesapp.Helper/Info.plist
similarity index 70%
rename from com.robotsandpencils.XcodesApp.Helper/Info.plist
rename to com.xcodesorg.xcodesapp.Helper/Info.plist
index 2c54701c..feec3e05 100644
--- a/com.robotsandpencils.XcodesApp.Helper/Info.plist
+++ b/com.xcodesorg.xcodesapp.Helper/Info.plist
@@ -12,7 +12,7 @@
 	<string>$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)</string>
 	<key>SMAuthorizedClients</key>
 	<array>
-		<string>identifier "com.robotsandpencils.XcodesApp" and info [CFBundleShortVersionString] &gt;= "1.0.0" and anchor apple generic and certificate leaf[subject.OU] = "$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)"</string>
+		<string>identifier &quot;com.xcodesorg.xcodesapp&quot; and info [CFBundleShortVersionString] &gt;= &quot;1.0.0&quot; and anchor apple generic and certificate leaf[subject.OU] = &quot;$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)&quot;</string>
 	</array>
 </dict>
 </plist>
diff --git a/com.robotsandpencils.XcodesApp.Helper/Logger.swift b/com.xcodesorg.xcodesapp.Helper/Logger.swift
similarity index 100%
rename from com.robotsandpencils.XcodesApp.Helper/Logger.swift
rename to com.xcodesorg.xcodesapp.Helper/Logger.swift
diff --git a/com.robotsandpencils.XcodesApp.Helper/SimpleXPCApp.LICENSE b/com.xcodesorg.xcodesapp.Helper/SimpleXPCApp.LICENSE
similarity index 100%
rename from com.robotsandpencils.XcodesApp.Helper/SimpleXPCApp.LICENSE
rename to com.xcodesorg.xcodesapp.Helper/SimpleXPCApp.LICENSE
diff --git a/com.robotsandpencils.XcodesApp.Helper/XPCDelegate.swift b/com.xcodesorg.xcodesapp.Helper/XPCDelegate.swift
similarity index 100%
rename from com.robotsandpencils.XcodesApp.Helper/XPCDelegate.swift
rename to com.xcodesorg.xcodesapp.Helper/XPCDelegate.swift
diff --git a/com.robotsandpencils.XcodesApp.Helper/com.robotsandpencils.XcodesApp.Helper-Bridging-Header.h b/com.xcodesorg.xcodesapp.Helper/com.xcodesorg.xcodesapp.Helper-Bridging-Header.h
similarity index 100%
rename from com.robotsandpencils.XcodesApp.Helper/com.robotsandpencils.XcodesApp.Helper-Bridging-Header.h
rename to com.xcodesorg.xcodesapp.Helper/com.xcodesorg.xcodesapp.Helper-Bridging-Header.h
diff --git a/com.robotsandpencils.XcodesApp.Helper/com.robotsandpencils.XcodesApp.HelperTest.entitlements b/com.xcodesorg.xcodesapp.Helper/com.xcodesorg.xcodesapp.HelperTest.entitlements
similarity index 100%
rename from com.robotsandpencils.XcodesApp.Helper/com.robotsandpencils.XcodesApp.HelperTest.entitlements
rename to com.xcodesorg.xcodesapp.Helper/com.xcodesorg.xcodesapp.HelperTest.entitlements
diff --git a/com.robotsandpencils.XcodesApp.Helper/launchd.plist b/com.xcodesorg.xcodesapp.Helper/launchd.plist
similarity index 70%
rename from com.robotsandpencils.XcodesApp.Helper/launchd.plist
rename to com.xcodesorg.xcodesapp.Helper/launchd.plist
index 29f25594..c1484391 100644
--- a/com.robotsandpencils.XcodesApp.Helper/launchd.plist
+++ b/com.xcodesorg.xcodesapp.Helper/launchd.plist
@@ -3,10 +3,10 @@
 <plist version="1.0">
 <dict>
 	<key>Label</key>
-	<string>com.robotsandpencils.XcodesApp.Helper</string>
+	<string>com.xcodesorg.xcodesapp.Helper</string>
 	<key>MachServices</key>
 	<dict>
-		<key>com.robotsandpencils.XcodesApp.Helper</key>
+		<key>com.xcodesorg.xcodesapp.Helper</key>
 		<true/>
 	</dict>
 </dict>
diff --git a/com.robotsandpencils.XcodesApp.Helper/main.swift b/com.xcodesorg.xcodesapp.Helper/main.swift
similarity index 100%
rename from com.robotsandpencils.XcodesApp.Helper/main.swift
rename to com.xcodesorg.xcodesapp.Helper/main.swift