diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index 96a2f41c3f8..9bea757a703 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -3,8 +3,8 @@ package {
 }
 
 aconfig_declarations {
-    name: "aconfig_settings_connecteddevice_flags",
-    package: "com.android.settings.connecteddevice.flags",
+    name: "aconfig_settings_flags",
+    package: "com.android.settings.flags",
     srcs: [
         "settings_connecteddevice_flag_declarations.aconfig",
     ],
@@ -12,6 +12,6 @@ aconfig_declarations {
 
 java_aconfig_library {
     name: "aconfig_settings_flags_lib",
-    aconfig_declarations: "aconfig_settings_connecteddevice_flags",
+    aconfig_declarations: "aconfig_settings_flags",
 }
 
diff --git a/aconfig/settings_connecteddevice_flag_declarations.aconfig b/aconfig/settings_connecteddevice_flag_declarations.aconfig
index edeb35a50df..db42fff700d 100644
--- a/aconfig/settings_connecteddevice_flag_declarations.aconfig
+++ b/aconfig/settings_connecteddevice_flag_declarations.aconfig
@@ -1,4 +1,4 @@
-package: "com.android.settings.connecteddevice.flags"
+package: "com.android.settings.flags"
 
 flag {
   name: "enable_subsequent_pair_settings_integration"