diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index b07d200d9..1ae34be58 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -38,7 +38,7 @@ struct sway_drag_icon {
 enum sway_seat_operation {
 	OP_NONE,
 	OP_DOWN,
-	OP_MOVE,
+	OP_MOVE_FLOATING,
 	OP_RESIZE_FLOATING,
 	OP_RESIZE_TILING,
 };
@@ -172,8 +172,8 @@ void drag_icon_update_position(struct sway_drag_icon *icon);
 void seat_begin_down(struct sway_seat *seat, struct sway_container *con,
 		uint32_t button, double sx, double sy);
 
-void seat_begin_move(struct sway_seat *seat, struct sway_container *con,
-		uint32_t button);
+void seat_begin_move_floating(struct sway_seat *seat,
+		struct sway_container *con, uint32_t button);
 
 void seat_begin_resize_floating(struct sway_seat *seat,
 		struct sway_container *con, uint32_t button, enum wlr_edges edge);
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index b9ca396a9..00448be7f 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -333,7 +333,7 @@ static void handle_request_move(struct wl_listener *listener, void *data) {
 	struct wlr_xdg_toplevel_move_event *e = data;
 	struct sway_seat *seat = e->seat->seat->data;
 	if (e->serial == seat->last_button_serial) {
-		seat_begin_move(seat, view->container, seat->last_button);
+		seat_begin_move_floating(seat, view->container, seat->last_button);
 	}
 }
 
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 0c121adc5..d2c9a68b0 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -330,7 +330,7 @@ static void handle_request_move(struct wl_listener *listener, void *data) {
 	struct wlr_xdg_toplevel_v6_move_event *e = data;
 	struct sway_seat *seat = e->seat->seat->data;
 	if (e->serial == seat->last_button_serial) {
-		seat_begin_move(seat, view->container, seat->last_button);
+		seat_begin_move_floating(seat, view->container, seat->last_button);
 	}
 }
 
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 6761b6bcc..3619f2024 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -449,7 +449,7 @@ static void handle_request_move(struct wl_listener *listener, void *data) {
 		return;
 	}
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	seat_begin_move(seat, view->container, seat->last_button);
+	seat_begin_move_floating(seat, view->container, seat->last_button);
 }
 
 static void handle_request_resize(struct wl_listener *listener, void *data) {
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 69a019bbf..cd87e9767 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -218,7 +218,7 @@ static void handle_down_motion(struct sway_seat *seat,
 	seat->op_moved = true;
 }
 
-static void handle_move_motion(struct sway_seat *seat,
+static void handle_move_floating_motion(struct sway_seat *seat,
 		struct sway_cursor *cursor) {
 	struct sway_container *con = seat->op_container;
 	desktop_damage_whole_container(con);
@@ -402,8 +402,8 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 		case OP_DOWN:
 			handle_down_motion(seat, cursor, time_msec);
 			break;
-		case OP_MOVE:
-			handle_move_motion(seat, cursor);
+		case OP_MOVE_FLOATING:
+			handle_move_floating_motion(seat, cursor);
 			break;
 		case OP_RESIZE_FLOATING:
 			handle_resize_floating_motion(seat, cursor);
@@ -719,7 +719,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 			while (cont->parent) {
 				cont = cont->parent;
 			}
-			seat_begin_move(seat, cont, button);
+			seat_begin_move_floating(seat, cont, button);
 			return;
 		}
 	}
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 5709a7f7a..a908560ad 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -963,13 +963,13 @@ void seat_begin_down(struct sway_seat *seat, struct sway_container *con,
 	seat->op_moved = false;
 }
 
-void seat_begin_move(struct sway_seat *seat, struct sway_container *con,
-		uint32_t button) {
+void seat_begin_move_floating(struct sway_seat *seat,
+		struct sway_container *con, uint32_t button) {
 	if (!seat->cursor) {
 		wlr_log(WLR_DEBUG, "Ignoring move request due to no cursor device");
 		return;
 	}
-	seat->operation = OP_MOVE;
+	seat->operation = OP_MOVE_FLOATING;
 	seat->op_container = con;
 	seat->op_button = button;
 	cursor_set_image(seat->cursor, "grab", NULL);
@@ -1017,7 +1017,7 @@ void seat_begin_resize_tiling(struct sway_seat *seat,
 
 void seat_end_mouse_operation(struct sway_seat *seat) {
 	enum sway_seat_operation operation = seat->operation;
-	if (seat->operation == OP_MOVE) {
+	if (seat->operation == OP_MOVE_FLOATING) {
 		// We "move" the container to its own location so it discovers its
 		// output again.
 		struct sway_container *con = seat->op_container;