diff --git a/mboxd_msg.c b/mboxd_msg.c
index 193166e..28c3670 100644
--- a/mboxd_msg.c
+++ b/mboxd_msg.c
@@ -339,7 +339,7 @@
 
 	if (!context->current) { /* No existing window */
 		MSG_DBG("No existing window which maps that flash offset\n");
-		rc = create_map_window(context, &context->current, flash_offset,
+		rc = windows_create_map(context, &context->current, flash_offset,
 				       context->version == API_VERSION_1);
 		if (rc < 0) { /* Unable to map offset */
 			MSG_ERR("Couldn't create window mapping for offset 0x%.8x\n"
diff --git a/windows.c b/windows.c
index 0111fea..1842108 100644
--- a/windows.c
+++ b/windows.c
@@ -537,7 +537,7 @@
 }
 
 /*
- * create_map_window() - Create a window mapping which maps the requested offset
+ * windows_create_map() - Create a window mapping which maps the requested offset
  * @context:		The mbox context pointer
  * @this_window:	A pointer to update to the "new" window
  * @offset:		Absolute flash offset to create a mapping for (bytes)
@@ -551,7 +551,7 @@
  *
  * Return:	0 on success otherwise negative error code
  */
-int create_map_window(struct mbox_context *context,
+int windows_create_map(struct mbox_context *context,
 		      struct window_context **this_window, uint32_t offset,
 		      bool exact)
 {
diff --git a/windows.h b/windows.h
index 22db2ca..711f77f 100644
--- a/windows.h
+++ b/windows.h
@@ -29,7 +29,7 @@
 struct window_context *windows_find_largest(struct mbox_context *context);
 struct window_context *windows_search(struct mbox_context *context,
 				      uint32_t offset, bool exact);
-int create_map_window(struct mbox_context *context,
+int windows_create_map(struct mbox_context *context,
 		      struct window_context **this_window,
 		      uint32_t offset, bool exact);