diff --git a/dist/tools/pktbuf-stats/README.md b/dist/tools/pktbuf-stats/README.md
index 976a14014e..0ab6ff1960 100644
--- a/dist/tools/pktbuf-stats/README.md
+++ b/dist/tools/pktbuf-stats/README.md
@@ -2,7 +2,7 @@
 ===============
 
 This parses the output of the command `pktbuf` provided by the module
-`gnrc_pktbuf_cmd` for the `gnrc_pktbuf_static` implementation.
+`shell_cmd_gnrc_pktbuf` for the `gnrc_pktbuf_static` implementation.
 
 The command expects the ELF file of the binary the `pktbuf` command was executed
 in to get some binary information on structs potentially stored in the packet
diff --git a/dist/tools/pktbuf-stats/pktbuf-stats.py b/dist/tools/pktbuf-stats/pktbuf-stats.py
index 0dbc37d2fc..7d4a595bb2 100755
--- a/dist/tools/pktbuf-stats/pktbuf-stats.py
+++ b/dist/tools/pktbuf-stats/pktbuf-stats.py
@@ -9,7 +9,7 @@
 # @author   Martine Lenders <m.lenders@fu-berlin.de>
 
 """
-Script to parse the output of the `pktbuf` (provided by the `gnrc_pktbuf_cmd`
+Script to parse the output of the `pktbuf` (provided by the `shell_cmd_gnrc_pktbuf`
 pseudo-module) command and the `gnrc_pktbuf_stats()` function.
 """
 
diff --git a/sys/net/gnrc/Makefile.dep b/sys/net/gnrc/Makefile.dep
index dc82c11f8f..01e7f48e8d 100644
--- a/sys/net/gnrc/Makefile.dep
+++ b/sys/net/gnrc/Makefile.dep
@@ -433,7 +433,7 @@ ifneq (,$(filter gnrc_pktbuf, $(USEMODULE)))
   ifeq (,$(filter gnrc_pktbuf_%, $(USEMODULE)))
     USEMODULE += gnrc_pktbuf_static
   endif
-  ifeq (gnrc_pktbuf_cmd,$(filter gnrc_pktbuf_%, $(USEMODULE)))
+  ifeq (shell_cmd_gnrc_pktbuf,$(filter gnrc_pktbuf_%, $(USEMODULE)))
     USEMODULE += gnrc_pktbuf_static
   endif
   DEFAULT_MODULE += auto_init_gnrc_pktbuf
@@ -444,7 +444,7 @@ ifneq (,$(filter gnrc_pktbuf_%, $(USEMODULE)))
   USEMODULE += gnrc_pktbuf # make MODULE_GNRC_PKTBUF macro available for all implementations
 endif
 
-ifneq (,$(filter gnrc_pktbuf_cmd,$(USEMODULE)))
+ifneq (,$(filter shell_cmd_gnrc_pktbuf,$(USEMODULE)))
   ifneq (,$(filter gnrc_pktbuf_static,$(USEMODULE)))
     USEMODULE += od
   endif
diff --git a/tests/gnrc_ipv6_ext/Makefile b/tests/gnrc_ipv6_ext/Makefile
index d87b16004b..0dd6223178 100644
--- a/tests/gnrc_ipv6_ext/Makefile
+++ b/tests/gnrc_ipv6_ext/Makefile
@@ -19,7 +19,7 @@ USEMODULE += auto_init_gnrc_netif
 USEMODULE += gnrc_ipv6_router_default
 USEMODULE += gnrc_icmpv6_error
 USEMODULE += gnrc_pktdump
-USEMODULE += gnrc_pktbuf_cmd
+USEMODULE += shell_cmd_gnrc_pktbuf
 # IPv6 extension headers
 USEMODULE += gnrc_ipv6_ext
 USEMODULE += od
diff --git a/tests/gnrc_ipv6_ext_frag/Makefile b/tests/gnrc_ipv6_ext_frag/Makefile
index 9339258af2..c5d2deab51 100644
--- a/tests/gnrc_ipv6_ext_frag/Makefile
+++ b/tests/gnrc_ipv6_ext_frag/Makefile
@@ -23,7 +23,7 @@ USEMODULE += netdev_test
 USEMODULE += gnrc_ipv6_router_default
 USEMODULE += gnrc_icmpv6_error
 USEMODULE += gnrc_pktdump
-USEMODULE += gnrc_pktbuf_cmd
+USEMODULE += shell_cmd_gnrc_pktbuf
 # IPv6 extension headers
 USEMODULE += gnrc_ipv6_ext_frag
 # UDP support for payload
diff --git a/tests/gnrc_ipv6_ext_opt/Makefile b/tests/gnrc_ipv6_ext_opt/Makefile
index 6deeb83c1c..f789a3f79c 100644
--- a/tests/gnrc_ipv6_ext_opt/Makefile
+++ b/tests/gnrc_ipv6_ext_opt/Makefile
@@ -18,7 +18,7 @@ USEMODULE += auto_init_gnrc_netif
 USEMODULE += gnrc_ipv6_default
 USEMODULE += gnrc_icmpv6_error
 USEMODULE += gnrc_pktdump
-USEMODULE += gnrc_pktbuf_cmd
+USEMODULE += shell_cmd_gnrc_pktbuf
 # IPv6 extension headers
 USEMODULE += gnrc_ipv6_ext_opt
 USEMODULE += od
diff --git a/tests/gnrc_ipv6_fwd_w_sub/Makefile b/tests/gnrc_ipv6_fwd_w_sub/Makefile
index 1d32d96fe5..e57f3ff0dd 100644
--- a/tests/gnrc_ipv6_fwd_w_sub/Makefile
+++ b/tests/gnrc_ipv6_fwd_w_sub/Makefile
@@ -3,7 +3,7 @@ include ../Makefile.tests_common
 
 USEMODULE += gnrc_ipv6_router_default
 USEMODULE += gnrc_netif
-USEMODULE += gnrc_pktbuf_cmd
+USEMODULE += shell_cmd_gnrc_pktbuf
 USEMODULE += netdev_eth
 USEMODULE += netdev_test
 USEMODULE += od
diff --git a/tests/gnrc_rpl_srh/Makefile b/tests/gnrc_rpl_srh/Makefile
index 365e533990..9df428b537 100644
--- a/tests/gnrc_rpl_srh/Makefile
+++ b/tests/gnrc_rpl_srh/Makefile
@@ -21,7 +21,7 @@ USEMODULE += auto_init_gnrc_netif
 USEMODULE += gnrc_ipv6_router_default
 USEMODULE += gnrc_icmpv6_error
 USEMODULE += gnrc_pktdump
-USEMODULE += gnrc_pktbuf_cmd
+USEMODULE += shell_cmd_gnrc_pktbuf
 # IPv6 extension headers
 USEMODULE += gnrc_rpl_srh
 USEMODULE += od
diff --git a/tests/gnrc_sock_tcp/Makefile b/tests/gnrc_sock_tcp/Makefile
index 05b2d1824f..8313f61374 100644
--- a/tests/gnrc_sock_tcp/Makefile
+++ b/tests/gnrc_sock_tcp/Makefile
@@ -25,7 +25,7 @@ endif
 USEMODULE += auto_init_gnrc_netif
 USEMODULE += gnrc_ipv6_default
 USEMODULE += gnrc_sock_tcp
-USEMODULE += gnrc_pktbuf_cmd
+USEMODULE += shell_cmd_gnrc_pktbuf
 USEMODULE += gnrc_netif_single          # Only one interface used and it makes
                                         # shell commands easier
 USEMODULE += shell
diff --git a/tests/gnrc_tcp/Makefile b/tests/gnrc_tcp/Makefile
index 3f27b297d0..a06c7f6949 100644
--- a/tests/gnrc_tcp/Makefile
+++ b/tests/gnrc_tcp/Makefile
@@ -30,7 +30,7 @@ endif
 USEMODULE += auto_init_gnrc_netif
 USEMODULE += gnrc_ipv6_default
 USEMODULE += gnrc_tcp
-USEMODULE += gnrc_pktbuf_cmd
+USEMODULE += shell_cmd_gnrc_pktbuf
 USEMODULE += gnrc_netif_single    # Only one interface used and it makes
                                   # shell commands easier
 USEMODULE += shell
diff --git a/tests/gnrc_udp/Makefile b/tests/gnrc_udp/Makefile
index 84349e1ecd..21de74a960 100644
--- a/tests/gnrc_udp/Makefile
+++ b/tests/gnrc_udp/Makefile
@@ -4,7 +4,7 @@ USEMODULE += netdev_default
 USEMODULE += auto_init_gnrc_netif
 USEMODULE += gnrc_ipv6_router_default
 USEMODULE += gnrc_ipv6_ext_frag
-USEMODULE += gnrc_pktbuf_cmd
+USEMODULE += shell_cmd_gnrc_pktbuf
 USEMODULE += gnrc_udp
 USEMODULE += gnrc_rpl
 USEMODULE += auto_init_gnrc_rpl