diff --git a/windows.c b/windows.c
index 3759bb3..37fceb1 100644
--- a/windows.c
+++ b/windows.c
@@ -444,12 +444,12 @@
 }
 
 /*
- * find_oldest_window() - Find the oldest (Least Recently Used) window
+ * windows_find_oldest() - Find the oldest (Least Recently Used) window
  * @context:		The mbox context pointer
  *
  * Return:	Pointer to the least recently used window
  */
-struct window_context *find_oldest_window(struct mbox_context *context)
+struct window_context *windows_find_oldest(struct mbox_context *context)
 {
 	struct window_context *oldest = NULL, *cur;
 	uint32_t min_age = context->windows.max_age + 1;
@@ -567,7 +567,7 @@
 	/* No uninitialised window found, we need to choose one to "evict" */
 	if (!cur) {
 		MSG_DBG("No uninitialised window, evicting one\n");
-		cur = find_oldest_window(context);
+		cur = windows_find_oldest(context);
 		window_reset(context, cur);
 	}
 
diff --git a/windows.h b/windows.h
index 943ea9b..3cb2a52 100644
--- a/windows.h
+++ b/windows.h
@@ -25,7 +25,7 @@
 			  uint8_t flags);
 void window_reset(struct mbox_context *context, struct window_context *window);
 void windows_reset_all(struct mbox_context *context, bool set_bmc_event);
-struct window_context *find_oldest_window(struct mbox_context *context);
+struct window_context *windows_find_oldest(struct mbox_context *context);
 struct window_context *find_largest_window(struct mbox_context *context);
 struct window_context *search_windows(struct mbox_context *context,
 				      uint32_t offset, bool exact);