diff --git a/include/sway/output.h b/include/sway/output.h
index 300fcd489..969867000 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -124,11 +124,11 @@ void output_layer_for_each_surface(struct sway_output *output,
 	struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator,
 	void *user_data);
 
-void output_layer_for_each_surface_toplevel(struct sway_output *output,
+void output_layer_for_each_toplevel_surface(struct sway_output *output,
 	struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator,
 	void *user_data);
 
-void output_layer_for_each_surface_popup(struct sway_output *output,
+void output_layer_for_each_popup_surface(struct sway_output *output,
 	struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator,
 	void *user_data);
 
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 7921d5971..5edc8f96e 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -243,7 +243,7 @@ void output_layer_for_each_surface(struct sway_output *output,
 	}
 }
 
-void output_layer_for_each_surface_toplevel(struct sway_output *output,
+void output_layer_for_each_toplevel_surface(struct sway_output *output,
 		struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator,
 		void *user_data) {
 	struct sway_layer_surface *layer_surface;
@@ -257,7 +257,7 @@ void output_layer_for_each_surface_toplevel(struct sway_output *output,
 }
 
 
-void output_layer_for_each_surface_popup(struct sway_output *output,
+void output_layer_for_each_popup_surface(struct sway_output *output,
 		struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator,
 		void *user_data) {
 	struct sway_layer_surface *layer_surface;
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index acf503a42..bd85282c4 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -171,7 +171,7 @@ static void render_layer_toplevel(struct sway_output *output,
 		.damage = damage,
 		.alpha = 1.0f,
 	};
-	output_layer_for_each_surface_toplevel(output, layer_surfaces,
+	output_layer_for_each_toplevel_surface(output, layer_surfaces,
 		render_surface_iterator, &data);
 }
 
@@ -181,7 +181,7 @@ static void render_layer_popups(struct sway_output *output,
 		.damage = damage,
 		.alpha = 1.0f,
 	};
-	output_layer_for_each_surface_popup(output, layer_surfaces,
+	output_layer_for_each_popup_surface(output, layer_surfaces,
 		render_surface_iterator, &data);
 }