diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 572dd8e36..3548afc13 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -97,13 +97,12 @@ struct sway_container *container_workspace_create(
 struct sway_container *container_view_create(
 		struct sway_container *sibling, struct sway_view *sway_view);
 
-struct sway_container *container_output_destroy(
-		struct sway_container *output);
+struct sway_container *container_output_destroy(struct sway_container *output);
 
 struct sway_container *container_view_destroy(struct sway_container *view);
 
-struct sway_container *container_set_layout(
-		struct sway_container *container, enum sway_container_layout layout);
+struct sway_container *container_set_layout(struct sway_container *container,
+		enum sway_container_layout layout);
 
 void container_descendents(struct sway_container *root,
 		enum sway_container_type type,
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 64b059047..64f079f4e 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -51,7 +51,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
 				"Expected 'focus <direction|parent|child|mode_toggle>' or 'focus output <direction|name>'");
 	}
 
-	struct sway_container *next_focus = get_swayc_in_direction(con, seat, direction);
+	struct sway_container *next_focus = container_get_in_direction(con, seat, direction);
 	if (next_focus) {
 		sway_seat_set_focus(seat, next_focus);
 	}
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 5152e5230..fb34573ff 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -587,7 +587,7 @@ static struct sway_container *get_swayc_in_direction_under(struct sway_container
 	}
 }
 
-struct sway_container *get_swayc_in_direction(struct sway_container *container, struct sway_seat *seat,
+struct sway_container *container_get_in_direction(struct sway_container *container, struct sway_seat *seat,
 		enum movement_direction dir) {
 	return get_swayc_in_direction_under(container, dir, seat, NULL);
 }