diff --git a/src/event.c b/src/event.c
index 454d4fc..87de238 100644
--- a/src/event.c
+++ b/src/event.c
@@ -340,7 +340,7 @@ static inline void ev_reparent_notify(session_t *ps, xcb_reparent_notify_event_t
 		// Firstly, check if it's a known client window
 		if (!w_top) {
 			// If not, look for its frame window
-			auto w_real_top = find_toplevel_nocache(ps, ev->parent);
+			auto w_real_top = find_managed_window_or_parent(ps, ev->parent);
 			// If found, and the client window has not been determined, or its
 			// frame may not have a correct client, continue
 			if (w_real_top && (!w_real_top->client_win ||
@@ -450,7 +450,7 @@ static inline void ev_property_notify(session_t *ps, xcb_property_notify_event_t
 			                             (const uint32_t[]){determine_evmask(
 			                                 ps, ev->window, WIN_EVMODE_UNKNOWN)});
 
-			auto w_top = find_toplevel_nocache(ps, ev->window);
+			auto w_top = find_managed_window_or_parent(ps, ev->window);
 			// Initialize client_win as early as possible
 			if (w_top &&
 			    (!w_top->client_win || w_top->client_win == w_top->base.id) &&
diff --git a/src/picom.c b/src/picom.c
index ceef454..a7bc763 100644
--- a/src/picom.c
+++ b/src/picom.c
@@ -180,7 +180,7 @@ static inline struct managed_win *find_win_all(session_t *ps, const xcb_window_t
 	if (!w)
 		w = find_toplevel(ps, wid);
 	if (!w)
-		w = find_toplevel_nocache(ps, wid);
+		w = find_managed_window_or_parent(ps, wid);
 	return w;
 }
 
diff --git a/src/win.c b/src/win.c
index 43bfa91..2da27eb 100644
--- a/src/win.c
+++ b/src/win.c
@@ -2189,13 +2189,13 @@ struct managed_win *find_toplevel(session_t *ps, xcb_window_t id) {
 }
 
 /**
- * Find out the WM frame of a client window by querying X.
+ * Find a managed window that is, or is a parent of `wid`.
  *
  * @param ps current session
  * @param wid window ID
  * @return struct _win object of the found window, NULL if not found
  */
-struct managed_win *find_toplevel_nocache(session_t *ps, xcb_window_t wid) {
+struct managed_win *find_managed_window_or_parent(session_t *ps, xcb_window_t wid) {
 	// TODO this should probably be an "update tree", then find_toplevel.
 	//      current approach is a bit more "racy"
 	struct win *w = NULL;
diff --git a/src/win.h b/src/win.h
index bde9a12..d3d9071 100644
--- a/src/win.h
+++ b/src/win.h
@@ -402,13 +402,13 @@ struct managed_win *find_managed_win(session_t *ps, xcb_window_t id);
 struct win *find_win(session_t *ps, xcb_window_t id);
 struct managed_win *find_toplevel(session_t *ps, xcb_window_t id);
 /**
- * Find out the WM frame of a client window by querying X.
+ * Find a managed window that is, or is a parent of `wid`.
  *
  * @param ps current session
  * @param wid window ID
  * @return struct _win object of the found window, NULL if not found
  */
-struct managed_win *find_toplevel_nocache(session_t *ps, xcb_window_t wid);
+struct managed_win *find_managed_window_or_parent(session_t *ps, xcb_window_t wid);
 
 /**
  * Check if a window is a fullscreen window.