diff --git a/drivers/cc110x/gnrc_cc110x/gnrc_netdev2_cc110x.c b/drivers/cc110x/gnrc_cc110x/gnrc_netdev2_cc110x.c
index 49a94d3b26..869a95f5e3 100644
--- a/drivers/cc110x/gnrc_cc110x/gnrc_netdev2_cc110x.c
+++ b/drivers/cc110x/gnrc_cc110x/gnrc_netdev2_cc110x.c
@@ -14,7 +14,7 @@
 #include "net/gnrc.h"
 #include "cc110x.h"
 #include "cc110x-netdev2.h"
-#include "net/gnrc/gnrc_netdev2.h"
+#include "net/gnrc/netdev2.h"
 #include "od.h"
 
 #define ENABLE_DEBUG    (0)
diff --git a/drivers/cc110x/include/gnrc_netdev2_cc110x.h b/drivers/cc110x/include/gnrc_netdev2_cc110x.h
index d98b75c7b4..e21a42d7fb 100644
--- a/drivers/cc110x/include/gnrc_netdev2_cc110x.h
+++ b/drivers/cc110x/include/gnrc_netdev2_cc110x.h
@@ -16,7 +16,7 @@
  * @author    Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#include "net/gnrc/gnrc_netdev2.h"
+#include "net/gnrc/netdev2.h"
 #include "cc110x-netdev2.h"
 
 #ifndef GNRC_CC110X_H
diff --git a/sys/auto_init/netif/auto_init_cc110x.c b/sys/auto_init/netif/auto_init_cc110x.c
index 8902f05fa2..2ab1b6adc4 100644
--- a/sys/auto_init/netif/auto_init_cc110x.c
+++ b/sys/auto_init/netif/auto_init_cc110x.c
@@ -20,7 +20,7 @@
 #ifdef MODULE_CC110X
 
 #include "board.h"
-#include "net/gnrc/gnrc_netdev2.h"
+#include "net/gnrc/netdev2.h"
 #include "gnrc_netdev2_cc110x.h"
 #include "net/gnrc.h"
 
diff --git a/sys/auto_init/netif/auto_init_encx24j600.c b/sys/auto_init/netif/auto_init_encx24j600.c
index 1047c47cbe..790b8b711e 100644
--- a/sys/auto_init/netif/auto_init_encx24j600.c
+++ b/sys/auto_init/netif/auto_init_encx24j600.c
@@ -23,7 +23,7 @@
 #include "debug.h"
 
 #include "encx24j600.h"
-#include "net/gnrc/gnrc_netdev2_eth.h"
+#include "net/gnrc/netdev2/eth.h"
 
 static encx24j600_t encx24j600;
 
diff --git a/sys/auto_init/netif/auto_init_netdev2_tap.c b/sys/auto_init/netif/auto_init_netdev2_tap.c
index a6e02c67dc..3e473e20b8 100644
--- a/sys/auto_init/netif/auto_init_netdev2_tap.c
+++ b/sys/auto_init/netif/auto_init_netdev2_tap.c
@@ -23,7 +23,7 @@
 #include "debug.h"
 
 #include "netdev2_tap.h"
-#include "net/gnrc/gnrc_netdev2_eth.h"
+#include "net/gnrc/netdev2/eth.h"
 
 extern netdev2_tap_t netdev2_tap;
 
diff --git a/sys/include/net/gnrc/gnrc_netdev2.h b/sys/include/net/gnrc/netdev2.h
similarity index 100%
rename from sys/include/net/gnrc/gnrc_netdev2.h
rename to sys/include/net/gnrc/netdev2.h
diff --git a/sys/include/net/gnrc/gnrc_netdev2_eth.h b/sys/include/net/gnrc/netdev2/eth.h
similarity index 96%
rename from sys/include/net/gnrc/gnrc_netdev2_eth.h
rename to sys/include/net/gnrc/netdev2/eth.h
index d14b4930c8..85fd044773 100644
--- a/sys/include/net/gnrc/gnrc_netdev2_eth.h
+++ b/sys/include/net/gnrc/netdev2/eth.h
@@ -19,7 +19,7 @@
 #ifndef GNRC_NETDEV2_ETH_H
 #define GNRC_NETDEV2_ETH_H
 
-#include "net/gnrc/gnrc_netdev2.h"
+#include "net/gnrc/netdev2.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/net/gnrc/link_layer/netdev2/gnrc_netdev2.c b/sys/net/gnrc/link_layer/netdev2/gnrc_netdev2.c
index f71c839054..e618c4a40f 100644
--- a/sys/net/gnrc/link_layer/netdev2/gnrc_netdev2.c
+++ b/sys/net/gnrc/link_layer/netdev2/gnrc_netdev2.c
@@ -28,7 +28,7 @@
 #include "net/gnrc/nettype.h"
 #include "net/netdev2.h"
 
-#include "net/gnrc/gnrc_netdev2.h"
+#include "net/gnrc/netdev2.h"
 #include "net/ethernet/hdr.h"
 
 #define ENABLE_DEBUG    (0)
diff --git a/sys/net/gnrc/link_layer/netdev2/gnrc_netdev2_eth.c b/sys/net/gnrc/link_layer/netdev2/gnrc_netdev2_eth.c
index 3bd0c85e38..ebe36143b6 100644
--- a/sys/net/gnrc/link_layer/netdev2/gnrc_netdev2_eth.c
+++ b/sys/net/gnrc/link_layer/netdev2/gnrc_netdev2_eth.c
@@ -17,7 +17,7 @@
  */
 
 #include "net/gnrc.h"
-#include "net/gnrc/gnrc_netdev2.h"
+#include "net/gnrc/netdev2.h"
 #include "net/ethernet/hdr.h"
 
 #include "od.h"