diff --git a/src/intel/vulkan/anv_android.c b/src/intel/vulkan/anv_android.c
index 5e95149dbfa..3dec9025219 100644
--- a/src/intel/vulkan/anv_android.c
+++ b/src/intel/vulkan/anv_android.c
@@ -27,7 +27,7 @@
  * Called from anv_AllocateMemory when import AHardwareBuffer.
  */
 VkResult
-anv_import_ahw_memory(VkDevice device_h,
+anv_import_ahb_memory(VkDevice device_h,
                       struct anv_device_memory *mem)
 {
 #if ANDROID_API_LEVEL >= 26
diff --git a/src/intel/vulkan/anv_android.h b/src/intel/vulkan/anv_android.h
index 468cd464235..da177165415 100644
--- a/src/intel/vulkan/anv_android.h
+++ b/src/intel/vulkan/anv_android.h
@@ -49,7 +49,7 @@ VkResult anv_image_init_from_gralloc(struct anv_device *device,
                                      const VkImageCreateInfo *base_info,
                                      const VkNativeBufferANDROID *gralloc_info);
 
-VkResult anv_import_ahw_memory(VkDevice device_h,
+VkResult anv_import_ahb_memory(VkDevice device_h,
                                struct anv_device_memory *mem);
 
 #endif /* ANV_ANDROID_H */
diff --git a/src/intel/vulkan/anv_android_stubs.c b/src/intel/vulkan/anv_android_stubs.c
index 12cc2845e9c..7fcfe85fe2c 100644
--- a/src/intel/vulkan/anv_android_stubs.c
+++ b/src/intel/vulkan/anv_android_stubs.c
@@ -41,7 +41,7 @@ anv_image_init_from_gralloc(struct anv_device *device,
 }
 
 VkResult
-anv_import_ahw_memory(VkDevice device_h,
+anv_import_ahb_memory(VkDevice device_h,
                       struct anv_device_memory *mem)
 {
    return VK_ERROR_EXTENSION_NOT_PRESENT;
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index d43d5da37ae..542aadf5fde 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -1576,7 +1576,7 @@ VkResult anv_AllocateMemory(
       alloc_flags |= ANV_BO_ALLOC_DYNAMIC_VISIBLE_POOL;
 
    if (mem->vk.ahardware_buffer) {
-      result = anv_import_ahw_memory(_device, mem);
+      result = anv_import_ahb_memory(_device, mem);
       if (result != VK_SUCCESS)
          goto fail;
 
diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index 5cf1c1a7416..7cb4bad160b 100644
--- a/src/intel/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
@@ -2257,7 +2257,7 @@ void anv_GetPhysicalDeviceExternalBufferProperties(
          pExternalBufferProperties->externalMemoryProperties = android_buffer_props;
          return;
       }
-      FALLTHROUGH; /* If ahw not supported */
+      FALLTHROUGH; /* If ahb not supported */
    default:
       goto unsupported;
    }
diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c
index 48fc61f2de5..395be9f84d5 100644
--- a/src/intel/vulkan/anv_image.c
+++ b/src/intel/vulkan/anv_image.c
@@ -2265,7 +2265,7 @@ VkResult anv_CreateImage(
               __LINE__, pCreateInfo->flags);
 
 #ifndef VK_USE_PLATFORM_ANDROID_KHR
-   /* Skip the WSI common swapchain creation here on Android. Similar to ahw,
+   /* Skip the WSI common swapchain creation here on Android. Similar to ahb,
     * this case is handled by a partial image init and then resolved when the
     * image is bound and gralloc info is passed.
     */
@@ -2357,7 +2357,7 @@ anv_GetImageOpaqueCaptureDescriptorDataEXT(VkDevice device,
  * format and prepare anv_image properly.
  */
 static void
-resolve_ahw_image(struct anv_device *device,
+resolve_ahb_image(struct anv_device *device,
                   struct anv_image *image,
                   struct anv_device_memory *mem)
 {
@@ -2984,7 +2984,7 @@ anv_bind_image_memory(struct anv_device *device,
 
    /* Resolve will alter the image's aspects, do this first. */
    if (mem && mem->vk.ahardware_buffer)
-      resolve_ahw_image(device, image, mem);
+      resolve_ahb_image(device, image, mem);
 
    vk_foreach_struct_const(s, bind_info->pNext) {
       switch (s->sType) {