diff --git a/src/panfrost/genxml/v10.xml b/src/panfrost/genxml/v10.xml
index 99fa2f37538..0ca608ef696 100644
--- a/src/panfrost/genxml/v10.xml
+++ b/src/panfrost/genxml/v10.xml
@@ -506,12 +506,12 @@
     <value name="Invalidate" value="2"/>
   </enum>
 
-  <enum name="CS Sync scope">
+  <enum name="CS Sync Scope">
     <value name="System" value="0"/>
     <value name="CSG" value="2"/>
   </enum>
 
-  <enum name="CS Exception type">
+  <enum name="CS Exception Type">
     <value name="Tiler OOM" value="2"/>
   </enum>
 
@@ -585,24 +585,24 @@
   </struct>
 
   <struct name="CS WAIT" size="2">
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Progress Increment" size="1" start="32" type="CS Progress Increment" default="No Increment"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="WAIT"/>
   </struct>
 
   <struct name="CS RUN_COMPUTE" size="2">
-    <field name="Task increment" size="14" start="0" type="uint"/>
-    <field name="Task axis" size="2" start="14" type="Task Axis"/>
+    <field name="Task Increment" size="14" start="0" type="uint"/>
+    <field name="Task Axis" size="2" start="14" type="Task Axis"/>
     <field name="Progress Increment" size="1" start="32" type="CS Progress Increment" default="No Increment"/>
-    <field name="SRT select" size="2" start="40" type="uint"/>
-    <field name="SPD select" size="2" start="42" type="uint"/>
-    <field name="TSD select" size="2" start="44" type="uint"/>
-    <field name="FAU select" size="2" start="46" type="uint"/>
+    <field name="SRT Select" size="2" start="40" type="uint"/>
+    <field name="SPD Select" size="2" start="42" type="uint"/>
+    <field name="TSD Select" size="2" start="44" type="uint"/>
+    <field name="FAU Select" size="2" start="46" type="uint"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="RUN_COMPUTE"/>
   </struct>
 
   <struct name="CS RUN_TILING" size="2">
-    <field name="Flags override" size="32" start="0" type="hex"/>
+    <field name="Flags Override" size="32" start="0" type="hex"/>
     <field name="Progress Increment" size="1" start="32" type="CS Progress Increment" default="No Increment"/>
     <field name="SRT select" size="2" start="40" type="uint"/>
     <field name="SPD select" size="2" start="42" type="uint"/>
@@ -612,7 +612,7 @@
   </struct>
 
   <struct name="CS RUN_IDVS" size="2">
-    <field name="Flags override" size="32" start="0" type="hex"/>
+    <field name="Flags Override" size="32" start="0" type="hex"/>
     <field name="Progress Increment" size="1" start="32" type="CS Progress Increment" default="No Increment"/>
     <field name="Malloc enable" size="1" start="33" type="bool"/>
     <field name="Draw ID register enable" size="1" start="34" type="bool"/>
@@ -627,13 +627,13 @@
 
   <struct name="CS RUN_FRAGMENT" size="2">
     <field name="Enable TEM" size="1" start="0" type="bool"/>
-    <field name="Tile order" size="4" start="4" type="Tile Render Order"/>
+    <field name="Tile Order" size="4" start="4" type="Tile Render Order"/>
     <field name="Progress Increment" size="1" start="32" type="CS Progress Increment" default="No Increment"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="RUN_FRAGMENT"/>
   </struct>
 
   <struct name="CS RUN_FULLSCREEN" size="2">
-    <field name="Flags override" size="32" start="0" type="hex"/>
+    <field name="Flags Override" size="32" start="0" type="hex"/>
     <field name="Progress Increment" size="1" start="32" type="CS Progress Increment" default="No Increment"/>
     <field name="DCD" size="8" start="40" type="uint"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="RUN_FULLSCREEN"/>
@@ -646,7 +646,7 @@
 
   <struct name="CS FINISH_FRAGMENT" size="2">
     <field name="Increment Fragment Completed" size="1" start="0" type="bool"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Last Heap Chunk" size="8" start="32" type="uint"/>
     <field name="First Heap Chunk" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -678,7 +678,7 @@
     <field name="Offset" size="16" start="0" type="int"/>
     <field name="Mask" size="16" start="16" type="hex"/>
     <field name="Address" size="8" start="40" type="uint"/>
-    <field name="Base register" size="8" start="48" type="uint"/>
+    <field name="Base Register" size="8" start="48" type="uint"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="LOAD_MULTIPLE"/>
   </struct>
 
@@ -686,7 +686,7 @@
     <field name="Offset" size="16" start="0" type="int"/>
     <field name="Mask" size="16" start="16" type="hex"/>
     <field name="Address" size="8" start="40" type="uint"/>
-    <field name="Base register" size="8" start="48" type="uint"/>
+    <field name="Base Register" size="8" start="48" type="uint"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="STORE_MULTIPLE"/>
   </struct>
 
@@ -699,7 +699,7 @@
 
   <struct name="CS SET_SB_ENTRY" size="2">
     <field name="Endpoint entry" size="4" start="0" type="uint"/>
-    <field name="Other entry" size="4" start="4" type="uint"/>
+    <field name="Other Entry" size="4" start="4" type="uint"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="SET_SB_ENTRY"/>
   </struct>
 
@@ -710,7 +710,7 @@
   </struct>
 
   <struct name="CS SET_EXCEPTION_HANDLER" size="2">
-    <field name="Exception type" size="8" start="0" type="CS Exception type"/>
+    <field name="Exception Type" size="8" start="0" type="CS Exception Type"/>
     <field name="Length" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="SET_EXCEPTION_HANDLER"/>
@@ -737,10 +737,10 @@
   </struct>
 
   <struct name="CS FLUSH_CACHE2" size="2">
-    <field name="L2 flush mode" size="4" start="0" type="CS Flush Mode"/>
-    <field name="LSC flush mode" size="4" start="4" type="CS Flush Mode"/>
-    <field name="Other flush mode" size="4" start="8" type="CS Other Flush Mode"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="L2 Flush Mode" size="4" start="0" type="CS Flush Mode"/>
+    <field name="LSC Flush Mode" size="4" start="4" type="CS Flush Mode"/>
+    <field name="Other Flush Mode" size="4" start="8" type="CS Other Flush Mode"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Latest Flush ID" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="FLUSH_CACHE2"/>
@@ -748,9 +748,9 @@
 
   <struct name="CS SYNC_ADD32" size="2">
     <!-- Iter status is written at [Address + 4], 0 == NO_FAULT, 1 == FAULT -->
-    <field name="Error propagate" size="1" start="0" type="bool"/>
-    <field name="Scope" size="2" start="1" type="CS Sync scope"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Error Propagate" size="1" start="0" type="bool"/>
+    <field name="Scope" size="2" start="1" type="CS Sync Scope"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Data" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -759,9 +759,9 @@
 
   <struct name="CS SYNC_SET32" size="2">
     <!-- Iter status is written at [Address + 4], 0 == NO_FAULT, 1 == FAULT -->
-    <field name="Error propagate" size="1" start="0" type="bool"/>
-    <field name="Scope" size="2" start="1" type="CS Sync scope"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Error Propagate" size="1" start="0" type="bool"/>
+    <field name="Scope" size="2" start="1" type="CS Sync Scope"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Data" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -769,7 +769,7 @@
   </struct>
 
   <struct name="CS SYNC_WAIT32" size="2">
-    <field name="Error reject" size="1" start="0" type="bool"/>
+    <field name="Error Reject" size="1" start="0" type="bool"/>
     <field name="Condition" size="4" start="28" type="CS Condition"/>
     <field name="Data" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
@@ -779,7 +779,7 @@
   <struct name="CS STORE_STATE" size="2">
     <!-- Iter status is written at [Address + 4], 0 == NO_FAULT, 1 == FAULT -->
     <field name="Offset" size="16" start="0" type="int"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="State" size="8" start="32" type="CS State"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -802,12 +802,12 @@
   </struct>
 
   <struct name="CS RUN_COMPUTE_INDIRECT" size="2">
-    <field name="Workgroups per task" size="16" start="0" type="uint"/>
+    <field name="Workgroups Per Task" size="16" start="0" type="uint"/>
     <field name="Progress Increment" size="1" start="32" type="CS Progress Increment" default="No Increment"/>
-    <field name="SRT select" size="2" start="40" type="uint"/>
-    <field name="SPD select" size="2" start="42" type="uint"/>
-    <field name="TSD select" size="2" start="44" type="uint"/>
-    <field name="FAU select" size="2" start="46" type="uint"/>
+    <field name="SRT Select" size="2" start="40" type="uint"/>
+    <field name="SPD Select" size="2" start="42" type="uint"/>
+    <field name="TSD Select" size="2" start="44" type="uint"/>
+    <field name="FAU Select" size="2" start="46" type="uint"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="RUN_COMPUTE_INDIRECT"/>
   </struct>
 
@@ -821,26 +821,26 @@
   </struct>
 
   <struct name="CS HEAP_OPERATION" size="2">
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Operation" size="3" start="32" type="CS Heap Operation"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="HEAP_OPERATION"/>
   </struct>
 
   <struct name="CS TRACE_POINT" size="2">
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Base Register" size="8" start="32" type="uint"/>
-    <field name="Register Count" size="8" start="40" type="uint"/>
+    <field name="Register count" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="TRACE_POINT"/>
   </struct>
 
   <struct name="CS SYNC_ADD64" size="2">
     <!-- Iter status is written at [Address + 8], 0 == NO_FAULT, 1 == FAULT -->
-    <field name="Error propagate" size="1" start="0" type="bool"/>
+    <field name="Error Propagate" size="1" start="0" type="bool"/>
     <!-- Used for inter-queue synchronization (unblocking a queue waiting on a mem-based fence) -->
-    <field name="Scope" size="2" start="1" type="CS Sync scope"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Scope" size="2" start="1" type="CS Sync Scope"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Data" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -849,9 +849,9 @@
 
   <struct name="CS SYNC_SET64" size="2">
     <!-- Iter status is written at [Address + 8], 0 == NO_FAULT, 1 == FAULT -->
-    <field name="Error propagate" size="1" start="0" type="bool"/>
-    <field name="Scope" size="2" start="1" type="CS Sync scope"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Error Propagate" size="1" start="0" type="bool"/>
+    <field name="Scope" size="2" start="1" type="CS Sync Scope"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Data" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -859,7 +859,7 @@
   </struct>
 
   <struct name="CS SYNC_WAIT64" size="2">
-    <field name="Error reject" size="1" start="0" type="bool"/>
+    <field name="Error Reject" size="1" start="0" type="bool"/>
     <field name="Condition" size="4" start="28" type="CS Condition"/>
     <field name="Data" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
@@ -1669,7 +1669,7 @@
     <value name="Never" value="0"/>
     <value name="Always" value="1"/>
     <value name="Intersect" value="2"/>
-    <value name="Early ZS always" value="3"/>
+    <value name="Early ZS Always" value="3"/>
   </enum>
 
   <enum name="Downscale">
@@ -2123,36 +2123,36 @@
   </struct>
 
   <struct name="DCD Flags 0" size="1">
-    <field name="Allow forward pixel to kill" size="1" start="0" type="bool"/>
-    <field name="Allow forward pixel to be killed" size="1" start="1" type="bool"/>
-    <field name="Pixel kill operation" size="2" start="2" type="Pixel Kill"/>
-    <field name="ZS update operation" size="2" start="4" type="Pixel Kill"/>
-    <field name="Allow primitive reorder" size="1" start="6" type="bool"/>
-    <field name="Overdraw alpha0" start="7" size="1" type="bool"/>
-    <field name="Overdraw alpha1" size="1" start="8" type="bool"/>
+    <field name="Allow Forward Pixel To Kill" size="1" start="0" type="bool"/>
+    <field name="Allow Forward Pixel To Be Killed" size="1" start="1" type="bool"/>
+    <field name="Pixel Kill Operation" size="2" start="2" type="Pixel Kill"/>
+    <field name="ZS Update Operation" size="2" start="4" type="Pixel Kill"/>
+    <field name="Allow Primitive Reorder" size="1" start="6" type="bool"/>
+    <field name="Overdraw Alpha0" start="7" size="1" type="bool"/>
+    <field name="Overdraw Alpha1" size="1" start="8" type="bool"/>
     <field name="Clean Fragment Write" size="1" start="9" type="bool"/>
     <field name="Primitive Barrier" size="1" start="10" type="bool"/>
     <field name="Evaluate per-sample" size="1" start="11" type="bool"/>
     <field name="Aligned line-ends" size="1" start="13" type="bool"/>
-    <field name="Occlusion query" size="2" start="14" type="Occlusion Mode"/>
-    <field name="Front face CCW" size="1" start="16" type="bool"/>
-    <field name="Cull front face" size="1" start="17" type="bool"/>
-    <field name="Cull back face" size="1" start="18" type="bool"/>
-    <field name="Multisample enable" size="1" start="19" type="bool"/>
-    <field name="Shader modifies coverage" size="1" start="20" type="bool"/>
-    <field name="Alpha-to-coverage Invert" size="1" start="21" type="bool"/>
-    <field name="Alpha-to-coverage" size="1" start="22" type="bool"/>
-    <field name="Scissor to bounding box" size="1" start="23" type="bool"/>
+    <field name="Occlusion Query" size="2" start="14" type="Occlusion Mode"/>
+    <field name="Front Face CCW" size="1" start="16" type="bool"/>
+    <field name="Cull Front Face" size="1" start="17" type="bool"/>
+    <field name="Cull Back Face" size="1" start="18" type="bool"/>
+    <field name="Multisample Enable" size="1" start="19" type="bool"/>
+    <field name="Shader Modifies Coverage" size="1" start="20" type="bool"/>
+    <field name="Alpha To Coverage Invert" size="1" start="21" type="bool"/>
+    <field name="Alpha To Coverage" size="1" start="22" type="bool"/>
+    <field name="Scissor To Bounding Box" size="1" start="23" type="bool"/>
   </struct>
 
   <struct name="DCD Flags 1" size="1">
-    <field name="Sample mask" size="16" start="0" type="hex"/>
-    <field name="Render target mask" start="16" size="8" type="hex"/>
+    <field name="Sample Mask" size="16" start="0" type="hex"/>
+    <field name="Render Target Mask" start="16" size="8" type="hex"/>
   </struct>
 
   <struct name="DCD Flags 2" size="1">
-    <field name="Read mask" size="12" start="0" type="hex"/>
-    <field name="Write mask" size="12" start="12" type="hex"/>
+    <field name="Read Mask" size="12" start="0" type="hex"/>
+    <field name="Write Mask" size="12" start="12" type="hex"/>
   </struct>
 
   <struct name="Draw" align="64">
diff --git a/src/panfrost/genxml/v12.xml b/src/panfrost/genxml/v12.xml
index e94adfc6d87..c28fffb2977 100644
--- a/src/panfrost/genxml/v12.xml
+++ b/src/panfrost/genxml/v12.xml
@@ -712,7 +712,7 @@
   </struct>
 
   <struct name="CS WAIT" size="2">
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Progress Increment" size="1" start="32" type="CS Progress Increment" default="No Increment"/>
     <field name="Wait Mode" size="1" start="33" type="CS Wait Mode" default="Immediate"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="WAIT"/>
@@ -838,7 +838,7 @@
   </struct>
 
   <struct name="CS SET_EXCEPTION_HANDLER" size="2">
-    <field name="Exception type" size="8" start="0" type="CS Exception Type" default="Tiler OOM"/>
+    <field name="Exception Type" size="8" start="0" type="CS Exception Type" default="Tiler OOM"/>
     <field name="Length" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="SET_EXCEPTION_HANDLER"/>
@@ -912,7 +912,7 @@
   <struct name="CS SYNC_ADD32" size="2">
     <field name="Error Propagate" size="1" start="0" type="bool"/>
     <field name="Scope" size="2" start="1" type="CS Sync Scope"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Data" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -923,7 +923,7 @@
   <struct name="CS SYNC_SET32" size="2">
     <field name="Error Propagate" size="1" start="0" type="bool"/>
     <field name="Scope" size="2" start="1" type="CS Sync Scope"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Data" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -986,7 +986,7 @@
   </struct>
 
   <struct name="CS HEAP_OPERATION" size="2">
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Operation" size="3" start="32" type="CS Heap Operation"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
     <field name="Defer Mode" size="1" start="52" type="CS Defer Mode"/>
@@ -994,7 +994,7 @@
   </struct>
 
   <struct name="CS TRACE_POINT" size="2">
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Base Register" size="8" start="32" type="uint"/>
     <field name="Register count" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -1005,7 +1005,7 @@
   <struct name="CS SYNC_ADD64" size="2">
     <field name="Error Propagate" size="1" start="0" type="bool"/>
     <field name="Scope" size="2" start="1" type="CS Sync Scope"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Data" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -1016,7 +1016,7 @@
   <struct name="CS SYNC_SET64" size="2">
     <field name="Error Propagate" size="1" start="0" type="bool"/>
     <field name="Scope" size="2" start="1" type="CS Sync Scope"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Data" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -2389,7 +2389,7 @@
     <field name="Shader Modifies Coverage" size="1" start="20" type="bool"/>
     <field name="Alpha To Coverage Invert" size="1" start="21" type="bool"/>
     <field name="Alpha To Coverage" size="1" start="22" type="bool"/>
-    <field name="Scissor to bounding box" size="1" start="23" type="bool"/>
+    <field name="Scissor To Bounding Box" size="1" start="23" type="bool"/>
     <field name="Conservative Rast Mode" size="2" start="24" type="Conservative Rast Mode"/>
     <field name="Cull Zero Area" size="1" start="26" type="bool"/>
     <field name="Conservative Tracking" size="1" start="27" type="bool"/>
diff --git a/src/panfrost/genxml/v13.xml b/src/panfrost/genxml/v13.xml
index 57c34fc8823..70846c2671e 100644
--- a/src/panfrost/genxml/v13.xml
+++ b/src/panfrost/genxml/v13.xml
@@ -755,7 +755,7 @@
   </struct>
 
   <struct name="CS WAIT" size="2">
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Progress Increment" size="1" start="32" type="CS Progress Increment" default="No Increment"/>
     <field name="Wait Mode" size="1" start="33" type="CS Wait Mode" default="Immediate"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="WAIT"/>
@@ -884,7 +884,7 @@
   </struct>
 
   <struct name="CS SET_EXCEPTION_HANDLER" size="2">
-    <field name="Exception type" size="8" start="0" type="CS Exception Type" default="Tiler OOM"/>
+    <field name="Exception Type" size="8" start="0" type="CS Exception Type" default="Tiler OOM"/>
     <field name="Length" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Opcode" size="8" start="56" type="CS Opcode" default="SET_EXCEPTION_HANDLER"/>
@@ -958,7 +958,7 @@
   <struct name="CS SYNC_ADD32" size="2">
     <field name="Error Propagate" size="1" start="0" type="bool"/>
     <field name="Scope" size="2" start="1" type="CS Sync Scope"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Data" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -969,7 +969,7 @@
   <struct name="CS SYNC_SET32" size="2">
     <field name="Error Propagate" size="1" start="0" type="bool"/>
     <field name="Scope" size="2" start="1" type="CS Sync Scope"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Data" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -1032,7 +1032,7 @@
   </struct>
 
   <struct name="CS HEAP_OPERATION" size="2">
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Operation" size="3" start="32" type="CS Heap Operation"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
     <field name="Defer Mode" size="1" start="52" type="CS Defer Mode" default="Defer Immediate"/>
@@ -1040,7 +1040,7 @@
   </struct>
 
   <struct name="CS TRACE_POINT" size="2">
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Base Register" size="8" start="32" type="uint"/>
     <field name="Register count" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -1051,7 +1051,7 @@
   <struct name="CS SYNC_ADD64" size="2">
     <field name="Error Propagate" size="1" start="0" type="bool"/>
     <field name="Scope" size="2" start="1" type="CS Sync Scope"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Data" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -1062,7 +1062,7 @@
   <struct name="CS SYNC_SET64" size="2">
     <field name="Error Propagate" size="1" start="0" type="bool"/>
     <field name="Scope" size="2" start="1" type="CS Sync Scope"/>
-    <field name="Wait mask" size="16" start="16" type="hex"/>
+    <field name="Wait Mask" size="16" start="16" type="hex"/>
     <field name="Data" size="8" start="32" type="uint"/>
     <field name="Address" size="8" start="40" type="uint"/>
     <field name="Signal slot" size="4" start="48" type="uint"/>
@@ -2694,7 +2694,7 @@
     <field name="Shader Modifies Coverage" size="1" start="20" type="bool"/>
     <field name="Alpha To Coverage Invert" size="1" start="21" type="bool"/>
     <field name="Alpha To Coverage" size="1" start="22" type="bool"/>
-    <field name="Scissor to bounding box" size="1" start="23" type="bool"/>
+    <field name="Scissor To Bounding Box" size="1" start="23" type="bool"/>
     <field name="Conservative Rast Mode" size="2" start="24" type="Conservative Rast Mode"/>
     <field name="Cull Zero Area" size="1" start="26" type="bool"/>
     <field name="Conservative Tracking" size="1" start="27" type="bool"/>
diff --git a/src/panfrost/genxml/v14.xml b/src/panfrost/genxml/v14.xml
index 868f07b11ce..a08c085ac41 100644
--- a/src/panfrost/genxml/v14.xml
+++ b/src/panfrost/genxml/v14.xml
@@ -2687,7 +2687,7 @@
     <field name="Shader Modifies Coverage" size="1" start="20" type="bool"/>
     <field name="Alpha To Coverage Invert" size="1" start="21" type="bool"/>
     <field name="Alpha To Coverage" size="1" start="22" type="bool"/>
-    <field name="Scissor to bounding box" size="1" start="23" type="bool"/>
+    <field name="Scissor To Bounding Box" size="1" start="23" type="bool"/>
     <field name="Conservative Rast Mode" size="2" start="24" type="Conservative Rast Mode"/>
     <field name="Cull Zero Area" size="1" start="26" type="bool"/>
     <field name="Conservative Tracking" size="1" start="27" type="bool"/>
diff --git a/src/panfrost/genxml/v9.xml b/src/panfrost/genxml/v9.xml
index 8649cc53444..4074a8f7966 100644
--- a/src/panfrost/genxml/v9.xml
+++ b/src/panfrost/genxml/v9.xml
@@ -1592,7 +1592,7 @@
     <field name="Shader modifies coverage" size="1" start="20" type="bool"/>
     <field name="Alpha-to-coverage Invert" size="1" start="21" type="bool"/>
     <field name="Alpha-to-coverage" size="1" start="22" type="bool"/>
-    <field name="Scissor to bounding box" size="1" start="23" type="bool"/>
+    <field name="Scissor To Bounding Box" size="1" start="23" type="bool"/>
   </struct>
 
   <struct name="DCD Flags 1" size="1">