diff --git a/src/gallium/drivers/panfrost/pan_csf.c b/src/gallium/drivers/panfrost/pan_csf.c
index c941658517d..da6ce875f86 100644
--- a/src/gallium/drivers/panfrost/pan_csf.c
+++ b/src/gallium/drivers/panfrost/pan_csf.c
@@ -546,9 +546,9 @@ csf_submit_wait_and_dump(struct panfrost_batch *batch,
 
       for (unsigned i = 0; i < gsubmit->queue_submits.count; i++) {
          uint32_t regs[256] = {0};
-         pandecode_cs(dev->decode_ctx, qsubmits[i].stream_addr,
-                      qsubmits[i].stream_size, panfrost_device_gpu_id(dev),
-                      regs);
+         pandecode_interpret_cs(dev->decode_ctx, qsubmits[i].stream_addr,
+                                qsubmits[i].stream_size,
+                                panfrost_device_gpu_id(dev), regs);
       }
 
       if (dev->debug & PAN_DBG_DUMP)
@@ -1462,8 +1462,9 @@ GENX(csf_init_context)(struct panfrost_context *ctx)
 
    if (dev->debug & PAN_DBG_TRACE) {
       uint32_t regs[256] = {0};
-      pandecode_cs(dev->decode_ctx, qsubmit.stream_addr, qsubmit.stream_size,
-                   panfrost_device_gpu_id(dev), regs);
+      pandecode_interpret_cs(dev->decode_ctx, qsubmit.stream_addr,
+                             qsubmit.stream_size, panfrost_device_gpu_id(dev),
+                             regs);
    }
 
    if (ret)
diff --git a/src/panfrost/lib/genxml/decode.h b/src/panfrost/lib/genxml/decode.h
index 69aa15a3b64..41bb9c4b8c0 100644
--- a/src/panfrost/lib/genxml/decode.h
+++ b/src/panfrost/lib/genxml/decode.h
@@ -130,8 +130,8 @@ void pandecode_abort_on_fault_v7(struct pandecode_context *ctx,
 void pandecode_abort_on_fault_v9(struct pandecode_context *ctx,
                                  mali_ptr jc_gpu_va);
 
-void pandecode_cs_v10(struct pandecode_context *ctx, mali_ptr queue,
-                      uint32_t size, unsigned gpu_id, uint32_t *regs);
+void pandecode_interpret_cs_v10(struct pandecode_context *ctx, mali_ptr queue,
+                                uint32_t size, unsigned gpu_id, uint32_t *regs);
 
 /* Logging infrastructure */
 static void
diff --git a/src/panfrost/lib/genxml/decode_common.c b/src/panfrost/lib/genxml/decode_common.c
index f947aa8f44a..ad22e6fc41f 100644
--- a/src/panfrost/lib/genxml/decode_common.c
+++ b/src/panfrost/lib/genxml/decode_common.c
@@ -417,14 +417,14 @@ pandecode_jc(struct pandecode_context *ctx, mali_ptr jc_gpu_va, unsigned gpu_id)
 }
 
 void
-pandecode_cs(struct pandecode_context *ctx, mali_ptr queue_gpu_va,
-             uint32_t size, unsigned gpu_id, uint32_t *regs)
+pandecode_interpret_cs(struct pandecode_context *ctx, mali_ptr queue_gpu_va,
+                       uint32_t size, unsigned gpu_id, uint32_t *regs)
 {
    simple_mtx_lock(&ctx->lock);
 
    switch (pan_arch(gpu_id)) {
    case 10:
-      pandecode_cs_v10(ctx, queue_gpu_va, size, gpu_id, regs);
+      pandecode_interpret_cs_v10(ctx, queue_gpu_va, size, gpu_id, regs);
       break;
    default:
       unreachable("Unsupported architecture");
diff --git a/src/panfrost/lib/genxml/decode_csf.c b/src/panfrost/lib/genxml/decode_csf.c
index bbd6ec3fc5e..9d0723f9cc1 100644
--- a/src/panfrost/lib/genxml/decode_csf.c
+++ b/src/panfrost/lib/genxml/decode_csf.c
@@ -1038,8 +1038,8 @@ no_interpret:
 }
 
 void
-GENX(pandecode_cs)(struct pandecode_context *ctx, mali_ptr queue, uint32_t size,
-                   unsigned gpu_id, uint32_t *regs)
+GENX(pandecode_interpret_cs)(struct pandecode_context *ctx, mali_ptr queue,
+                             uint32_t size, unsigned gpu_id, uint32_t *regs)
 {
    pandecode_dump_file_open(ctx);
 
diff --git a/src/panfrost/lib/wrap.h b/src/panfrost/lib/wrap.h
index c1e61332203..5d7d89adfd9 100644
--- a/src/panfrost/lib/wrap.h
+++ b/src/panfrost/lib/wrap.h
@@ -61,8 +61,9 @@ void pandecode_inject_free(struct pandecode_context *ctx, uint64_t gpu_va,
 void pandecode_jc(struct pandecode_context *ctx, uint64_t jc_gpu_va,
                   unsigned gpu_id);
 
-void pandecode_cs(struct pandecode_context *ctx, mali_ptr queue_gpu_va,
-                  uint32_t size, unsigned gpu_id, uint32_t *regs);
+void pandecode_interpret_cs(struct pandecode_context *ctx,
+                            mali_ptr queue_gpu_va, uint32_t size,
+                            unsigned gpu_id, uint32_t *regs);
 
 void pandecode_abort_on_fault(struct pandecode_context *ctx, uint64_t jc_gpu_va,
                               unsigned gpu_id);
diff --git a/src/panfrost/vulkan/csf/panvk_vX_queue.c b/src/panfrost/vulkan/csf/panvk_vX_queue.c
index b9544af4888..df3a9c23bce 100644
--- a/src/panfrost/vulkan/csf/panvk_vX_queue.c
+++ b/src/panfrost/vulkan/csf/panvk_vX_queue.c
@@ -302,9 +302,9 @@ init_subqueue(struct panvk_queue *queue, enum panvk_subqueue_id subqueue)
                           "SyncobjWait failed: %m");
 
    if (debug & PANVK_DEBUG_TRACE) {
-      pandecode_cs(dev->debug.decode_ctx, qsubmit.stream_addr,
-                   qsubmit.stream_size, phys_dev->kmod.props.gpu_prod_id,
-                   subq->reg_file);
+      pandecode_interpret_cs(dev->debug.decode_ctx, qsubmit.stream_addr,
+                             qsubmit.stream_size,
+                             phys_dev->kmod.props.gpu_prod_id, subq->reg_file);
       pandecode_next_frame(dev->debug.decode_ctx);
    }
 
@@ -788,8 +788,9 @@ panvk_queue_submit_process_debug(const struct panvk_queue_submit *submit)
          pandecode_log(decode_ctx, "CS%d\n", subqueue);
          simple_mtx_unlock(&decode_ctx->lock);
 
-         pandecode_cs(decode_ctx, qsubmit->stream_addr, qsubmit->stream_size,
-                      props->gpu_prod_id, queue->subqueues[subqueue].reg_file);
+         pandecode_interpret_cs(decode_ctx, qsubmit->stream_addr,
+                                qsubmit->stream_size, props->gpu_prod_id,
+                                queue->subqueues[subqueue].reg_file);
       }
    }