diff --git a/mboxd_msg.c b/mboxd_msg.c
index ea07a0d..cc23fe3 100644
--- a/mboxd_msg.c
+++ b/mboxd_msg.c
@@ -327,7 +327,7 @@
 				return rc;
 			}
 		}
-		close_current_window(context, NO_BMC_EVENT, FLAGS_NONE);
+		windows_close_current(context, NO_BMC_EVENT, FLAGS_NONE);
 	}
 
 	/* Offset the host has requested */
@@ -662,7 +662,7 @@
 		}
 
 		/* Host asked for it -> Don't set the BMC Event */
-		close_current_window(context, NO_BMC_EVENT, flags);
+		windows_close_current(context, NO_BMC_EVENT, flags);
 	}
 
 	return 0;