diff --git a/AltStore.xcconfig b/AltStore.xcconfig
index f8172a13..63f7cd6f 100644
--- a/AltStore.xcconfig
+++ b/AltStore.xcconfig
@@ -1,3 +1,3 @@
 #include "Build.xcconfig"
 
-PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).AltStore
+PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).SideStore
diff --git a/AltStore/Operations/FetchProvisioningProfilesOperation.swift b/AltStore/Operations/FetchProvisioningProfilesOperation.swift
index d4f9bd8e..d2ce34d5 100644
--- a/AltStore/Operations/FetchProvisioningProfilesOperation.swift
+++ b/AltStore/Operations/FetchProvisioningProfilesOperation.swift
@@ -136,7 +136,7 @@ extension FetchProvisioningProfilesOperation
                 if app.isAltStoreApp
                 {
                     // Use legacy bundle ID format for AltStore.
-                    preferredBundleID = "com.\(team.identifier).\(app.bundleIdentifier)"
+                    preferredBundleID = teamsMatch ? installedApp.resignedBundleIdentifier : nil
                 }
                 else
                 {
@@ -181,7 +181,7 @@ extension FetchProvisioningProfilesOperation
                 if app.isAltStoreApp
                 {
                     // Use legacy bundle ID format for AltStore (and its extensions).
-                    updatedParentBundleID = "com.\(team.identifier).\(parentBundleID)"
+                    updatedParentBundleID = parentBundleID + "." + team.identifier // Append just team identifier to make it harder to track.
                 }
                 else
                 {
diff --git a/Build.xcconfig b/Build.xcconfig
index 48eedee6..ce0dc1b7 100644
--- a/Build.xcconfig
+++ b/Build.xcconfig
@@ -6,7 +6,7 @@ CURRENT_PROJECT_VERSION = 3001
 
 // Vars to be overwritten by `CodeSigning.xcconfig` if exists
 DEVELOPMENT_TEAM = S32Z3HMYVQ
-ORG_IDENTIFIER = com.joemattiello
+ORG_IDENTIFIER = com.SideStore
 
 // Codesigning settings defined optionally, see `CodeSigning.xcconfig.example`
 #include? "CodeSigning.xcconfig"
@@ -16,8 +16,8 @@ ORG_PREFIX = $(ORG_IDENTIFIER)
 PRODUCT_NAME = SideStore
 //PRODUCT_NAME[configuration=Debug] = Prov Debug
 
-PRODUCT_BUNDLE_IDENTIFIER   = $(ORG_PREFIX).$(PROJECT_NAME)
+PRODUCT_BUNDLE_IDENTIFIER   = $(ORG_PREFIX).SideStore
 //PRODUCT_BUNDLE_IDENTIFIER[configuration=Debug] = $(ORG_PREFIX).$(PROJECT_NAME:lower)-debug
 
-APP_GROUP_IDENTIFIER        = $(ORG_PREFIX).$(PROJECT_NAME)
+APP_GROUP_IDENTIFIER        = $(ORG_PREFIX).SideStore
 ICLOUD_CONTAINER_IDENTIFIER = iCloud.$(ORG_PREFIX).$(PROJECT_NAME)
diff --git a/Shared/Extensions/Bundle+AltStore.swift b/Shared/Extensions/Bundle+AltStore.swift
index 0a998fd5..88e73b66 100644
--- a/Shared/Extensions/Bundle+AltStore.swift
+++ b/Shared/Extensions/Bundle+AltStore.swift
@@ -53,7 +53,7 @@ public extension Bundle
 
 public extension Bundle
 {
-    static var baseAltStoreAppGroupID = "group.com.rileytestut.AltStore"
+    static var baseAltStoreAppGroupID = "group.com.SideStore.SideStore"
     
     var appGroups: [String] {
         return self.infoDictionary?[Bundle.Info.appGroups] as? [String] ?? []