diff --git a/src/panfrost/lib/genxml/cs_builder.h b/src/panfrost/lib/genxml/cs_builder.h
index 24a53096584..a05e6789b4e 100644
--- a/src/panfrost/lib/genxml/cs_builder.h
+++ b/src/panfrost/lib/genxml/cs_builder.h
@@ -1253,7 +1253,7 @@ static inline void
 cs_add32(struct cs_builder *b, struct cs_index dest, struct cs_index src,
          unsigned imm)
 {
-   cs_emit(b, ADD_IMMEDIATE32, I) {
+   cs_emit(b, ADD_IMM32, I) {
       I.destination = cs_dst32(b, dest);
       I.source = cs_src32(b, src);
       I.immediate = imm;
@@ -1264,7 +1264,7 @@ static inline void
 cs_add64(struct cs_builder *b, struct cs_index dest, struct cs_index src,
          unsigned imm)
 {
-   cs_emit(b, ADD_IMMEDIATE64, I) {
+   cs_emit(b, ADD_IMM64, I) {
       I.destination = cs_dst64(b, dest);
       I.source = cs_src64(b, src);
       I.immediate = imm;
diff --git a/src/panfrost/lib/genxml/decode_csf.c b/src/panfrost/lib/genxml/decode_csf.c
index 4ee9a0f94f7..fb4d3d104a4 100644
--- a/src/panfrost/lib/genxml/decode_csf.c
+++ b/src/panfrost/lib/genxml/decode_csf.c
@@ -204,7 +204,7 @@ print_cs_instr(FILE *fp, const uint64_t *instr)
    }
 
    case MALI_CS_OPCODE_ADD_IMMEDIATE32: {
-      cs_unpack(instr, CS_ADD_IMMEDIATE32, I);
+      cs_unpack(instr, CS_ADD_IMM32, I);
 
       fprintf(fp, "ADD_IMMEDIATE32 r%u, r%u, #%d", I.destination, I.source,
               I.immediate);
@@ -212,7 +212,7 @@ print_cs_instr(FILE *fp, const uint64_t *instr)
    }
 
    case MALI_CS_OPCODE_ADD_IMMEDIATE64: {
-      cs_unpack(instr, CS_ADD_IMMEDIATE64, I);
+      cs_unpack(instr, CS_ADD_IMM64, I);
 
       fprintf(fp, "ADD_IMMEDIATE64 d%u, d%u, #%d", I.destination, I.source,
               I.immediate);
@@ -972,14 +972,14 @@ interpret_cs_instr(struct pandecode_context *ctx, struct queue_ctx *qctx)
    }
 
    case MALI_CS_OPCODE_ADD_IMMEDIATE32: {
-      cs_unpack(bytes, CS_ADD_IMMEDIATE32, I);
+      cs_unpack(bytes, CS_ADD_IMM32, I);
 
       qctx->regs[I.destination] = qctx->regs[I.source] + I.immediate;
       break;
    }
 
    case MALI_CS_OPCODE_ADD_IMMEDIATE64: {
-      cs_unpack(bytes, CS_ADD_IMMEDIATE64, I);
+      cs_unpack(bytes, CS_ADD_IMM64, I);
 
       int64_t value =
          (qctx->regs[I.source] | ((int64_t)qctx->regs[I.source + 1] << 32)) +
@@ -1201,13 +1201,13 @@ record_indirect_branch_target(struct cs_code_cfg *cfg,
          }
 
          case MALI_CS_OPCODE_ADD_IMMEDIATE32: {
-            cs_unpack(instr, CS_ADD_IMMEDIATE32, I);
+            cs_unpack(instr, CS_ADD_IMM32, I);
             reg_file.u32[I.destination] = reg_file.u32[I.source] + I.immediate;
             break;
          }
 
          case MALI_CS_OPCODE_ADD_IMMEDIATE64: {
-            cs_unpack(instr, CS_ADD_IMMEDIATE64, I);
+            cs_unpack(instr, CS_ADD_IMM64, I);
 
             assert(I.destination % 2 == 0 &&
                    "Destination register should be aligned to 2");
@@ -1275,7 +1275,7 @@ collect_indirect_branch_targets_recurse(struct cs_code_cfg *cfg,
       }
 
       case MALI_CS_OPCODE_ADD_IMMEDIATE32: {
-         cs_unpack(instr, CS_ADD_IMMEDIATE32, I);
+         cs_unpack(instr, CS_ADD_IMM32, I);
          if (BITSET_TEST(track_map, I.destination)) {
             BITSET_SET(track_map, I.source);
             BITSET_CLEAR(track_map, I.destination);
@@ -1284,7 +1284,7 @@ collect_indirect_branch_targets_recurse(struct cs_code_cfg *cfg,
       }
 
       case MALI_CS_OPCODE_ADD_IMMEDIATE64: {
-         cs_unpack(instr, CS_ADD_IMMEDIATE64, I);
+         cs_unpack(instr, CS_ADD_IMM64, I);
          if (BITSET_TEST(track_map, I.destination)) {
             BITSET_SET(track_map, I.source);
             BITSET_CLEAR(track_map, I.destination);
diff --git a/src/panfrost/lib/genxml/v10.xml b/src/panfrost/lib/genxml/v10.xml
index 91629f23a67..52c144e78c8 100644
--- a/src/panfrost/lib/genxml/v10.xml
+++ b/src/panfrost/lib/genxml/v10.xml
@@ -632,14 +632,14 @@
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="FINISH_FRAGMENT"/>
   </struct>
 
-  <struct name="CS ADD_IMMEDIATE32" size="2">
+  <struct name="CS ADD_IMM32" size="2">
     <field name="Immediate" size="32" start="0" type="int"/>
     <field name="Source" size="8" start="40" type="uint"/>
     <field name="Destination" size="8" start="48" type="uint"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="ADD_IMMEDIATE32"/>
   </struct>
 
-  <struct name="CS ADD_IMMEDIATE64" size="2">
+  <struct name="CS ADD_IMM64" size="2">
     <field name="Immediate" size="32" start="0" type="int"/>
     <field name="Source" size="8" start="40" type="uint"/>
     <field name="Destination" size="8" start="48" type="uint"/>