diff --git a/configs/freedom-kl25z/README.txt b/configs/freedom-kl25z/README.txt
index f7614bb79d7..23390503de5 100644
--- a/configs/freedom-kl25z/README.txt
+++ b/configs/freedom-kl25z/README.txt
@@ -391,7 +391,7 @@ Where <subdir> is one of the following:
          CONFIG_SPI_EXCHANGE=y
 
        Drivers -> Wireless
-         CONFIG_WIRELESS=y                       : Enable wireless support
+         CONFIG_DRIVERS_WIRELESS=y               : Enable wireless support
          CONFIG_WL_CC3000=y                      : Build the CC3000 driver
 
        Applications -> Examples
diff --git a/configs/freedom-kl25z/src/kl_wifi.c b/configs/freedom-kl25z/src/kl_wifi.c
index 77788b2b7f5..461a681f885 100644
--- a/configs/freedom-kl25z/src/kl_wifi.c
+++ b/configs/freedom-kl25z/src/kl_wifi.c
@@ -61,8 +61,8 @@
  ****************************************************************************/
 
 #ifdef CONFIG_WL_CC3000
-#ifndef CONFIG_WIRELESS
-#  error "Wireless support requires CONFIG_WIRELESS"
+#ifndef CONFIG_DRIVERS_WIRELESS
+#  error "Wireless support requires CONFIG_DRIVERS_WIRELESS"
 #endif
 
 #ifndef CONFIG_KL_SPI0
diff --git a/configs/nucleo-f4x1re/src/stm32_wireless.c b/configs/nucleo-f4x1re/src/stm32_wireless.c
index 29b70855264..7b90d024c66 100644
--- a/configs/nucleo-f4x1re/src/stm32_wireless.c
+++ b/configs/nucleo-f4x1re/src/stm32_wireless.c
@@ -60,8 +60,8 @@
 /* Configuration ************************************************************/
 
 #ifdef CONFIG_WL_CC3000
-#ifndef CONFIG_WIRELESS
-#  error "Wireless support requires CONFIG_WIRELESS"
+#ifndef CONFIG_DRIVERS_WIRELESS
+#  error "Wireless support requires CONFIG_DRIVERS_WIRELESS"
 #endif
 
 #ifndef CONFIG_STM32_SPI2
diff --git a/configs/sama5d4-ek/knsh/defconfig.ROMFS b/configs/sama5d4-ek/knsh/defconfig.ROMFS
index c4598170f87..ad8befab70d 100644
--- a/configs/sama5d4-ek/knsh/defconfig.ROMFS
+++ b/configs/sama5d4-ek/knsh/defconfig.ROMFS
@@ -548,7 +548,7 @@ CONFIG_USART4_2STOP=0
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
-# CONFIG_WIRELESS is not set
+# CONFIG_DRIVERS_WIRELESS is not set
 
 #
 # System Logging Device Options
diff --git a/configs/spark/src/stm32_wireless.c b/configs/spark/src/stm32_wireless.c
index 86cfd7f0af9..912670b9167 100644
--- a/configs/spark/src/stm32_wireless.c
+++ b/configs/spark/src/stm32_wireless.c
@@ -60,8 +60,8 @@
 /* Configuration ************************************************************/
 
 #ifdef CONFIG_WL_CC3000
-#ifndef CONFIG_WIRELESS
-#  error "Wireless support requires CONFIG_WIRELESS"
+#ifndef CONFIG_DRIVERS_WIRELESS
+#  error "Wireless support requires CONFIG_DRIVERS_WIRELESS"
 #endif
 
 #ifndef CONFIG_STM32_SPI2