diff --git a/android/app/build.gradle b/android/app/build.gradle
index 893796e30..7089a2c76 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -106,7 +106,7 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     // Can't set this, since it causes issues to Official flavor
-    // namespace APPLICATION_ID 
+    namespace "chat.rocket.android"
     defaultConfig {
         applicationId APPLICATION_ID
         minSdkVersion rootProject.ext.minSdkVersion
@@ -118,7 +118,7 @@ android {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
             missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60" // See note below!
         }
-        resValue "string", "rn_config_reader_custom_package", "chat.rocket.reactnative"
+        resValue "string", "rn_config_reader_custom_package", APPLICATION_ID
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
diff --git a/android/app/src/androidTest/java/chat/rocket/reactnative/DetoxTest.java b/android/app/src/androidTest/java/chat/rocket/reactnative/DetoxTest.java
index 2c848e9a6..2d27bf238 100644
--- a/android/app/src/androidTest/java/chat/rocket/reactnative/DetoxTest.java
+++ b/android/app/src/androidTest/java/chat/rocket/reactnative/DetoxTest.java
@@ -1,5 +1,5 @@
 // Replace "com.example" here and below with your app's package name from the top of MainActivity.java
-package chat.rocket.reactnative;
+package chat.rocket.android;
 
 import com.wix.detox.Detox;
 import com.wix.detox.config.DetoxConfig;
@@ -18,14 +18,14 @@ public class DetoxTest {
     @Rule
     // Replace 'MainActivity' with the value of android:name entry in 
     // <activity> in AndroidManifest.xml
-    public ActivityTestRule<chat.rocket.reactnative.MainActivity> mActivityRule = new ActivityTestRule<>(chat.rocket.reactnative.MainActivity.class, false, false);
+    public ActivityTestRule<chat.rocket.android.MainActivity> mActivityRule = new ActivityTestRule<>(chat.rocket.android.MainActivity.class, false, false);
 
     @Test
     public void runDetoxTests() {
         DetoxConfig detoxConfig = new DetoxConfig();
         detoxConfig.idlePolicyConfig.masterTimeoutSec = 90;
         detoxConfig.idlePolicyConfig.idleResourceTimeoutSec = 60;
-        detoxConfig.rnContextLoadTimeoutSec = (chat.rocket.reactnative.BuildConfig.DEBUG ? 180 : 60);
+        detoxConfig.rnContextLoadTimeoutSec = (chat.rocket.android.BuildConfig.DEBUG ? 180 : 60);
 
         Detox.runTests(mActivityRule, detoxConfig);
     }
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index febfaf65f..73c83b3a5 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
-        android:name="chat.rocket.reactnative.MainDebugApplication"
+        android:name=".MainDebugApplication"
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:name"
         tools:targetApi="28"
diff --git a/android/app/src/debug/java/chat/rocket/reactnative/ReactNativeFlipper.java b/android/app/src/debug/java/chat/rocket/reactnative/ReactNativeFlipper.java
index 1cb53dd48..2d7490ba2 100644
--- a/android/app/src/debug/java/chat/rocket/reactnative/ReactNativeFlipper.java
+++ b/android/app/src/debug/java/chat/rocket/reactnative/ReactNativeFlipper.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.android;
 import android.content.Context;
 import com.facebook.flipper.android.AndroidFlipperClient;
 import com.facebook.flipper.android.utils.FlipperUtils;
diff --git a/android/app/src/foss/java/chat/rocket/reactnative/AdditionalModules.java b/android/app/src/foss/java/chat/rocket/reactnative/AdditionalModules.java
index b7f868cdc..8f369d394 100644
--- a/android/app/src/foss/java/chat/rocket/reactnative/AdditionalModules.java
+++ b/android/app/src/foss/java/chat/rocket/reactnative/AdditionalModules.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.android;
 
 import android.app.Application;
 
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index b1305bfd6..a10bf8ffc 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="chat.rocket.reactnative">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -15,7 +14,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     
     <application
-        android:name="chat.rocket.reactnative.MainApplication"
+        android:name=".MainApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -26,7 +25,7 @@
         android:hardwareAccelerated="true"
         tools:replace="android:allowBackup">
         <activity
-            android:name="chat.rocket.reactnative.MainActivity"
+            android:name=".MainActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
             android:exported="true"
             android:label="@string/app_name"
@@ -63,7 +62,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="chat.rocket.reactnative.share.ShareActivity"
+            android:name=".share.ShareActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:label="@string/share_extension_name"
             android:noHistory="true"
diff --git a/android/app/src/main/java/chat/rocket/reactnative/MainActivity.java b/android/app/src/main/java/chat/rocket/reactnative/MainActivity.java
index a515c6087..b41e6c2ff 100644
--- a/android/app/src/main/java/chat/rocket/reactnative/MainActivity.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/MainActivity.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.android;
 
 import android.content.Intent;
 import android.content.res.Configuration;
diff --git a/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java b/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java
index cc8ceebb9..be486cf0b 100644
--- a/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/MainApplication.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.android;
 
 import android.app.Application;
 
@@ -21,7 +21,7 @@ import expo.modules.ReactNativeHostWrapper;
 import java.util.Arrays;
 import java.util.List;
 
-import chat.rocket.reactnative.networking.SSLPinningPackage;
+import chat.rocket.android.networking.SSLPinningPackage;
 
 public class MainApplication extends Application implements ReactApplication {
 
diff --git a/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningModule.java b/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningModule.java
index aad807859..d7292c461 100644
--- a/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningModule.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningModule.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative.networking;
+package chat.rocket.android.networking;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
diff --git a/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningPackage.java b/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningPackage.java
index cc8492434..106b7afc9 100644
--- a/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningPackage.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningPackage.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative.networking;
+package chat.rocket.android.networking;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/android/app/src/main/java/chat/rocket/reactnative/share/ShareActivity.java b/android/app/src/main/java/chat/rocket/reactnative/share/ShareActivity.java
index 366efc3b8..e3ac3f1bf 100644
--- a/android/app/src/main/java/chat/rocket/reactnative/share/ShareActivity.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/share/ShareActivity.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative.share;
+package chat.rocket.android.share;
 
 import com.facebook.react.ReactActivity;
 
diff --git a/android/app/src/main/java/chat/rocket/reactnative/share/ShareApplication.java b/android/app/src/main/java/chat/rocket/reactnative/share/ShareApplication.java
index 94cd8b861..69d227e14 100644
--- a/android/app/src/main/java/chat/rocket/reactnative/share/ShareApplication.java
+++ b/android/app/src/main/java/chat/rocket/reactnative/share/ShareApplication.java
@@ -1,6 +1,6 @@
-package chat.rocket.reactnative.share;
+package chat.rocket.android.share;
 
-import chat.rocket.reactnative.BuildConfig;
+import chat.rocket.android.BuildConfig;
 
 import chat.rocket.SharePackage;
 
diff --git a/android/app/src/play/AndroidManifest.xml b/android/app/src/play/AndroidManifest.xml
index 969447240..b17607972 100644
--- a/android/app/src/play/AndroidManifest.xml
+++ b/android/app/src/play/AndroidManifest.xml
@@ -3,18 +3,18 @@
 		  xmlns:tools="http://schemas.android.com/tools">
 
 	<application
-		android:name="chat.rocket.reactnative.MainPlayApplication"
+		android:name=".MainPlayApplication"
 		android:label="@string/app_name"
 		android:icon="@mipmap/ic_launcher"
 		android:networkSecurityConfig="@xml/network_security_config"
 		tools:replace="android:name"
 	>
 		<receiver
-			android:name="chat.rocket.reactnative.ReplyBroadcast"
+			android:name=".ReplyBroadcast"
 			android:enabled="true"
 			android:exported="true" />
 		<receiver
-			android:name="chat.rocket.reactnative.DismissNotification"
+			android:name=".DismissNotification"
 			android:enabled="true"
 			android:exported="true" >
 		</receiver>
diff --git a/android/app/src/play/java/chat/rocket/reactnative/AdditionalModules.java b/android/app/src/play/java/chat/rocket/reactnative/AdditionalModules.java
index 5a32de49e..10ff25d79 100644
--- a/android/app/src/play/java/chat/rocket/reactnative/AdditionalModules.java
+++ b/android/app/src/play/java/chat/rocket/reactnative/AdditionalModules.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.android;
 
 import android.app.Application;
 
diff --git a/android/app/src/play/java/chat/rocket/reactnative/Callback.java b/android/app/src/play/java/chat/rocket/reactnative/Callback.java
index b94484eb8..9b48bd3a3 100644
--- a/android/app/src/play/java/chat/rocket/reactnative/Callback.java
+++ b/android/app/src/play/java/chat/rocket/reactnative/Callback.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.android;
 
 import android.os.Bundle;
 
diff --git a/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java b/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java
index 2232517ca..e9f6237b0 100644
--- a/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java
+++ b/android/app/src/play/java/chat/rocket/reactnative/CustomPushNotification.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.android;
 
 import static com.wix.reactnativenotifications.Defs.NOTIFICATION_RECEIVED_EVENT_NAME;
 
diff --git a/android/app/src/play/java/chat/rocket/reactnative/DismissNotification.java b/android/app/src/play/java/chat/rocket/reactnative/DismissNotification.java
index b43cf295d..6c8cafd34 100644
--- a/android/app/src/play/java/chat/rocket/reactnative/DismissNotification.java
+++ b/android/app/src/play/java/chat/rocket/reactnative/DismissNotification.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.android;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/android/app/src/play/java/chat/rocket/reactnative/Ejson.java b/android/app/src/play/java/chat/rocket/reactnative/Ejson.java
index fb083df13..88c7266a2 100644
--- a/android/app/src/play/java/chat/rocket/reactnative/Ejson.java
+++ b/android/app/src/play/java/chat/rocket/reactnative/Ejson.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.android;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.Callback;
diff --git a/android/app/src/play/java/chat/rocket/reactnative/Encryption.java b/android/app/src/play/java/chat/rocket/reactnative/Encryption.java
index 7ddab1979..941a39199 100644
--- a/android/app/src/play/java/chat/rocket/reactnative/Encryption.java
+++ b/android/app/src/play/java/chat/rocket/reactnative/Encryption.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.android;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/android/app/src/play/java/chat/rocket/reactnative/LoadNotification.java b/android/app/src/play/java/chat/rocket/reactnative/LoadNotification.java
index 0e75534cb..d6b6e5400 100644
--- a/android/app/src/play/java/chat/rocket/reactnative/LoadNotification.java
+++ b/android/app/src/play/java/chat/rocket/reactnative/LoadNotification.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.android;
 
 import android.os.Bundle;
 
diff --git a/android/app/src/play/java/chat/rocket/reactnative/MainPlayApplication.java b/android/app/src/play/java/chat/rocket/reactnative/MainPlayApplication.java
index 608d24f3a..6d5403b07 100644
--- a/android/app/src/play/java/chat/rocket/reactnative/MainPlayApplication.java
+++ b/android/app/src/play/java/chat/rocket/reactnative/MainPlayApplication.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.android;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/android/app/src/play/java/chat/rocket/reactnative/ReplyBroadcast.java b/android/app/src/play/java/chat/rocket/reactnative/ReplyBroadcast.java
index ef1579b51..4c6335448 100644
--- a/android/app/src/play/java/chat/rocket/reactnative/ReplyBroadcast.java
+++ b/android/app/src/play/java/chat/rocket/reactnative/ReplyBroadcast.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.android;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
diff --git a/android/app/src/release/java/chat/rocket/reactnative/ReactNativeFlipper.java b/android/app/src/release/java/chat/rocket/reactnative/ReactNativeFlipper.java
index cc80dd985..108c3dce8 100644
--- a/android/app/src/release/java/chat/rocket/reactnative/ReactNativeFlipper.java
+++ b/android/app/src/release/java/chat/rocket/reactnative/ReactNativeFlipper.java
@@ -1,4 +1,4 @@
-package chat.rocket.reactnative;
+package chat.rocket.android;
 import android.content.Context;
 import com.facebook.react.ReactInstanceManager;
 /**
diff --git a/android/gradle.properties b/android/gradle.properties
index fb13c4cab..572d98f95 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -42,7 +42,7 @@ newArchEnabled=false
 hermesEnabled=true
 
 # Application ID
-APPLICATION_ID=chat.rocket.reactnative
+APPLICATION_ID=chat.rocket.android
 
 # App properties
 VERSIONCODE=999999999