diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 9016bce2..0597261a 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -2069,6 +2069,7 @@ create_black_surface(struct weston_compositor *ec,
 		     float x, float y, int w, int h)
 {
 	struct weston_solid_color_surface surface_data = {};
+	struct weston_view *view;
 
 	surface_data.surface_committed = black_surface_committed;
 	surface_data.get_label = black_surface_get_label;
@@ -2078,8 +2079,7 @@ create_black_surface(struct weston_compositor *ec,
 	surface_data.g = 0;
 	surface_data.b = 0;
 
-	struct weston_view *view =
-		create_solid_color_surface(ec, &surface_data, x, y, w, h);
+	view = weston_curtain_create(ec, &surface_data, x, y, w, h);
 
 	return view;
 }
diff --git a/kiosk-shell/kiosk-shell.c b/kiosk-shell/kiosk-shell.c
index 14857ecc..9f2c1fa6 100644
--- a/kiosk-shell/kiosk-shell.c
+++ b/kiosk-shell/kiosk-shell.c
@@ -480,6 +480,7 @@ static void
 kiosk_shell_output_recreate_background(struct kiosk_shell_output *shoutput)
 {
 	struct kiosk_shell *shell = shoutput->shell;
+	struct weston_compositor *ec = shell->compositor;
 	struct weston_output *output = shoutput->output;
 	struct weston_config_section *shell_section = NULL;
 	uint32_t bg_color = 0x0;
@@ -505,12 +506,10 @@ kiosk_shell_output_recreate_background(struct kiosk_shell_output *shoutput)
 	solid_surface.surface_committed = NULL;
 	solid_surface.surface_private = NULL;
 
-	shoutput->background_view =
-			create_solid_color_surface(shoutput->shell->compositor,
-						   &solid_surface,
-						   output->x, output->y,
-						   output->width,
-						   output->height);
+	shoutput->background_view = weston_curtain_create(ec, &solid_surface,
+							  output->x, output->y,
+							  output->width,
+							  output->height);
 
 	weston_surface_set_role(shoutput->background_view->surface,
 				"kiosk-shell-background", NULL, 0);
diff --git a/shared/shell-utils.c b/shared/shell-utils.c
index a301eefc..57b54d63 100644
--- a/shared/shell-utils.c
+++ b/shared/shell-utils.c
@@ -139,9 +139,9 @@ surface_get_label(struct weston_surface *surface, char *buf, size_t len)
 }
 
 struct weston_view *
-create_solid_color_surface(struct weston_compositor *compositor,
-			   struct weston_solid_color_surface *ss,
-			   float x, float y, int w, int h)
+weston_curtain_create(struct weston_compositor *compositor,
+		      struct weston_solid_color_surface *ss,
+		      float x, float y, int w, int h)
 {
 	struct weston_surface *surface = NULL;
 	struct weston_view *view;
diff --git a/shared/shell-utils.h b/shared/shell-utils.h
index b25de1a0..0bfd480c 100644
--- a/shared/shell-utils.h
+++ b/shared/shell-utils.h
@@ -26,7 +26,7 @@
 #include "shared/helpers.h"
 #include <libweston/libweston.h>
 
-/* parameter for create_solid_color_surface() */
+/* parameter for weston_curtain_create() */
 struct weston_solid_color_surface {
 	int (*get_label)(struct weston_surface *es, char *buf, size_t len);
 	void (*surface_committed)(struct weston_surface *es, int32_t sx, int32_t sy);
@@ -53,6 +53,6 @@ surface_get_label(struct weston_surface *surface, char *buf, size_t len);
 /* helper to create a view w/ a color
  */
 struct weston_view *
-create_solid_color_surface(struct weston_compositor *compositor,
-			   struct weston_solid_color_surface *ss,
-			   float x, float y, int w, int h);
+weston_curtain_create(struct weston_compositor *compositor,
+		      struct weston_solid_color_surface *ss,
+		      float x, float y, int w, int h);
diff --git a/tests/safe-signal-output-removal-test.c b/tests/safe-signal-output-removal-test.c
index 0a747307..3aacbe84 100644
--- a/tests/safe-signal-output-removal-test.c
+++ b/tests/safe-signal-output-removal-test.c
@@ -89,9 +89,8 @@ output_create_view(struct test_output *t_output)
        solid_surface.surface_committed = NULL;
        solid_surface.surface_private = NULL;
 
-       t_output->view =
-               create_solid_color_surface(t_output->compositor,
-                                          &solid_surface, 0, 0, 320, 240);
+       t_output->view = weston_curtain_create(t_output->compositor,
+					      &solid_surface, 0, 0, 320, 240);
        weston_view_set_output(t_output->view, t_output->output);
 
        /* weston_compositor_remove_output() has to be patched with