diff --git a/shared/source/command_container/command_encoder_xehp_and_later.inl b/shared/source/command_container/command_encoder_xehp_and_later.inl
index 609c4ed70d..0a7de0e3e7 100644
--- a/shared/source/command_container/command_encoder_xehp_and_later.inl
+++ b/shared/source/command_container/command_encoder_xehp_and_later.inl
@@ -329,12 +329,15 @@ bool EncodeDispatchKernel<Family>::isRuntimeLocalIdsGenerationRequired(uint32_t
 
         //make sure table below matches Hardware Spec
         constexpr uint32_t walkOrderPossibilties = 6u;
-        constexpr uint8_t possibleWalkOrders[walkOrderPossibilties][3] = {{0, 1, 2},
-                                                                          {0, 2, 1},
-                                                                          {1, 0, 2},
-                                                                          {2, 0, 1},
-                                                                          {1, 2, 0},
-                                                                          {2, 1, 0}};
+        constexpr uint8_t X = 0;
+        constexpr uint8_t Y = 1;
+        constexpr uint8_t Z = 2;
+        constexpr uint8_t possibleWalkOrders[walkOrderPossibilties][3] = {{X, Y, Z},  // 0 1 2
+                                                                          {X, Z, Y},  // 0 2 1
+                                                                          {Y, X, Z},  // 1 0 2
+                                                                          {Z, X, Y},  // 1 2 0
+                                                                          {Y, Z, X},  // 2 0 1
+                                                                          {Z, Y, X}}; // 2 1 0
 
         //check if we need to follow kernel requirements
         if (requireInputWalkOrder) {