diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java
index 09d7ff725d..4738c0ff9e 100644
--- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java
@@ -15,8 +15,8 @@
  */
 package com.android.launcher3.taskbar;
 
-import static com.android.launcher3.taskbar.TaskbarDesktopModeFlags.enableAltTabKqsFlatenning;
-import static com.android.launcher3.taskbar.TaskbarDesktopModeFlags.enableAltTabKqsOnConnectedDisplays;
+import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAltTabKqsFlatenning;
+import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAltTabKqsOnConnectedDisplays;
 
 import android.app.ActivityManager;
 import android.content.ComponentName;
diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java
index d69830a8b9..693fe9cc8f 100644
--- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchView.java
@@ -17,7 +17,7 @@ package com.android.launcher3.taskbar;
 
 import static androidx.constraintlayout.widget.ConstraintLayout.LayoutParams.PARENT_ID;
 
-import static com.android.launcher3.taskbar.TaskbarDesktopModeFlags.enableAltTabKqsFlatenning;
+import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAltTabKqsFlatenning;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java
index b537660bc7..47791b79fb 100644
--- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchViewController.java
@@ -16,7 +16,7 @@
 package com.android.launcher3.taskbar;
 
 import static com.android.launcher3.desktop.DesktopAppLaunchTransition.AppLaunchType.UNMINIMIZE;
-import static com.android.launcher3.taskbar.TaskbarDesktopModeFlags.enableAltTabKqsFlatenning;
+import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAltTabKqsFlatenning;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopModeFlags.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopExperienceFlags.kt
similarity index 51%
rename from quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopModeFlags.kt
rename to quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopExperienceFlags.kt
index 870a2ca8f6..ab876e43c3 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopModeFlags.kt
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDesktopExperienceFlags.kt
@@ -16,17 +16,23 @@
 
 package com.android.launcher3.taskbar
 
-import android.window.DesktopModeFlags.DesktopModeFlag
+import android.window.DesktopExperienceFlags.DesktopExperienceFlag
 import com.android.launcher3.Flags
 
-class TaskbarDesktopModeFlags {
-    companion object {
-        @JvmField
-        val enableAltTabKqsOnConnectedDisplays: DesktopModeFlag =
-            DesktopModeFlag(Flags::enableAltTabKqsOnConnectedDisplays, false)
+object TaskbarDesktopExperienceFlags {
+    @JvmField
+    val enableAltTabKqsOnConnectedDisplays: DesktopExperienceFlag =
+        DesktopExperienceFlag(
+            Flags::enableAltTabKqsOnConnectedDisplays,
+            /* shouldOverrideByDevOption= */ false,
+            Flags.FLAG_ENABLE_ALT_TAB_KQS_ON_CONNECTED_DISPLAYS,
+        )
 
-        @JvmField
-        val enableAltTabKqsFlatenning: DesktopModeFlag =
-            DesktopModeFlag(Flags::enableAltTabKqsFlatenning, false)
-    }
+    @JvmField
+    val enableAltTabKqsFlatenning: DesktopExperienceFlag =
+        DesktopExperienceFlag(
+            Flags::enableAltTabKqsFlatenning,
+            /* shouldOverrideByDevOption= */ false,
+            Flags.FLAG_ENABLE_ALT_TAB_KQS_FLATENNING,
+        )
 }
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 1704092d43..0e18178a63 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -29,7 +29,7 @@ import static com.android.launcher3.Flags.enableOverviewOnConnectedDisplays;
 import static com.android.launcher3.LauncherPrefs.backedUpItem;
 import static com.android.launcher3.MotionEventsUtils.isTrackpadMotionEvent;
 import static com.android.launcher3.MotionEventsUtils.isTrackpadMultiFingerSwipe;
-import static com.android.launcher3.taskbar.TaskbarDesktopModeFlags.enableAltTabKqsOnConnectedDisplays;
+import static com.android.launcher3.taskbar.TaskbarDesktopExperienceFlags.enableAltTabKqsOnConnectedDisplays;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
 import static com.android.launcher3.util.OnboardingPrefs.HOME_BOUNCE_SEEN;