diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/TEST_MAPPING b/libs/WindowManager/Shell/src/com/android/wm/shell/back/TEST_MAPPING
index 837d5ff3b073c..f02559f36169d 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/TEST_MAPPING
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/TEST_MAPPING
@@ -12,19 +12,19 @@
       ]
     },
     {
-      "name": "CtsWindowManagerDeviceTestCases",
+      "name": "CtsWindowManagerDeviceBackNavigation",
       "options": [
         {
           "exclude-annotation": "androidx.test.filters.FlakyTest"
         },
         {
-          "include-filter": "android.server.wm.BackGestureInvokedTest"
+          "include-filter": "android.server.wm.backnavigation.BackGestureInvokedTest"
         },
         {
-          "include-filter": "android.server.wm.BackNavigationTests"
+          "include-filter": "android.server.wm.backnavigation.BackNavigationTests"
         },
         {
-          "include-filter": "android.server.wm.OnBackInvokedCallbackGestureTest"
+          "include-filter": "android.server.wm.backnavigation.OnBackInvokedCallbackGestureTest"
         }
       ]
     }