diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index fd4ed4a6..400b7322 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -225,7 +225,7 @@ android {
         }
     }
 
-    namespace = "com.powersync"
+    namespace = "com.powersync.common"
     compileSdk =
         libs.versions.android.compileSdk
             .get()
diff --git a/common/src/androidMain/kotlin/BuildConfig.kt b/common/src/androidMain/kotlin/BuildConfig.kt
index f52fcaa8..51f1208d 100644
--- a/common/src/androidMain/kotlin/BuildConfig.kt
+++ b/common/src/androidMain/kotlin/BuildConfig.kt
@@ -1,5 +1,5 @@
 @Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
 internal actual object BuildConfig {
     actual val isDebug: Boolean
-        get() = com.powersync.BuildConfig.DEBUG
+        get() = com.powersync.common.BuildConfig.DEBUG
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 8cf8b054..ce18001a 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -94,7 +94,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    namespace = "com.powersync"
+    namespace = "com.powersync.core"
     compileSdk =
         libs.versions.android.compileSdk
             .get()
diff --git a/demos/supabase-todolist/shared/build.gradle.kts b/demos/supabase-todolist/shared/build.gradle.kts
index 3a0fe227..28c4fc1e 100644
--- a/demos/supabase-todolist/shared/build.gradle.kts
+++ b/demos/supabase-todolist/shared/build.gradle.kts
@@ -70,7 +70,7 @@ kotlin {
 }
 
 android {
-    namespace = "com.powersync.demos"
+    namespace = "com.powersync.demos.shared"
     compileSdk =
         libs.versions.android.compileSdk
             .get()
diff --git a/integrations/room/build.gradle.kts b/integrations/room/build.gradle.kts
index 6df7a78e..07977edc 100644
--- a/integrations/room/build.gradle.kts
+++ b/integrations/room/build.gradle.kts
@@ -79,7 +79,7 @@ dependencies {
 }
 
 android {
-    namespace = "com.powersync.compose"
+    namespace = "com.powersync.integrations.room"
     compileSdk =
         libs.versions.android.compileSdk
             .get()
diff --git a/integrations/sqldelight/build.gradle.kts b/integrations/sqldelight/build.gradle.kts
index d9eb1aba..2400f68f 100644
--- a/integrations/sqldelight/build.gradle.kts
+++ b/integrations/sqldelight/build.gradle.kts
@@ -49,7 +49,7 @@ kotlin {
 }
 
 android {
-    namespace = "com.powersync.drivers.common"
+    namespace = "com.powersync.integrations.sqldelight"
     compileSdk =
         libs.versions.android.compileSdk
             .get()
diff --git a/internal/testutils/build.gradle.kts b/internal/testutils/build.gradle.kts
index b21974c7..b907fc96 100644
--- a/internal/testutils/build.gradle.kts
+++ b/internal/testutils/build.gradle.kts
@@ -52,7 +52,7 @@ android {
         }
     }
 
-    namespace = "com.powersync"
+    namespace = "com.powersync.internal.testutils"
     compileSdk =
         libs.versions.android.compileSdk
             .get()