diff --git a/Makefile.am b/Makefile.am
index 74a9587a..e4f5fc7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,8 +130,7 @@ src_iwd_SOURCES = src/main.c linux/nl80211.h src/iwd.h \
 					src/ap.h src/ap.c \
 					src/adhoc.h src/adhoc.c \
 					src/sae.h src/sae.c \
-					src/nl80211_util.h \
-					src/nl80211_util.c \
+					src/nl80211util.h src/nl80211util.c \
 					$(eap_sources) \
 					$(builtin_sources)
 src_iwd_LDADD = ell/libell-internal.la -ldl
diff --git a/src/adhoc.c b/src/adhoc.c
index 4edf0dee..69de257a 100644
--- a/src/adhoc.c
+++ b/src/adhoc.c
@@ -40,7 +40,7 @@
 #include "src/mpdu.h"
 #include "src/adhoc.h"
 #include "src/dbus.h"
-#include "src/nl80211_util.h"
+#include "src/nl80211util.h"
 
 struct adhoc_state {
 	struct netdev *netdev;
diff --git a/src/ap.c b/src/ap.c
index 01e85fef..51e60727 100644
--- a/src/ap.c
+++ b/src/ap.c
@@ -44,7 +44,7 @@
 #include "src/handshake.h"
 #include "src/ap.h"
 #include "src/dbus.h"
-#include "src/nl80211_util.h"
+#include "src/nl80211util.h"
 
 struct ap_state {
 	struct netdev *netdev;
diff --git a/src/netdev.c b/src/netdev.c
index 3cb8c024..af4e0bc3 100644
--- a/src/netdev.c
+++ b/src/netdev.c
@@ -56,7 +56,7 @@
 #include "src/util.h"
 #include "src/watchlist.h"
 #include "src/sae.h"
-#include "src/nl80211_util.h"
+#include "src/nl80211util.h"
 
 #ifndef ENOTSUPP
 #define ENOTSUPP 524
diff --git a/src/nl80211_util.c b/src/nl80211util.c
similarity index 99%
rename from src/nl80211_util.c
rename to src/nl80211util.c
index b5053b96..0d690e86 100644
--- a/src/nl80211_util.c
+++ b/src/nl80211util.c
@@ -25,7 +25,7 @@
 
 #include "linux/nl80211.h"
 
-#include "nl80211_util.h"
+#include "src/nl80211util.h"
 
 struct l_genl_msg *nl80211_build_new_key_group(uint32_t ifindex, uint32_t cipher,
 					uint8_t key_id, const uint8_t *key,
diff --git a/src/nl80211_util.h b/src/nl80211util.h
similarity index 100%
rename from src/nl80211_util.h
rename to src/nl80211util.h