diff --git a/Makefile.am b/Makefile.am
index aed16365..2be469a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,8 +121,8 @@ builtin_sources += drivers/atmodem/atutil.h \
 
 builtin_modules += hfpmodem
 builtin_sources += drivers/atmodem/atutil.h \
-			drivers/hfpmodem/hfp.h \
-			drivers/hfpmodem/hfp.c
+			drivers/hfpmodem/hfpmodem.h \
+			drivers/hfpmodem/hfpmodem.c
 
 builtin_modules += modemconf
 builtin_sources += plugins/modemconf.c
diff --git a/drivers/hfpmodem/hfp.c b/drivers/hfpmodem/hfpmodem.c
similarity index 98%
rename from drivers/hfpmodem/hfp.c
rename to drivers/hfpmodem/hfpmodem.c
index 2d9e6a56..615acd38 100644
--- a/drivers/hfpmodem/hfp.c
+++ b/drivers/hfpmodem/hfpmodem.c
@@ -37,7 +37,7 @@
 #include <gatchat.h>
 #include <gatresult.h>
 
-#include "hfp.h"
+#include "hfpmodem.h"
 
 static int hfpmodem_init(void)
 {
diff --git a/drivers/hfpmodem/hfp.h b/drivers/hfpmodem/hfpmodem.h
similarity index 100%
rename from drivers/hfpmodem/hfp.h
rename to drivers/hfpmodem/hfpmodem.h
diff --git a/plugins/hfp.c b/plugins/hfp.c
index c2973be3..9733cfca 100644
--- a/plugins/hfp.c
+++ b/plugins/hfp.c
@@ -49,7 +49,7 @@
 #include <ofono/ussd.h>
 #include <ofono/voicecall.h>
 
-#include <drivers/hfpmodem/hfp.h>
+#include <drivers/hfpmodem/hfpmodem.h>
 
 static const char *brsf_prefix[] = { "+BRSF:", NULL };
 static const char *cind_prefix[] = { "+CIND:", NULL };