diff --git a/app/build.gradle b/app/build.gradle
index f02348614..d916cf511 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,6 +55,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.example.android.uamp'
 }
 
 dependencies {
diff --git a/automotive/build.gradle b/automotive/build.gradle
index 1156851d5..8ef192667 100644
--- a/automotive/build.gradle
+++ b/automotive/build.gradle
@@ -52,6 +52,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.example.android.uamp.automotive'
 
 }
 
diff --git a/build.gradle b/build.gradle
index 3302912ed..d4c046963 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.android.gms:strict-version-matcher-plugin:$gms_strict_version_matcher_version"
 
diff --git a/common/build.gradle b/common/build.gradle
index 35a547fe4..27fc1ac48 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -23,9 +23,6 @@ android {
     compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
-        versionCode 1
-        versionName "1.0"
-
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
 
@@ -42,6 +39,7 @@ android {
     compileOptions {
         targetCompatibility = '1.8'
     }
+    namespace 'com.example.android.uamp.media'
 
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a43d6aa1e..8fb033510 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip