diff --git a/Makefile.mesh b/Makefile.mesh
index 28c87a0..76e424b 100644
--- a/Makefile.mesh
+++ b/Makefile.mesh
@@ -5,7 +5,7 @@ dbus_DATA += mesh/bluetooth-mesh.conf
 endif
 
 mesh_sources = mesh/mesh.h mesh/mesh.c \
-				mesh/net_keys.h mesh/net_keys.c \
+				mesh/net-keys.h mesh/net-keys.c \
 				mesh/mesh-io.h mesh/mesh-io.c \
 				mesh/error.h mesh/mesh-io-api.h \
 				mesh/mesh-io-generic.h \
diff --git a/mesh/friend.c b/mesh/friend.c
index d17fde0..1722a2e 100644
--- a/mesh/friend.c
+++ b/mesh/friend.c
@@ -29,7 +29,7 @@
 #include "mesh/mesh-defs.h"
 
 #include "mesh/mesh.h"
-#include "mesh/net_keys.h"
+#include "mesh/net-keys.h"
 #include "mesh/node.h"
 #include "mesh/net.h"
 #include "mesh/crypto.h"
diff --git a/mesh/net_keys.c b/mesh/net-keys.c
similarity index 99%
rename from mesh/net_keys.c
rename to mesh/net-keys.c
index 6f7b7c1..84e3982 100644
--- a/mesh/net_keys.c
+++ b/mesh/net-keys.c
@@ -25,7 +25,7 @@
 #include <ell/ell.h>
 
 #include "mesh/crypto.h"
-#include "mesh/net_keys.h"
+#include "mesh/net-keys.h"
 
 #define BEACON_TYPE_SNB		0x01
 #define KEY_REFRESH		0x01
diff --git a/mesh/net_keys.h b/mesh/net-keys.h
similarity index 100%
rename from mesh/net_keys.h
rename to mesh/net-keys.h
diff --git a/mesh/net.c b/mesh/net.c
index 53010d5..2adae70 100644
--- a/mesh/net.c
+++ b/mesh/net.c
@@ -32,7 +32,7 @@
 #include "mesh/util.h"
 
 #include "mesh/crypto.h"
-#include "mesh/net_keys.h"
+#include "mesh/net-keys.h"
 #include "mesh/mesh.h"
 #include "mesh/node.h"
 #include "mesh/net.h"
diff --git a/mesh/pb-adv.c b/mesh/pb-adv.c
index 57647e1..a6104ca 100644
--- a/mesh/pb-adv.c
+++ b/mesh/pb-adv.c
@@ -39,7 +39,7 @@
 #include "src/shared/ecc.h"
 
 #include "mesh/util.h"
-#include "mesh/net_keys.h"
+#include "mesh/net-keys.h"
 #include "mesh/crypto.h"
 #include "mesh/net.h"
 #include "mesh/mesh-io.h"
diff --git a/mesh/prov-acceptor.c b/mesh/prov-acceptor.c
index 3d4d93b..a8bc2c9 100644
--- a/mesh/prov-acceptor.c
+++ b/mesh/prov-acceptor.c
@@ -39,7 +39,7 @@
 #include "src/shared/ecc.h"
 
 #include "mesh/util.h"
-#include "mesh/net_keys.h"
+#include "mesh/net-keys.h"
 #include "mesh/crypto.h"
 #include "mesh/net.h"
 #include "mesh/error.h"
diff --git a/mesh/prov-initiator.c b/mesh/prov-initiator.c
index d915f2a..df8884a 100644
--- a/mesh/prov-initiator.c
+++ b/mesh/prov-initiator.c
@@ -39,7 +39,7 @@
 #include "src/shared/ecc.h"
 
 #include "mesh/util.h"
-#include "mesh/net_keys.h"
+#include "mesh/net-keys.h"
 #include "mesh/crypto.h"
 #include "mesh/net.h"
 #include "mesh/error.h"