diff --git a/control.c b/control.c
index 36dd542..92ad21e 100644
--- a/control.c
+++ b/control.c
@@ -48,7 +48,7 @@
 	 * Better set the bmc event to notify the host of this.
 	 */
 	reset_all_windows(context, SET_BMC_EVENT);
-	rc = reset_lpc(context);
+	rc = lpc_reset(context);
 	if (rc < 0) {
 		return rc;
 	}
diff --git a/lpc.h b/lpc.h
index 4d792de..cf91d42 100644
--- a/lpc.h
+++ b/lpc.h
@@ -8,6 +8,6 @@
 void lpc_dev_free(struct mbox_context *context);
 int lpc_map_flash(struct mbox_context *context);
 int lpc_map_memory(struct mbox_context *context);
-int reset_lpc(struct mbox_context *context);
+int lpc_reset(struct mbox_context *context);
 
 #endif /* LPC_H */
diff --git a/lpc_reset.c b/lpc_reset.c
index 73fd214..b1e7939 100644
--- a/lpc_reset.c
+++ b/lpc_reset.c
@@ -7,12 +7,12 @@
 #include "lpc.h"
 
 /*
- * reset_lpc() - Reset the lpc bus mapping
+ * lpc_reset() - Reset the lpc bus mapping
  * @context:	The mbox context pointer
  *
  * Return:	0 on success otherwise negative error code
  */
-int reset_lpc(struct mbox_context *context)
+int lpc_reset(struct mbox_context *context)
 {
 	return lpc_map_flash(context);
 }
diff --git a/mboxd.c b/mboxd.c
index 541e117..634ae03 100644
--- a/mboxd.c
+++ b/mboxd.c
@@ -140,7 +140,7 @@
 			case SIGHUP:
 				/* Host didn't request reset -> Notify it */
 				reset_all_windows(context, SET_BMC_EVENT);
-				rc = reset_lpc(context);
+				rc = lpc_reset(context);
 				if (rc < 0) {
 					MSG_ERR("WARNING: Failed to point the "
 						"LPC bus back to flash on "
@@ -178,7 +178,7 @@
 	/* Best to reset windows and the lpc mapping for safety */
 	/* Host didn't request reset -> Notify it */
 	reset_all_windows(context, SET_BMC_EVENT);
-	rc = reset_lpc(context);
+	rc = lpc_reset(context);
 	/* Not much we can do if this fails */
 	if (rc < 0) {
 		MSG_ERR("WARNING: Failed to point the LPC bus back to flash\n"
@@ -384,7 +384,7 @@
 #endif
 
 	/* Set the LPC bus mapping */
-	rc = reset_lpc(context);
+	rc = lpc_reset(context);
 	if (rc) {
 		MSG_ERR("LPC configuration failed, RESET required: %d\n", rc);
 	}
diff --git a/mboxd_msg.c b/mboxd_msg.c
index e7c701f..5d92960 100644
--- a/mboxd_msg.c
+++ b/mboxd_msg.c
@@ -124,7 +124,7 @@
 {
 	/* Host requested it -> No BMC Event */
 	reset_all_windows(context, NO_BMC_EVENT);
-	return reset_lpc(context);
+	return lpc_reset(context);
 }
 
 /*
diff --git a/vpnor/lpc_reset.cpp b/vpnor/lpc_reset.cpp
index 588def7..3874b5e 100644
--- a/vpnor/lpc_reset.cpp
+++ b/vpnor/lpc_reset.cpp
@@ -25,12 +25,12 @@
 #include "mboxd_pnor_partition_table.h"
 
 /*
- * reset_lpc() - Reset the lpc bus mapping
+ * lpc_reset() - Reset the lpc bus mapping
  * @context:     The mbox context pointer
  *
  * Return        0 on success otherwise negative error code
  */
-int reset_lpc(struct mbox_context *context)
+int lpc_reset(struct mbox_context *context)
 {
     int rc;