diff --git a/packages/LineageSettingsProvider/Android.bp b/packages/LineageSettingsProvider/Android.bp
index 9d89db5..bf95f07 100644
--- a/packages/LineageSettingsProvider/Android.bp
+++ b/packages/LineageSettingsProvider/Android.bp
@@ -15,7 +15,10 @@
 //
 
 android_app {
-    name: "LineageSettingsProvider",
+    name: "SHIFT-SettingsProvider",
+
+    overrides: ["LineageSettingsProvider"],
+
     srcs: ["src/**/*.java"],
     resource_dirs: ["res"],
 
diff --git a/packages/LineageSettingsProvider/tests/Android.bp b/packages/LineageSettingsProvider/tests/Android.bp
index d9e64db..2e84836 100644
--- a/packages/LineageSettingsProvider/tests/Android.bp
+++ b/packages/LineageSettingsProvider/tests/Android.bp
@@ -15,9 +15,11 @@
 //
 
 android_test {
-    name: "LineageSettingsProviderTests",
+    name: "SHIFT-SettingsProviderTests",
 
-    instrumentation_for: "LineageSettingsProvider",
+    overrides: ["LineageSettingsProviderTests"],
+
+    instrumentation_for: "SHIFT-SettingsProvider",
 
     srcs: ["**/*.java"],