diff --git a/src/imagination/vulkan/pds/pvr_pds.h b/src/imagination/vulkan/pds/pvr_pds.h
index 97668ee02a7..d21179def17 100644
--- a/src/imagination/vulkan/pds/pvr_pds.h
+++ b/src/imagination/vulkan/pds/pvr_pds.h
@@ -868,12 +868,12 @@ struct pvr_pds_descriptor_set {
 };
 
 #define PVR_BUFFER_TYPE_UBO (0)
-#define PVR_BUFFER_TYPES_COMPILE_TIME (1)
+#define PVR_BUFFER_TYPE_COMPILE_TIME (1)
 #define PVR_BUFFER_TYPE_BLEND_CONSTS (2)
 #define PVR_BUFFER_TYPE_PUSH_CONSTS (3)
-#define PVR_BUFFER_TYPES_BUFFER_LENGTHS (4)
+#define PVR_BUFFER_TYPE_BUFFER_LENGTHS (4)
 #define PVR_BUFFER_TYPE_DYNAMIC (5)
-#define PVR_BUFFER_TYPES_UBO_ZEROING (6)
+#define PVR_BUFFER_TYPE_UBO_ZEROING (6)
 #define PVR_BUFFER_TYPE_INVALID (~0)
 
 struct pvr_pds_buffer {
@@ -895,7 +895,7 @@ struct pvr_pds_buffer {
 
 #define PVR_PDS_MAX_BUFFERS (24)
 
-struct pvr_descriptor_program_input {
+struct pvr_pds_descriptor_program_input {
    /* User-specified descriptor sets. */
    unsigned int descriptor_set_count;
    struct pvr_pds_descriptor_set descriptor_sets[8];
@@ -1133,7 +1133,7 @@ struct pvr_pds_info {
 };
 
 void pvr_pds_generate_descriptor_upload_program(
-   struct pvr_descriptor_program_input *input_program,
+   struct pvr_pds_descriptor_program_input *input_program,
    uint32_t *code_section,
    struct pvr_pds_info *info);
 void pvr_pds_generate_vertex_primary_program(
diff --git a/src/imagination/vulkan/pds/pvr_xgl_pds.c b/src/imagination/vulkan/pds/pvr_xgl_pds.c
index 0a4850c05cd..1ba6fa5471e 100644
--- a/src/imagination/vulkan/pds/pvr_xgl_pds.c
+++ b/src/imagination/vulkan/pds/pvr_xgl_pds.c
@@ -1490,7 +1490,7 @@ void pvr_pds_generate_vertex_primary_program(
 }
 
 void pvr_pds_generate_descriptor_upload_program(
-   struct pvr_descriptor_program_input *input_program,
+   struct pvr_pds_descriptor_program_input *input_program,
    uint32_t *code_section,
    struct pvr_pds_info *info)
 {
@@ -1608,7 +1608,7 @@ void pvr_pds_generate_descriptor_upload_program(
          special_buffer_entry->buffer_index = buffer->source_offset;
          break;
       }
-      case PVR_BUFFER_TYPES_COMPILE_TIME: {
+      case PVR_BUFFER_TYPE_COMPILE_TIME: {
          struct pvr_const_map_entry_special_buffer *special_buffer_entry;
 
          special_buffer_entry =
@@ -1616,11 +1616,11 @@ void pvr_pds_generate_descriptor_upload_program(
                                                  sizeof(*special_buffer_entry));
          special_buffer_entry->type =
             PVR_PDS_CONST_MAP_ENTRY_TYPE_SPECIAL_BUFFER;
-         special_buffer_entry->buffer_type = PVR_BUFFER_TYPES_COMPILE_TIME;
+         special_buffer_entry->buffer_type = PVR_BUFFER_TYPE_COMPILE_TIME;
          special_buffer_entry->buffer_index = compile_time_buffer_index++;
          break;
       }
-      case PVR_BUFFER_TYPES_BUFFER_LENGTHS: {
+      case PVR_BUFFER_TYPE_BUFFER_LENGTHS: {
          struct pvr_const_map_entry_special_buffer *special_buffer_entry;
 
          special_buffer_entry =
@@ -1628,7 +1628,7 @@ void pvr_pds_generate_descriptor_upload_program(
                                                  sizeof(*special_buffer_entry));
          special_buffer_entry->type =
             PVR_PDS_CONST_MAP_ENTRY_TYPE_SPECIAL_BUFFER;
-         special_buffer_entry->buffer_type = PVR_BUFFER_TYPES_BUFFER_LENGTHS;
+         special_buffer_entry->buffer_type = PVR_BUFFER_TYPE_BUFFER_LENGTHS;
          break;
       }
       case PVR_BUFFER_TYPE_BLEND_CONSTS: {
@@ -1659,7 +1659,7 @@ void pvr_pds_generate_descriptor_upload_program(
          constant_buffer_entry->size_in_dwords = buffer->size_in_dwords;
          break;
       }
-      case PVR_BUFFER_TYPES_UBO_ZEROING: {
+      case PVR_BUFFER_TYPE_UBO_ZEROING: {
          struct pvr_const_map_entry_constant_buffer_zeroing
             *constant_buffer_entry;
 
diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c
index 9d6618d70b7..f83cdffc1ad 100644
--- a/src/imagination/vulkan/pvr_cmd_buffer.c
+++ b/src/imagination/vulkan/pvr_cmd_buffer.c
@@ -3061,7 +3061,7 @@ static VkResult pvr_setup_descriptor_mappings(
             (struct pvr_const_map_entry_special_buffer *)entries;
 
          switch (special_buff_entry->buffer_type) {
-         case PVR_BUFFER_TYPES_COMPILE_TIME: {
+         case PVR_BUFFER_TYPE_COMPILE_TIME: {
             uint64_t addr = descriptor_state->static_consts->vma->dev_addr.addr;
 
             PVR_WRITE(qword_buffer,
diff --git a/src/imagination/vulkan/pvr_pipeline.c b/src/imagination/vulkan/pvr_pipeline.c
index 31bac625ac6..bfed49dc3f1 100644
--- a/src/imagination/vulkan/pvr_pipeline.c
+++ b/src/imagination/vulkan/pvr_pipeline.c
@@ -613,7 +613,7 @@ static VkResult pvr_pds_descriptor_program_setup_buffers(
        * Currently we're only setting up a single buffer.
        */
       buffers[buffer_count++] = (struct pvr_pds_buffer){
-         .type = PVR_BUFFER_TYPES_COMPILE_TIME,
+         .type = PVR_BUFFER_TYPE_COMPILE_TIME,
          .size_in_dwords = compile_time_consts_data->static_consts.num,
          .destination = compile_time_consts_data->static_consts.dest,
       };
@@ -649,7 +649,7 @@ static VkResult pvr_pds_descriptor_program_create_and_upload(
    const size_t const_entries_size_in_bytes =
       pvr_pds_get_max_descriptor_upload_const_map_size_in_bytes();
    struct pvr_pds_info *const pds_info = &descriptor_state->pds_info;
-   struct pvr_descriptor_program_input program = { 0 };
+   struct pvr_pds_descriptor_program_input program = { 0 };
    struct pvr_const_map_entry *entries_buffer;
    ASSERTED uint32_t code_size_in_dwords;
    uint32_t staging_buffer_size;