diff --git a/template-compose/app/build.gradle.kts b/template-compose/app/build.gradle.kts
index 028198533..5e1dfc3aa 100644
--- a/template-compose/app/build.gradle.kts
+++ b/template-compose/app/build.gradle.kts
@@ -19,6 +19,8 @@ val getVersionCode: () -> Int = {
 }
 
 android {
+    namespace = "co.nimblehq.template.compose"
+
     signingConfigs {
         create(BuildType.RELEASE) {
             // Remember to edit signing.properties to have the correct info for release build.
diff --git a/template-compose/app/src/debug/AndroidManifest.xml b/template-compose/app/src/debug/AndroidManifest.xml
index c10e37a53..95ab02920 100644
--- a/template-compose/app/src/debug/AndroidManifest.xml
+++ b/template-compose/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.nimblehq.template.compose">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!--For Chucker in debug build only-->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
diff --git a/template-compose/app/src/main/AndroidManifest.xml b/template-compose/app/src/main/AndroidManifest.xml
index 1bae8bf99..42327e885 100644
--- a/template-compose/app/src/main/AndroidManifest.xml
+++ b/template-compose/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.nimblehq.template.compose">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/template-compose/data/build.gradle.kts b/template-compose/data/build.gradle.kts
index 1ef1f1921..106308962 100644
--- a/template-compose/data/build.gradle.kts
+++ b/template-compose/data/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 }
 
 android {
+    namespace = "co.nimblehq.template.compose.data"
     compileSdk = Versions.ANDROID_COMPILE_SDK_VERSION
     defaultConfig {
         minSdk = Versions.ANDROID_MIN_SDK_VERSION
@@ -36,8 +37,8 @@ android {
         jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
-    lintOptions {
-        isCheckDependencies = true
+    lint {
+        checkDependencies = true
         xmlReport = true
         xmlOutput = file("build/reports/lint/lint-result.xml")
     }
diff --git a/template-compose/data/src/main/AndroidManifest.xml b/template-compose/data/src/main/AndroidManifest.xml
index 1e37650d4..8072ee00d 100644
--- a/template-compose/data/src/main/AndroidManifest.xml
+++ b/template-compose/data/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="co.nimblehq.template.compose.data" />
+<manifest />
diff --git a/template-compose/domain/src/main/java/co/nimblehq/template/compose/domain/repository/AppPreferencesRepository.kt b/template-compose/domain/src/main/java/co/nimblehq/template/compose/domain/repository/AppPreferencesRepository.kt
index edef9baa4..5787c3f1d 100644
--- a/template-compose/domain/src/main/java/co/nimblehq/template/compose/domain/repository/AppPreferencesRepository.kt
+++ b/template-compose/domain/src/main/java/co/nimblehq/template/compose/domain/repository/AppPreferencesRepository.kt
@@ -6,5 +6,5 @@ interface AppPreferencesRepository {
 
     fun getAppPreference(): Flow<Boolean>
 
-    suspend fun updateAppPreference(appPreferencesValue: Boolean)
+    suspend fun updateAppPreference(appPreferenceValue: Boolean)
 }
diff --git a/template-xml/app/build.gradle.kts b/template-xml/app/build.gradle.kts
index 02fa4b2cd..a89331a3a 100644
--- a/template-xml/app/build.gradle.kts
+++ b/template-xml/app/build.gradle.kts
@@ -13,6 +13,8 @@ plugins {
 val keystoreProperties = rootDir.loadGradleProperties("signing.properties")
 
 android {
+    namespace = "co.nimblehq.template.xml"
+
     signingConfigs {
         create(BuildType.RELEASE) {
             // Remember to edit signing.properties to have the correct info for release build.
diff --git a/template-xml/app/src/debug/AndroidManifest.xml b/template-xml/app/src/debug/AndroidManifest.xml
index fd3d72658..9a18ba0cd 100644
--- a/template-xml/app/src/debug/AndroidManifest.xml
+++ b/template-xml/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.nimblehq.template.xml">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!--For Chucker in debug build only-->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
diff --git a/template-xml/app/src/main/AndroidManifest.xml b/template-xml/app/src/main/AndroidManifest.xml
index 17f10d919..40191d873 100644
--- a/template-xml/app/src/main/AndroidManifest.xml
+++ b/template-xml/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.nimblehq.template.xml">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/template-xml/data/build.gradle.kts b/template-xml/data/build.gradle.kts
index 70e39944f..aa7f80b69 100644
--- a/template-xml/data/build.gradle.kts
+++ b/template-xml/data/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+    namespace = "co.nimblehq.template.xml.data"
     compileSdk = Versions.ANDROID_COMPILE_SDK_VERSION
     defaultConfig {
         minSdk = Versions.ANDROID_MIN_SDK_VERSION
@@ -36,8 +37,8 @@ android {
         jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
-    lintOptions {
-        isCheckDependencies = true
+    lint {
+        checkDependencies = true
         xmlReport = true
         xmlOutput = file("build/reports/lint/lint-result.xml")
     }
diff --git a/template-xml/data/src/main/AndroidManifest.xml b/template-xml/data/src/main/AndroidManifest.xml
index 0e8c5c5cb..8072ee00d 100644
--- a/template-xml/data/src/main/AndroidManifest.xml
+++ b/template-xml/data/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="co.nimblehq.template.xml.data" />
+<manifest />