diff --git a/mboxd.c b/mboxd.c
index 2e9f10f..0baa1ce 100644
--- a/mboxd.c
+++ b/mboxd.c
@@ -364,7 +364,7 @@
 	}
 
 	/* We've found the reserved memory region -> we can assign to windows */
-	rc = init_windows(context);
+	rc = windows_init(context);
 	if (rc) {
 		goto finish;
 	}
diff --git a/test/mbox.c b/test/mbox.c
index 1ec5698..4a213dc 100644
--- a/test/mbox.c
+++ b/test/mbox.c
@@ -254,7 +254,7 @@
 	rc = fallocate(test.lpc.fd, 0, 0, test.context.mem_size);
 	assert(rc == 0);
 
-	rc = init_windows(&test.context);
+	rc = windows_init(&test.context);
 	assert(rc == 0);
 
 	return rc ? NULL : &test.context;
diff --git a/windows.c b/windows.c
index 762054a..c14386c 100644
--- a/windows.c
+++ b/windows.c
@@ -83,12 +83,12 @@
 	return 0;
 }
 /*
- * init_windows() - Initalise the window cache
+ * windows_init() - Initalise the window cache
  * @context:    The mbox context pointer
  *
  * Return:      0 on success otherwise negative
  */
-int init_windows(struct mbox_context *context)
+int windows_init(struct mbox_context *context)
 {
 	int i;
 
diff --git a/windows.h b/windows.h
index c541c22..a1901c2 100644
--- a/windows.h
+++ b/windows.h
@@ -10,7 +10,7 @@
 #include "mbox.h"
 
 /* Initialisation Functions */
-int init_windows(struct mbox_context *context);
+int windows_init(struct mbox_context *context);
 void free_windows(struct mbox_context *context);
 /* Write From Window Functions */
 int write_from_window_v1(struct mbox_context *context,