diff --git a/vpnor/Makefile.am.include b/vpnor/Makefile.am.include
index e4379d2..703cfa3 100644
--- a/vpnor/Makefile.am.include
+++ b/vpnor/Makefile.am.include
@@ -2,7 +2,7 @@
 	%reldir%/mboxd_pnor_partition_table.cpp \
 	%reldir%/flash.cpp \
 	%reldir%/pnor_partition.cpp \
-	%reldir%/mboxd_lpc_reset.cpp \
+	%reldir%/lpc_reset.cpp \
 	%reldir%/mboxd_msg.cpp
 
 mboxd_LDFLAGS += -lstdc++fs \
diff --git a/vpnor/mboxd_lpc_reset.cpp b/vpnor/lpc_reset.cpp
similarity index 97%
rename from vpnor/mboxd_lpc_reset.cpp
rename to vpnor/lpc_reset.cpp
index 9bcbb89..6c5a5d6 100644
--- a/vpnor/mboxd_lpc_reset.cpp
+++ b/vpnor/lpc_reset.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "mbox.h"
-#include "mboxd_lpc.h"
+#include "lpc.h"
 #include "mboxd_pnor_partition_table.h"
 
 /*
diff --git a/vpnor/test/Makefile.am.include b/vpnor/test/Makefile.am.include
index e2d5427..d1c37c1 100644
--- a/vpnor/test/Makefile.am.include
+++ b/vpnor/test/Makefile.am.include
@@ -7,8 +7,8 @@
 	common.c \
 	mboxd_msg.c \
 	mboxd_windows.c \
-	mboxd_lpc.c \
-	vpnor/mboxd_lpc_reset.cpp \
+	lpc.c \
+	vpnor/lpc_reset.cpp \
 	vpnor/mboxd_pnor_partition_table.cpp \
 	vpnor/flash.cpp \
 	vpnor/mboxd_msg.cpp \