diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 6a6c098c6eb..e5905f8296a 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -9098,7 +9098,7 @@ static void iris_emit_execute_indirect_dispatch(struct iris_context *ice,
       ind.PredicateEnable            =
          ice->state.predicate == IRIS_PREDICATE_STATE_USE_BIT;
       ind.MaxCount                   = 1;
-      ind.COMPUTE_WALKER_BODY        = body;
+      ind.body                       = body;
       ind.ArgumentBufferStartAddress = indirect_bo;
       ind.MOCS                       =
          iris_mocs(indirect_bo.bo, &screen->isl_dev, 0);
diff --git a/src/intel/decoder/intel_batch_decoder.c b/src/intel/decoder/intel_batch_decoder.c
index caa073adc27..e0b14fa8ea7 100644
--- a/src/intel/decoder/intel_batch_decoder.c
+++ b/src/intel/decoder/intel_batch_decoder.c
@@ -503,8 +503,7 @@ handle_compute_walker(struct intel_batch_decode_ctx *ctx,
    struct intel_field_iterator iter;
    intel_field_iterator_init(&iter, inst, p, 0, false);
    while (intel_field_iterator_next(&iter)) {
-      if (strcmp(iter.name, "body") == 0 ||
-          strcmp(iter.name, "COMPUTE_WALKER_BODY") == 0) {
+      if (strcmp(iter.name, "body") == 0) {
          intel_field_iterator_init(&iter, iter.struct_desc,
                                    &iter.p[iter.start_bit / 32],
                                    0, false);
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index 94b40fa4a90..57a3b843b08 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -1962,7 +1962,7 @@
     <field name="Count Buffer Indirect Enable" start="64" end="64" type="bool" />
     <field name="Count Buffer Address" start="66" end="127" type="address" />
     <field name="Argument Buffer Start Address" start="130" end="191" type="address" />
-    <field name="COMPUTE_WALKER_BODY" start="192" end="1407" type="COMPUTE_WALKER_BODY" />
+    <field name="body" start="192" end="1407" type="COMPUTE_WALKER_BODY" />
   </instruction>
   <instruction name="EXECUTE_INDIRECT_DRAW" bias="2" length="6" engine="render">
     <field name="DWord Length" start="0" end="7" type="uint" default="4" />
diff --git a/src/intel/genxml/gen200.xml b/src/intel/genxml/gen200.xml
index 91e2ba2cd49..17a31fda4f5 100644
--- a/src/intel/genxml/gen200.xml
+++ b/src/intel/genxml/gen200.xml
@@ -1529,7 +1529,7 @@
     <field name="Count Buffer Indirect Enable" start="64" end="64" type="bool" />
     <field name="Count Buffer Address" start="66" end="127" type="address" />
     <field name="Argument Buffer Start Address" start="130" end="191" type="address" />
-    <field name="COMPUTE_WALKER_BODY" start="192" end="1439" type="COMPUTE_WALKER_BODY" />
+    <field name="body" start="192" end="1439" type="COMPUTE_WALKER_BODY" />
   </instruction>
   <instruction name="MI_MEM_FENCE" bias="1" length="1">
     <field name="Fence Type" start="0" end="1" type="uint" prefix="FENCE_TYPE">
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index e653cf6d5ee..ba24de59067 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -6394,7 +6394,7 @@ void genX(cmd_emit_timestamp)(struct anv_batch *batch,
       GENX(EXECUTE_INDIRECT_DISPATCH_pack)
       (batch, dwords, &(struct GENX(EXECUTE_INDIRECT_DISPATCH)) {
             .MOCS = anv_mocs(device, NULL, 0),
-            .COMPUTE_WALKER_BODY = {
+            .body = {
                .PostSync = (struct GENX(POSTSYNC_DATA)) {
                   .Operation = WriteTimestamp,
                   .DestinationAddress = addr,
diff --git a/src/intel/vulkan/genX_cmd_compute.c b/src/intel/vulkan/genX_cmd_compute.c
index 763335f69cf..742390e25ed 100644
--- a/src/intel/vulkan/genX_cmd_compute.c
+++ b/src/intel/vulkan/genX_cmd_compute.c
@@ -499,7 +499,7 @@ emit_indirect_compute_walker(struct anv_cmd_buffer *cmd_buffer,
          GENX(EXECUTE_INDIRECT_DISPATCH),
          .PredicateEnable            = predicate,
          .MaxCount                   = 1,
-         .COMPUTE_WALKER_BODY        = body,
+         .body                       = body,
          .ArgumentBufferStartAddress = indirect_addr,
          .MOCS                       = anv_mocs(cmd_buffer->device,
                                                 indirect_addr.bo, 0),