diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c
index c61f6a9a163..3d41d36973f 100644
--- a/src/nouveau/vulkan/nvk_cmd_buffer.c
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.c
@@ -798,15 +798,15 @@ nvk_cmd_buffer_flush_push_descriptors(struct nvk_cmd_buffer *cmd,
 }
 
 bool
-nvk_cmd_buffer_get_cbuf_descriptor(struct nvk_cmd_buffer *cmd,
-                                   const struct nvk_descriptor_state *desc,
-                                   const struct nvk_shader *shader,
-                                   const struct nvk_cbuf *cbuf,
-                                   struct nvk_buffer_address *desc_out)
+nvk_cmd_buffer_get_cbuf_addr(struct nvk_cmd_buffer *cmd,
+                             const struct nvk_descriptor_state *desc,
+                             const struct nvk_shader *shader,
+                             const struct nvk_cbuf *cbuf,
+                             struct nvk_buffer_address *addr_out)
 {
    switch (cbuf->type) {
    case NVK_CBUF_TYPE_INVALID:
-      *desc_out = (struct nvk_buffer_address) { .size = 0 };
+      *addr_out = (struct nvk_buffer_address) { .size = 0 };
       return true;
 
    case NVK_CBUF_TYPE_ROOT_DESC:
@@ -814,20 +814,20 @@ nvk_cmd_buffer_get_cbuf_descriptor(struct nvk_cmd_buffer *cmd,
       return false;
 
    case NVK_CBUF_TYPE_SHADER_DATA:
-      *desc_out = (struct nvk_buffer_address) {
+      *addr_out = (struct nvk_buffer_address) {
          .base_addr = shader->data_addr,
          .size = shader->data_size,
       };
       return true;
 
    case NVK_CBUF_TYPE_DESC_SET:
-      *desc_out = desc->root.sets[cbuf->desc_set];
+      *addr_out = desc->root.sets[cbuf->desc_set];
       return true;
 
    case NVK_CBUF_TYPE_DYNAMIC_UBO: {
       const uint32_t dyn_start =
          desc->root.set_dynamic_buffer_start[cbuf->desc_set];
-      *desc_out = desc->root.dynamic_buffers[dyn_start + cbuf->dynamic_idx];
+      *addr_out = desc->root.dynamic_buffers[dyn_start + cbuf->dynamic_idx];
       return true;
    }
 
@@ -841,7 +841,7 @@ nvk_cmd_buffer_get_cbuf_descriptor(struct nvk_cmd_buffer *cmd,
 
       assert(cbuf->desc_offset < NVK_PUSH_DESCRIPTOR_SET_SIZE);
       void *desc = &push->data[cbuf->desc_offset];
-      *desc_out = *(struct nvk_buffer_address *)desc;
+      *addr_out = *(struct nvk_buffer_address *)desc;
       return true;
    }
 
diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.h b/src/nouveau/vulkan/nvk_cmd_buffer.h
index fb54ec0bf8b..aee44cd0875 100644
--- a/src/nouveau/vulkan/nvk_cmd_buffer.h
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.h
@@ -272,11 +272,11 @@ nvk_cmd_buffer_flush_push_descriptors(struct nvk_cmd_buffer *cmd,
                                       struct nvk_descriptor_state *desc);
 
 bool
-nvk_cmd_buffer_get_cbuf_descriptor(struct nvk_cmd_buffer *cmd,
-                                   const struct nvk_descriptor_state *desc,
-                                   const struct nvk_shader *shader,
-                                   const struct nvk_cbuf *cbuf,
-                                   struct nvk_buffer_address *desc_out);
+nvk_cmd_buffer_get_cbuf_addr(struct nvk_cmd_buffer *cmd,
+                             const struct nvk_descriptor_state *desc,
+                             const struct nvk_shader *shader,
+                             const struct nvk_cbuf *cbuf,
+                             struct nvk_buffer_address *addr_out);
 uint64_t
 nvk_cmd_buffer_get_cbuf_descriptor_addr(struct nvk_cmd_buffer *cmd,
                                         const struct nvk_descriptor_state *desc,
diff --git a/src/nouveau/vulkan/nvk_cmd_dispatch.c b/src/nouveau/vulkan/nvk_cmd_dispatch.c
index fd7325017fe..98467184bfd 100644
--- a/src/nouveau/vulkan/nvk_cmd_dispatch.c
+++ b/src/nouveau/vulkan/nvk_cmd_dispatch.c
@@ -157,7 +157,7 @@ nvk_flush_compute_state(struct nvk_cmd_buffer *cmd,
          };
       } else {
          ASSERTED bool direct_descriptor =
-            nvk_cmd_buffer_get_cbuf_descriptor(cmd, desc, shader, cbuf, &ba);
+            nvk_cmd_buffer_get_cbuf_addr(cmd, desc, shader, cbuf, &ba);
          assert(direct_descriptor);
       }
 
diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c
index 648792aea04..9cb9997ed6c 100644
--- a/src/nouveau/vulkan/nvk_cmd_draw.c
+++ b/src/nouveau/vulkan/nvk_cmd_draw.c
@@ -2364,7 +2364,7 @@ nvk_flush_descriptors(struct nvk_cmd_buffer *cmd)
          }
 
          struct nvk_buffer_address ba;
-         if (nvk_cmd_buffer_get_cbuf_descriptor(cmd, desc, shader, cbuf, &ba)) {
+         if (nvk_cmd_buffer_get_cbuf_addr(cmd, desc, shader, cbuf, &ba)) {
             assert(ba.base_addr % min_cbuf_alignment == 0);
             ba.size = align(ba.size, min_cbuf_alignment);
             ba.size = MIN2(ba.size, NVK_MAX_CBUF_SIZE);