diff --git a/safeDispatch/build.gradle b/safeDispatch/build.gradle
index 11bd364..94cc018 100644
--- a/safeDispatch/build.gradle
+++ b/safeDispatch/build.gradle
@@ -25,7 +25,7 @@ android {
     buildToolsVersion "31.0.0"
 
     defaultConfig {
-        applicationId "com.safemobile.dispatch"
+        applicationId "com.safemobile.safedispatch"
         minSdkVersion 21
         targetSdkVersion 31
         versionName androidGitVersion.name()
diff --git a/safeDispatch/release/SafeDispatchMobile_v.8.0.35-release.aab b/safeDispatch/release/SafeDispatchMobile_v.8.0.35-release.aab
new file mode 100644
index 0000000..f3928fb
Binary files /dev/null and b/safeDispatch/release/SafeDispatchMobile_v.8.0.35-release.aab differ
diff --git a/safeDispatch/release/output-metadata.json b/safeDispatch/release/output-metadata.json
index 22939f8..62e52b3 100644
--- a/safeDispatch/release/output-metadata.json
+++ b/safeDispatch/release/output-metadata.json
@@ -4,16 +4,16 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "com.safemobile.dispatch",
+  "applicationId": "com.safemobile.safedispatch",
   "variantName": "release",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 8000033,
-      "versionName": "8.0.33",
-      "outputFile": "SafeDispatchMobile_v.8.0.33-release.apk"
+      "versionCode": 8000035,
+      "versionName": "8.0.35",
+      "outputFile": "SafeDispatchMobile_v.8.0.35-release.apk"
     }
   ],
   "elementType": "File"
diff --git a/safeDispatch/src/main/AndroidManifest.xml b/safeDispatch/src/main/AndroidManifest.xml
index 14cf37f..cb9d383 100644
--- a/safeDispatch/src/main/AndroidManifest.xml
+++ b/safeDispatch/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.safemobile.dispatch">
+    package="com.safemobile.safedispatch">
 
     <!-- require OpenGL ES version 2 for Google Maps -->
     <uses-feature
@@ -40,7 +40,7 @@
         <service android:name="com.safemobile.services.TCPService" />
 
         <activity
-            android:name=".SDMobileActivity"
+            android:name="com.safemobile.safedispatch.SDMobileActivity"
             android:configChanges="orientation"
             android:exported="true"
             android:label="@string/app_name_demo"
@@ -52,41 +52,41 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".SetupActivity"
+            android:name="com.safemobile.safedispatch.SetupActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".TabLayoutActivity"
+            android:name="com.safemobile.safedispatch.TabLayoutActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".LiveActivity"
+            android:name="com.safemobile.safedispatch.LiveActivity"
             android:exported="false"
             android:configChanges="orientation"
             android:screenOrientation="landscape"
             android:label="@string/title_activity_google_maps" />
         <activity
-            android:name=".HistoryActivity"
+            android:name="com.safemobile.safedispatch.HistoryActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".MessagesActivity"
+            android:name="com.safemobile.safedispatch.MessagesActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".AlarmActivity"
+            android:name="com.safemobile.safedispatch.AlarmActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".RadioActivity"
+            android:name="com.safemobile.safedispatch.RadioActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".RecordingsActivity"
+            android:name="com.safemobile.safedispatch.RecordingsActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".NotificationActivity"
+            android:name="com.safemobile.safedispatch.NotificationActivity"
             android:configChanges="orientation"
             android:screenOrientation="landscape" />
     </application>
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/AlarmActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/AlarmActivity.java
similarity index 99%
rename from safeDispatch/src/main/java/com/safemobile/dispatch/AlarmActivity.java
rename to safeDispatch/src/main/java/com/safemobile/safedispatch/AlarmActivity.java
index 70631e5..84e6be6 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/AlarmActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/AlarmActivity.java
@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import java.util.ArrayList;
 import java.util.Locale;
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/GoogleMapsInfoBubble.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/GoogleMapsInfoBubble.java
similarity index 99%
rename from safeDispatch/src/main/java/com/safemobile/dispatch/GoogleMapsInfoBubble.java
rename to safeDispatch/src/main/java/com/safemobile/safedispatch/GoogleMapsInfoBubble.java
index c3ac8cb..de11ea3 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/GoogleMapsInfoBubble.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/GoogleMapsInfoBubble.java
@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.content.Context;
 import android.util.Log;
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/HistoryActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/HistoryActivity.java
similarity index 99%
rename from safeDispatch/src/main/java/com/safemobile/dispatch/HistoryActivity.java
rename to safeDispatch/src/main/java/com/safemobile/safedispatch/HistoryActivity.java
index e205be8..9ac7e70 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/HistoryActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/HistoryActivity.java
@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/IconContextMenu.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/IconContextMenu.java
similarity index 99%
rename from safeDispatch/src/main/java/com/safemobile/dispatch/IconContextMenu.java
rename to safeDispatch/src/main/java/com/safemobile/safedispatch/IconContextMenu.java
index bcd2fae..1c67c8d 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/IconContextMenu.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/IconContextMenu.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import java.util.ArrayList;
 
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/LiveActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/LiveActivity.java
similarity index 99%
rename from safeDispatch/src/main/java/com/safemobile/dispatch/LiveActivity.java
rename to safeDispatch/src/main/java/com/safemobile/safedispatch/LiveActivity.java
index 34d0e31..8f64e51 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/LiveActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/LiveActivity.java
@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/MapDemo.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/MapDemo.java
similarity index 88%
rename from safeDispatch/src/main/java/com/safemobile/dispatch/MapDemo.java
rename to safeDispatch/src/main/java/com/safemobile/safedispatch/MapDemo.java
index cee9e0c..696607f 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/MapDemo.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/MapDemo.java
@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.os.Bundle;
 import androidx.fragment.app.FragmentActivity;
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/MessagesActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/MessagesActivity.java
similarity index 99%
rename from safeDispatch/src/main/java/com/safemobile/dispatch/MessagesActivity.java
rename to safeDispatch/src/main/java/com/safemobile/safedispatch/MessagesActivity.java
index b40e85d..00ae4a3 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/MessagesActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/MessagesActivity.java
@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/NotificationActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/NotificationActivity.java
similarity index 96%
rename from safeDispatch/src/main/java/com/safemobile/dispatch/NotificationActivity.java
rename to safeDispatch/src/main/java/com/safemobile/safedispatch/NotificationActivity.java
index c775a3b..a64d418 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/NotificationActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/NotificationActivity.java
@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/RadioActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/RadioActivity.java
similarity index 99%
rename from safeDispatch/src/main/java/com/safemobile/dispatch/RadioActivity.java
rename to safeDispatch/src/main/java/com/safemobile/safedispatch/RadioActivity.java
index edf82b5..95d83e3 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/RadioActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/RadioActivity.java
@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/RecordingsActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/RecordingsActivity.java
similarity index 99%
rename from safeDispatch/src/main/java/com/safemobile/dispatch/RecordingsActivity.java
rename to safeDispatch/src/main/java/com/safemobile/safedispatch/RecordingsActivity.java
index 39d4049..d394205 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/RecordingsActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/RecordingsActivity.java
@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/SDMobileActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity.java
similarity index 99%
rename from safeDispatch/src/main/java/com/safemobile/dispatch/SDMobileActivity.java
rename to safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity.java
index 20484f1..540b80d 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/SDMobileActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity.java
@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/SDMobileActivity_beforeMod.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity_beforeMod.java
similarity index 99%
rename from safeDispatch/src/main/java/com/safemobile/dispatch/SDMobileActivity_beforeMod.java
rename to safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity_beforeMod.java
index 630f4d9..a1a4d8b 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/SDMobileActivity_beforeMod.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity_beforeMod.java
@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/SetupActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/SetupActivity.java
similarity index 99%
rename from safeDispatch/src/main/java/com/safemobile/dispatch/SetupActivity.java
rename to safeDispatch/src/main/java/com/safemobile/safedispatch/SetupActivity.java
index 37a2450..6d7ad82 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/SetupActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/SetupActivity.java
@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import java.util.Locale;
 
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/TabLayoutActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
similarity index 99%
rename from safeDispatch/src/main/java/com/safemobile/dispatch/TabLayoutActivity.java
rename to safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
index 1e31c99..e50b788 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/TabLayoutActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
@@ -1,4 +1,4 @@
-package com.safemobile.dispatch;
+package com.safemobile.safedispatch;
 
 import java.io.BufferedReader;
 import java.io.IOException;