diff --git a/release/aconfig/bp1a/Android.bp b/release/aconfig/bp2a/Android.bp
similarity index 73%
rename from release/aconfig/bp1a/Android.bp
rename to release/aconfig/bp2a/Android.bp
index 03c9f73..28b27ad 100644
--- a/release/aconfig/bp1a/Android.bp
+++ b/release/aconfig/bp2a/Android.bp
@@ -14,10 +14,10 @@
 // limitations under the License.
 
 aconfig_value_set {
-    name: "aconfig_value_set-omnirom-bp1a",
+    name: "aconfig_value_set-omnirom-bp2a",
     values: [
-        "aconfig-values-bp1a-com.android.launcher3.flags-all",
-        "aconfig-values-bp1a-com.android.settings.flags-all",
-        "aconfig-values-bp1a-com.android.systemui.flags-all",
+        "aconfig-values-bp2a-com.android.launcher3.flags-all",
+        "aconfig-values-bp2a-com.android.settings.flags-all",
+        "aconfig-values-bp2a-com.android.systemui.flags-all",
     ],
 }
diff --git a/release/aconfig/bp1a/com.android.launcher3/Android.bp b/release/aconfig/bp2a/com.android.launcher3/Android.bp
similarity index 91%
rename from release/aconfig/bp1a/com.android.launcher3/Android.bp
rename to release/aconfig/bp2a/com.android.launcher3/Android.bp
index 156446c..978a2c9 100644
--- a/release/aconfig/bp1a/com.android.launcher3/Android.bp
+++ b/release/aconfig/bp2a/com.android.launcher3/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-bp1a-com.android.launcher3.flags-all",
+  name: "aconfig-values-bp2a-com.android.launcher3.flags-all",
   package: "com.android.launcher3",
   srcs: [
     "*_flag_values.textproto",
diff --git a/release/aconfig/bp1a/com.android.launcher3/force_monochrome_app_icons_flag_values.textproto b/release/aconfig/bp2a/com.android.launcher3/force_monochrome_app_icons_flag_values.textproto
similarity index 100%
rename from release/aconfig/bp1a/com.android.launcher3/force_monochrome_app_icons_flag_values.textproto
rename to release/aconfig/bp2a/com.android.launcher3/force_monochrome_app_icons_flag_values.textproto
diff --git a/release/aconfig/bp1a/com.android.settings.flags/Android.bp b/release/aconfig/bp2a/com.android.settings.flags/Android.bp
similarity index 91%
rename from release/aconfig/bp1a/com.android.settings.flags/Android.bp
rename to release/aconfig/bp2a/com.android.settings.flags/Android.bp
index f6a670f..6bd1925 100644
--- a/release/aconfig/bp1a/com.android.settings.flags/Android.bp
+++ b/release/aconfig/bp2a/com.android.settings.flags/Android.bp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 aconfig_values {
-  name: "aconfig-values-bp1a-com.android.settings.flags-all",
+  name: "aconfig-values-bp2a-com.android.settings.flags-all",
   package: "com.android.settings.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/release/aconfig/bp1a/com.android.settings.flags/homepage_revamp_flag_values.textproto b/release/aconfig/bp2a/com.android.settings.flags/homepage_revamp_flag_values.textproto
similarity index 100%
rename from release/aconfig/bp1a/com.android.settings.flags/homepage_revamp_flag_values.textproto
rename to release/aconfig/bp2a/com.android.settings.flags/homepage_revamp_flag_values.textproto
diff --git a/release/aconfig/bp1a/com.android.systemui/Android.bp b/release/aconfig/bp2a/com.android.systemui/Android.bp
similarity index 91%
rename from release/aconfig/bp1a/com.android.systemui/Android.bp
rename to release/aconfig/bp2a/com.android.systemui/Android.bp
index f30c183..0b34ea5 100644
--- a/release/aconfig/bp1a/com.android.systemui/Android.bp
+++ b/release/aconfig/bp2a/com.android.systemui/Android.bp
@@ -15,7 +15,7 @@
 
 
 aconfig_values {
-    name: "aconfig-values-bp1a-com.android.systemui.flags-all",
+    name: "aconfig-values-bp2a-com.android.systemui.flags-all",
     package: "com.android.systemui",
     srcs: [
         "*.textproto",
diff --git a/release/aconfig/bp1a/com.android.systemui/systemui_flags.textproto b/release/aconfig/bp2a/com.android.systemui/systemui_flags.textproto
similarity index 100%
rename from release/aconfig/bp1a/com.android.systemui/systemui_flags.textproto
rename to release/aconfig/bp2a/com.android.systemui/systemui_flags.textproto
diff --git a/release/build_config/bp1a.textproto b/release/build_config/bp1a.textproto
deleted file mode 100644
index 75dff20..0000000
--- a/release/build_config/bp1a.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-values: [
-    {
-        name: "RELEASE_ACONFIG_VALUE_SETS"
-        value: "aconfig_value_set-omnirom-bp1a"
-    }
-]
diff --git a/release/build_config/bp2a.textproto b/release/build_config/bp2a.textproto
new file mode 100644
index 0000000..a0c568a
--- /dev/null
+++ b/release/build_config/bp2a.textproto
@@ -0,0 +1,6 @@
+values: [
+    {
+        name: "RELEASE_ACONFIG_VALUE_SETS"
+        value: "aconfig_value_set-omnirom-bp2a"
+    }
+]
diff --git a/release/release_config_map.textproto b/release/release_config_map.textproto
index 799a7de..2c4a164 100644
--- a/release/release_config_map.textproto
+++ b/release/release_config_map.textproto
@@ -4,11 +4,11 @@
 default_containers: "vendor"
 
 release_config {
-    name: "bp1a"
-    flag_value_files: "release_configs/bp1a.textproto"
+    name: "bp2a"
+    flag_value_files: "release_configs/bp2a.textproto"
 }
 
 build_config {
-    name: "bp1a"
-    flag_value_files: "build_config/bp1a.textproto"
+    name: "bp2a"
+    flag_value_files: "build_config/bp2a.textproto"
 }
diff --git a/release/release_configs/bp1a.textproto b/release/release_configs/bp1a.textproto
deleted file mode 100644
index 24b24bd..0000000
--- a/release/release_configs/bp1a.textproto
+++ /dev/null
@@ -1,3 +0,0 @@
-name: "bp1a"
-prior_stages: "trunk"
-aconfig_value_sets: "aconfig_value_set-omnirom-bp1a"
diff --git a/release/release_configs/bp2a.textproto b/release/release_configs/bp2a.textproto
new file mode 100644
index 0000000..9596a3e
--- /dev/null
+++ b/release/release_configs/bp2a.textproto
@@ -0,0 +1,3 @@
+name: "bp2a"
+prior_stages: "trunk"
+aconfig_value_sets: "aconfig_value_set-omnirom-bp2a"