diff --git a/WireGuard.xcodeproj/project.pbxproj b/WireGuard.xcodeproj/project.pbxproj
index d9be511..832b347 100644
--- a/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard.xcodeproj/project.pbxproj
@@ -791,7 +791,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios.WireGuard;
+				PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h";
@@ -817,7 +817,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios.WireGuard;
+				PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h";
@@ -885,7 +885,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/wireguard-go-bridge",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios.WireGuard.WireGuardNetworkExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios.WireGuardNetworkExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
@@ -914,7 +914,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/wireguard-go-bridge",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios.WireGuard.WireGuardNetworkExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.wireguard.ios.WireGuardNetworkExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
diff --git a/WireGuard/Coordinators/AppCoordinator.swift b/WireGuard/Coordinators/AppCoordinator.swift
index 02ea4e8..7038053 100644
--- a/WireGuard/Coordinators/AppCoordinator.swift
+++ b/WireGuard/Coordinators/AppCoordinator.swift
@@ -21,8 +21,8 @@ enum AppCoordinatorError: Error {
 
 extension UINavigationController: Identifyable {}
 
-let APPGROUP = "group.com.wireguard.ios.WireGuard"
-let VPNBUNDLE = "com.wireguard.ios.WireGuard.WireGuardNetworkExtension"
+let APPGROUP = "group.com.wireguard.ios"
+let VPNBUNDLE = "com.wireguard.ios.WireGuardNetworkExtension"
 
 class AppCoordinator: RootViewCoordinator {
 
diff --git a/WireGuard/Log.swift b/WireGuard/Log.swift
index 1739155..06823e8 100644
--- a/WireGuard/Log.swift
+++ b/WireGuard/Log.swift
@@ -9,5 +9,5 @@
 import os.log
 
 struct Log {
-    static var general = OSLog(subsystem: "com.wireguard.ios.WireGuard", category: "general")
+    static var general = OSLog(subsystem: "com.wireguard.ios", category: "general")
 }
diff --git a/WireGuard/WireGuard.entitlements b/WireGuard/WireGuard.entitlements
index 001f478..a4774c6 100644
--- a/WireGuard/WireGuard.entitlements
+++ b/WireGuard/WireGuard.entitlements
@@ -8,11 +8,11 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.wireguard.ios.WireGuard</string>
+		<string>group.com.wireguard.ios</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)com.wireguard.ios.WireGuard</string>
+		<string>$(AppIdentifierPrefix)com.wireguard.ios</string>
 	</array>
 </dict>
 </plist>
diff --git a/WireGuardNetworkExtension/Log.swift b/WireGuardNetworkExtension/Log.swift
index 8b529ff..a35f308 100644
--- a/WireGuardNetworkExtension/Log.swift
+++ b/WireGuardNetworkExtension/Log.swift
@@ -9,5 +9,5 @@
 import os.log
 
 struct Log {
-    static var general = OSLog(subsystem: "com.wireguard.ios.WireGuard.WireGuardNetworkExtension", category: "general")
+    static var general = OSLog(subsystem: "com.wireguard.ios.WireGuardNetworkExtension", category: "general")
 }
diff --git a/WireGuardNetworkExtension/WireGuardNetworkExtension.entitlements b/WireGuardNetworkExtension/WireGuardNetworkExtension.entitlements
index 9022e82..a4774c6 100644
--- a/WireGuardNetworkExtension/WireGuardNetworkExtension.entitlements
+++ b/WireGuardNetworkExtension/WireGuardNetworkExtension.entitlements
@@ -8,11 +8,11 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>com.wireguard.ios.WireGuard</string>
+		<string>group.com.wireguard.ios</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)com.wireguard.ios.WireGuard</string>
+		<string>$(AppIdentifierPrefix)com.wireguard.ios</string>
 	</array>
 </dict>
 </plist>