diff --git a/cmd-tile-float-pane.c b/cmd-tile-float-pane.c
index 1c33a148..2f26bd77 100644
--- a/cmd-tile-float-pane.c
+++ b/cmd-tile-float-pane.c
@@ -88,7 +88,7 @@ cmd_float_pane_exec(struct cmd *self, struct cmdq_item *item)
 		return (CMD_RETURN_ERROR);
 	}
 
-	layout_cell_remove_tile(w, lc);
+	layout_remove_tile(w, lc);
 	layout_cell_floating_args(item, args, w, &sx, &sy, &ox, &oy, &cause);
 	if (cause != NULL) {
 		cmdq_error(item, "failed to float pane: %s", cause);
@@ -134,7 +134,7 @@ cmd_tile_pane_exec(struct cmd *self, struct cmdq_item *item)
 	}
 
 	layout_save_size(lc);
-	if (layout_cell_insert_tile(w, lc) == 0)
+	if (layout_insert_tile(w, lc) == 0)
 		return (CMD_RETURN_ERROR);
 
 
diff --git a/layout.c b/layout.c
index e36f7e7a..b189d48e 100644
--- a/layout.c
+++ b/layout.c
@@ -1796,7 +1796,7 @@ layout_get_floating_cell(struct cmdq_item *item, struct args *args,
 }
 
 int
-layout_cell_remove_tile(struct window *w, struct layout_cell *lc)
+layout_remove_tile(struct window *w, struct layout_cell *lc)
 {
 	struct layout_cell	*lcother, *lcparent;
 	enum layout_type	 type;
@@ -1807,7 +1807,7 @@ layout_cell_remove_tile(struct window *w, struct layout_cell *lc)
 
 	lcother = layout_cell_get_neighbour(lc);
 	if (lcother == NULL) {
-		layout_cell_remove_tile(w, lc->parent);
+		layout_remove_tile(w, lc->parent);
 	} else if ((lcparent = lcother->parent) != NULL) {
 		type = lcparent->type;
 		if (type == LAYOUT_TOPBOTTOM)
@@ -1822,7 +1822,7 @@ layout_cell_remove_tile(struct window *w, struct layout_cell *lc)
 }
 
 int
-layout_cell_insert_tile(struct window *w, struct layout_cell *lc)
+layout_insert_tile(struct window *w, struct layout_cell *lc)
 {
 	struct window_pane	*wp;
 	struct layout_cell	*lcother, *lcparent = lc->parent;
@@ -1845,7 +1845,7 @@ layout_cell_insert_tile(struct window *w, struct layout_cell *lc)
 		 * This is now the only revealed cell in the parent. Reveal the
 		 * parent, then set the child's 'type' dimension.
 		 */
-		layout_cell_insert_tile(w, lcparent);
+		layout_insert_tile(w, lcparent);
 		if (type == LAYOUT_LEFTRIGHT)
 			size1 = lcparent->sx;
 		else 
diff --git a/tmux.h b/tmux.h
index c4050f48..3bba53e8 100644
--- a/tmux.h
+++ b/tmux.h
@@ -3593,8 +3593,8 @@ struct layout_cell *layout_get_floating_cell(struct cmdq_item *, struct args *,
 struct layout_cell *layout_get_tiled_cell(struct cmdq_item *, struct args *,
 		     struct window *, struct window_pane *, int, char **);
 int		 layout_cell_is_tiled(struct layout_cell *);
-int		 layout_cell_remove_tile(struct window *, struct layout_cell *);
-int		 layout_cell_insert_tile(struct window *, struct layout_cell *);
+int		 layout_remove_tile(struct window *, struct layout_cell *);
+int		 layout_insert_tile(struct window *, struct layout_cell *);
 
 /* layout-custom.c */
 char		*layout_dump(struct window *, struct layout_cell *);