diff --git a/__e2e__/flows/composer-self-label.yml b/__e2e__/flows/composer-self-label.yml
index 816cbc6511..535eb69bc5 100644
--- a/__e2e__/flows/composer-self-label.yml
+++ b/__e2e__/flows/composer-self-label.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/flows/composer.yml b/__e2e__/flows/composer.yml
index 0196e6a873..bf64f2cdf9 100644
--- a/__e2e__/flows/composer.yml
+++ b/__e2e__/flows/composer.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/flows/create-account.yml b/__e2e__/flows/create-account.yml
index dbdf02eb47..a512754ad5 100644
--- a/__e2e__/flows/create-account.yml
+++ b/__e2e__/flows/create-account.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/flows/curate-lists.yml b/__e2e__/flows/curate-lists.yml
index a412886b88..5ac9053675 100644
--- a/__e2e__/flows/curate-lists.yml
+++ b/__e2e__/flows/curate-lists.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/flows/feed-reorder.yml b/__e2e__/flows/feed-reorder.yml
index a68f204120..c39425b0cc 100644
--- a/__e2e__/flows/feed-reorder.yml
+++ b/__e2e__/flows/feed-reorder.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/flows/home-screen.yml b/__e2e__/flows/home-screen.yml
index 188139910b..f2792047b3 100644
--- a/__e2e__/flows/home-screen.yml
+++ b/__e2e__/flows/home-screen.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/flows/login.yml b/__e2e__/flows/login.yml
index 683f9ec3da..95c34205e5 100644
--- a/__e2e__/flows/login.yml
+++ b/__e2e__/flows/login.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/flows/mod-lists.yml b/__e2e__/flows/mod-lists.yml
index 98979e1863..9389eaab4c 100644
--- a/__e2e__/flows/mod-lists.yml
+++ b/__e2e__/flows/mod-lists.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/flows/onboarding-avatar-creator.yml b/__e2e__/flows/onboarding-avatar-creator.yml
index c0221bbdea..bf7bad4bfc 100644
--- a/__e2e__/flows/onboarding-avatar-creator.yml
+++ b/__e2e__/flows/onboarding-avatar-creator.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/flows/onboarding.yml b/__e2e__/flows/onboarding.yml
index 23c1ae8468..6d58ba0fcc 100644
--- a/__e2e__/flows/onboarding.yml
+++ b/__e2e__/flows/onboarding.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/flows/profile-screen-edit.yml b/__e2e__/flows/profile-screen-edit.yml
index 65a037e2ef..2a80258d23 100644
--- a/__e2e__/flows/profile-screen-edit.yml
+++ b/__e2e__/flows/profile-screen-edit.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/flows/profile-screen.yml b/__e2e__/flows/profile-screen.yml
index f4f8252251..ffdcd23aa6 100644
--- a/__e2e__/flows/profile-screen.yml
+++ b/__e2e__/flows/profile-screen.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/flows/search-screen.yml b/__e2e__/flows/search-screen.yml
index 1952e374f3..1943631f8a 100644
--- a/__e2e__/flows/search-screen.yml
+++ b/__e2e__/flows/search-screen.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/flows/thread-muting.yml b/__e2e__/flows/thread-muting.yml
index 093d1106c5..9cb607f2de 100644
--- a/__e2e__/flows/thread-muting.yml
+++ b/__e2e__/flows/thread-muting.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/flows/thread-screen.yml b/__e2e__/flows/thread-screen.yml
index 9245f04618..4ee4ebf666 100644
--- a/__e2e__/flows/thread-screen.yml
+++ b/__e2e__/flows/thread-screen.yml
@@ -1,4 +1,4 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - runScript:
     file: ../setupServer.js
diff --git a/__e2e__/perf-test.yml b/__e2e__/perf-test.yml
index aa14026d66..2856f4420b 100644
--- a/__e2e__/perf-test.yml
+++ b/__e2e__/perf-test.yml
@@ -1,6 +1,6 @@
 # flow.yaml
 
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - launchApp
 # Login
diff --git a/__e2e__/setupApp.yml b/__e2e__/setupApp.yml
index f4f098dbb1..9468d20648 100644
--- a/__e2e__/setupApp.yml
+++ b/__e2e__/setupApp.yml
@@ -1,7 +1,7 @@
-appId: xyz.blueskyweb.app.dev
+appId: dev.xyz.blueskyweb.app
 ---
 - launchApp:
-    appId: "xyz.blueskyweb.app.dev"
+    appId: "dev.xyz.blueskyweb.app"
     clearState: true
 - waitForAnimationToEnd
 - tapOn: "http://localhost:8081"
diff --git a/app.config.js b/app.config.js
index c6242c8708..05590e883a 100644
--- a/app.config.js
+++ b/app.config.js
@@ -47,7 +47,7 @@ module.exports = function (_config) {
       ios: {
         supportsTablet: false,
         bundleIdentifier: IS_DEV
-          ? 'xyz.blueskyweb.app.dev'
+          ? 'dev.xyz.blueskyweb.app'
           : 'xyz.blueskyweb.app',
         config: {
           usesNonExemptEncryption: false,
@@ -186,7 +186,7 @@ module.exports = function (_config) {
         googleServicesFile: IS_DEV
           ? './google-services-dev.json'
           : './google-services.json',
-        package: IS_DEV ? 'xyz.blueskyweb.app.dev' : 'xyz.blueskyweb.app',
+        package: IS_DEV ? 'dev.xyz.blueskyweb.app' : 'xyz.blueskyweb.app',
         intentFilters: [
           {
             action: 'VIEW',
@@ -412,7 +412,7 @@ module.exports = function (_config) {
                       ? 'Share-with-Bluesky-Dev'
                       : 'Share-with-Bluesky',
                     bundleIdentifier: IS_DEV
-                      ? 'xyz.blueskyweb.app.dev.Share-with-Bluesky'
+                      ? 'dev.xyz.blueskyweb.app.Share-with-Bluesky'
                       : 'xyz.blueskyweb.app.Share-with-Bluesky',
                     entitlements: {
                       'com.apple.security.application-groups': [
@@ -423,7 +423,7 @@ module.exports = function (_config) {
                   {
                     targetName: 'BlueskyNSE-Dev',
                     bundleIdentifier: IS_DEV
-                      ? 'xyz.blueskyweb.app.dev.BlueskyNSE'
+                      ? 'dev.xyz.blueskyweb.app.BlueskyNSE'
                       : 'xyz.blueskyweb.app.BlueskyNSE',
                     entitlements: {
                       'com.apple.security.application-groups': [
diff --git a/google-services-dev.json.example b/google-services-dev.json.example
index 07350e82a0..49acd99796 100644
--- a/google-services-dev.json.example
+++ b/google-services-dev.json.example
@@ -9,7 +9,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063",
         "android_client_info": {
-          "package_name": "xyz.blueskyweb.app.dev"
+          "package_name": "dev.xyz.blueskyweb.app"
         }
       },
       "oauth_client": [
diff --git a/package.json b/package.json
index a9977bef62..0fcf6dba9e 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "e2e:run": "maestro test __e2e__",
     "perf:test": "NODE_ENV=test maestro test",
     "perf:test:run": "NODE_ENV=test maestro test __e2e__/perf-test.yml",
-    "perf:test:measure": "NODE_ENV=test flashlight test --bundleId xyz.blueskyweb.app.dev --testCommand \"yarn perf:test\" --duration 150000 --resultsFilePath .perf/results.json",
+    "perf:test:measure": "NODE_ENV=test flashlight test --bundleId dev.xyz.blueskyweb.app --testCommand \"yarn perf:test\" --duration 150000 --resultsFilePath .perf/results.json",
     "perf:test:results": "NODE_ENV=test flashlight report .perf/results.json",
     "perf:measure": "NODE_ENV=test flashlight measure",
     "intl:build": "yarn intl:extract:all && yarn intl:compile",