diff --git a/src/asahi/vulkan/hk_cmd_meta.c b/src/asahi/vulkan/hk_cmd_meta.c
index 4a3828d19c5..7e3b91cbc17 100644
--- a/src/asahi/vulkan/hk_cmd_meta.c
+++ b/src/asahi/vulkan/hk_cmd_meta.c
@@ -797,7 +797,7 @@ hk_meta_copy_image_to_buffer2(struct vk_command_buffer *cmd,
          bool is_3d = region->imageExtent.depth > 1;
 
          struct vk_meta_image_copy_key key = {
-            .key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER_PIPELINE,
+            .key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER,
             .type = IMG2BUF,
             .block_size = blocksize_B,
             .nr_samples = image->samples,
@@ -982,7 +982,7 @@ hk_meta_copy_buffer_to_image2(struct vk_command_buffer *cmd,
          bool is_3d = region->imageExtent.depth > 1;
 
          struct vk_meta_image_copy_key key = {
-            .key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER_PIPELINE,
+            .key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER,
             .type = BUF2IMG,
             .block_size = blocksize_B,
             .nr_samples = image->samples,
@@ -1141,8 +1141,8 @@ hk_meta_copy_image2(struct vk_command_buffer *cmd, struct vk_meta_device *meta,
                   : (1 << aspect);
 
             struct vk_meta_image_copy_key key = {
-               .key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER_PIPELINE,
-               .type = IMG2IMG,
+               .key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER,
+               .type = IMG2IMG
                .block_size = blocksize_B,
                .nr_samples = dst_image->samples,
                .src_format = hk_format_to_pipe_format(canonical),
diff --git a/src/vulkan/runtime/vk_meta.h b/src/vulkan/runtime/vk_meta.h
index dd447babcec..55a0251f18f 100644
--- a/src/vulkan/runtime/vk_meta.h
+++ b/src/vulkan/runtime/vk_meta.h
@@ -158,14 +158,14 @@ void vk_meta_device_finish(struct vk_device *device,
 /** Keys should start with one of these to ensure uniqueness */
 enum vk_meta_object_key_type {
    VK_META_OBJECT_KEY_TYPE_INVALID = 0,
-   VK_META_OBJECT_KEY_CLEAR_PIPELINE,
-   VK_META_OBJECT_KEY_BLIT_PIPELINE,
-   VK_META_OBJECT_KEY_BLIT_SAMPLER,
-   VK_META_OBJECT_KEY_COPY_BUFFER_PIPELINE,
-   VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER_PIPELINE,
-   VK_META_OBJECT_KEY_COPY_BUFFER_TO_IMAGE_PIPELINE,
-   VK_META_OBJECT_KEY_COPY_IMAGE_PIPELINE,
-   VK_META_OBJECT_KEY_FILL_BUFFER_PIPELINE,
+
+   VK_META_OBJECT_KEY_CLEAR,
+   VK_META_OBJECT_KEY_BLIT,
+   VK_META_OBJECT_KEY_COPY_BUFFER,
+   VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER,
+   VK_META_OBJECT_KEY_COPY_BUFFER_TO_IMAGE,
+   VK_META_OBJECT_KEY_COPY_IMAGE,
+   VK_META_OBJECT_KEY_FILL_BUFFER,
 
    /* BVH build pipelines */
    VK_META_OBJECT_KEY_LEAF,
diff --git a/src/vulkan/runtime/vk_meta_blit_resolve.c b/src/vulkan/runtime/vk_meta_blit_resolve.c
index 6ad80f680f1..8d84f64b128 100644
--- a/src/vulkan/runtime/vk_meta_blit_resolve.c
+++ b/src/vulkan/runtime/vk_meta_blit_resolve.c
@@ -470,7 +470,7 @@ get_blit_sampler(struct vk_device *device,
    } key;
 
    memset(&key, 0, sizeof(key));
-   key.key_type = VK_META_OBJECT_KEY_BLIT_SAMPLER;
+   key.key_type = VK_META_OBJECT_KEY_BLIT;
    key.filter = filter;
 
    VkSampler from_cache = vk_meta_lookup_sampler(meta, &key, sizeof(key));
@@ -734,7 +734,7 @@ vk_meta_blit_image(struct vk_command_buffer *cmd,
 
    struct vk_meta_blit_key key;
    memset(&key, 0, sizeof(key));
-   key.key_type = VK_META_OBJECT_KEY_BLIT_PIPELINE;
+   key.key_type = VK_META_OBJECT_KEY_BLIT;
    key.src_samples = src_image->samples;
    key.dim = vk_image_sampler_dim(src_image);
    key.dst_format = dst_format;
@@ -825,7 +825,7 @@ vk_meta_resolve_image(struct vk_command_buffer *cmd,
 {
    struct vk_meta_blit_key key;
    memset(&key, 0, sizeof(key));
-   key.key_type = VK_META_OBJECT_KEY_BLIT_PIPELINE;
+   key.key_type = VK_META_OBJECT_KEY_BLIT;
    key.dim = vk_image_sampler_dim(src_image);
    key.src_samples = src_image->samples;
    key.resolve_mode = resolve_mode;
diff --git a/src/vulkan/runtime/vk_meta_clear.c b/src/vulkan/runtime/vk_meta_clear.c
index af62e1a2ab7..e9360d9d23f 100644
--- a/src/vulkan/runtime/vk_meta_clear.c
+++ b/src/vulkan/runtime/vk_meta_clear.c
@@ -209,7 +209,7 @@ vk_meta_clear_attachments(struct vk_command_buffer *cmd,
 
    struct vk_meta_clear_key key;
    memset(&key, 0, sizeof(key));
-   key.key_type = VK_META_OBJECT_KEY_CLEAR_PIPELINE;
+   key.key_type = VK_META_OBJECT_KEY_CLEAR;
    vk_meta_rendering_info_copy(&key.render, render);
 
    struct vk_meta_clear_push_data push = {0};
diff --git a/src/vulkan/runtime/vk_meta_copy_fill_update.c b/src/vulkan/runtime/vk_meta_copy_fill_update.c
index fa401be448b..cb95a01cffc 100644
--- a/src/vulkan/runtime/vk_meta_copy_fill_update.c
+++ b/src/vulkan/runtime/vk_meta_copy_fill_update.c
@@ -1323,7 +1323,7 @@ copy_image_to_buffer_region(
    struct vk_device *dev = cmd->base.device;
    const struct vk_device_dispatch_table *disp = &dev->dispatch_table;
    struct vk_meta_copy_buffer_image_key key = {
-      .key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER_PIPELINE,
+      .key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER,
       .bind_point = VK_PIPELINE_BIND_POINT_COMPUTE,
       .img = {
          .view = img_copy_view_info(vk_image_sampled_view_type(img),
@@ -1503,7 +1503,7 @@ copy_buffer_to_image_region_gfx(
          : (VkImageViewType)-1;
 
    struct vk_meta_copy_buffer_image_key key = {
-      .key_type = VK_META_OBJECT_KEY_COPY_BUFFER_TO_IMAGE_PIPELINE,
+      .key_type = VK_META_OBJECT_KEY_COPY_BUFFER_TO_IMAGE,
       .bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS,
       .img = {
          .view = img_copy_view_info(view_type,
@@ -1548,7 +1548,7 @@ copy_buffer_to_image_region_compute(
    const struct vk_device_dispatch_table *disp = &dev->dispatch_table;
    VkImageViewType view_type = vk_image_storage_view_type(img);
    struct vk_meta_copy_buffer_image_key key = {
-      .key_type = VK_META_OBJECT_KEY_COPY_BUFFER_TO_IMAGE_PIPELINE,
+      .key_type = VK_META_OBJECT_KEY_COPY_BUFFER_TO_IMAGE,
       .bind_point = VK_PIPELINE_BIND_POINT_COMPUTE,
       .img = {
          .view = img_copy_view_info(view_type,
@@ -2037,7 +2037,7 @@ copy_image_region_gfx(struct vk_command_buffer *cmd,
           region->dstSubresource.aspectMask);
 
    struct vk_meta_copy_image_key key = {
-      .key_type = VK_META_OBJECT_KEY_COPY_IMAGE_PIPELINE,
+      .key_type = VK_META_OBJECT_KEY_COPY_IMAGE,
       .bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS,
       .samples = src_img->samples,
       .aspects = region->srcSubresource.aspectMask,
@@ -2098,7 +2098,7 @@ copy_image_region_compute(struct vk_command_buffer *cmd,
           region->dstSubresource.aspectMask);
 
    struct vk_meta_copy_image_key key = {
-      .key_type = VK_META_OBJECT_KEY_COPY_IMAGE_PIPELINE,
+      .key_type = VK_META_OBJECT_KEY_COPY_IMAGE,
       .bind_point = VK_PIPELINE_BIND_POINT_COMPUTE,
       .samples = src_img->samples,
       .aspects = region->srcSubresource.aspectMask,
@@ -2272,7 +2272,7 @@ copy_buffer_region(struct vk_command_buffer *cmd, struct vk_meta_device *meta,
    VkResult result;
 
    struct vk_meta_copy_buffer_key key = {
-      .key_type = VK_META_OBJECT_KEY_COPY_BUFFER_PIPELINE,
+      .key_type = VK_META_OBJECT_KEY_COPY_BUFFER,
    };
 
    VkDeviceSize size = region->size;
@@ -2452,7 +2452,7 @@ vk_meta_fill_buffer(struct vk_command_buffer *cmd, struct vk_meta_device *meta,
    VkResult result;
 
    struct vk_meta_fill_buffer_key key = {
-      .key_type = VK_META_OBJECT_KEY_FILL_BUFFER_PIPELINE,
+      .key_type = VK_META_OBJECT_KEY_FILL_BUFFER,
    };
 
    VkPipelineLayout pipeline_layout;