diff --git a/app-nia-catalog/build.gradle.kts b/app-nia-catalog/build.gradle.kts
index dc8d4ffc0..f163b2740 100644
--- a/app-nia-catalog/build.gradle.kts
+++ b/app-nia-catalog/build.gradle.kts
@@ -20,6 +20,7 @@ plugins {
 }
 
 android {
+    namespace = "com.google.samples.apps.niacatalog"
     defaultConfig {
         applicationId = "com.google.samples.apps.niacatalog"
     }
diff --git a/app-nia-catalog/src/main/AndroidManifest.xml b/app-nia-catalog/src/main/AndroidManifest.xml
index cd0b1e371..f51c864ba 100644
--- a/app-nia-catalog/src/main/AndroidManifest.xml
+++ b/app-nia-catalog/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.niacatalog">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 15405e118..9f6e2485a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -24,6 +24,7 @@ plugins {
 }
 
 android {
+    namespace = "com.google.samples.apps.nowinandroid"
     defaultConfig {
         applicationId = "com.google.samples.apps.nowinandroid"
         versionCode = 1
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ae56af758..b4eefca57 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.samples.apps.nowinandroid">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/benchmark/src/main/AndroidManifest.xml b/benchmark/src/main/AndroidManifest.xml
deleted file mode 100644
index 1cf255471..000000000
--- a/benchmark/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/core-common/build.gradle.kts b/core-common/build.gradle.kts
index a04464ef0..bec9abb1f 100644
--- a/core-common/build.gradle.kts
+++ b/core-common/build.gradle.kts
@@ -20,6 +20,10 @@ plugins {
     id("nowinandroid.spotless")
 }
 
+android {
+    namespace = "com.google.samples.apps.nowinandroid.core.common"
+}
+
 dependencies {
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.hilt.android)
diff --git a/core-common/src/main/AndroidManifest.xml b/core-common/src/main/AndroidManifest.xml
deleted file mode 100644
index a0b613a7b..000000000
--- a/core-common/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.common">
-
-</manifest>
\ No newline at end of file
diff --git a/core-data-test/build.gradle.kts b/core-data-test/build.gradle.kts
index 24ec632fd..c9152a548 100644
--- a/core-data-test/build.gradle.kts
+++ b/core-data-test/build.gradle.kts
@@ -20,6 +20,10 @@ plugins {
     id("nowinandroid.spotless")
 }
 
+android {
+    namespace = "com.google.samples.apps.nowinandroid.core.data.test"
+}
+
 dependencies {
     api(project(":core-data"))
     implementation(project(":core-testing"))
diff --git a/core-data-test/src/main/AndroidManifest.xml b/core-data-test/src/main/AndroidManifest.xml
deleted file mode 100644
index 2ce7621ac..000000000
--- a/core-data-test/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.data.test">
-
-</manifest>
diff --git a/core-data/build.gradle.kts b/core-data/build.gradle.kts
index 66fa5bcb4..cc6c4bc95 100644
--- a/core-data/build.gradle.kts
+++ b/core-data/build.gradle.kts
@@ -22,6 +22,10 @@ plugins {
     id("nowinandroid.spotless")
 }
 
+android {
+    namespace = "com.google.samples.apps.nowinandroid.core.data"
+}
+
 dependencies {
     implementation(project(":core-common"))
     implementation(project(":core-model"))
diff --git a/core-data/src/main/AndroidManifest.xml b/core-data/src/main/AndroidManifest.xml
deleted file mode 100644
index 431264e4a..000000000
--- a/core-data/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.data">
-
-</manifest>
\ No newline at end of file
diff --git a/core-database/build.gradle.kts b/core-database/build.gradle.kts
index 0461f28f2..745652fda 100644
--- a/core-database/build.gradle.kts
+++ b/core-database/build.gradle.kts
@@ -23,6 +23,7 @@ plugins {
 }
 
 android {
+    namespace = "com.google.samples.apps.nowinandroid.core.database"
     defaultConfig {
         // The schemas directory contains a schema file for each version of the Room database.
         // This is required to enable Room auto migrations.
diff --git a/core-database/src/main/AndroidManifest.xml b/core-database/src/main/AndroidManifest.xml
deleted file mode 100644
index ae6d3fe50..000000000
--- a/core-database/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.database">
-
-</manifest>
\ No newline at end of file
diff --git a/core-datastore-test/build.gradle.kts b/core-datastore-test/build.gradle.kts
index 9b59bd85b..8582ec69a 100644
--- a/core-datastore-test/build.gradle.kts
+++ b/core-datastore-test/build.gradle.kts
@@ -20,6 +20,10 @@ plugins {
     id("nowinandroid.spotless")
 }
 
+android {
+    namespace = "com.google.samples.apps.nowinandroid.core.datastore.test"
+}
+
 dependencies {
     api(project(":core-datastore"))
     implementation(project(":core-testing"))
diff --git a/core-datastore-test/src/main/AndroidManifest.xml b/core-datastore-test/src/main/AndroidManifest.xml
deleted file mode 100644
index e0d63ea27..000000000
--- a/core-datastore-test/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.datastore.test">
-
-</manifest>
\ No newline at end of file
diff --git a/core-datastore/build.gradle.kts b/core-datastore/build.gradle.kts
index 2ccc9ade1..405103104 100644
--- a/core-datastore/build.gradle.kts
+++ b/core-datastore/build.gradle.kts
@@ -32,6 +32,7 @@ android {
     defaultConfig {
         consumerProguardFiles("consumer-proguard-rules.pro")
     }
+    namespace = "com.google.samples.apps.nowinandroid.core.datastore"
 }
 
 // Setup protobuf configuration, generating lite Java and Kotlin classes
diff --git a/core-datastore/src/main/AndroidManifest.xml b/core-datastore/src/main/AndroidManifest.xml
index d07c935fa..ec921f928 100644
--- a/core-datastore/src/main/AndroidManifest.xml
+++ b/core-datastore/src/main/AndroidManifest.xml
@@ -14,7 +14,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.datastore">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/core-model/build.gradle.kts b/core-model/build.gradle.kts
index bda0c4037..b90d33b34 100644
--- a/core-model/build.gradle.kts
+++ b/core-model/build.gradle.kts
@@ -21,6 +21,10 @@ plugins {
     id("nowinandroid.spotless")
 }
 
+android {
+    namespace = "com.google.samples.apps.nowinandroid.core.model"
+}
+
 dependencies {
     testImplementation(project(":core-testing"))
 
diff --git a/core-model/src/main/AndroidManifest.xml b/core-model/src/main/AndroidManifest.xml
deleted file mode 100644
index e04125b63..000000000
--- a/core-model/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.model">
-
-</manifest>
\ No newline at end of file
diff --git a/core-navigation/build.gradle.kts b/core-navigation/build.gradle.kts
index c9606b6ce..3ffca053e 100644
--- a/core-navigation/build.gradle.kts
+++ b/core-navigation/build.gradle.kts
@@ -22,6 +22,10 @@ plugins {
     id("nowinandroid.spotless")
 }
 
+android {
+    namespace = "com.google.samples.apps.nowinandroid.core.navigation"
+}
+
 dependencies {
     api(libs.androidx.hilt.navigation.compose)
     api(libs.androidx.navigation.compose)
diff --git a/core-navigation/src/main/AndroidManifest.xml b/core-navigation/src/main/AndroidManifest.xml
deleted file mode 100644
index 915676f9b..000000000
--- a/core-navigation/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.navigation">
-
-</manifest>
\ No newline at end of file
diff --git a/core-network/build.gradle.kts b/core-network/build.gradle.kts
index 9b3303f4d..3825d1e81 100644
--- a/core-network/build.gradle.kts
+++ b/core-network/build.gradle.kts
@@ -24,6 +24,7 @@ plugins {
 }
 
 android {
+    namespace = "com.google.samples.apps.nowinandroid.core.network"
     buildTypes {
         val staging by creating {
             initWith(getByName("debug"))
diff --git a/core-network/src/main/AndroidManifest.xml b/core-network/src/main/AndroidManifest.xml
index 0d9ff8a0f..0cb50fd30 100644
--- a/core-network/src/main/AndroidManifest.xml
+++ b/core-network/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.network">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
 
 </manifest>
\ No newline at end of file
diff --git a/core-testing/build.gradle.kts b/core-testing/build.gradle.kts
index 795da59d8..ae3cebaaf 100644
--- a/core-testing/build.gradle.kts
+++ b/core-testing/build.gradle.kts
@@ -19,6 +19,10 @@ plugins {
     id("nowinandroid.spotless")
 }
 
+android {
+    namespace = "com.google.samples.apps.nowinandroid.core.testing"
+}
+
 dependencies {
     implementation(project(":core-common"))
     implementation(project(":core-data"))
diff --git a/core-testing/src/main/AndroidManifest.xml b/core-testing/src/main/AndroidManifest.xml
deleted file mode 100644
index 42486709c..000000000
--- a/core-testing/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.testing">
-
-</manifest>
\ No newline at end of file
diff --git a/core-ui/build.gradle.kts b/core-ui/build.gradle.kts
index 7fade59be..d51ea87b5 100644
--- a/core-ui/build.gradle.kts
+++ b/core-ui/build.gradle.kts
@@ -20,6 +20,10 @@ plugins {
     id("nowinandroid.spotless")
 }
 
+android {
+    namespace = "com.google.samples.apps.nowinandroid.core.ui"
+}
+
 dependencies {
     implementation(project(":core-model"))
 
diff --git a/core-ui/src/main/AndroidManifest.xml b/core-ui/src/main/AndroidManifest.xml
deleted file mode 100644
index 864e3481d..000000000
--- a/core-ui/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.ui">
-
-</manifest>
\ No newline at end of file
diff --git a/feature-author/build.gradle.kts b/feature-author/build.gradle.kts
index d212fe597..bf861ac83 100644
--- a/feature-author/build.gradle.kts
+++ b/feature-author/build.gradle.kts
@@ -23,6 +23,7 @@ plugins {
 }
 
 android {
+    namespace = "com.google.samples.apps.nowinandroid.feature.author"
     defaultConfig {
         testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
     }
diff --git a/feature-author/src/main/AndroidManifest.xml b/feature-author/src/main/AndroidManifest.xml
deleted file mode 100644
index bd1b40b71..000000000
--- a/feature-author/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.feature.author">
-
-</manifest>
diff --git a/feature-foryou/build.gradle.kts b/feature-foryou/build.gradle.kts
index eb8cea8f1..078e0a1df 100644
--- a/feature-foryou/build.gradle.kts
+++ b/feature-foryou/build.gradle.kts
@@ -23,6 +23,7 @@ plugins {
 }
 
 android {
+    namespace = "com.google.samples.apps.nowinandroid.feature.foryou"
     defaultConfig {
         testInstrumentationRunner =
             "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
diff --git a/feature-foryou/src/main/AndroidManifest.xml b/feature-foryou/src/main/AndroidManifest.xml
deleted file mode 100644
index f72fbc540..000000000
--- a/feature-foryou/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.feature.foryou">
-
-</manifest>
\ No newline at end of file
diff --git a/feature-interests/build.gradle.kts b/feature-interests/build.gradle.kts
index 396d6c85e..90c14d54f 100644
--- a/feature-interests/build.gradle.kts
+++ b/feature-interests/build.gradle.kts
@@ -23,6 +23,7 @@ plugins {
 }
 
 android {
+    namespace = "com.google.samples.apps.nowinandroid.feature.interests"
     defaultConfig {
         testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
     }
diff --git a/feature-interests/src/main/AndroidManifest.xml b/feature-interests/src/main/AndroidManifest.xml
deleted file mode 100644
index 13505caf9..000000000
--- a/feature-interests/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.feature.interests">
-
-</manifest>
\ No newline at end of file
diff --git a/feature-topic/build.gradle.kts b/feature-topic/build.gradle.kts
index de2c8085b..c1220ab73 100644
--- a/feature-topic/build.gradle.kts
+++ b/feature-topic/build.gradle.kts
@@ -23,6 +23,7 @@ plugins {
 }
 
 android {
+    namespace = "com.google.samples.apps.nowinandroid.feature.topic"
     defaultConfig {
         testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
     }
diff --git a/feature-topic/src/main/AndroidManifest.xml b/feature-topic/src/main/AndroidManifest.xml
deleted file mode 100644
index be0731035..000000000
--- a/feature-topic/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.feature.topic">
-
-</manifest>
diff --git a/sync/build.gradle.kts b/sync/build.gradle.kts
index 531032a9f..47c7afe67 100644
--- a/sync/build.gradle.kts
+++ b/sync/build.gradle.kts
@@ -22,6 +22,7 @@ plugins {
 }
 
 android {
+    namespace = "com.google.samples.apps.nowinandroid.sync"
     defaultConfig {
         testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
     }
diff --git a/sync/src/main/AndroidManifest.xml b/sync/src/main/AndroidManifest.xml
index b06d3c873..2487eb105 100644
--- a/sync/src/main/AndroidManifest.xml
+++ b/sync/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.samples.apps.nowinandroid.sync">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application>
         <provider