diff --git a/include/wlr/xwayland/xwayland.h b/include/wlr/xwayland/xwayland.h
index 4b476a03..837a57e0 100644
--- a/include/wlr/xwayland/xwayland.h
+++ b/include/wlr/xwayland/xwayland.h
@@ -299,10 +299,10 @@ void wlr_xwayland_surface_ping(struct wlr_xwayland_surface *surface);
  * Returns: true if the window should receive focus
  *          false if it should be ignored
  */
-bool wlr_xwayland_or_surface_wants_focus(
+bool wlr_xwayland_surface_override_redirect_wants_focus(
 	const struct wlr_xwayland_surface *xsurface);
 
-enum wlr_xwayland_icccm_input_model wlr_xwayland_icccm_input_model(
+enum wlr_xwayland_icccm_input_model wlr_xwayland_surface_icccm_input_model(
 	const struct wlr_xwayland_surface *xsurface);
 
 /**
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index c65851bb..b22ed9a7 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -2322,7 +2322,7 @@ void wlr_xwayland_surface_ping(struct wlr_xwayland_surface *surface) {
 	surface->pinging = true;
 }
 
-bool wlr_xwayland_or_surface_wants_focus(
+bool wlr_xwayland_surface_override_redirect_wants_focus(
 		const struct wlr_xwayland_surface *xsurface) {
 	static const enum atom_name needles[] = {
 		NET_WM_WINDOW_TYPE_COMBO,
@@ -2347,8 +2347,8 @@ bool wlr_xwayland_or_surface_wants_focus(
 	return true;
 }
 
-enum wlr_xwayland_icccm_input_model wlr_xwayland_icccm_input_model(
-	const struct wlr_xwayland_surface *xsurface) {
+enum wlr_xwayland_icccm_input_model wlr_xwayland_surface_icccm_input_model(
+		const struct wlr_xwayland_surface *xsurface) {
 	bool take_focus = xwm_atoms_contains(xsurface->xwm,
 		xsurface->protocols, xsurface->protocols_len,
 		WM_TAKE_FOCUS);