diff --git a/release/aconfig/ap1a/Android.bp b/release/aconfig/ap2a/Android.bp
similarity index 85%
rename from release/aconfig/ap1a/Android.bp
rename to release/aconfig/ap2a/Android.bp
index ded39ea8..1908c300 100644
--- a/release/aconfig/ap1a/Android.bp
+++ b/release/aconfig/ap2a/Android.bp
@@ -14,8 +14,8 @@
 // limitations under the License.
 
 aconfig_value_set {
-    name: "aconfig_value_set-tequila-ap1a",
+    name: "aconfig_value_set-tequila-ap2a",
     values: [
-        "aconfig-values-ap1a-com.android.settingslib.media.flags-all",
+        "aconfig-values-ap2a-com.android.settingslib.media.flags-all",
     ],
 }
diff --git a/release/aconfig/ap1a/com.android.settingslib.media.flags/Android.bp b/release/aconfig/ap2a/com.android.settingslib.media.flags/Android.bp
similarity index 92%
rename from release/aconfig/ap1a/com.android.settingslib.media.flags/Android.bp
rename to release/aconfig/ap2a/com.android.settingslib.media.flags/Android.bp
index 9b298652..ded221a3 100644
--- a/release/aconfig/ap1a/com.android.settingslib.media.flags/Android.bp
+++ b/release/aconfig/ap2a/com.android.settingslib.media.flags/Android.bp
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 aconfig_values {
-    name: "aconfig-values-ap1a-com.android.settingslib.media.flags-all",
+    name: "aconfig-values-ap2a-com.android.settingslib.media.flags-all",
     package: "com.android.settingslib.media.flags",
     srcs: [
         "*_flag_values.textproto",
diff --git a/release/aconfig/ap1a/com.android.settingslib.media.flags/use_media_router2_for_info_media_manager_flag_values.textproto b/release/aconfig/ap2a/com.android.settingslib.media.flags/use_media_router2_for_info_media_manager_flag_values.textproto
similarity index 100%
rename from release/aconfig/ap1a/com.android.settingslib.media.flags/use_media_router2_for_info_media_manager_flag_values.textproto
rename to release/aconfig/ap2a/com.android.settingslib.media.flags/use_media_router2_for_info_media_manager_flag_values.textproto
diff --git a/release/build_config/ap1a.scl b/release/build_config/ap2a.scl
similarity index 98%
rename from release/build_config/ap1a.scl
rename to release/build_config/ap2a.scl
index d25e5e15..67927061 100644
--- a/release/build_config/ap1a.scl
+++ b/release/build_config/ap2a.scl
@@ -18,6 +18,6 @@ load("//build/make/core/release_config.scl", "value")
 
 values = [
     # keep-sorted start numeric=yes
-    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-tequila-ap1a"),
+    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-tequila-ap2a"),
     # keep-sorted end
 ]
diff --git a/release/release_config_map.mk b/release/release_config_map.mk
index 48c4465a..aa016cd2 100644
--- a/release/release_config_map.mk
+++ b/release/release_config_map.mk
@@ -17,6 +17,6 @@
 local_dir := $(dir $(lastword $(MAKEFILE_LIST)))
 
 # Attach the flag value definitions to the various release configurations.
-$(call declare-release-config, ap1a, $(local_dir)build_config/ap1a.scl)
+$(call declare-release-config, ap2a, $(local_dir)build_config/ap2a.scl)
 
 local_dir :=