diff --git a/release/aconfig/ap2a/Android.bp b/release/aconfig/ap3a/Android.bp
similarity index 79%
rename from release/aconfig/ap2a/Android.bp
rename to release/aconfig/ap3a/Android.bp
index ad3b68f..8ab6019 100644
--- a/release/aconfig/ap2a/Android.bp
+++ b/release/aconfig/ap3a/Android.bp
@@ -14,9 +14,9 @@
 // limitations under the License.
 
 aconfig_value_set {
-    name: "aconfig_value_set-omnirom-ap2a",
+    name: "aconfig_value_set-omnirom-ap3a",
     values: [
-        "aconfig-values-ap2a-com.android.settingslib.flags-all",
-        "aconfig-values-ap2a-com.android.systemui.flags-all",
+        "aconfig-values-ap3a-com.android.settingslib.flags-all",
+        "aconfig-values-ap3a-com.android.systemui.flags-all",
     ],
 }
diff --git a/release/aconfig/ap2a/com.android.settingslib.flags/Android.bp b/release/aconfig/ap3a/com.android.settingslib.flags/Android.bp
similarity index 91%
rename from release/aconfig/ap2a/com.android.settingslib.flags/Android.bp
rename to release/aconfig/ap3a/com.android.settingslib.flags/Android.bp
index f5277cf..d357585 100644
--- a/release/aconfig/ap2a/com.android.settingslib.flags/Android.bp
+++ b/release/aconfig/ap3a/com.android.settingslib.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-ap2a-com.android.settingslib.flags-all",
+  name: "aconfig-values-ap3a-com.android.settingslib.flags-all",
   package: "com.android.settingslib.flags",
   srcs: [
     "*.textproto",
diff --git a/release/aconfig/ap2a/com.android.settingslib.flags/settingslib_flags.textproto b/release/aconfig/ap3a/com.android.settingslib.flags/settingslib_flags.textproto
similarity index 100%
rename from release/aconfig/ap2a/com.android.settingslib.flags/settingslib_flags.textproto
rename to release/aconfig/ap3a/com.android.settingslib.flags/settingslib_flags.textproto
diff --git a/release/aconfig/ap2a/com.android.systemui/Android.bp b/release/aconfig/ap3a/com.android.systemui/Android.bp
similarity index 91%
rename from release/aconfig/ap2a/com.android.systemui/Android.bp
rename to release/aconfig/ap3a/com.android.systemui/Android.bp
index 0e857bb..236df0b 100644
--- a/release/aconfig/ap2a/com.android.systemui/Android.bp
+++ b/release/aconfig/ap3a/com.android.systemui/Android.bp
@@ -15,7 +15,7 @@
 
 
 aconfig_values {
-    name: "aconfig-values-ap2a-com.android.systemui.flags-all",
+    name: "aconfig-values-ap3a-com.android.systemui.flags-all",
     package: "com.android.systemui",
     srcs: [
         "*.textproto",
diff --git a/release/aconfig/ap2a/com.android.systemui/systemui_flags.textproto b/release/aconfig/ap3a/com.android.systemui/systemui_flags.textproto
similarity index 100%
rename from release/aconfig/ap2a/com.android.systemui/systemui_flags.textproto
rename to release/aconfig/ap3a/com.android.systemui/systemui_flags.textproto
diff --git a/release/build_config/ap2a.scl b/release/build_config/ap3a.scl
similarity index 98%
rename from release/build_config/ap2a.scl
rename to release/build_config/ap3a.scl
index abf0099..ae6a6ae 100644
--- a/release/build_config/ap2a.scl
+++ b/release/build_config/ap3a.scl
@@ -18,6 +18,6 @@
 
 values = [
     # keep-sorted start numeric=yes
-    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-omnirom-ap2a"),
+    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-omnirom-ap3a"),
     # keep-sorted end
 ]
diff --git a/release/release_config_map.mk b/release/release_config_map.mk
index aa016cd..5c3bdae 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, ap2a, $(local_dir)build_config/ap2a.scl)
+$(call declare-release-config, ap3a, $(local_dir)build_config/ap3a.scl)
 
 local_dir :=