diff --git a/flash.c b/flash.c
index 63a1293..c446658 100644
--- a/flash.c
+++ b/flash.c
@@ -97,7 +97,7 @@
 	return rc;
 }
 
-void free_flash_dev(struct mbox_context *context)
+void flash_dev_free(struct mbox_context *context)
 {
 	free(context->flash_bmap);
 	close(context->fds[MTD_FD].fd);
diff --git a/flash.h b/flash.h
index 1c66fc2..a53e76e 100644
--- a/flash.h
+++ b/flash.h
@@ -10,7 +10,7 @@
 #include "mbox.h"
 
 int flash_dev_init(struct mbox_context *context);
-void free_flash_dev(struct mbox_context *context);
+void flash_dev_free(struct mbox_context *context);
 int64_t copy_flash(struct mbox_context *context, uint32_t offset, void *mem,
 		   uint32_t size);
 int set_flash_bytemap(struct mbox_context *context, uint32_t offset,
diff --git a/mboxd.c b/mboxd.c
index 545d142..7393151 100644
--- a/mboxd.c
+++ b/mboxd.c
@@ -404,7 +404,7 @@
 	clr_bmc_events(context, BMC_EVENT_DAEMON_READY, SET_BMC_EVENT);
 
 	dbus_free(context);
-	free_flash_dev(context);
+	flash_dev_free(context);
 	free_lpc_dev(context);
 	free_mbox_dev(context);
 	free_windows(context);
diff --git a/test/erase_flash.c b/test/erase_flash.c
index f4f4821..eae2627 100644
--- a/test/erase_flash.c
+++ b/test/erase_flash.c
@@ -204,7 +204,7 @@
 	recorded = NULL;
 	n_ioctls = 0;
 
-	free_flash_dev(&context);
+	flash_dev_free(&context);
 
 	return rc;
 }
diff --git a/test/write_flash.c b/test/write_flash.c
index 4f37bef..f0c107c 100644
--- a/test/write_flash.c
+++ b/test/write_flash.c
@@ -99,7 +99,7 @@
 	rc = memcmp(src, map, sizeof(src));
 	assert(rc == 0);
 
-	free_flash_dev(context);
+	flash_dev_free(context);
 
 	return rc;
 }
diff --git a/vpnor/flash.cpp b/vpnor/flash.cpp
index b5a2122..b2e0134 100644
--- a/vpnor/flash.cpp
+++ b/vpnor/flash.cpp
@@ -89,7 +89,7 @@
     return rc;
 }
 
-void free_flash_dev(struct mbox_context* context)
+void flash_dev_free(struct mbox_context* context)
 {
     // No-op
 }