diff --git a/src/intel/compiler/brw/brw_generator.cpp b/src/intel/compiler/brw/brw_generator.cpp
index c3904cd7f7f..978fc8d2c86 100644
--- a/src/intel/compiler/brw/brw_generator.cpp
+++ b/src/intel/compiler/brw/brw_generator.cpp
@@ -1448,11 +1448,11 @@ brw_generator::generate_code(const brw_shader &s,
       stats->dispatch_width = dispatch_width;
       stats->max_polygons = s.max_polygons;
       stats->instrs = before_size / 16 - nop_count - sync_nop_count;
-      stats->send_messages = send_count;
-      stats->loop_count = loop_count;
-      stats->cycle_count = perf.latency;
-      stats->spill_count = shader_stats.spill_count;
-      stats->fill_count = shader_stats.fill_count;
+      stats->sends = send_count;
+      stats->loops = loop_count;
+      stats->cycles = perf.latency;
+      stats->spills = shader_stats.spill_count;
+      stats->fills = shader_stats.fill_count;
       stats->max_live_registers = shader_stats.max_register_pressure;
       stats->non_ssa_regs_after_nir = shader_stats.non_ssa_registers_after_nir;
       stats->source_hash = prog_data->source_hash;
diff --git a/src/intel/vulkan/anv_internal_kernels.c b/src/intel/vulkan/anv_internal_kernels.c
index 9a05f2e3e05..d58bf4d2b7b 100644
--- a/src/intel/vulkan/anv_internal_kernels.c
+++ b/src/intel/vulkan/anv_internal_kernels.c
@@ -51,9 +51,9 @@ lower_base_workgroup_id(nir_builder *b, nir_intrinsic_instr *intrin,
 static void
 check_sends(struct genisa_stats *stats, unsigned send_count)
 {
-   assert(stats->spill_count == 0);
-   assert(stats->fill_count == 0);
-   assert(stats->send_messages == send_count);
+   assert(stats->spills == 0);
+   assert(stats->fills == 0);
+   assert(stats->sends == send_count);
 }
 
 static struct anv_shader_internal *
diff --git a/src/util/shader_stats.xml b/src/util/shader_stats.xml
index d7c8796749a..c67aea40bf6 100644
--- a/src/util/shader_stats.xml
+++ b/src/util/shader_stats.xml
@@ -133,29 +133,29 @@
       <isa name="GenISA">
          <stat name="Dispatch width" hidden="true">0 for vec4</stat>
          <stat name="Max polygons" hidden="true"/>
-         <stat name="Instruction Count" display="Instrs">
+         <stat name="Instructions" display="Instrs">
             Number of GEN instructions in the final generated shader executable.
          </stat>
-         <stat name="SEND Count" display="Send messages">
+         <stat name="SENDs" display="Sends">
             Number of instructions in the final generated shader executable
             which access external units such as the constant cache or the sampler.
          </stat>
-         <stat name="Loop Count" display="Loop count">
+         <stat name="Loops">
             Number of loops (not unrolled) in the final generated shader
             executable.
          </stat>
-         <stat name="Cycle Count" display="Cycle count">
+         <stat name="Cycles">
             Estimate of the number of EU cycles required to execute the final
             generated executable. This is an estimate only and may vary greatly
             from actual run-time performance.
          </stat>
-         <stat name="Spill Count" display="Spill count">
+         <stat name="Spills">
             Number of scratch spill operations. This gives a rough estimate of
             the cost incurred due to spilling temporary values to memory. If
             this is non-zero, you may want to adjust your shader to reduce
             register pressure.
          </stat>
-         <stat name="Fill Count" display="Fill count">
+         <stat name="Fills">
             Number of scratch fill operations. This gives a rough estimate of
             the cost incurred due to spilling temporary values to memory. If
             this is non-zero, you may want to adjust your shader to reduce