diff --git a/drivers/dfplayer/Kconfig b/drivers/dfplayer/Kconfig
index d70694fa49..0f79665734 100644
--- a/drivers/dfplayer/Kconfig
+++ b/drivers/dfplayer/Kconfig
@@ -15,13 +15,13 @@ menuconfig MODULE_DFPLAYER
     select MODULE_XTIMER
     select HAVE_MULTIMEDIA_DEVICE
 # Perhaps this could be moved to its own symbol to enable the dfplayer commands
-    select MODULE_FMT if MODULE_SHELL_COMMANDS
+    select MODULE_FMT if MODULE_SHELL_CMDS
 
 config DFPLAYER_NO_STRERROR
     bool
     prompt "Avoid using strerror in shell command" if !(HAS_ARCH_AVR8 || HAS_ARCH_MSP430)
     depends on MODULE_DFPLAYER
-    depends on MODULE_SHELL_COMMANDS
+    depends on MODULE_SHELL_CMDS
     # no strerror() on AVR and MSP430
     default y if (HAS_ARCH_AVR8 || HAS_ARCH_MSP430)
     help
diff --git a/pkg/lwip/include/lwipopts.h b/pkg/lwip/include/lwipopts.h
index c363b63a23..1b179fb23b 100644
--- a/pkg/lwip/include/lwipopts.h
+++ b/pkg/lwip/include/lwipopts.h
@@ -143,7 +143,7 @@ extern "C" {
 #define LWIP_NETCONN            0
 #endif /* MODULE_LWIP_SOCK */
 
-#ifdef MODULE_SHELL_COMMANDS
+#ifdef MODULE_SHELL_CMD_LWIP_NETIF
 #define LWIP_DEBUG              1
 #endif
 
diff --git a/pkg/nimble/contrib/nimble_riot.c b/pkg/nimble/contrib/nimble_riot.c
index e85cd83bf2..05bf29573e 100644
--- a/pkg/nimble/contrib/nimble_riot.c
+++ b/pkg/nimble/contrib/nimble_riot.c
@@ -151,7 +151,7 @@ void nimble_riot_init(void)
 #ifdef MODULE_NIMBLE_NETIF
     extern void nimble_netif_init(void);
     nimble_netif_init();
-#ifdef MODULE_SHELL_COMMANDS
+#ifdef MODULE_SHELL_CMD_NIMBLE_NETIF
     extern void sc_nimble_netif_init(void);
     sc_nimble_netif_init();
 #endif