diff --git a/Makefile.dep b/Makefile.dep
index 7bd54f6c647eb7a1f94ca47597ec7f4209c93789..bfcadf9342cd4cd16002e2afe9cad905f1f20df9 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -10,7 +10,7 @@ ifneq (,$(filter ng_nomac,$(USEMODULE)))
   USEMODULE += ng_netbase
 endif
 
-ifneq (,$(filter ng_at86rf2%,$(USEMODULE)))
+ifneq (,$(filter at86rf2%,$(USEMODULE)))
   USEMODULE += at86rf2xx
   USEMODULE += ieee802154
 endif
diff --git a/Makefile.pseudomodules b/Makefile.pseudomodules
index 812c825992ed6e4a1ce316ed578b193b96dd2e19..79ffcb872454bd40fee691e7bd880fb1211e1874 100644
--- a/Makefile.pseudomodules
+++ b/Makefile.pseudomodules
@@ -12,5 +12,5 @@ PSEUDOMODULES += log
 PSEUDOMODULES += log_printfnoformat
 
 # include variants of the AT86RF2xx drivers as pseudo modules
-PSEUDOMODULES += ng_at86rf23%
-PSEUDOMODULES += ng_at86rf21%
+PSEUDOMODULES += at86rf23%
+PSEUDOMODULES += at86rf21%
diff --git a/boards/iot-lab_M3/Makefile.dep b/boards/iot-lab_M3/Makefile.dep
index c5fd7c234250cfb227d0202ab64c34afcee17ce0..b8732d076d91aa20e05c1096f7fa21098d20e3ce 100644
--- a/boards/iot-lab_M3/Makefile.dep
+++ b/boards/iot-lab_M3/Makefile.dep
@@ -1,4 +1,4 @@
 ifneq (,$(filter ng_netif_default,$(USEMODULE)))
-  USEMODULE += ng_at86rf231
+  USEMODULE += at86rf231
   USEMODULE += ng_nomac
 endif
diff --git a/boards/mulle/Makefile.dep b/boards/mulle/Makefile.dep
index 98ff416c3af87bfcf4267e8f60d06c922df869ff..7adfff1029f29755e4a86e6ff0d2dc19238d1c5f 100644
--- a/boards/mulle/Makefile.dep
+++ b/boards/mulle/Makefile.dep
@@ -1,5 +1,5 @@
 ifneq (,$(filter ng_netif_default,$(USEMODULE)))
-  USEMODULE += ng_at86rf212b
+  USEMODULE += at86rf212b
   USEMODULE += ng_nomac
 endif
 
diff --git a/boards/samr21-xpro/Makefile.dep b/boards/samr21-xpro/Makefile.dep
index 87c0062d23877bcc6ae69323d3563d150c798fd3..bc1a4baad3a29ffd46beab216eacb2d0248f8b20 100644
--- a/boards/samr21-xpro/Makefile.dep
+++ b/boards/samr21-xpro/Makefile.dep
@@ -1,4 +1,4 @@
 ifneq (,$(filter ng_netif_default,$(USEMODULE)))
-  USEMODULE += ng_at86rf233
+  USEMODULE += at86rf233
   USEMODULE += ng_nomac
 endif
diff --git a/sys/auto_init/netif/auto_init_ng_at86rf2xx.c b/sys/auto_init/netif/auto_init_at86rf2xx.c
similarity index 100%
rename from sys/auto_init/netif/auto_init_ng_at86rf2xx.c
rename to sys/auto_init/netif/auto_init_at86rf2xx.c
diff --git a/tests/driver_at86rf2xx/Makefile b/tests/driver_at86rf2xx/Makefile
index 7a443d9df62c9f66208c740e8773d854bbabef41..f91040035bbb8231b799c42ad1d3a7fd68e33b00 100644
--- a/tests/driver_at86rf2xx/Makefile
+++ b/tests/driver_at86rf2xx/Makefile
@@ -8,19 +8,19 @@ BOARD_BLACKLIST        := nucleo-f334
 # nucleo-f334:  not enough GPIO pins defined
 
 ifneq (,$(filter samr21-xpro,$(BOARD)))
-  DRIVER ?= ng_at86rf233
+  DRIVER ?= at86rf233
   USE_BOARD_PARAMETERS:=true
 endif
 ifneq (,$(filter iot-lab_M3,$(BOARD)))
-  DRIVER ?= ng_at86rf231
+  DRIVER ?= at86rf231
   USE_BOARD_PARAMETERS:=true
 endif
 
 ifneq (,$(DRIVER))
   USEMODULE += $(DRIVER)
 else
-  # default to ng_at86rf231
-  USEMODULE += ng_at86rf231
+  # default to at86rf231
+  USEMODULE += at86rf231
 endif
 
 ifneq (true,$(USE_BOARD_PARAMETERS))