diff --git a/Makefile.dep b/Makefile.dep
index 85c785d83a7c286ed7d7221b0501f5f28b2c1add..fa45d3d2c88fb7e87704113337695ce6e80a9912 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -1,13 +1,17 @@
+ifneq (,$(filter gnrc_%,$(filter-out gnrc_netapi gnrc_netreg gnrc_netif% gnrc_pktbuf,$(USEMODULE))))
+  USEMODULE += gnrc
+endif
+
 ifneq (,$(filter ng_netif_default,$(USEMODULE)))
   USEMODULE += ng_netif
 endif
 
 ifneq (,$(filter ng_netif,$(USEMODULE)))
-  USEMODULE += ng_netbase
+  USEMODULE += gnrc
 endif
 
 ifneq (,$(filter ng_nomac,$(USEMODULE)))
-  USEMODULE += ng_netbase
+  USEMODULE += gnrc
 endif
 
 ifneq (,$(filter at86rf2%,$(USEMODULE)))
@@ -66,7 +70,7 @@ endif
 ifneq (,$(filter ng_sixlowpan,$(USEMODULE)))
   USEMODULE += ng_ipv6
   USEMODULE += ng_sixlowpan_netif
-  USEMODULE += ng_netbase
+  USEMODULE += gnrc
 endif
 
 ifneq (,$(filter ng_sixlowpan_ctx,$(USEMODULE)))
@@ -99,7 +103,7 @@ endif
 
 ifneq (,$(filter ng_icmpv6_echo,$(USEMODULE)))
   USEMODULE += ng_icmpv6
-  USEMODULE += ng_netbase
+  USEMODULE += gnrc
 endif
 
 ifneq (,$(filter ng_icmpv6,$(USEMODULE)))
@@ -130,7 +134,7 @@ ifneq (,$(filter ng_ipv6,$(USEMODULE)))
   USEMODULE += ng_ipv6_hdr
   USEMODULE += ng_ipv6_nc
   USEMODULE += ng_ipv6_netif
-  USEMODULE += ng_netbase
+  USEMODULE += gnrc
 endif
 
 ifneq (,$(filter ng_ipv6_hdr,$(USEMODULE)))
@@ -153,7 +157,7 @@ ifneq (,$(filter ng_ipv6_netif,$(USEMODULE)))
 endif
 
 ifneq (,$(filter ng_udp,$(USEMODULE)))
-  USEMODULE += ng_netbase
+  USEMODULE += gnrc
   USEMODULE += inet_csum
   USEMODULE += udp
 endif
@@ -166,7 +170,7 @@ ifneq (,$(filter ng_nettest,$(USEMODULE)))
   USEMODULE += vtimer
 endif
 
-ifneq (,$(filter ng_netbase,$(USEMODULE)))
+ifneq (,$(filter gnrc,$(USEMODULE)))
   USEMODULE += ng_netapi
   USEMODULE += ng_netreg
   USEMODULE += ng_netif
@@ -190,7 +194,7 @@ ifneq (,$(filter ng_pktbuf_%, $(USEMODULE)))
 endif
 
 ifneq (,$(filter ng_slip,$(USEMODULE)))
-  USEMODULE += ng_netbase
+  USEMODULE += gnrc
 endif
 
 ifneq (,$(filter uart0,$(USEMODULE)))
diff --git a/Makefile.pseudomodules b/Makefile.pseudomodules
index 79ffcb872454bd40fee691e7bd880fb1211e1874..a415f69dd4cd60a903c30bae02a37944aa60243f 100644
--- a/Makefile.pseudomodules
+++ b/Makefile.pseudomodules
@@ -4,7 +4,6 @@ PSEUDOMODULES += ng_ipv6_default
 PSEUDOMODULES += ng_ipv6_router
 PSEUDOMODULES += ng_ipv6_router_default
 PSEUDOMODULES += pktqueue
-PSEUDOMODULES += ng_netbase
 PSEUDOMODULES += ng_pktbuf
 PSEUDOMODULES += newlib
 PSEUDOMODULES += ng_sixlowpan_default
diff --git a/cpu/nrf51/radio/nrfmin/nrfmin.c b/cpu/nrf51/radio/nrfmin/nrfmin.c
index d12317d8a7126d4bf99a551309cd5e7949278415..047b10fc656c61d7ad9cfcb57f190e17c47f9fe4 100644
--- a/cpu/nrf51/radio/nrfmin/nrfmin.c
+++ b/cpu/nrf51/radio/nrfmin/nrfmin.c
@@ -26,7 +26,7 @@
 #include "periph_conf.h"
 #include "periph/cpuid.h"
 #include "nrfmin.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #define ENABLE_DEBUG    (0)
 #include "debug.h"
diff --git a/drivers/at86rf2xx/at86rf2xx.c b/drivers/at86rf2xx/at86rf2xx.c
index d90c090bdf6255523c34d1d0c6d56f9ff87666df..0b18afb9f19c17881ec1dec448052b3b3a3e0bf0 100644
--- a/drivers/at86rf2xx/at86rf2xx.c
+++ b/drivers/at86rf2xx/at86rf2xx.c
@@ -27,7 +27,7 @@
 #include "periph/cpuid.h"
 #include "byteorder.h"
 #include "net/ieee802154.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "at86rf2xx_registers.h"
 #include "at86rf2xx_internal.h"
 #include "at86rf2xx_netdev.h"
diff --git a/drivers/at86rf2xx/at86rf2xx_netdev.c b/drivers/at86rf2xx/at86rf2xx_netdev.c
index 3be39058f54aa09a727cf7151a00b82c637a5319..d77dc529e1f0444c4aa55fcb55bd23ba609de7a1 100644
--- a/drivers/at86rf2xx/at86rf2xx_netdev.c
+++ b/drivers/at86rf2xx/at86rf2xx_netdev.c
@@ -21,7 +21,7 @@
 
 #include "net/eui64.h"
 #include "net/ieee802154.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "at86rf2xx.h"
 #include "at86rf2xx_netdev.h"
 #include "at86rf2xx_internal.h"
diff --git a/drivers/include/xbee.h b/drivers/include/xbee.h
index 5f5bec545a0a26e3e6da303c781ccd807b074a1c..a4b590a2216d59c1f04f164e9ba4193cce1293d1 100644
--- a/drivers/include/xbee.h
+++ b/drivers/include/xbee.h
@@ -29,7 +29,7 @@
 #include "mutex.h"
 #include "periph/uart.h"
 #include "periph/gpio.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ieee802154.h"
 
 #ifdef __cplusplus
diff --git a/drivers/kw2xrf/kw2xrf.c b/drivers/kw2xrf/kw2xrf.c
index b41ed5fc5e2c70d94c0753bf52190b9332bb538d..8df534245c667dd6c8ab7b3adb80e45ab323f28a 100644
--- a/drivers/kw2xrf/kw2xrf.c
+++ b/drivers/kw2xrf/kw2xrf.c
@@ -24,7 +24,7 @@
 #include "msg.h"
 #include "periph/gpio.h"
 #include "periph/cpuid.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ieee802154.h"
 
 #define ENABLE_DEBUG    (0)
diff --git a/examples/gnrc_networking/udp.c b/examples/gnrc_networking/udp.c
index 3365ea1ea4da665e3ce644148550df8cc2f1b16f..a727cb641269b20cf9445b4546d592e91aa0df50 100644
--- a/examples/gnrc_networking/udp.c
+++ b/examples/gnrc_networking/udp.c
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 
 #include "kernel.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_ipv6.h"
 #include "net/ng_udp.h"
 #include "net/ng_pktdump.h"
diff --git a/sys/Makefile b/sys/Makefile
index 94bce4564dddbd2bcaf0bace92161517d2ad3671..4115c0b8dd9a98535cda38ab39876cd96e31c74b 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -28,6 +28,9 @@ endif
 ifneq (,$(filter ipv6_hdr,$(USEMODULE)))
     DIRS += net/network_layer/ipv6/hdr
 endif
+ifneq (,$(filter gnrc gnrc_%,$(USEMODULE)))
+    DIRS += net/gnrc
+endif
 ifneq (,$(filter ng_icmpv6,$(USEMODULE)))
     DIRS += net/network_layer/ng_icmpv6
 endif
diff --git a/sys/auto_init/netif/auto_init_at86rf2xx.c b/sys/auto_init/netif/auto_init_at86rf2xx.c
index a605e3660ad95be4535473705cc998345c7a88a7..a14d7a1977be9f18a775a09afdfbb3525bc3d51f 100644
--- a/sys/auto_init/netif/auto_init_at86rf2xx.c
+++ b/sys/auto_init/netif/auto_init_at86rf2xx.c
@@ -21,7 +21,7 @@
 
 #include "board.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #include "at86rf2xx.h"
 #include "at86rf2xx_params.h"
diff --git a/sys/auto_init/netif/auto_init_kw2xrf.c b/sys/auto_init/netif/auto_init_kw2xrf.c
index 3b522803e014c190e66ba4ffd64570a7a0afd987..1a2f2911646c981655e5ffbf494f521f5ba03949 100644
--- a/sys/auto_init/netif/auto_init_kw2xrf.c
+++ b/sys/auto_init/netif/auto_init_kw2xrf.c
@@ -23,7 +23,7 @@
 
 #include "board.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #include "kw2xrf.h"
 #include "kw2xrf_params.h"
diff --git a/sys/auto_init/netif/auto_init_ng_netdev_eth.c b/sys/auto_init/netif/auto_init_ng_netdev_eth.c
index e998a577e6f16383a6d965dd4cec6d641f68f019..196e0a83eaad36d98c474e4f45a747b2beddd9f6 100644
--- a/sys/auto_init/netif/auto_init_ng_netdev_eth.c
+++ b/sys/auto_init/netif/auto_init_ng_netdev_eth.c
@@ -22,7 +22,7 @@
 
 #include "board.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #include "net/ng_netdev_eth.h"
 #include "net/dev_eth.h"
diff --git a/sys/auto_init/netif/auto_init_slip.c b/sys/auto_init/netif/auto_init_slip.c
index aa05a6da4153ac27b72d9dd5b76c11e262ccb0af..691dcc4761a269065f570172e7a686d3c6c16881 100644
--- a/sys/auto_init/netif/auto_init_slip.c
+++ b/sys/auto_init/netif/auto_init_slip.c
@@ -21,7 +21,7 @@
 
 #include "board.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #include "slip.h"
 #include "slip_params.h"
diff --git a/sys/auto_init/netif/auto_init_xbee.c b/sys/auto_init/netif/auto_init_xbee.c
index e106bd91ec4713ed8436ab3560fd59e010d0880e..ebabbf8613d679007e5802de4d7a126313ae505b 100644
--- a/sys/auto_init/netif/auto_init_xbee.c
+++ b/sys/auto_init/netif/auto_init_xbee.c
@@ -21,7 +21,7 @@
 
 #include "board.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #include "xbee.h"
 #include "xbee_params.h"
diff --git a/sys/include/net/ng_netbase.h b/sys/include/net/gnrc.h
similarity index 80%
rename from sys/include/net/ng_netbase.h
rename to sys/include/net/gnrc.h
index 70083e19e18296b00d8d1a878d200d1954994dbd..e39f16ae7704eb3b3c53a675000000ee3bfa3580 100644
--- a/sys/include/net/ng_netbase.h
+++ b/sys/include/net/gnrc.h
@@ -7,12 +7,13 @@
  */
 
 /**
- * @defgroup    net_ng_netbase  Network Stack Pseudo Header
+ * @defgroup    net_gnrc    Generic (gnrc) network stack.
  * @ingroup     net
+ * @brief       RIOT's modular default IP network stack.
  * @{
  *
  * @file
- * @brief       Pseudo header that includes all network stack base modules
+ * @brief       Pseudo header that includes all gnrc network stack base modules
  *
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
diff --git a/sys/include/net/ng_ipv6.h b/sys/include/net/ng_ipv6.h
index 990be25e37cc97816d701d3890f5f8e73b15b30f..ee65d727674b903b7df414518e1ebffdfd8fb6ca 100644
--- a/sys/include/net/ng_ipv6.h
+++ b/sys/include/net/ng_ipv6.h
@@ -29,7 +29,7 @@
 #define NG_IPV6_H_
 
 #include "kernel_types.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "thread.h"
 
 #include "net/ipv6.h"
diff --git a/sys/include/net/ng_slip.h b/sys/include/net/ng_slip.h
index 51fa3a371503057738913a3a88c7722c2f1cff5f..b72d6e6dba36e254dbe32f1e7ea9ef71ff920dd2 100644
--- a/sys/include/net/ng_slip.h
+++ b/sys/include/net/ng_slip.h
@@ -26,7 +26,7 @@
 
 #include <inttypes.h>
 
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "periph/uart.h"
 #include "ringbuffer.h"
 
diff --git a/sys/include/net/ng_udp.h b/sys/include/net/ng_udp.h
index 259d642d11b7c0ade8a6b49c5b07b82db3425bb4..9df0ba9ba6ede007707fcf00b6d51b937393d4fa 100644
--- a/sys/include/net/ng_udp.h
+++ b/sys/include/net/ng_udp.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 
 #include "byteorder.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/udp.h"
 
 #ifdef __cplusplus
diff --git a/sys/net/application_layer/ng_zep/ng_zep.c b/sys/net/application_layer/ng_zep/ng_zep.c
index 1faabc89fef17935dcc8621de426f20363026e05..29188d4302cd3dbc6433942c53c2dd740e910516 100644
--- a/sys/net/application_layer/ng_zep/ng_zep.c
+++ b/sys/net/application_layer/ng_zep/ng_zep.c
@@ -26,7 +26,7 @@
 #include "net/ieee802154.h"
 #include "net/ipv6/addr.h"
 #include "net/ng_ipv6/hdr.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_udp.h"
 #include "periph/cpuid.h"
 #include "random.h"
diff --git a/sys/net/crosslayer/ng_pktdump/ng_pktdump.c b/sys/net/crosslayer/ng_pktdump/ng_pktdump.c
index 2bc6decb3b3474f2106dd37c554938c0cc34d23f..d17b14fa9ca83b05339a19b2cd831c63f6a7f034 100644
--- a/sys/net/crosslayer/ng_pktdump/ng_pktdump.c
+++ b/sys/net/crosslayer/ng_pktdump/ng_pktdump.c
@@ -27,7 +27,7 @@
 #include "msg.h"
 #include "kernel.h"
 #include "net/ng_pktdump.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ipv6/addr.h"
 #include "net/ipv6/hdr.h"
 #include "net/ng_sixlowpan.h"
diff --git a/sys/net/gnrc/Makefile b/sys/net/gnrc/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..48422e909a47d7cd428d10fa73825060ccc8d8c2
--- /dev/null
+++ b/sys/net/gnrc/Makefile
@@ -0,0 +1 @@
+include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/link_layer/ng_nomac/ng_nomac.c b/sys/net/link_layer/ng_nomac/ng_nomac.c
index 90ea92048d48d3ad3b221b09bb8ffd7455bd4084..a5c03a9e2fc281a52fdc1cc1d063f5fe5cf13741 100644
--- a/sys/net/link_layer/ng_nomac/ng_nomac.c
+++ b/sys/net/link_layer/ng_nomac/ng_nomac.c
@@ -22,7 +22,7 @@
 #include "msg.h"
 #include "thread.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #define ENABLE_DEBUG    (0)
 #include "debug.h"
diff --git a/sys/net/link_layer/ng_slip/ng_slip.c b/sys/net/link_layer/ng_slip/ng_slip.c
index ead9715d34ea054b9922c8e222ed2d5d0b4b2e79..6255c8ce6f6aade32afe6c6e4fe62e42928c3d4f 100644
--- a/sys/net/link_layer/ng_slip/ng_slip.c
+++ b/sys/net/link_layer/ng_slip/ng_slip.c
@@ -27,7 +27,7 @@
 #include "kernel.h"
 #include "kernel_types.h"
 #include "msg.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "periph/uart.h"
 #include "ringbuffer.h"
 #include "thread.h"
diff --git a/sys/net/network_layer/ng_icmpv6/echo/ng_icmpv6_echo.c b/sys/net/network_layer/ng_icmpv6/echo/ng_icmpv6_echo.c
index 85a5dfed90bfe84389b105a97cc8d8eac143e20c..b005ad66f79855301f0f64a7be7373239fa87610 100644
--- a/sys/net/network_layer/ng_icmpv6/echo/ng_icmpv6_echo.c
+++ b/sys/net/network_layer/ng_icmpv6/echo/ng_icmpv6_echo.c
@@ -12,7 +12,7 @@
  * @file
  */
 
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 #include "od.h"
 #include "net/ng_icmpv6.h"
diff --git a/sys/net/network_layer/ng_icmpv6/ng_icmpv6.c b/sys/net/network_layer/ng_icmpv6/ng_icmpv6.c
index bfb372fa5d8988c3dc1a7d2c7d1c8a60b5e702f5..a7b736ddc0b6bae85aae9ec77d9e21226ece9f85 100644
--- a/sys/net/network_layer/ng_icmpv6/ng_icmpv6.c
+++ b/sys/net/network_layer/ng_icmpv6/ng_icmpv6.c
@@ -22,7 +22,7 @@
 #include "byteorder.h"
 #include "kernel_types.h"
 #include "net/ipv6/hdr.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_ndp.h"
 #include "net/protnum.h"
 #include "od.h"
diff --git a/sys/net/network_layer/ng_ipv6/ng_ipv6.c b/sys/net/network_layer/ng_ipv6/ng_ipv6.c
index a6664aecbcb5dce8190c060d60fcb6cead3c7f70..cc4ac45160574b37803e34ac8f6a9a53f0c76132 100644
--- a/sys/net/network_layer/ng_ipv6/ng_ipv6.c
+++ b/sys/net/network_layer/ng_ipv6/ng_ipv6.c
@@ -19,7 +19,7 @@
 #include "cpu_conf.h"
 #include "kernel_types.h"
 #include "net/ng_icmpv6.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_ndp.h"
 #include "net/protnum.h"
 #include "thread.h"
diff --git a/sys/net/network_layer/ng_ndp/ng_ndp.c b/sys/net/network_layer/ng_ndp/ng_ndp.c
index 895708531e35757cd5799c6b0ee8582228078cd1..45ba40bee6b023ac6241c36c8778a540063d6467 100644
--- a/sys/net/network_layer/ng_ndp/ng_ndp.c
+++ b/sys/net/network_layer/ng_ndp/ng_ndp.c
@@ -23,7 +23,7 @@
 #include "net/ipv6/ext/rh.h"
 #include "net/ng_icmpv6.h"
 #include "net/ng_ipv6.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "random.h"
 #include "utlist.h"
 #include "thread.h"
diff --git a/sys/net/network_layer/ng_sixlowpan/frag/rbuf.c b/sys/net/network_layer/ng_sixlowpan/frag/rbuf.c
index 50b7d72bcd81c3b39f77c793345caff759803f74..96f31a53b8c03d57d4edd21b2ee20934e2641fd5 100644
--- a/sys/net/network_layer/ng_sixlowpan/frag/rbuf.c
+++ b/sys/net/network_layer/ng_sixlowpan/frag/rbuf.c
@@ -16,7 +16,7 @@
 #include <stdbool.h>
 
 #include "rbuf.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_ipv6/hdr.h"
 #include "net/ng_ipv6/netif.h"
 #include "net/ng_sixlowpan.h"
diff --git a/sys/net/network_layer/ng_sixlowpan/iphc/ng_sixlowpan_iphc.c b/sys/net/network_layer/ng_sixlowpan/iphc/ng_sixlowpan_iphc.c
index b43512b94ccc56e8723ee0caba8c4650fe2433d7..9cae43153ece2df634fdb62cf9384ed19152c556 100644
--- a/sys/net/network_layer/ng_sixlowpan/iphc/ng_sixlowpan_iphc.c
+++ b/sys/net/network_layer/ng_sixlowpan/iphc/ng_sixlowpan_iphc.c
@@ -17,7 +17,7 @@
 #include "byteorder.h"
 #include "net/ieee802154.h"
 #include "net/ipv6/hdr.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_sixlowpan/ctx.h"
 #include "utlist.h"
 
diff --git a/sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c b/sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c
index 8730a3f3406984fac58419f27c2b9735f75ba1bc..7d7be3fb3d21ac93d3cc83c23772cf5f114ce79b 100644
--- a/sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c
+++ b/sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c
@@ -13,7 +13,7 @@
  */
 
 #include "kernel_types.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "thread.h"
 #include "utlist.h"
 
diff --git a/sys/net/transport_layer/ng_udp/ng_udp.c b/sys/net/transport_layer/ng_udp/ng_udp.c
index 9c165518a9a623c41dead72a5043b1315fc79e80..29bd1d04c90faa6465595cff3d16242fbafd8799 100644
--- a/sys/net/transport_layer/ng_udp/ng_udp.c
+++ b/sys/net/transport_layer/ng_udp/ng_udp.c
@@ -27,7 +27,7 @@
 #include "utlist.h"
 #include "net/ipv6/hdr.h"
 #include "net/ng_udp.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/inet_csum.h"
 
 
diff --git a/sys/shell/commands/sc_icmpv6_echo.c b/sys/shell/commands/sc_icmpv6_echo.c
index c5332aa724bbb513af845afe50545edc36ca96b6..c307b1970cf6fe23480304395d1cfafe8b1f818e 100644
--- a/sys/shell/commands/sc_icmpv6_echo.c
+++ b/sys/shell/commands/sc_icmpv6_echo.c
@@ -26,7 +26,7 @@
 #include "net/ipv6/addr.h"
 #include "net/ng_ipv6/nc.h"
 #include "net/ng_ipv6/hdr.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "thread.h"
 #include "utlist.h"
 #include "vtimer.h"
diff --git a/tests/driver_at86rf2xx/auto_init_ng_netif/netif_app.c b/tests/driver_at86rf2xx/auto_init_ng_netif/netif_app.c
index 644992b053f7fbc627bb1053beaafe2eb731a4ce..e2f8f20f54ef9470f43dc6f5a9b510cf04977dbb 100644
--- a/tests/driver_at86rf2xx/auto_init_ng_netif/netif_app.c
+++ b/tests/driver_at86rf2xx/auto_init_ng_netif/netif_app.c
@@ -23,7 +23,7 @@
 #include "kernel.h"
 #include "at86rf2xx.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 /* make sure the SPI port and the needed GPIO pins are defined */
 #ifndef ATRF_SPI
diff --git a/tests/driver_at86rf2xx/main.c b/tests/driver_at86rf2xx/main.c
index 6c10603ab962247facb0734ef91161d5562768f2..c6f7c9c8db4d3f50ac974f57cd6471b7a200adca 100644
--- a/tests/driver_at86rf2xx/main.c
+++ b/tests/driver_at86rf2xx/main.c
@@ -25,7 +25,7 @@
 #include "posix_io.h"
 #include "board_uart0.h"
 #include "net/ng_pktdump.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 /**
  * @brief   Buffer size used by the shell
diff --git a/tests/driver_kw2xrf/auto_init_ng_netif/netif_app.c b/tests/driver_kw2xrf/auto_init_ng_netif/netif_app.c
index ae54951c2fcff6e3f70d149129933a0f4d88bcb1..38a03497ad0a6680deadf778f81ce1f604c45334 100644
--- a/tests/driver_kw2xrf/auto_init_ng_netif/netif_app.c
+++ b/tests/driver_kw2xrf/auto_init_ng_netif/netif_app.c
@@ -25,7 +25,7 @@
 #include "kernel.h"
 #include "kw2xrf.h"
 #include "net/ng_nomac.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 
 /* make sure the SPI port and the needed GPIO pins are defined */
 #ifndef KWRF_SPI
diff --git a/tests/driver_kw2xrf/main.c b/tests/driver_kw2xrf/main.c
index 3977d07c107378abd65844e6af0460863cc30d59..295c72f784d0b0ea0947f46903c9086d9c90fd40 100644
--- a/tests/driver_kw2xrf/main.c
+++ b/tests/driver_kw2xrf/main.c
@@ -23,7 +23,7 @@
 #include "shell_commands.h"
 #include "posix_io.h"
 #include "board_uart0.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_pktdump.h"
 
 /**
diff --git a/tests/driver_netdev_eth/Makefile b/tests/driver_netdev_eth/Makefile
index a2fcc6e80a6da691c5f80561f32159c7a19cfc26..c663b08962446435f5e817b1f4cf4182de727d58 100644
--- a/tests/driver_netdev_eth/Makefile
+++ b/tests/driver_netdev_eth/Makefile
@@ -4,7 +4,7 @@ include ../Makefile.tests_common
 BOARD_WHITELIST := native
 
 USEMODULE += dev_eth_tap
-USEMODULE += ng_netbase
+USEMODULE += gnrc
 USEMODULE += ng_nomac
 USEMODULE += ng_pktdump
 USEMODULE += ng_netdev_eth
diff --git a/tests/driver_netdev_eth/main.c b/tests/driver_netdev_eth/main.c
index 0f200b096c04414efe30d69d7a33d27083e4a9ef..1d903982d154d154821bdc75f8621c14289c1951 100644
--- a/tests/driver_netdev_eth/main.c
+++ b/tests/driver_netdev_eth/main.c
@@ -26,7 +26,7 @@
 #include "kernel.h"
 #include "shell.h"
 #include "shell_commands.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_nomac.h"
 #include "net/ng_pktdump.h"
 #include "net/ng_netdev_eth.h"
diff --git a/tests/driver_nrfmin/Makefile b/tests/driver_nrfmin/Makefile
index f20c9800dc9ae0d22fbc04a6d91cd797534749e9..d07a6818294940a82739f6cff35aeea0d250436d 100644
--- a/tests/driver_nrfmin/Makefile
+++ b/tests/driver_nrfmin/Makefile
@@ -8,7 +8,7 @@ USEMODULE += shell_commands
 USEMODULE += ps
 USEMODULE += uart0
 USEMODULE += radio_nrfmin
-USEMODULE += ng_netbase
+USEMODULE += gnrc
 USEMODULE += ng_nomac
 USEMODULE += ng_pktdump
 
diff --git a/tests/driver_nrfmin/main.c b/tests/driver_nrfmin/main.c
index c4356684f92106fe6775ac70575121f5ebd471f2..7ef04605ba2dd8716684ef5cad761a9eef039551 100644
--- a/tests/driver_nrfmin/main.c
+++ b/tests/driver_nrfmin/main.c
@@ -24,7 +24,7 @@
 #include "posix_io.h"
 #include "board_uart0.h"
 #include "nrfmin.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_nomac.h"
 #include "net/ng_pktdump.h"
 
diff --git a/tests/driver_xbee/main.c b/tests/driver_xbee/main.c
index a95c0f0dfd50a2c735b171a52840b6974d178f2f..81dfad5c60e805ab5398c65101234887e0ff5038 100644
--- a/tests/driver_xbee/main.c
+++ b/tests/driver_xbee/main.c
@@ -22,7 +22,7 @@
 
 #include "shell.h"
 #include "shell_commands.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_pktdump.h"
 
 /**
diff --git a/tests/slip/Makefile b/tests/slip/Makefile
index d86efb34df645bec797d9819d024e7ff024e6328..3d70963e0ffddbd4e7c9e311ecb28ad5b440fbcf 100644
--- a/tests/slip/Makefile
+++ b/tests/slip/Makefile
@@ -3,7 +3,7 @@ include ../Makefile.tests_common
 
 BOARD_INSUFFICIENT_RAM := stm32f0discovery
 
-USEMODULE += ng_netbase
+USEMODULE += gnrc
 USEMODULE += ng_pktdump
 USEMODULE += ng_slip
 USEMODULE += shell
diff --git a/tests/slip/main.c b/tests/slip/main.c
index f137b1bb907f20e651aba3089e5e181cfd11fe2e..f7cf62a56379f1f69a0ec4b3946be0dc381a03f4 100644
--- a/tests/slip/main.c
+++ b/tests/slip/main.c
@@ -22,7 +22,7 @@
 
 #include "shell.h"
 #include "shell_commands.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_pktdump.h"
 
 /**
diff --git a/tests/zep/main.c b/tests/zep/main.c
index 2f7343f489d8eb45cd082762487957dc52e5e4ce..fd9b087743fcaef3a9da4e88506d439bf3ea8541 100644
--- a/tests/zep/main.c
+++ b/tests/zep/main.c
@@ -22,7 +22,7 @@
 
 #include "shell.h"
 #include "shell_commands.h"
-#include "net/ng_netbase.h"
+#include "net/gnrc.h"
 #include "net/ng_pktdump.h"
 
 /**