diff --git a/mboxd.c b/mboxd.c
index 0baa1ce..ccdccc1 100644
--- a/mboxd.c
+++ b/mboxd.c
@@ -407,7 +407,7 @@
 	flash_dev_free(context);
 	lpc_dev_free(context);
 	free_mbox_dev(context);
-	free_windows(context);
+	windows_free(context);
 #ifdef VIRTUAL_PNOR_ENABLED
 	destroy_vpnor(context);
 #endif
diff --git a/windows.c b/windows.c
index c14386c..921e06f 100644
--- a/windows.c
+++ b/windows.c
@@ -121,10 +121,10 @@
 }
 
 /*
- * free_windows() - Free the window cache
+ * windows_free() - Free the window cache
  * @context:	The mbox context pointer
  */
-void free_windows(struct mbox_context *context)
+void windows_free(struct mbox_context *context)
 {
 	int i;
 
diff --git a/windows.h b/windows.h
index a1901c2..002e507 100644
--- a/windows.h
+++ b/windows.h
@@ -11,7 +11,7 @@
 
 /* Initialisation Functions */
 int windows_init(struct mbox_context *context);
-void free_windows(struct mbox_context *context);
+void windows_free(struct mbox_context *context);
 /* Write From Window Functions */
 int write_from_window_v1(struct mbox_context *context,
 			 uint32_t offset_bytes, uint32_t count_bytes);