diff --git a/Fly App/README.md b/Fly App/README.md
index 38f706d..9845fc8 100644
--- a/Fly App/README.md	
+++ b/Fly App/README.md	
@@ -46,17 +46,29 @@ SDK registration will fail without a valid App Key bound to this app's
 application id.
 
 1. Sign in at <https://developer.dji.com/user/apps/> and create a new app.
-   - **Package name** must be exactly: `com.dji.flutter.dji_msdk_sample`
+   - **Package name** must be exactly: `com.pilotvault.flyapp`
    - SDK: **Mobile SDK**
 2. Copy the generated **App Key**.
-3. Paste it into [`android/gradle.properties`](android/gradle.properties):
+3. Put it in your **user-global** Gradle properties — *not* in the repo. Gradle
+   merges this file into every build, so the key stays off version control:
+
+   - Linux/macOS: `~/.gradle/gradle.properties`
+   - Windows: `%USERPROFILE%\.gradle\gradle.properties`
 
    ```properties
-   DJI_API_KEY=your_real_app_key_here
+   PILOTVAULT_FLY_API_KEY=your_real_app_key_here
+   ```
+
+   For a one-off build you can pass it inline instead:
+
+   ```bash
+   flutter build apk --debug -PPILOTVAULT_FLY_API_KEY=your_real_app_key_here
    ```
 
    The key is injected into `AndroidManifest.xml` at build time via a
-   `manifestPlaceholder` (`com.dji.sdk.API_KEY`).
+   `manifestPlaceholder` (`com.dji.sdk.API_KEY`). If it is missing the build
+   still succeeds but prints a warning, and SDK registration fails on the
+   aircraft — so watch for that warning.
 
 ## Run
 
diff --git a/Fly App/android/app/build.gradle b/Fly App/android/app/build.gradle
index 9805838..8411ad6 100644
--- a/Fly App/android/app/build.gradle	
+++ b/Fly App/android/app/build.gradle	
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    namespace = "com.dji.flutter.dji_msdk_sample"
+    namespace = "com.pilotvault.flyapp"
     compileSdk = 35
     // DJI MSDK V4 ships prebuilt native (.so) libraries; pin a known-good NDK.
     ndkVersion = flutter.ndkVersion
@@ -21,7 +21,7 @@ android {
     }
 
     defaultConfig {
-        applicationId = "com.dji.flutter.dji_msdk_sample"
+        applicationId = "com.pilotvault.flyapp"
         // DJI MSDK V4 requires Android 5.0+ (API 21).
         minSdkVersion = flutter.minSdkVersion
         targetSdk = 34
@@ -37,9 +37,24 @@ android {
         }
 
         // The DJI App Key is injected into AndroidManifest.xml at build time.
-        // Set DJI_API_KEY in android/gradle.properties (or pass -PDJI_API_KEY=...).
-        manifestPlaceholders["DJI_API_KEY"] =
-                (project.findProperty("DJI_API_KEY") ?: "PASTE_YOUR_DJI_APP_KEY_HERE")
+        // It is deliberately not stored in the repo — see android/gradle.properties
+        // for where to put it (~/.gradle/gradle.properties, or -P on the command
+        // line). Warn loudly when it is missing: the build still succeeds, but the
+        // resulting APK fails DJI SDK registration once it is on the aircraft.
+        // println, not logger.warn: `flutter build` filters Gradle's warn-level
+        // output, so a logger.warn here is never seen by the person building.
+        def djiAppKey = project.findProperty("PILOTVAULT_FLY_API_KEY")
+        if (!djiAppKey) {
+            println(
+                    "\n**************************************************************\n" +
+                    "WARNING: PILOTVAULT_FLY_API_KEY is not set.\n" +
+                    "The APK will build, but DJI SDK registration will FAIL at\n" +
+                    "runtime. Set the key in ~/.gradle/gradle.properties - see\n" +
+                    "android/gradle.properties for details.\n" +
+                    "**************************************************************\n")
+        }
+        manifestPlaceholders["PILOTVAULT_FLY_API_KEY"] =
+                (djiAppKey ?: "PASTE_YOUR_DJI_APP_KEY_HERE")
     }
 
     buildTypes {
diff --git a/Fly App/android/app/src/main/AndroidManifest.xml b/Fly App/android/app/src/main/AndroidManifest.xml
index 17f893a..e22900f 100644
--- a/Fly App/android/app/src/main/AndroidManifest.xml	
+++ b/Fly App/android/app/src/main/AndroidManifest.xml	
@@ -48,10 +48,12 @@
             android:name="org.apache.http.legacy"
             android:required="false" />
 
-        <!-- DJI App Key. The value is injected from gradle.properties (DJI_API_KEY). -->
+        <!-- DJI App Key. The value is injected from gradle.properties
+             (PILOTVAULT_FLY_API_KEY). The meta-data name below is fixed by the
+             DJI SDK and must stay "com.dji.sdk.API_KEY". -->
         <meta-data
             android:name="com.dji.sdk.API_KEY"
-            android:value="${DJI_API_KEY}" />
+            android:value="${PILOTVAULT_FLY_API_KEY}" />
 
         <activity
             android:name=".MainActivity"
diff --git a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/AccountBridge.kt b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/AccountBridge.kt
similarity index 98%
rename from Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/AccountBridge.kt
rename to Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/AccountBridge.kt
index 2fb2307..1a8105b 100644
--- a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/AccountBridge.kt	
+++ b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/AccountBridge.kt	
@@ -1,4 +1,4 @@
-package com.dji.flutter.dji_msdk_sample
+package com.pilotvault.flyapp
 
 import dji.common.error.DJIError
 import dji.common.useraccount.UserAccountState
diff --git a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/CameraBridge.kt b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/CameraBridge.kt
similarity index 99%
rename from Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/CameraBridge.kt
rename to Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/CameraBridge.kt
index f84b2b3..0c39309 100644
--- a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/CameraBridge.kt	
+++ b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/CameraBridge.kt	
@@ -1,4 +1,4 @@
-package com.dji.flutter.dji_msdk_sample
+package com.pilotvault.flyapp
 
 import dji.common.camera.ExposureSettings
 import dji.common.camera.SettingsDefinitions
diff --git a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/DjiApplication.kt b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/DjiApplication.kt
similarity index 94%
rename from Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/DjiApplication.kt
rename to Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/DjiApplication.kt
index e3a9b97..8632f81 100644
--- a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/DjiApplication.kt	
+++ b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/DjiApplication.kt	
@@ -1,4 +1,4 @@
-package com.dji.flutter.dji_msdk_sample
+package com.pilotvault.flyapp
 
 import android.app.Application
 import android.content.Context
diff --git a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/DjiSdkBridge.kt b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/DjiSdkBridge.kt
similarity index 99%
rename from Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/DjiSdkBridge.kt
rename to Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/DjiSdkBridge.kt
index 5e20f30..1ba429f 100644
--- a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/DjiSdkBridge.kt	
+++ b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/DjiSdkBridge.kt	
@@ -1,4 +1,4 @@
-package com.dji.flutter.dji_msdk_sample
+package com.pilotvault.flyapp
 
 import android.content.Context
 import android.os.Handler
diff --git a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/DjiVideoView.kt b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/DjiVideoView.kt
similarity index 98%
rename from Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/DjiVideoView.kt
rename to Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/DjiVideoView.kt
index 2546e10..dcf3262 100644
--- a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/DjiVideoView.kt	
+++ b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/DjiVideoView.kt	
@@ -1,4 +1,4 @@
-package com.dji.flutter.dji_msdk_sample
+package com.pilotvault.flyapp
 
 import android.content.Context
 import android.graphics.SurfaceTexture
diff --git a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/FlightControllerBridge.kt b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/FlightControllerBridge.kt
similarity index 99%
rename from Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/FlightControllerBridge.kt
rename to Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/FlightControllerBridge.kt
index 32d25ee..da44e10 100644
--- a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/FlightControllerBridge.kt	
+++ b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/FlightControllerBridge.kt	
@@ -1,4 +1,4 @@
-package com.dji.flutter.dji_msdk_sample
+package com.pilotvault.flyapp
 
 import dji.common.flightcontroller.FlightControllerState
 import dji.sdk.base.BaseProduct
diff --git a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/GimbalBridge.kt b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/GimbalBridge.kt
similarity index 97%
rename from Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/GimbalBridge.kt
rename to Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/GimbalBridge.kt
index f99d6c2..886bad0 100644
--- a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/GimbalBridge.kt	
+++ b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/GimbalBridge.kt	
@@ -1,4 +1,4 @@
-package com.dji.flutter.dji_msdk_sample
+package com.pilotvault.flyapp
 
 import dji.common.gimbal.Rotation
 import dji.common.gimbal.RotationMode
diff --git a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/MainActivity.kt b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/MainActivity.kt
similarity index 98%
rename from Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/MainActivity.kt
rename to Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/MainActivity.kt
index f98828d..7d01232 100644
--- a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/MainActivity.kt	
+++ b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/MainActivity.kt	
@@ -1,4 +1,4 @@
-package com.dji.flutter.dji_msdk_sample
+package com.pilotvault.flyapp
 
 import android.Manifest
 import android.content.pm.PackageManager
diff --git a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/MediaBridge.kt b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/MediaBridge.kt
similarity index 99%
rename from Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/MediaBridge.kt
rename to Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/MediaBridge.kt
index 344916e..7a4e250 100644
--- a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/MediaBridge.kt	
+++ b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/MediaBridge.kt	
@@ -1,4 +1,4 @@
-package com.dji.flutter.dji_msdk_sample
+package com.pilotvault.flyapp
 
 import android.graphics.Bitmap
 import dji.common.camera.SettingsDefinitions
diff --git a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/MissionBridge.kt b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/MissionBridge.kt
similarity index 99%
rename from Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/MissionBridge.kt
rename to Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/MissionBridge.kt
index 420f11e..c8f73c1 100644
--- a/Fly App/android/app/src/main/kotlin/com/dji/flutter/dji_msdk_sample/MissionBridge.kt	
+++ b/Fly App/android/app/src/main/kotlin/com/pilotvault/flyapp/MissionBridge.kt	
@@ -1,4 +1,4 @@
-package com.dji.flutter.dji_msdk_sample
+package com.pilotvault.flyapp
 
 import android.graphics.RectF
 import dji.common.mission.activetrack.ActiveTrackMission
diff --git a/Fly App/android/gradle.properties b/Fly App/android/gradle.properties
index 9423b29..e1c4f27 100644
--- a/Fly App/android/gradle.properties	
+++ b/Fly App/android/gradle.properties	
@@ -3,11 +3,18 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # DJI Mobile SDK
-# Register the application id "com.dji.flutter.dji_msdk_sample" at
-# https://developer.dji.com/user/apps/ to obtain an App Key, then paste it below.
-# This value is injected into AndroidManifest.xml via a manifestPlaceholder.
-# DJI_API_KEY=PASTE_YOUR_DJI_APP_KEY_HERE
-DJI_API_KEY=e427e182254c91013ba591e9
+# Register the application id "com.pilotvault.flyapp" at
+# https://developer.dji.com/user/apps/ to obtain an App Key. The key is injected
+# into AndroidManifest.xml via a manifestPlaceholder.
+#
+# The key is deliberately NOT stored in this file, because this file is tracked
+# in git. Put it in your user-global Gradle properties instead, which Gradle
+# merges into every build:
+#
+#   ~/.gradle/gradle.properties        (Windows: %USERPROFILE%\.gradle\)
+#   PILOTVAULT_FLY_API_KEY=your_app_key_here
+#
+# Or pass it per-invocation: -PPILOTVAULT_FLY_API_KEY=your_app_key_here
 # This builtInKotlin flag was added automatically by Flutter migrator
 android.builtInKotlin=false
 # This newDsl flag was added automatically by Flutter migrator
diff --git a/Fly App/backup_pocketbase_app/pubspec_pocketbase.yaml b/Fly App/backup_pocketbase_app/pubspec_pocketbase.yaml
index 69fa4d5..962387a 100644
--- a/Fly App/backup_pocketbase_app/pubspec_pocketbase.yaml	
+++ b/Fly App/backup_pocketbase_app/pubspec_pocketbase.yaml	
@@ -1,4 +1,4 @@
-name: dji_msdk_sample
+name: pilotvault_fly
 description: "DJI Mobile SDK V4 sample app built with Flutter"
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
diff --git a/Fly App/lib/ui/map_page.dart b/Fly App/lib/ui/map_page.dart
index c15fa57..b3ecb18 100644
--- a/Fly App/lib/ui/map_page.dart	
+++ b/Fly App/lib/ui/map_page.dart	
@@ -82,7 +82,7 @@ class _MapPageState extends State<MapPage> {
           children: <Widget>[
             TileLayer(
               urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
-              userAgentPackageName: 'com.dji.flutter.dji_msdk_sample',
+              userAgentPackageName: 'com.pilotvault.flyapp',
             ),
             if (_waypoints.length >= 2)
               PolylineLayer<Object>(polylines: <Polyline<Object>>[
diff --git a/Fly App/pubspec.yaml b/Fly App/pubspec.yaml
index 318372f..fab581d 100644
--- a/Fly App/pubspec.yaml	
+++ b/Fly App/pubspec.yaml	
@@ -1,4 +1,4 @@
-name: dji_msdk_sample
+name: pilotvault_fly
 description: "PilotVault Fly App — drone telemetry client built with Flutter (DJI Mobile SDK V4)"
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
diff --git a/Fly App/test/widget_test.dart b/Fly App/test/widget_test.dart
index 99884a8..5af8e12 100644
--- a/Fly App/test/widget_test.dart	
+++ b/Fly App/test/widget_test.dart	
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:dji_msdk_sample/main.dart';
+import 'package:pilotvault_fly/main.dart';
 
 void main() {
   testWidgets('Shows the login screen when signed out',