diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index be782bea..41ad9dea 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -1836,12 +1836,12 @@ drm_output_init_egl(struct drm_output *output, struct drm_backend *b)
 
 	if (format[1])
 		n_formats = 2;
-	if (gl_renderer->output_create(&output->base,
-				       (EGLNativeWindowType)output->gbm_surface,
-				       output->gbm_surface,
-				       gl_renderer->opaque_attribs,
-				       format,
-				       n_formats) < 0) {
+	if (gl_renderer->output_window_create(&output->base,
+					      (EGLNativeWindowType)output->gbm_surface,
+					      output->gbm_surface,
+					      gl_renderer->opaque_attribs,
+					      format,
+					      n_formats) < 0) {
 		weston_log("failed to create gl renderer output state\n");
 		gbm_surface_destroy(output->gbm_surface);
 		return -1;
diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
index 869659c7..1a46c4e7 100644
--- a/libweston/compositor-wayland.c
+++ b/libweston/compositor-wayland.c
@@ -700,12 +700,12 @@ wayland_output_init_gl_renderer(struct wayland_output *output)
 		return -1;
 	}
 
-	if (gl_renderer->output_create(&output->base,
-				       output->gl.egl_window,
-				       output->gl.egl_window,
-				       gl_renderer->alpha_attribs,
-				       NULL,
-				       0) < 0)
+	if (gl_renderer->output_window_create(&output->base,
+					      output->gl.egl_window,
+					      output->gl.egl_window,
+					      gl_renderer->alpha_attribs,
+					      NULL,
+					      0) < 0)
 		goto cleanup_window;
 
 	return 0;
diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
index ccee8db7..0804591d 100644
--- a/libweston/compositor-x11.c
+++ b/libweston/compositor-x11.c
@@ -923,12 +923,13 @@ x11_output_enable(struct weston_output *base)
 		 * but eglCreateWindowSurface takes a Window. */
 		Window xid = (Window) output->window;
 
-		ret = gl_renderer->output_create(&output->base,
-						 (EGLNativeWindowType) output->window,
-						 &xid,
-						 gl_renderer->opaque_attribs,
-						 NULL,
-						 0);
+		ret = gl_renderer->output_window_create(
+					&output->base,
+					(EGLNativeWindowType) output->window,
+					&xid,
+					gl_renderer->opaque_attribs,
+					NULL,
+					0);
 		if (ret < 0)
 			goto err;
 	}
diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
index b33a19ab..7c9a1b0b 100644
--- a/libweston/gl-renderer.c
+++ b/libweston/gl-renderer.c
@@ -2640,12 +2640,12 @@ static int
 gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface);
 
 static int
-gl_renderer_output_create(struct weston_output *output,
-			  EGLNativeWindowType window_for_legacy,
-			  void *window_for_platform,
-			  const EGLint *attribs,
-			  const EGLint *visual_id,
-			  int n_ids)
+gl_renderer_output_window_create(struct weston_output *output,
+				 EGLNativeWindowType window_for_legacy,
+				 void *window_for_platform,
+				 const EGLint *attribs,
+				 const EGLint *visual_id,
+				 int n_ids)
 {
 	struct weston_compositor *ec = output->compositor;
 	struct gl_renderer *gr = get_renderer(ec);
@@ -3284,7 +3284,7 @@ WL_EXPORT struct gl_renderer_interface gl_renderer_interface = {
 
 	.display_create = gl_renderer_display_create,
 	.display = gl_renderer_display,
-	.output_create = gl_renderer_output_create,
+	.output_window_create = gl_renderer_output_window_create,
 	.output_destroy = gl_renderer_output_destroy,
 	.output_surface = gl_renderer_output_surface,
 	.output_set_border = gl_renderer_output_set_border,
diff --git a/libweston/gl-renderer.h b/libweston/gl-renderer.h
index 32ba1536..ee327904 100644
--- a/libweston/gl-renderer.h
+++ b/libweston/gl-renderer.h
@@ -69,12 +69,12 @@ struct gl_renderer_interface {
 
 	EGLDisplay (*display)(struct weston_compositor *ec);
 
-	int (*output_create)(struct weston_output *output,
-			     EGLNativeWindowType window_for_legacy,
-			     void *window_for_platform,
-			     const EGLint *attribs,
-			     const EGLint *visual_id,
-			     const int n_ids);
+	int (*output_window_create)(struct weston_output *output,
+				    EGLNativeWindowType window_for_legacy,
+				    void *window_for_platform,
+				    const EGLint *attribs,
+				    const EGLint *visual_id,
+				    const int n_ids);
 
 	void (*output_destroy)(struct weston_output *output);