diff --git a/release/aconfig/bp2a/com.android.systemui.shared/clock_reactive_variants.textproto b/release/aconfig/bp2a/com.android.systemui.shared/clock_reactive_variants.textproto
deleted file mode 100644
index 1b841ba1..00000000
--- a/release/aconfig/bp2a/com.android.systemui.shared/clock_reactive_variants.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "clock_reactive_variants"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/release/aconfig/bp2a/com.android.systemui.shared/enable_launcher_icon_shapes.textproto b/release/aconfig/bp2a/com.android.systemui.shared/enable_launcher_icon_shapes.textproto
deleted file mode 100644
index aabb0d57..00000000
--- a/release/aconfig/bp2a/com.android.systemui.shared/enable_launcher_icon_shapes.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "enable_launcher_icon_shapes"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/release/aconfig/bp2a/com.android.systemui.shared/lockscreen_custom_clocks.textproto b/release/aconfig/bp2a/com.android.systemui.shared/lockscreen_custom_clocks.textproto
deleted file mode 100644
index 5efb1a92..00000000
--- a/release/aconfig/bp2a/com.android.systemui.shared/lockscreen_custom_clocks.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "lockscreen_custom_clocks"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/release/aconfig/bp2a/com.android.systemui/notification_row_transparency.textproto b/release/aconfig/bp2a/com.android.systemui/disable_blurred_shade_visible.textproto
similarity index 69%
rename from release/aconfig/bp2a/com.android.systemui/notification_row_transparency.textproto
rename to release/aconfig/bp2a/com.android.systemui/disable_blurred_shade_visible.textproto
index d902f6eb..9530c76d 100644
--- a/release/aconfig/bp2a/com.android.systemui/notification_row_transparency.textproto
+++ b/release/aconfig/bp2a/com.android.systemui/disable_blurred_shade_visible.textproto
@@ -1,6 +1,6 @@
 flag_value {
   package: "com.android.systemui"
-  name: "notification_row_transparency"
+  name: "disable_blurred_shade_visible"
   state: ENABLED
   permission: READ_ONLY
 }
diff --git a/release/aconfig/bp2a/com.android.systemui/lockscreen_custom_clocks.textproto b/release/aconfig/bp2a/com.android.systemui/lockscreen_custom_clocks.textproto
deleted file mode 100644
index 555b28df..00000000
--- a/release/aconfig/bp2a/com.android.systemui/lockscreen_custom_clocks.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "lockscreen_custom_clocks"
-  state: ENABLED
-  permission: READ_ONLY
-}