diff --git a/src/xrt/auxiliary/vk/vk_compositor_flags.c b/src/xrt/auxiliary/vk/vk_compositor_flags.c
index b7d6dcde0..ac906435e 100644
--- a/src/xrt/auxiliary/vk/vk_compositor_flags.c
+++ b/src/xrt/auxiliary/vk/vk_compositor_flags.c
@@ -44,8 +44,8 @@ check_feature(VkFormat format,
 {
 	if ((format_features & flag) == 0) {
 		U_LOG_E("vk_csci_get_image_usage_flags: %s requested but %s not supported for format %s (%08x) (%08x)",
-		        xrt_swapchain_usage_string(usage), vk_format_feature_string(flag),
-		        vk_color_format_string(format), format_features, flag);
+		        xrt_swapchain_usage_string(usage), vk_format_feature_string(flag), vk_format_string(format),
+		        format_features, flag);
 		return false;
 	}
 	return true;
@@ -235,7 +235,7 @@ vk_csci_get_image_usage_flags(struct vk_bundle *vk, VkFormat format, enum xrt_sw
 		VkFormatFeatureFlags flag = VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT;
 		if ((format_features & flag) == 0) {
 			U_LOG_E("%s: Compositor needs %s but not supported for format %s (%08x) (%08x)", __func__,
-			        vk_format_feature_string(flag), vk_color_format_string(format), format_features, flag);
+			        vk_format_feature_string(flag), vk_format_string(format), format_features, flag);
 			return 0;
 		}
 
diff --git a/src/xrt/auxiliary/vk/vk_helpers.c b/src/xrt/auxiliary/vk/vk_helpers.c
index 2e6c6e046..663b7d233 100644
--- a/src/xrt/auxiliary/vk/vk_helpers.c
+++ b/src/xrt/auxiliary/vk/vk_helpers.c
@@ -73,7 +73,7 @@ vk_result_string(VkResult code)
 }
 
 const char *
-vk_color_format_string(VkFormat code)
+vk_format_string(VkFormat code)
 {
 	switch (code) {
 		ENUM_TO_STR(VK_FORMAT_B8G8R8A8_UNORM);
diff --git a/src/xrt/auxiliary/vk/vk_helpers.h b/src/xrt/auxiliary/vk/vk_helpers.h
index e714997cf..4022bc139 100644
--- a/src/xrt/auxiliary/vk/vk_helpers.h
+++ b/src/xrt/auxiliary/vk/vk_helpers.h
@@ -352,7 +352,7 @@ const char *
 vk_result_string(VkResult code);
 
 const char *
-vk_color_format_string(VkFormat code);
+vk_format_string(VkFormat code);
 
 const char *
 vk_present_mode_string(VkPresentModeKHR code);
diff --git a/src/xrt/compositor/main/comp_target_swapchain.c b/src/xrt/compositor/main/comp_target_swapchain.c
index 51340c732..4a6993502 100644
--- a/src/xrt/compositor/main/comp_target_swapchain.c
+++ b/src/xrt/compositor/main/comp_target_swapchain.c
@@ -377,7 +377,7 @@ _find_surface_format(struct comp_target_swapchain *cts, VkSurfaceKHR surface, Vk
 
 	// Dump formats
 	for (uint32_t i = 0; i < format_count; i++) {
-		COMP_SPEW(cts->base.c, "VkSurfaceFormatKHR: %i [%s, %s]", i, vk_color_format_string(formats[i].format),
+		COMP_SPEW(cts->base.c, "VkSurfaceFormatKHR: %i [%s, %s]", i, vk_format_string(formats[i].format),
 		          vk_color_space_string(formats[i].colorSpace));
 	}
 
@@ -464,10 +464,10 @@ cleanup:
 	           "VkSurfaceFormatKHR"
 	           "\n\tpicked: [format = %s, colorSpace = %s]"
 	           "\n\tpreferred: [format = %s, colorSpace = %s]",
-	           vk_color_format_string(format->format),              //
-	           vk_color_space_string(format->colorSpace),           //
-	           vk_color_format_string(cts->preferred.color_format), //
-	           vk_color_space_string(cts->preferred.color_space));  //
+	           vk_format_string(format->format),                   //
+	           vk_color_space_string(format->colorSpace),          //
+	           vk_format_string(cts->preferred.color_format),      //
+	           vk_color_space_string(cts->preferred.color_space)); //
 
 	return true;
 
diff --git a/src/xrt/compositor/util/comp_swapchain.c b/src/xrt/compositor/util/comp_swapchain.c
index 5a8580ce9..08c8dd6c4 100644
--- a/src/xrt/compositor/util/comp_swapchain.c
+++ b/src/xrt/compositor/util/comp_swapchain.c
@@ -292,7 +292,7 @@ comp_swapchain_create(struct vk_bundle *vk,
 
 	VK_DEBUG(vk, "CREATE %p %dx%d %s (%ld)", (void *)sc, //
 	         info->width, info->height,                  //
-	         vk_color_format_string(info->format), info->format);
+	         vk_format_string(info->format), info->format);
 
 	// Use the image helper to allocate the images.
 	ret = vk_ic_allocate(vk, info, image_count, &sc->vkic);