diff --git a/src/xrt/state_trackers/oxr/oxr_swapchain_d3d11.c b/src/xrt/state_trackers/oxr/oxr_swapchain_d3d11.c
index 499063e96..d9422455d 100644
--- a/src/xrt/state_trackers/oxr/oxr_swapchain_d3d11.c
+++ b/src/xrt/state_trackers/oxr/oxr_swapchain_d3d11.c
@@ -19,10 +19,10 @@
 
 
 static XrResult
-oxr_swapchain_d3d11_enumerate_images(struct oxr_logger *log,
-                                     struct oxr_swapchain *sc,
-                                     uint32_t count,
-                                     XrSwapchainImageBaseHeader *images)
+d3d11_enumerate_images(struct oxr_logger *log,
+                       struct oxr_swapchain *sc,
+                       uint32_t count,
+                       XrSwapchainImageBaseHeader *images)
 {
 	struct xrt_swapchain_d3d11 *xscd3d = (struct xrt_swapchain_d3d11 *)sc->swapchain;
 	XrSwapchainImageD3D11KHR *d3d_imgs = (XrSwapchainImageD3D11KHR *)images;
@@ -49,7 +49,7 @@ oxr_swapchain_d3d11_create(struct oxr_logger *log,
 	}
 
 	// Set our API specific function(s).
-	sc->enumerate_images = oxr_swapchain_d3d11_enumerate_images;
+	sc->enumerate_images = d3d11_enumerate_images;
 
 	*out_swapchain = sc;
 
diff --git a/src/xrt/state_trackers/oxr/oxr_swapchain_d3d12.c b/src/xrt/state_trackers/oxr/oxr_swapchain_d3d12.c
index 7944e22d5..f41204a71 100644
--- a/src/xrt/state_trackers/oxr/oxr_swapchain_d3d12.c
+++ b/src/xrt/state_trackers/oxr/oxr_swapchain_d3d12.c
@@ -20,10 +20,10 @@
 
 
 static XrResult
-oxr_swapchain_d3d12_enumerate_images(struct oxr_logger *log,
-                                     struct oxr_swapchain *sc,
-                                     uint32_t count,
-                                     XrSwapchainImageBaseHeader *images)
+d3d12_enumerate_images(struct oxr_logger *log,
+                       struct oxr_swapchain *sc,
+                       uint32_t count,
+                       XrSwapchainImageBaseHeader *images)
 {
 	struct xrt_swapchain_d3d12 *xscd3d = (struct xrt_swapchain_d3d12 *)sc->swapchain;
 	XrSwapchainImageD3D12KHR *d3d_imgs = (XrSwapchainImageD3D12KHR *)images;
@@ -57,7 +57,7 @@ oxr_swapchain_d3d12_create(struct oxr_logger *log,
 	}
 
 	// Set our API specific function(s).
-	sc->enumerate_images = oxr_swapchain_d3d12_enumerate_images;
+	sc->enumerate_images = d3d12_enumerate_images;
 
 	*out_swapchain = sc;
 
diff --git a/src/xrt/state_trackers/oxr/oxr_swapchain_gl.c b/src/xrt/state_trackers/oxr/oxr_swapchain_gl.c
index 31e3b1f72..6c4eb3c5f 100644
--- a/src/xrt/state_trackers/oxr/oxr_swapchain_gl.c
+++ b/src/xrt/state_trackers/oxr/oxr_swapchain_gl.c
@@ -22,10 +22,10 @@
 
 #if defined(XR_USE_GRAPHICS_API_OPENGL)
 static XrResult
-oxr_swapchain_gl_enumerate_images_gl(struct oxr_logger *log,
-                                     struct oxr_swapchain *sc,
-                                     uint32_t count,
-                                     XrSwapchainImageOpenGLKHR *images)
+gl_enumerate_images_gl(struct oxr_logger *log,
+                       struct oxr_swapchain *sc,
+                       uint32_t count,
+                       XrSwapchainImageOpenGLKHR *images)
 {
 	struct xrt_swapchain_gl *xsc = (struct xrt_swapchain_gl *)sc->swapchain;
 	for (uint32_t i = 0; i < count; i++) {
@@ -42,10 +42,10 @@ oxr_swapchain_gl_enumerate_images_gl(struct oxr_logger *log,
 
 #if defined(XR_USE_GRAPHICS_API_OPENGL_ES)
 static XrResult
-oxr_swapchain_gl_enumerate_images_gles(struct oxr_logger *log,
-                                       struct oxr_swapchain *sc,
-                                       uint32_t count,
-                                       XrSwapchainImageOpenGLESKHR *images)
+gl_enumerate_images_gles(struct oxr_logger *log,
+                         struct oxr_swapchain *sc,
+                         uint32_t count,
+                         XrSwapchainImageOpenGLESKHR *images)
 {
 	struct xrt_swapchain_gl *xsc = (struct xrt_swapchain_gl *)sc->swapchain;
 	for (uint32_t i = 0; i < count; i++) {
@@ -60,20 +60,20 @@ oxr_swapchain_gl_enumerate_images_gles(struct oxr_logger *log,
 #endif // XR_USE_GRAPHICS_API_OPENGL_ES
 
 static XrResult
-oxr_swapchain_gl_enumerate_images(struct oxr_logger *log,
-                                  struct oxr_swapchain *sc,
-                                  uint32_t count,
-                                  XrSwapchainImageBaseHeader *images)
+gl_enumerate_images(struct oxr_logger *log,
+                    struct oxr_swapchain *sc,
+                    uint32_t count,
+                    XrSwapchainImageBaseHeader *images)
 {
 	assert(count > 0);
 	switch (images[0].type) {
 #if defined(XR_USE_GRAPHICS_API_OPENGL)
 	case XR_TYPE_SWAPCHAIN_IMAGE_OPENGL_KHR:
-		return oxr_swapchain_gl_enumerate_images_gl(log, sc, count, (XrSwapchainImageOpenGLKHR *)images);
+		return gl_enumerate_images_gl(log, sc, count, (XrSwapchainImageOpenGLKHR *)images);
 #endif // XR_USE_GRAPHICS_API_OPENGL
 #if defined(XR_USE_GRAPHICS_API_OPENGL_ES)
 	case XR_TYPE_SWAPCHAIN_IMAGE_OPENGL_ES_KHR:
-		return oxr_swapchain_gl_enumerate_images_gles(log, sc, count, (XrSwapchainImageOpenGLESKHR *)images);
+		return gl_enumerate_images_gles(log, sc, count, (XrSwapchainImageOpenGLESKHR *)images);
 #endif // XR_USE_GRAPHICS_API_OPENGL_ES
 	default: return oxr_error(log, XR_ERROR_VALIDATION_FAILURE, "Unsupported XrSwapchainImageBaseHeader type");
 	}
@@ -94,7 +94,7 @@ oxr_swapchain_gl_create(struct oxr_logger *log,
 	}
 
 	// Set our API specific function(s).
-	sc->enumerate_images = oxr_swapchain_gl_enumerate_images;
+	sc->enumerate_images = gl_enumerate_images;
 
 	*out_swapchain = sc;
 
diff --git a/src/xrt/state_trackers/oxr/oxr_swapchain_vk.c b/src/xrt/state_trackers/oxr/oxr_swapchain_vk.c
index 6bc40860f..d07876215 100644
--- a/src/xrt/state_trackers/oxr/oxr_swapchain_vk.c
+++ b/src/xrt/state_trackers/oxr/oxr_swapchain_vk.c
@@ -17,10 +17,10 @@
 
 
 static XrResult
-oxr_swapchain_vk_enumerate_images(struct oxr_logger *log,
-                                  struct oxr_swapchain *sc,
-                                  uint32_t count,
-                                  XrSwapchainImageBaseHeader *images)
+vk_enumerate_images(struct oxr_logger *log,
+                    struct oxr_swapchain *sc,
+                    uint32_t count,
+                    XrSwapchainImageBaseHeader *images)
 {
 	struct xrt_swapchain_vk *xscvk = (struct xrt_swapchain_vk *)sc->swapchain;
 	XrSwapchainImageVulkanKHR *vk_imgs = (XrSwapchainImageVulkanKHR *)images;
@@ -47,7 +47,7 @@ oxr_swapchain_vk_create(struct oxr_logger *log,
 	}
 
 	// Set our API specific function(s).
-	sc->enumerate_images = oxr_swapchain_vk_enumerate_images;
+	sc->enumerate_images = vk_enumerate_images;
 
 	*out_swapchain = sc;