diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 2ff6029..534145b 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="false">
         <activity
-            android:name="com.example.syncrow_app.MainActivity"
+            android:name="com.syncrow.mobile.MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
diff --git a/android/app/src/main/kotlin/com/example/syncrow_app/MainActivity.kt b/android/app/src/main/kotlin/com/example/syncrow_app/MainActivity.kt
index 1e03aee..54675a7 100644
--- a/android/app/src/main/kotlin/com/example/syncrow_app/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/example/syncrow_app/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.syncrow_application
+package com.syncrow.mobile
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/lib/firebase_options.dart b/lib/firebase_options.dart
index 4d4d3c1..3c3efb9 100644
--- a/lib/firebase_options.dart
+++ b/lib/firebase_options.dart
@@ -17,8 +17,7 @@ import 'package:syncrow_app/firebase_options_staging.dart' as staging;
 /// );
 /// ```
 class DefaultFirebaseOptions {
-  static FirebaseOptions get currentPlatform {
-    const flavor = String.fromEnvironment('flavor');
+  static FirebaseOptions currentPlatform(String flavor) {
     if (kIsWeb) {
       throw UnsupportedError(
         'DefaultFirebaseOptions have not been configured for web - '
@@ -30,12 +29,13 @@ class DefaultFirebaseOptions {
         return dev.DefaultFirebaseOptions.currentPlatform;
       case 'staging':
         return staging.DefaultFirebaseOptions.currentPlatform;
-      case 'prod':
+      case 'production':
         return prod.DefaultFirebaseOptions.currentPlatform;
       default:
-        throw UnsupportedError(
-          'DefaultFirebaseOptions are not supported for this flavor.',
-        );
+      throw UnsupportedError(
+        'DefaultFirebaseOptions have not been configured for web - '
+        'you can reconfigure this by running the FlutterFire CLI again.',
+      );
     }
   }
 }
diff --git a/lib/firebase_options_dev.dart b/lib/firebase_options_dev.dart
index bba6dbd..2d7fd66 100644
--- a/lib/firebase_options_dev.dart
+++ b/lib/firebase_options_dev.dart
@@ -73,6 +73,6 @@ class DefaultFirebaseOptions {
     projectId: 'syncrow-prod-79446',
     databaseURL: 'https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/',
     storageBucket: 'syncrow-prod-79446.firebasestorage.app',
-    iosBundleId: 'com.syncrow.mobile.dev',
+    iosBundleId: 'com.syncrow.iot.ex.dev',
   );
 }
diff --git a/lib/firebase_options_prod.dart b/lib/firebase_options_prod.dart
index 7050e8f..150553c 100644
--- a/lib/firebase_options_prod.dart
+++ b/lib/firebase_options_prod.dart
@@ -62,7 +62,7 @@ class DefaultFirebaseOptions {
     projectId: 'syncrow-staging',
     databaseURL: 'https://syncrow-prod-79446.asia-southeast1.firebasedatabase.app/',
     storageBucket: 'syncrow-staging.appspot.com',
-    iosBundleId: 'com.example.syncrow.app',
+    iosBundleId: 'com.syncrow.iot.ex',
   );
 
   static const FirebaseOptions web = FirebaseOptions(
diff --git a/lib/firebase_options_staging.dart b/lib/firebase_options_staging.dart
index 9fea94e..ddfe982 100644
--- a/lib/firebase_options_staging.dart
+++ b/lib/firebase_options_staging.dart
@@ -73,6 +73,6 @@ class DefaultFirebaseOptions {
     projectId: 'syncrow-prod-79446',
     databaseURL: 'https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/',
     storageBucket: 'syncrow-prod-79446.firebasestorage.app',
-    iosBundleId: 'com.syncrow.mobile.staging',
+    iosBundleId: 'com.syncrow.iot.ex.staging',
   );
 }
diff --git a/lib/main.dart b/lib/main.dart
index 9a48571..07acfc0 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -42,7 +42,8 @@ void main() {
     initialSetup();
 
     await Firebase.initializeApp(
-      options: DefaultFirebaseOptions.currentPlatform,
+      options: DefaultFirebaseOptions.currentPlatform('production'),
+      name: 'syncrow_app',
     );
 
     //final SharedPreferences prefs = await SharedPreferences.getInstance();
diff --git a/lib/main_dev.dart b/lib/main_dev.dart
index e2b171a..871a999 100644
--- a/lib/main_dev.dart
+++ b/lib/main_dev.dart
@@ -40,7 +40,8 @@ void main() {
     initialSetup();
 
     await Firebase.initializeApp(
-      options: DefaultFirebaseOptions.currentPlatform,
+      options: DefaultFirebaseOptions.currentPlatform('dev'),
+      name: 'syncrow_app',
     );
 
     //final SharedPreferences prefs = await SharedPreferences.getInstance();
diff --git a/lib/main_staging.dart b/lib/main_staging.dart
index 2fe60d3..25f060f 100644
--- a/lib/main_staging.dart
+++ b/lib/main_staging.dart
@@ -5,11 +5,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:permission_handler/permission_handler.dart';
-import 'package:syncrow_app/firebase_options_staging.dart';
 import 'package:syncrow_app/services/locator.dart';
 import 'package:syncrow_app/utils/bloc_observer.dart';
 import 'package:syncrow_app/utils/helpers/localization_helpers.dart';
 
+import 'firebase_options.dart';
 import 'my_app.dart';
 
 void main() {
@@ -40,7 +40,8 @@ void main() {
     initialSetup();
 
     await Firebase.initializeApp(
-      options: DefaultFirebaseOptions.currentPlatform,
+      options: DefaultFirebaseOptions.currentPlatform('staging'),
+      name: 'syncrow_app',
     );
 
     //final SharedPreferences prefs = await SharedPreferences.getInstance();