Merge pull request #14904 from leandrolanzieri/pr/kconfig/change_prefix_convention

treewide: modify Kconfig symbol prefixes
2020-09-01 15:57:06 +02:00 · 2020-09-01 15:57:06 +02:00 · 538155c344
commit 538155c344
parent 95d4a2e29f 2e79e00ca7
93 changed files with 465 additions and 465 deletions
--- a/Makefile.include
+++ b/Makefile.include
@ -370,7 +370,7 @@ include $(RIOTMAKE)/kconfig.mk
 # For testing, use TEST_KCONFIG as a switch between Makefile.dep and Kconfig
 ifeq (1,$(TEST_KCONFIG))
  $(info === [ATTENTION] Testing Kconfig dependency modelling ===)
-  KCONFIG_MODULES := $(call lowercase,$(patsubst CONFIG_MOD_%,%,$(filter CONFIG_MOD_%,$(.VARIABLES))))
+  KCONFIG_MODULES := $(call lowercase,$(patsubst CONFIG_MODULE_%,%,$(filter CONFIG_MODULE_%,$(.VARIABLES))))
  USEMODULE := $(KCONFIG_MODULES)
 else
  # handle removal of default modules
--- a/boards/Kconfig
+++ b/boards/Kconfig
@ -9,7 +9,7 @@ config BOARD
    help
        Name of the currently selected board.
-config MOD_BOARD
+config MODULE_BOARD
    bool
    default y
    depends on TEST_KCONFIG
--- a/boards/common/nrf52/Kconfig
+++ b/boards/common/nrf52/Kconfig
@ -8,4 +8,4 @@ config BOARD_COMMON_NRF52
    bool
    select HAS_PERIPH_RTT
    select HAS_PERIPH_TIMER
-    select HAS_RIOTBOOT if !PKG_NORDIC_SOFTDEVICE_BLE
+    select HAS_RIOTBOOT if !USEPKG_NORDIC_SOFTDEVICE_BLE
--- a/boards/esp32-olimex-evb/Kconfig
+++ b/boards/esp32-olimex-evb/Kconfig
@ -13,7 +13,7 @@ config BOARD_ESP32_OLIMEX_EVB
    select BOARD_COMMON_ESP32
    select CPU_MODEL_ESP32_WROOM_32
    select HAS_ARDUINO
-    select HAS_PERIPH_ADC if MODULE_OLIMEX_ESP32_GATEWAY
+    select HAS_PERIPH_ADC if USEMODULE_OLIMEX_ESP32_GATEWAY
    select HAS_PERIPH_I2C
    select HAS_PERIPH_PWM
    select HAS_PERIPH_SPI
--- a/core/Kconfig
+++ b/core/Kconfig
@ -5,7 +5,7 @@
 # directory for more details.
 #
-menuconfig MOD_CORE
+menuconfig MODULE_CORE
    bool "RIOT Core"
    default y
    depends on TEST_KCONFIG
@ -13,36 +13,36 @@ menuconfig MOD_CORE
        RIOT's core module. Only change this if you know what you are doing. If
        unsure, say Y.
-if MOD_CORE
+if MODULE_CORE
-config MOD_CORE_IDLE_THREAD
+config MODULE_CORE_IDLE_THREAD
    bool
    prompt "Use Idle thread"  if HAS_NO_IDLE_THREAD
    default y if !HAS_NO_IDLE_THREAD
    help
        Select y to include the Idle thread. This is mandatory for some CPUs.
-config MOD_CORE_INIT
+config MODULE_CORE_INIT
    bool "Kernel initialization module"
    default y
-config MOD_CORE_MBOX
+config MODULE_CORE_MBOX
    bool "Kernel message box module"
-config MOD_CORE_MSG
+config MODULE_CORE_MSG
    bool "Kernel messaging module"
    default y
-config MOD_CORE_MSG_BUS
+config MODULE_CORE_MSG_BUS
    bool "Messaging Bus module"
    help
        Messaging Bus API for inter process message broadcast.
-config MOD_CORE_PANIC
+config MODULE_CORE_PANIC
    bool "Kernel crash handling module"
    default y
-config MOD_CORE_THREAD_FLAGS
+config MODULE_CORE_THREAD_FLAGS
    bool "Thread flags"
-endif # MOD_CORE
+endif # MODULE_CORE
--- a/cpu/Kconfig
+++ b/cpu/Kconfig
@ -52,14 +52,14 @@ config CPU_ARCH
    help
        Architecture of the currently selected CPU.
-config MOD_CPU
+config MODULE_CPU
    bool
    default y
    depends on TEST_KCONFIG
    help
        Module which holds all CPU-specific files.
-config MOD_PERIPH
+config MODULE_PERIPH
    bool
    depends on TEST_KCONFIG
    help
--- a/cpu/cortexm_common/Kconfig
+++ b/cpu/cortexm_common/Kconfig
@ -4,11 +4,11 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
-config MOD_CORTEXM_COMMON
+config MODULE_CORTEXM_COMMON
    bool
    default y if CPU_CORE_CORTEX_M
    depends on TEST_KCONFIG
-    select MOD_PERIPH
+    select MODULE_PERIPH
    help
        Common code for Cortex-M cores.
@ -112,7 +112,7 @@ config HAS_CORTEXM_SVC
    help
        Indicates that ARM Cortex-M Supervisor Calls are available.
-config MOD_CORTEXM_FPU
+config MODULE_CORTEXM_FPU
    bool "Cortex-M Floating Point Unit (FPU) support"
    default y
    depends on HAS_CORTEXM_FPU
--- a/cpu/cortexm_common/cortexm_common.config
+++ b/cpu/cortexm_common/cortexm_common.config
@ -1,5 +1,5 @@
 # all cortex MCU's use newlib as libc
-CONFIG_MOD_NEWLIB=y
+CONFIG_MODULE_NEWLIB=y
 # use the nano-specs of Newlib when available
-CONFIG_MOD_NEWLIB_NANO=y
+CONFIG_MODULE_NEWLIB_NANO=y
--- a/cpu/cortexm_common/periph/Kconfig
+++ b/cpu/cortexm_common/periph/Kconfig
@ -5,7 +5,7 @@
 # directory for more details.
 #
-config MOD_CORTEXM_COMMON_PERIPH
+config MODULE_CORTEXM_COMMON_PERIPH
    bool
    default y if CPU_CORE_CORTEX_M
    depends on TEST_KCONFIG
--- a/cpu/msp430_common/Kconfig
+++ b/cpu/msp430_common/Kconfig
@ -34,4 +34,4 @@ config HAS_ARCH_MSP430
 ## Specific default configuration values
 config GNRC_PKTBUF_SIZE
    default 2560
-    depends on KCONFIG_MODULE_GNRC_PKTBUF_STATIC
+    depends on KCONFIG_USEMODULE_GNRC_PKTBUF_STATIC
--- a/cpu/nrf51/Kconfig
+++ b/cpu/nrf51/Kconfig
@ -46,6 +46,6 @@ config HAS_CPU_NRF51
 ## Platform-specific defaults
 config GNRC_PKTBUF_SIZE
    default 2048
-    depends on KCONFIG_MODULE_GNRC_PKTBUF_STATIC
+    depends on KCONFIG_USEMODULE_GNRC_PKTBUF_STATIC
 source "$(RIOTCPU)/nrf5x_common/Kconfig"
--- a/cpu/nrf52/radio/nrf802154/Kconfig
+++ b/cpu/nrf52/radio/nrf802154/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
-menuconfig KCONFIG_MODULE_NRF802154
+menuconfig KCONFIG_USEMODULE_NRF802154
    bool    "Configure nRF802154"
-    depends on MODULE_NRF802154
+    depends on USEMODULE_NRF802154
    help
        Configure nRF802154 module using Kconfig.
-if KCONFIG_MODULE_NRF802154
+if KCONFIG_USEMODULE_NRF802154
 config NRF802154_CCA_THRESH_DEFAULT
    hex "Default CCA threshold value"
@ -19,7 +19,7 @@ config NRF802154_CCA_THRESH_DEFAULT
    help
        Default CCA threshold value for the CCACTRL register.
-endif # KCONFIG_MODULE_NRF802154
+endif # KCONFIG_USEMODULE_NRF802154
 ## Related features
 config HAS_RADIO_NRF802154
--- a/cpu/sam0_common/periph/Kconfig
+++ b/cpu/sam0_common/periph/Kconfig
@ -5,10 +5,10 @@
 # directory for more details.
 config WDT_WARNING_PERIOD
-    depends on HAS_PERIPH_WDT_WARNING_PERIOD && KCONFIG_MODULE_PERIPH_WDT
+    depends on HAS_PERIPH_WDT_WARNING_PERIOD && KCONFIG_USEMODULE_PERIPH_WDT
    default 1
-config MOD_SAM0_COMMON_PERIPH
+config MODULE_SAM0_COMMON_PERIPH
    bool
    default y
    depends on TEST_KCONFIG
--- a/cpu/sam0_common/sam0_common.config
+++ b/cpu/sam0_common/sam0_common.config
@ -1 +1 @@
-CONFIG_MOD_PM_LAYERED=y
+CONFIG_MODULE_PM_LAYERED=y
--- a/doc/doxygen/src/kconfig/kconfig.md
+++ b/doc/doxygen/src/kconfig/kconfig.md
@ -454,10 +454,10 @@ reserved for the cases described bellow:
 | `CPU_FAM_` | Models a family of CPUs |
 | `CPU_MODEL_` | Models a particular model of CPU |
 | `HAS_` | Models a [feature](build-system-basics.html#features) |
-| `KCONFIG_MODULE_` | Used during transition to enable configuration of a module via Kconfig |
+| `KCONFIG_USEMODULE_` | Used during transition to enable configuration of a module via Kconfig |
-| `KCONFIG_PKG_` | Used during transition to enable configuration of a package via Kconfig |
+| `KCONFIG_USEPKG_` | Used during transition to enable configuration of a package via Kconfig |
-| `MODULE_` | Models a [RIOT module](creating-modules.html#creating-modules) |
+| `USEMODULE_` | Models a [RIOT module](creating-modules.html#creating-modules). Generated from `USEMODULE` variable |
-| `PKG_` | Models an [external package](group__pkg.html) |
+| `USEPKG_` | Models an [external package](group__pkg.html). Generated from `USEPKG` variable |
 ---
 # Appendixes                                              {#kconfig-appendixes}
--- a/drivers/ads101x/Kconfig
+++ b/drivers/ads101x/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_ADS101X
+menuconfig KCONFIG_USEMODULE_ADS101X
    bool "Configure ADS101X driver"
-    depends on MODULE_ADS101X
+    depends on USEMODULE_ADS101X
    help
        Configure the ADS101X driver using Kconfig.
-if KCONFIG_MODULE_ADS101X
+if KCONFIG_USEMODULE_ADS101X
 config ADS101X_I2C_ADDRESS
    hex "Default I2C address"
@ -21,4 +21,4 @@ config ADS101X_I2C_ADDRESS
        the state of ADDR Pin. Default value (0x48) corresponds to ADDR pin tied
        to GND. For more information refer I2C Address Selection in Datasheet.
-endif # KCONFIG_MODULE_ADS101X
+endif # KCONFIG_USEMODULE_ADS101X
--- a/drivers/at/Kconfig
+++ b/drivers/at/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_AT
+menuconfig KCONFIG_USEMODULE_AT
    bool "Configure AT driver"
-    depends on MODULE_AT
+    depends on USEMODULE_AT
    help
        Configure the AT driver using Kconfig.
-if KCONFIG_MODULE_AT
+if KCONFIG_USEMODULE_AT
 choice
    bool "End of line character"
@ -53,11 +53,11 @@ config AT_BUF_SIZE_EXP
    int "Exponent for the buffer size (resulting in the queue size 2^n)"
    range 0 31
    default 7
-    depends on MODULE_AT_URC
+    depends on USEMODULE_AT_URC
    help
        Size of buffer used to process unsolicited result code data. (as
        exponent of 2^n). As the buffer size ALWAYS needs to be power of two,
        this option represents the exponent of 2^n, which will be used as the
        size of the buffer.
-endif # KCONFIG_MODULE_AT
+endif # KCONFIG_USEMODULE_AT
--- a/drivers/at86rf215/Kconfig
+++ b/drivers/at86rf215/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_AT86RF215
+menuconfig KCONFIG_USEMODULE_AT86RF215
    bool "Configure AT86RF215 driver"
-    depends on MODULE_AT86RF215
+    depends on USEMODULE_AT86RF215
    help
        Configure the AT86RF215 driver using Kconfig.
-if KCONFIG_MODULE_AT86RF215
+if KCONFIG_USEMODULE_AT86RF215
 config AT86RF215_USE_CLOCK_OUTPUT
    bool "Enable clock output"
@ -143,4 +143,4 @@ config AT86RF215_DEFAULT_MR_OFDM_MCS
 endmenu
-endif # KCONFIG_MODULE_AT86RF215
+endif # KCONFIG_USEMODULE_AT86RF215
--- a/drivers/bmx055/Kconfig
+++ b/drivers/bmx055/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_BMX055
+menuconfig KCONFIG_USEMODULE_BMX055
    bool "Configure BMX055 driver"
-    depends on MODULE_BMX055
+    depends on USEMODULE_BMX055
    help
        Configure the BMX055 driver using Kconfig.
-if KCONFIG_MODULE_BMX055
+if KCONFIG_USEMODULE_BMX055
 config BMX055_MAG_ADDR_DEFAULT
    hex "I2C Address of magnetometer"
@ -39,4 +39,4 @@ config BMX055_GYRO_ADDR_DEFAULT
        For more information refer to the section 'Inter-Integrated
        Circuit (I²C)' in the datasheet.
-endif # KCONFIG_MODULE_BMX055
+endif # KCONFIG_USEMODULE_BMX055
--- a/drivers/cc110x/Kconfig
+++ b/drivers/cc110x/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_CC110X
+menuconfig KCONFIG_USEMODULE_CC110X
    bool "Configure CC110X driver"
-    depends on MODULE_CC110X
+    depends on USEMODULE_CC110X
    help
        Configure the CC110X driver using Kconfig.
-if KCONFIG_MODULE_CC110X
+if KCONFIG_USEMODULE_CC110X
 config CC110X_DEFAULT_CHANNEL
    int "Configure default channel"
@ -21,4 +21,4 @@ config CC110X_DEFAULT_CHANNEL
        maximum of 8 (0-7) Channels.
        Default channel is 0.
-endif # KCONFIG_MODULE_CC110X
+endif # KCONFIG_USEMODULE_CC110X
--- a/drivers/dose/Kconfig
+++ b/drivers/dose/Kconfig
@ -4,14 +4,14 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_DOSE
+menuconfig KCONFIG_USEMODULE_DOSE
    bool "Configure DOSE driver"
-    depends on MODULE_DOSE
+    depends on USEMODULE_DOSE
    help
        Configure the Differentially Operated Serial Ethernet (DOSE)
        driver using Kconfig.
-if KCONFIG_MODULE_DOSE
+if KCONFIG_USEMODULE_DOSE
 config DOSE_TIMEOUT_USEC
    int "Transaction timeout in microseconds [us]"
@ -20,4 +20,4 @@ config DOSE_TIMEOUT_USEC
        Timeout, in microseconds, to bring the driver back into idle state if
        the remote side died within a transaction.
-endif # KCONFIG_MODULE_DOSE
+endif # KCONFIG_USEMODULE_DOSE
--- a/drivers/fxos8700/Kconfig
+++ b/drivers/fxos8700/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_FXOS8700
+menuconfig KCONFIG_USEMODULE_FXOS8700
    bool "Configure FXOS8700 driver"
-    depends on MODULE_FXOS8700
+    depends on USEMODULE_FXOS8700
    help
        Configure the FXOS8700 driver using Kconfig.
-if KCONFIG_MODULE_FXOS8700
+if KCONFIG_USEMODULE_FXOS8700
 config FXOS8700_USE_ACC_RAW_VALUES
    bool "Enable raw ADC readings"
@ -18,4 +18,4 @@ config FXOS8700_USE_ACC_RAW_VALUES
        Enable this to return raw ADC readings.
        By default measurements are converted to mg.
-endif # KCONFIG_MODULE_FXOS8700
+endif # KCONFIG_USEMODULE_FXOS8700
--- a/drivers/hdc1000/Kconfig
+++ b/drivers/hdc1000/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_HDC1000
+menuconfig KCONFIG_USEMODULE_HDC1000
    bool "Configure HDC1000 driver"
-    depends on MODULE_HDC1000
+    depends on USEMODULE_HDC1000
    help
        Configure the HDC1000 driver using Kconfig.
-if KCONFIG_MODULE_HDC1000
+if KCONFIG_USEMODULE_HDC1000
 config HDC1000_I2C_ADDRESS
    hex "I2C default address"
@ -29,4 +29,4 @@ config HDC1000_CONVERSION_TIME
        conversions (worst case) to allow for timer imprecision:
        (convert temp + convert hum) * 2 -> (6.5ms + 6.5ms) * 2 := 26ms.
-endif # KCONFIG_MODULE_HDC1000
+endif # KCONFIG_USEMODULE_HDC1000
--- a/drivers/isl29020/Kconfig
+++ b/drivers/isl29020/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_ISL29020
+menuconfig KCONFIG_USEMODULE_ISL29020
    bool "Configure ISL29020 driver"
-    depends on MODULE_ISL29020
+    depends on USEMODULE_ISL29020
    help
        Configure the ISL29020 driver using Kconfig.
-if KCONFIG_MODULE_ISL29020
+if KCONFIG_USEMODULE_ISL29020
 config ISL29020_DEFAULT_ADDRESS
    hex "Default I2C address"
@ -21,4 +21,4 @@ config ISL29020_DEFAULT_ADDRESS
        corresponds to A0 connected to GND. For more information refer to the
        section 'I2C Interface' in the datasheet.
-endif # KCONFIG_MODULE_ISL29020
+endif # KCONFIG_USEMODULE_ISL29020
--- a/drivers/l3g4200d/Kconfig
+++ b/drivers/l3g4200d/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_L3G4200D
+menuconfig KCONFIG_USEMODULE_L3G4200D
    bool "Configure L3G4200D driver"
-    depends on MODULE_L3G4200D
+    depends on USEMODULE_L3G4200D
    help
        Configure the L3G4200D driver using Kconfig.
-if KCONFIG_MODULE_L3G4200D
+if KCONFIG_USEMODULE_L3G4200D
 config L3G4200D_DEFAULT_ADDRESS
    hex "Default I2C address"
@ -22,4 +22,4 @@ config L3G4200D_DEFAULT_ADDRESS
        information refer to the section 'I2C Operation' in
        the datasheet.
-endif # KCONFIG_MODULE_L3G4200D
+endif # KCONFIG_USEMODULE_L3G4200D
--- a/drivers/lpsxxx/Kconfig
+++ b/drivers/lpsxxx/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_LPSXXX
+menuconfig KCONFIG_USEMODULE_LPSXXX
    bool "Configure LPSXXX driver"
-    depends on MODULE_LPSXXX
+    depends on USEMODULE_LPSXXX
    help
        Configure the LPSXXX driver using Kconfig.
-if KCONFIG_MODULE_LPSXXX
+if KCONFIG_USEMODULE_LPSXXX
 config LPSXXX_DEFAULT_ADDRESS
    hex "Default I2C address"
@ -22,4 +22,4 @@ config LPSXXX_DEFAULT_ADDRESS
        information refer to the section 'I2C operation' in the
        datasheet.
-endif # KCONFIG_MODULE_LPSXXX
+endif # KCONFIG_USEMODULE_LPSXXX
--- a/drivers/mag3110/Kconfig
+++ b/drivers/mag3110/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_MAG3110
+menuconfig KCONFIG_USEMODULE_MAG3110
    bool "Configure MAG3110 driver"
-    depends on MODULE_MAG3110
+    depends on USEMODULE_MAG3110
    help
        Configure the MAG3110 driver using Kconfig.
-if KCONFIG_MODULE_MAG3110
+if KCONFIG_USEMODULE_MAG3110
 config MAG3110_I2C_ADDRESS
    hex "I2C default address"
@ -20,4 +20,4 @@ config MAG3110_I2C_ADDRESS
        The address depends on part number of MAG3110.
        For more information refer to the datasheet.
-endif # KCONFIG_MODULE_MAG3110
+endif # KCONFIG_USEMODULE_MAG3110
--- a/drivers/mma8x5x/Kconfig
+++ b/drivers/mma8x5x/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_MMA8X5X
+menuconfig KCONFIG_USEMODULE_MMA8X5X
    bool "Configure MMA8X5X driver"
-    depends on MODULE_MMA8X5X
+    depends on USEMODULE_MMA8X5X
    help
        Configure the MMA8X5X driver using Kconfig.
-if KCONFIG_MODULE_MMA8X5X
+if KCONFIG_USEMODULE_MMA8X5X
 config MMA8X5X_I2C_ADDRESS
    hex "Default I2C address"
@ -23,4 +23,4 @@ config MMA8X5X_I2C_ADDRESS
        (MMA8451Q/MMA8452Q/MMA8453Q)
        Default value corresponds to SA0 connected to VCC.
-endif # KCONFIG_MODULE_MMA8X5X
+endif # KCONFIG_USEMODULE_MMA8X5X
--- a/drivers/motor_driver/Kconfig
+++ b/drivers/motor_driver/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_MOTOR_DRIVER
+menuconfig KCONFIG_USEMODULE_MOTOR_DRIVER
    bool "Configure the DC Motor driver"
-    depends on MODULE_MOTOR_DRIVER
+    depends on USEMODULE_MOTOR_DRIVER
    help
        Configure the DC Motor driver using Kconfig.
-if KCONFIG_MODULE_MOTOR_DRIVER
+if KCONFIG_USEMODULE_MOTOR_DRIVER
 config MOTOR_DRIVER_MAX
    int "Maximum number of motors"
@ -20,4 +20,4 @@ config MOTOR_DRIVER_MAX
        The value should not exceed the number of PWM channels
        Default value is set to 2.
-endif # KCONFIG_MODULE_MOTOR_DRIVER
+endif # KCONFIG_USEMODULE_MOTOR_DRIVER
--- a/drivers/mrf24j40/Kconfig
+++ b/drivers/mrf24j40/Kconfig
@ -4,18 +4,18 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_MRF24J40
+menuconfig KCONFIG_USEMODULE_MRF24J40
    bool "Configure MRF24J40 driver"
-    depends on MODULE_MRF24J40
+    depends on USEMODULE_MRF24J40
    help
        Configure the MRF24J40 driver using Kconfig.
-if KCONFIG_MODULE_MRF24J40
+if KCONFIG_USEMODULE_MRF24J40
 config MRF24J40_USE_EXT_PA_LNA
    bool "Enable external PA/LNA control"
    default y
-    depends on !MODULE_MRF24J40MA
+    depends on !USEMODULE_MRF24J40MA
    help
        Increase RSSI for MRF24J40MC/MD/ME devices. No effect on MRF24J40MA.
        For more information, please refer to section 4.2 of MRF24J40 datasheet.
@ -27,4 +27,4 @@ config MRF24J40_TEST_SPI_CONNECTION
        device is connected. Enable this if you want the boot not to hang if the
        device is not connected / there are SPI errors.
-endif # KCONFIG_MODULE_MRF24J40
+endif # KCONFIG_USEMODULE_MRF24J40
--- a/drivers/mtd_sdcard/Kconfig
+++ b/drivers/mtd_sdcard/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_MTD_SDCARD
+menuconfig KCONFIG_USEMODULE_MTD_SDCARD
    bool "Configure MTD_SDCARD driver"
-    depends on MODULE_MTD_SDCARD
+    depends on USEMODULE_MTD_SDCARD
    help
        Configure the MTD_SDCARD driver using Kconfig.
-if KCONFIG_MODULE_MTD_SDCARD
+if KCONFIG_USEMODULE_MTD_SDCARD
 config MTD_SDCARD_ERASE
    bool "Enable SD card erase"
@ -20,4 +20,4 @@ config MTD_SDCARD_ERASE
        possible to directly write to the card without erasing
        the sector first hence this feature is disabled by default.
-endif # KCONFIG_MODULE_MTD_SDCARD
+endif # KCONFIG_USEMODULE_MTD_SDCARD
--- a/drivers/opt3001/Kconfig
+++ b/drivers/opt3001/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_OPT3001
+menuconfig KCONFIG_USEMODULE_OPT3001
    bool "Configure OPT3001 driver"
-    depends on MODULE_OPT3001
+    depends on USEMODULE_OPT3001
    help
        Configure the OPT3001 driver using Kconfig.
-if KCONFIG_MODULE_OPT3001
+if KCONFIG_USEMODULE_OPT3001
 config OPT3001_I2C_ADDRESS
    hex "Default I2C address"
@ -38,4 +38,4 @@ config OPT3001_CONVERSION_TIME_800
 endchoice
-endif # KCONFIG_MODULE_OPT3001
+endif # KCONFIG_USEMODULE_OPT3001
--- a/drivers/periph_common/Kconfig
+++ b/drivers/periph_common/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
-menuconfig KCONFIG_MODULE_PERIPH_WDT
+menuconfig KCONFIG_USEMODULE_PERIPH_WDT
    bool "Configure Watchdog peripheral"
-    depends on MODULE_PERIPH_WDT
+    depends on USEMODULE_PERIPH_WDT
    help
        Configure Watchdog peripheral using Kconfig.
-if KCONFIG_MODULE_PERIPH_WDT
+if KCONFIG_USEMODULE_PERIPH_WDT
 config WDT_WARNING_PERIOD
    int "Warning period (in ms)"
@ -18,7 +18,7 @@ config WDT_WARNING_PERIOD
    help
        Period in ms before reboot where wdt_cb() is executed.
-endif # KCONFIG_MODULE_PERIPH_WDT
+endif # KCONFIG_USEMODULE_PERIPH_WDT
 config HAS_PERIPH_WDT_WARNING_PERIOD
    bool
@ -28,134 +28,134 @@ config HAS_PERIPH_WDT_WARNING_PERIOD
 menu "Peripheral drivers"
    depends on TEST_KCONFIG
-config MOD_PERIPH_COMMON
+config MODULE_PERIPH_COMMON
    bool
    help
        Common peripherals module.
-config MOD_PERIPH_INIT
+config MODULE_PERIPH_INIT
    bool "Peripherals auto-initialization"
    default y
    help
        Auto-initialization of all used peripherals.
 # Common peripheral modules and auto-init
-config MOD_PERIPH_ADC
+config MODULE_PERIPH_ADC
    bool "ADC peripheral driver"
    depends on HAS_PERIPH_ADC
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-config MOD_PERIPH_INIT_ADC
+config MODULE_PERIPH_INIT_ADC
    bool "Auto initialize ADC peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_ADC
+    depends on MODULE_PERIPH_ADC
-config MOD_PERIPH_CPUID
+config MODULE_PERIPH_CPUID
    bool "CPU unique ID"
    depends on HAS_PERIPH_CPUID
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-config MOD_PERIPH_INIT_CPUID
+config MODULE_PERIPH_INIT_CPUID
    bool "Auto initialize CPU unique ID driver"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_CPUID
+    depends on MODULE_PERIPH_CPUID
-config MOD_PERIPH_DAC
+config MODULE_PERIPH_DAC
    bool "DAC peripheral driver"
    depends on HAS_PERIPH_DAC
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-config MOD_PERIPH_INIT_DAC
+config MODULE_PERIPH_INIT_DAC
    bool "Auto initialize DAC peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_DAC
+    depends on MODULE_PERIPH_DAC
-config MOD_PERIPH_DMA
+config MODULE_PERIPH_DMA
    bool "DMA peripheral driver"
    depends on HAS_PERIPH_DMA
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-config MOD_PERIPH_INIT_DMA
+config MODULE_PERIPH_INIT_DMA
    bool "Auto initialize DMA peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_DMA
+    depends on MODULE_PERIPH_DMA
-config MOD_PERIPH_EEPROM
+config MODULE_PERIPH_EEPROM
    bool "EEPROM peripheral driver"
    depends on HAS_PERIPH_EEPROM
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-config MOD_PERIPH_INIT_EEPROM
+config MODULE_PERIPH_INIT_EEPROM
    bool "Auto initialize EEPROM peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_EEPROM
+    depends on MODULE_PERIPH_EEPROM
 rsource "Kconfig.flashpage"
 rsource "Kconfig.gpio"
-config MOD_PERIPH_HWRNG
+config MODULE_PERIPH_HWRNG
    bool "HWRNG peripheral driver"
    depends on HAS_PERIPH_HWRNG
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-config MOD_PERIPH_INIT_HWRNG
+config MODULE_PERIPH_INIT_HWRNG
    bool "Auto initialize HWRNG peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_HWRNG
+    depends on MODULE_PERIPH_HWRNG
 rsource "Kconfig.i2c"
-config MOD_PERIPH_PWM
+config MODULE_PERIPH_PWM
    bool "PWM peripheral driver"
    depends on HAS_PERIPH_PWM
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-config MOD_PERIPH_INIT_PWM
+config MODULE_PERIPH_INIT_PWM
    bool "Auto initialize PWM peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_PWM
+    depends on MODULE_PERIPH_PWM
-config MOD_PERIPH_PM
+config MODULE_PERIPH_PM
    bool "Power Management (PM) peripheral driver"
    default y
    depends on HAS_PERIPH_PM
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-config MOD_PERIPH_INIT_PM
+config MODULE_PERIPH_INIT_PM
    bool "Auto initialize Power Management (PM) peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_PM
+    depends on MODULE_PERIPH_PM
-config MOD_PERIPH_QDEC
+config MODULE_PERIPH_QDEC
    bool "Quadrature Decoder (QDEC) peripheral driver"
    depends on HAS_PERIPH_QDEC
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-config MOD_PERIPH_INIT_QDEC
+config MODULE_PERIPH_INIT_QDEC
    bool "Auto initialize Quadrature Decoder (QDEC) peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_QDEC
+    depends on MODULE_PERIPH_QDEC
-config MOD_PERIPH_RTC
+config MODULE_PERIPH_RTC
    bool "RTC peripheral driver"
    depends on HAS_PERIPH_RTC
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-config MOD_PERIPH_INIT_RTC
+config MODULE_PERIPH_INIT_RTC
    bool "Auto initialize RTC peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_RTC
+    depends on MODULE_PERIPH_RTC
-config MOD_PERIPH_RTT
+config MODULE_PERIPH_RTT
    bool "RTT peripheral driver"
    depends on HAS_PERIPH_RTT
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-config MOD_PERIPH_INIT_RTT
+config MODULE_PERIPH_INIT_RTT
    bool "Auto initialize RTT peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_RTT
+    depends on MODULE_PERIPH_RTT
 rsource "Kconfig.spi"
@ -163,24 +163,24 @@ rsource "Kconfig.timer"
 rsource "Kconfig.uart"
-config MOD_PERIPH_USBDEV
+config MODULE_PERIPH_USBDEV
    bool "USBDEV peripheral driver"
    depends on HAS_PERIPH_USBDEV
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-config MOD_PERIPH_INIT_USBDEV
+config MODULE_PERIPH_INIT_USBDEV
    bool "Auto initialize USBDEV peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_USBDEV
+    depends on MODULE_PERIPH_USBDEV
-menuconfig MOD_PERIPH_WDT
+menuconfig MODULE_PERIPH_WDT
    bool "Watchdog Timer peripheral driver"
    depends on HAS_PERIPH_WDT
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-config MOD_PERIPH_INIT_WDT
+config MODULE_PERIPH_INIT_WDT
    bool "Auto initialize the Watchdog Timer peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_WDT
+    depends on MODULE_PERIPH_WDT
 endmenu # Peripheral drivers
--- a/drivers/periph_common/Kconfig.flashpage
+++ b/drivers/periph_common/Kconfig.flashpage
@ -5,36 +5,36 @@
 # directory for more details.
 #
-menuconfig MOD_PERIPH_FLASHPAGE
+menuconfig MODULE_PERIPH_FLASHPAGE
    bool "Flashpage peripheral driver"
    depends on HAS_PERIPH_FLASHPAGE
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
 # TODO: the 'init' modules are actually just artifacts from the way
 # periph_init_% modules are handled in Makefile. We need to define them to keep
 # the list the same for now. We should be able to remove them later on.
-config MOD_PERIPH_INIT_FLASHPAGE
+config MODULE_PERIPH_INIT_FLASHPAGE
    bool "Auto initialize Flashpage peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_FLASHPAGE
+    depends on MODULE_PERIPH_FLASHPAGE
-config MOD_PERIPH_FLASHPAGE_RAW
+config MODULE_PERIPH_FLASHPAGE_RAW
    bool "Raw writing support"
    depends on HAS_PERIPH_FLASHPAGE_RAW
-    depends on MOD_PERIPH_FLASHPAGE
+    depends on MODULE_PERIPH_FLASHPAGE
-config MOD_PERIPH_INIT_FLASHPAGE_RAW
+config MODULE_PERIPH_INIT_FLASHPAGE_RAW
    bool "Auto initialize Flashpage raw"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_FLASHPAGE_RAW
+    depends on MODULE_PERIPH_FLASHPAGE_RAW
-config MOD_PERIPH_FLASHPAGE_RWEE
+config MODULE_PERIPH_FLASHPAGE_RWEE
    bool "Read while Write support"
    depends on HAS_PERIPH_FLASHPAGE_RWEE
-    depends on MOD_PERIPH_FLASHPAGE
+    depends on MODULE_PERIPH_FLASHPAGE
-config MOD_PERIPH_INIT_FLASHPAGE_RWEE
+config MODULE_PERIPH_INIT_FLASHPAGE_RWEE
    bool "Auto initialize Flashpage RWEE"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_FLASHPAGE_RWEE
+    depends on MODULE_PERIPH_FLASHPAGE_RWEE
--- a/drivers/periph_common/Kconfig.gpio
+++ b/drivers/periph_common/Kconfig.gpio
@ -5,30 +5,30 @@
 # directory for more details.
 #
-menuconfig MOD_PERIPH_GPIO
+menuconfig MODULE_PERIPH_GPIO
    bool "GPIO peripheral driver"
    default y
    depends on HAS_PERIPH_GPIO
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-if MOD_PERIPH_GPIO
+if MODULE_PERIPH_GPIO
-config MOD_PERIPH_INIT_GPIO
+config MODULE_PERIPH_INIT_GPIO
    bool "Auto initialize GPIO peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-config MOD_PERIPH_GPIO_IRQ
+config MODULE_PERIPH_GPIO_IRQ
    bool "GPIO interrupt peripheral driver"
    depends on HAS_PERIPH_GPIO_IRQ
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
 # TODO: this module is actually just an artifact from the way periph_init_%
 # modules are handled in Makefile. We need to define it to keep the list the
 # same for now. We should be able to remove it later on.
-config MOD_PERIPH_INIT_GPIO_IRQ
+config MODULE_PERIPH_INIT_GPIO_IRQ
    bool "Auto initialize GPIO interrupt peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_GPIO_IRQ
+    depends on MODULE_PERIPH_GPIO_IRQ
-endif # MOD_PERIPH_GPIO
+endif # MODULE_PERIPH_GPIO
--- a/drivers/periph_common/Kconfig.i2c
+++ b/drivers/periph_common/Kconfig.i2c
@ -5,18 +5,18 @@
 # directory for more details.
 #
-menuconfig MOD_PERIPH_I2C
+menuconfig MODULE_PERIPH_I2C
    bool "I2C peripheral driver"
    depends on HAS_PERIPH_I2C
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-if MOD_PERIPH_I2C
+if MODULE_PERIPH_I2C
-config MOD_PERIPH_INIT_I2C
+config MODULE_PERIPH_INIT_I2C
    bool "Auto initialize I2C peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-config MOD_PERIPH_I2C_RECONFIGURE
+config MODULE_PERIPH_I2C_RECONFIGURE
    bool "Pin reconfiguration support"
    depends on HAS_PERIPH_I2C_RECONFIGURE
@ -24,9 +24,9 @@ config MOD_PERIPH_I2C_RECONFIGURE
 # modules are handled in Makefile. We need to define it to keep the list the
 # same for now. We should be able to remove it later on.
-config MOD_PERIPH_INIT_I2C_RECONFIGURE
+config MODULE_PERIPH_INIT_I2C_RECONFIGURE
    bool "Auto initialize I2C pin reconfiguration support"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_I2C_RECONFIGURE
+    depends on MODULE_PERIPH_I2C_RECONFIGURE
-endif # MOD_PERIPH_I2C
+endif # MODULE_PERIPH_I2C
--- a/drivers/periph_common/Kconfig.spi
+++ b/drivers/periph_common/Kconfig.spi
@ -5,18 +5,18 @@
 # directory for more details.
 #
-menuconfig MOD_PERIPH_SPI
+menuconfig MODULE_PERIPH_SPI
    bool "SPI peripheral driver"
    depends on HAS_PERIPH_SPI
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-if MOD_PERIPH_SPI
+if MODULE_PERIPH_SPI
-config MOD_PERIPH_INIT_SPI
+config MODULE_PERIPH_INIT_SPI
    bool "Auto initialize SPI peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-config MOD_PERIPH_SPI_RECONFIGURE
+config MODULE_PERIPH_SPI_RECONFIGURE
    bool "Pin reconfiguration support"
    depends on HAS_PERIPH_SPI_RECONFIGURE
@ -24,9 +24,9 @@ config MOD_PERIPH_SPI_RECONFIGURE
 # modules are handled in Makefile. We need to define it to keep the list the
 # same for now. We should be able to remove it later on.
-config MOD_PERIPH_INIT_SPI_RECONFIGURE
+config MODULE_PERIPH_INIT_SPI_RECONFIGURE
    bool "Auto initialize SPI pin reconfiguration support"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-    depends on MOD_PERIPH_SPI_RECONFIGURE
+    depends on MODULE_PERIPH_SPI_RECONFIGURE
-endif # MOD_PERIPH_SPI
+endif # MODULE_PERIPH_SPI
--- a/drivers/periph_common/Kconfig.timer
+++ b/drivers/periph_common/Kconfig.timer
@ -5,28 +5,28 @@
 # directory for more details.
 #
-menuconfig MOD_PERIPH_TIMER
+menuconfig MODULE_PERIPH_TIMER
    bool "Timer peripheral driver"
    depends on HAS_PERIPH_TIMER
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-if MOD_PERIPH_TIMER
+if MODULE_PERIPH_TIMER
 # TODO: the 'init' modules are actually just artifacts from the way
 # periph_init_% modules are handled in Makefile. We need to define them to keep
 # the list the same for now. We should be able to remove them later on.
-config MOD_PERIPH_INIT_TIMER
+config MODULE_PERIPH_INIT_TIMER
    bool "Auto initialize Timer peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-config MOD_PERIPH_TIMER_PERIODIC
+config MODULE_PERIPH_TIMER_PERIODIC
    bool "Periodic timeout support"
    depends on HAS_PERIPH_TIMER_PERIODIC
-config MOD_PERIPH_INIT_TIMER_PERIODIC
+config MODULE_PERIPH_INIT_TIMER_PERIODIC
    bool
-    depends on MOD_PERIPH_TIMER_PERIODIC
+    depends on MODULE_PERIPH_TIMER_PERIODIC
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-endif # MOD_PERIPH_TIMER
+endif # MODULE_PERIPH_TIMER
--- a/drivers/periph_common/Kconfig.uart
+++ b/drivers/periph_common/Kconfig.uart
@ -5,37 +5,37 @@
 # directory for more details.
 #
-menuconfig MOD_PERIPH_UART
+menuconfig MODULE_PERIPH_UART
    bool "UART peripheral driver"
    depends on HAS_PERIPH_UART
-    select MOD_PERIPH_COMMON
+    select MODULE_PERIPH_COMMON
-if MOD_PERIPH_UART
+if MODULE_PERIPH_UART
 # TODO: the 'init' modules are actually just artifacts from the way
 # periph_init_% modules are handled in Makefile. We need to define them to keep
 # the list the same for now. We should be able to remove them later on.
-config MOD_PERIPH_INIT_UART
+config MODULE_PERIPH_INIT_UART
    bool "Auto initialize UART peripheral"
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-config MOD_PERIPH_UART_MODECFG
+config MODULE_PERIPH_UART_MODECFG
    bool "Mode configuration support"
    depends on HAS_PERIPH_UART_MODECFG
-config MOD_PERIPH_UART_NONBLOCKING
+config MODULE_PERIPH_UART_NONBLOCKING
    bool "Non-blocking support"
    depends on HAS_PERIPH_UART_NONBLOCKING
-config MOD_PERIPH_INIT_UART_MODECFG
+config MODULE_PERIPH_INIT_UART_MODECFG
    bool
-    depends on MOD_PERIPH_UART_MODECFG
+    depends on MODULE_PERIPH_UART_MODECFG
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-config MOD_PERIPH_INIT_UART_NONBLOCKING
+config MODULE_PERIPH_INIT_UART_NONBLOCKING
    bool
-    depends on MOD_PERIPH_UART_NONBLOCKING
+    depends on MODULE_PERIPH_UART_NONBLOCKING
-    default y if MOD_PERIPH_INIT
+    default y if MODULE_PERIPH_INIT
-endif # MOD_PERIPH_UART
+endif # MODULE_PERIPH_UART
--- a/drivers/pn532/Kconfig
+++ b/drivers/pn532/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_PN532
+menuconfig KCONFIG_USEMODULE_PN532
    bool "Configure PN532 driver"
-    depends on MODULE_PN532
+    depends on USEMODULE_PN532
    help
        Configure the PN532 driver using Kconfig.
-if KCONFIG_MODULE_PN532
+if KCONFIG_USEMODULE_PN532
 config PN532_BUFFER_LEN
    int "Internal buffer size"
@ -20,4 +20,4 @@ config PN532_BUFFER_LEN
        For large NDEF files, the buffer size may be increased.
        Otherwise the files may be written in chunks.
-endif # KCONFIG_MODULE_PN532
+endif # KCONFIG_USEMODULE_PN532
--- a/drivers/rn2xx3/Kconfig
+++ b/drivers/rn2xx3/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_RN2XX3
+menuconfig KCONFIG_USEMODULE_RN2XX3
    bool "Configure RN2XX3 driver"
-    depends on MODULE_RN2XX3
+    depends on USEMODULE_RN2XX3
    help
        Configure the RN2XX3 driver using Kconfig.
-if KCONFIG_MODULE_RN2XX3
+if KCONFIG_USEMODULE_RN2XX3
 config RN2XX3_DEFAULT_SLEEP
    int "Sleep duration in milliseconds [ms]"
@ -20,4 +20,4 @@ config RN2XX3_DEFAULT_SLEEP
        Set the sleep duration (in ms).
        The value should be greater than RN2XX3_SLEEP_MIN (100 ms)
-endif # KCONFIG_MODULE_RN2XX3
+endif # KCONFIG_USEMODULE_RN2XX3
--- a/drivers/slipdev/Kconfig
+++ b/drivers/slipdev/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_SLIPDEV
+menuconfig KCONFIG_USEMODULE_SLIPDEV
    bool "Configure SLIPDEV driver"
-    depends on MODULE_SLIPDEV
+    depends on USEMODULE_SLIPDEV
    help
        Configure the SLIPDEV driver using Kconfig.
-if KCONFIG_MODULE_SLIPDEV
+if KCONFIG_USEMODULE_SLIPDEV
 config SLIPDEV_BUFSIZE_EXP
    int "Buffer size (as exponent of 2^n)"
@ -22,4 +22,4 @@ config SLIPDEV_BUFSIZE_EXP
        not include full IPv6 MTU.
        Value represents the exponent n of 2^n.
-endif # KCONFIG_MODULE_SLIPDEV
+endif # KCONFIG_USEMODULE_SLIPDEV
--- a/drivers/sps30/Kconfig
+++ b/drivers/sps30/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_SPS30
+menuconfig KCONFIG_USEMODULE_SPS30
    bool "Configure SPS30 driver"
-    depends on MODULE_SPS30
+    depends on USEMODULE_SPS30
    help
        Configure the SPS30 driver using Kconfig.
-if KCONFIG_MODULE_SPS30
+if KCONFIG_USEMODULE_SPS30
 config SPS30_ERROR_RETRY
    int "Maximum number of error retries"
@ -21,4 +21,4 @@ config SPS30_ERROR_RETRY
        The value may be increased if the device is connected over
        suboptimal wiring.
-endif # KCONFIG_MODULE_SPS30
+endif # KCONFIG_USEMODULE_SPS30
--- a/drivers/tcs37727/Kconfig
+++ b/drivers/tcs37727/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_TCS37727
+menuconfig KCONFIG_USEMODULE_TCS37727
    bool "Configure TCS37727 driver"
-    depends on MODULE_TCS37727
+    depends on USEMODULE_TCS37727
    help
        Configure the TCS37727 driver using Kconfig.
-if KCONFIG_MODULE_TCS37727
+if KCONFIG_USEMODULE_TCS37727
 config TCS37727_ATIME_DEFAULT
    int "RGBC integration time in microseconds"
@ -21,4 +21,4 @@ config TCS37727_ATIME_DEFAULT
        of the RGBC reading. Refer to the section "RGBC Time Register" in the
        datasheet for more information.
-endif # KCONFIG_MODULE_TCS37727
+endif # KCONFIG_USEMODULE_TCS37727
--- a/drivers/tmp00x/Kconfig
+++ b/drivers/tmp00x/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_TMP00X
+menuconfig KCONFIG_USEMODULE_TMP00X
    bool "Configure TMP00X driver"
-    depends on MODULE_TMP00X
+    depends on USEMODULE_TMP00X
    help
        Configure the TMP00X driver using Kconfig.
-if KCONFIG_MODULE_TMP00X
+if KCONFIG_USEMODULE_TMP00X
 config TMP00X_I2C_ADDRESS
    hex "Default I2C Address"
@ -61,4 +61,4 @@ config TMP00X_USE_RAW_VALUES
        Enable this to return raw ADC readings. By default measurements are
        converted to Celsius.
-endif # KCONFIG_MODULE_TMP00X
+endif # KCONFIG_USEMODULE_TMP00X
--- a/examples/gnrc_border_router/Kconfig
+++ b/examples/gnrc_border_router/Kconfig
@ -1,10 +1,10 @@
-if MODULE_ETHOS
+if USEMODULE_ETHOS
 config GNRC_DHCPV6_CLIENT_6LBR_STATIC_ROUTE
    default y
-    depends on MODULE_GNRC_DHCPV6_CLIENT_6LBR && KCONFIG_MODULE_GNRC_DHCPV6
+    depends on USEMODULE_GNRC_DHCPV6_CLIENT_6LBR && KCONFIG_USEMODULE_GNRC_DHCPV6
 config GNRC_NETIF_IPV6_ADDRS_NUMOF
    # CONFIG_GNRC_DHCPV6_CLIENT_6LBR_STATIC_ROUTE=1 requires one more address
    # for `fe80::2`.
    default 3
-    depends on KCONFIG_MODULE_GNRC_NETIF
+    depends on KCONFIG_USEMODULE_GNRC_NETIF
-endif # MODULE_ETHOS
+endif # USEMODULE_ETHOS
--- a/makefiles/kconfig.mk
+++ b/makefiles/kconfig.mk
@ -93,8 +93,8 @@ BUILDDEPS += $(KCONFIG_GENERATED_AUTOCONF_HEADER_C) $(FIXDEP)
 # Include configuration header when building
 CFLAGS += -imacros '$(KCONFIG_GENERATED_AUTOCONF_HEADER_C)'
-USEMODULE_W_PREFIX = $(addprefix MODULE_,$(USEMODULE))
+USEMODULE_W_PREFIX = $(addprefix USEMODULE_,$(USEMODULE))
-USEPKG_W_PREFIX = $(addprefix PKG_,$(USEPKG))
+USEPKG_W_PREFIX = $(addprefix USEPKG_,$(USEPKG))
 .PHONY: menuconfig
@ -116,7 +116,7 @@ endif
 ifneq (clean, $(MAKECMDGOALS))
 # Build a Kconfig file defining all used modules and packages. This is done by
-# defining symbols like 'MODULE_<MODULE_NAME>' or PKG_<PACKAGE_NAME> which
+# defining symbols like 'USEMODULE_<MODULE_NAME>' or USEPKG_<PACKAGE_NAME> which
 # default to 'y'. Then, every module and package Kconfig menu will depend on
 # that symbol being set to show its options.
 # Do nothing when testing Kconfig module dependency modelling.
--- a/pkg/tinydtls/Kconfig
+++ b/pkg/tinydtls/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_PKG_TINYDTLS
+menuconfig KCONFIG_USEPKG_TINYDTLS
    bool "Configure tinydtls"
-    depends on PKG_TINYDTLS
+    depends on USEPKG_TINYDTLS
    help
        Configure tinydtls package via Kconfig.
-if KCONFIG_PKG_TINYDTLS
+if KCONFIG_USEPKG_TINYDTLS
 # TODO change to multiple choice after DTLS application support enabling more than one types of cypher suites
 choice
@ -48,4 +48,4 @@ config DTLS_HANDSHAKE_MAX
    help
        The maximum number of concurrent DTLS handshakes.
-endif # KCONFIG_PKG_TINYDTLS
+endif # KCONFIG_USEPKG_TINYDTLS
--- a/pkg/wakaama/Kconfig
+++ b/pkg/wakaama/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_PKG_WAKAAMA
+menuconfig KCONFIG_USEPKG_WAKAAMA
    bool "Configure Wakaama LwM2M"
-    depends on PKG_WAKAAMA
+    depends on USEPKG_WAKAAMA
    help
        Configure Wakaama package via Kconfig.
-if KCONFIG_PKG_WAKAAMA
+if KCONFIG_USEPKG_WAKAAMA
 menu "Remote server"
@ -126,4 +126,4 @@ config LWM2M_TLSF_BUFFER
    int "Allocation buffer size"
    default 5120
-endif # KCONFIG_PKG_WAKAAMA
+endif # KCONFIG_USEPKG_WAKAAMA
--- a/sys/Kconfig
+++ b/sys/Kconfig
@ -13,7 +13,7 @@ rsource "Kconfig.stdio"
 rsource "pm_layered/Kconfig"
 rsource "usb/Kconfig"
-config MOD_SYS
+config MODULE_SYS
    bool
    default y
    depends on TEST_KCONFIG
--- a/sys/Kconfig.newlib
+++ b/sys/Kconfig.newlib
@ -5,24 +5,24 @@
 # directory for more details.
 #
-menuconfig MOD_NEWLIB
+menuconfig MODULE_NEWLIB
    bool "NewLib"
    depends on TEST_KCONFIG
-if MOD_NEWLIB
+if MODULE_NEWLIB
-config MOD_NEWLIB_NANO
+config MODULE_NEWLIB_NANO
    bool "NewLib Nano"
-config MOD_NEWLIB_GNU_SOURCE
+config MODULE_NEWLIB_GNU_SOURCE
    bool "NewLib GNU source"
-config MOD_NEWLIB_SYSCALLS_DEFAULT
+config MODULE_NEWLIB_SYSCALLS_DEFAULT
    bool "NewLib Syscalls default implementation"
    default y
    depends on !HAVE_CUSTOM_NEWLIB_SYSCALLS
-endif # MOD_NEWLIB
+endif # MODULE_NEWLIB
 config HAVE_CUSTOM_NEWLIB_SYSCALLS
    bool
--- a/sys/Kconfig.stdio
+++ b/sys/Kconfig.stdio
@ -10,20 +10,20 @@ menu "Standard Input/Ouput (STDIO)"
 choice
    bool "STDIO implementation"
-    default MOD_STDIO_UART
+    default MODULE_STDIO_UART
-# TODO: Add MOD_STDIO_CDC_ACM, MOD_STDIO_RTT, MOD_SLIPDEV_STDIO,
+# TODO: Add MODULE_STDIO_CDC_ACM, MODULE_STDIO_RTT, MODULE_SLIPDEV_STDIO,
-# MOD_STDIO_NATIVE and MOD_STDIO_ETHOS
+# MODULE_STDIO_NATIVE and MODULE_STDIO_ETHOS
-config MOD_STDIO_NULL
+config MODULE_STDIO_NULL
    bool "Null"
    help
        Empty implementation.
-config MOD_STDIO_UART
+config MODULE_STDIO_UART
    bool "UART"
    depends on HAS_PERIPH_UART
-    select MOD_PERIPH_UART
+    select MODULE_PERIPH_UART
 endchoice
--- a/sys/auto_init/Kconfig
+++ b/sys/auto_init/Kconfig
@ -5,7 +5,7 @@
 # directory for more details.
 #
-config MOD_AUTO_INIT
+config MODULE_AUTO_INIT
    bool "Auto-initialization system"
    default y
    depends on TEST_KCONFIG
--- a/sys/net/application_layer/asymcute/Kconfig
+++ b/sys/net/application_layer/asymcute/Kconfig
@ -4,9 +4,9 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_ASYMCUTE
+menuconfig KCONFIG_USEMODULE_ASYMCUTE
    bool "Configure Asymcute"
-    depends on MODULE_ASYMCUTE
+    depends on USEMODULE_ASYMCUTE
    help
        Configure Asymcute using Kconfig.`Asymcute` is a asynchronous MQTT-SN
        client implementation, aiming at providing the user a high degree of
@ -14,7 +14,7 @@ menuconfig KCONFIG_MODULE_ASYMCUTE
        any number of concurrent requests to one or more different gateways
        simultaneously.
-if KCONFIG_MODULE_ASYMCUTE
+if KCONFIG_USEMODULE_ASYMCUTE
 config ASYMCUTE_BUFSIZE_EXP
    int "Exponent for the buffer size (resulting in the buffer size 2^n)"
@ -85,4 +85,4 @@ config ASYMCUTE_N_RETRY
        information, see MQTT-SN Spec v1.2, section 6.13. For default values,
        see section 7.2 -> Nretry: 3-5.
-endif # KCONFIG_MODULE_ASYMCUTE
+endif # KCONFIG_USEMODULE_ASYMCUTE
--- a/sys/net/application_layer/dhcpv6/Kconfig
+++ b/sys/net/application_layer/dhcpv6/Kconfig
@ -4,16 +4,16 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_DHCPV6
+menuconfig KCONFIG_USEMODULE_DHCPV6
    bool "Configure DHCPv6"
-    depends on MODULE_DHCPV6
+    depends on USEMODULE_DHCPV6
    help
        Configure DHCPv6 client using Kconfig.
-if KCONFIG_MODULE_DHCPV6
+if KCONFIG_USEMODULE_DHCPV6
 config DHCPV6_CLIENT_PFX_LEASE_MAX
    int "Maximum number of prefix leases to be stored"
    default 1
-endif # KCONFIG_MODULE_DHCPv6
+endif # KCONFIG_USEMODULE_DHCPv6
--- a/sys/net/application_layer/gcoap/Kconfig
+++ b/sys/net/application_layer/gcoap/Kconfig
@ -4,14 +4,14 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GCOAP
+menuconfig KCONFIG_USEMODULE_GCOAP
    bool "Configure Gcoap"
-    depends on MODULE_GCOAP
+    depends on USEMODULE_GCOAP
    help
        Configure Gcoap module using Kconfig. If not set default values and
        CFLAGS will be used.
-if KCONFIG_MODULE_GCOAP
+if KCONFIG_USEMODULE_GCOAP
 config GCOAP_PDU_BUF_SIZE
    int "Request or response buffer size"
@ -113,4 +113,4 @@ config GCOAP_NO_AUTO_INIT
        Disable gcoap startup during system auto init. If disabled,
        gcoap_init() must be called by some other means.
-endif # KCONFIG_MODULE_GCOAP
+endif # KCONFIG_USEMODULE_GCOAP
--- a/sys/net/application_layer/nanocoap/Kconfig
+++ b/sys/net/application_layer/nanocoap/Kconfig
@ -6,15 +6,15 @@
 #
 # Nanocoap provides CoAP functionalities
-config MODULE_NANOCOAP
+config USEMODULE_NANOCOAP
    bool
    select HAS_PROTOCOL_COAP
-menuconfig KCONFIG_MODULE_NANOCOAP
+menuconfig KCONFIG_USEMODULE_NANOCOAP
    bool "Configure Nanocoap module"
-    depends on MODULE_NANOCOAP
+    depends on USEMODULE_NANOCOAP
-if KCONFIG_MODULE_NANOCOAP
+if KCONFIG_USEMODULE_NANOCOAP
 config NANOCOAP_NOPTS_MAX
    int "Maximum number of options in a message"
@ -35,4 +35,4 @@ config NANOCOAP_QS_MAX
    int "Maximum length of a query string written to a message"
    default 64
-endif # KCONFIG_MODULE_NANOCOAP
+endif # KCONFIG_USEMODULE_NANOCOAP
--- a/sys/net/ble/skald/Kconfig
+++ b/sys/net/ble/skald/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_SKALD
+menuconfig KCONFIG_USEMODULE_SKALD
    bool "Configure SKALD"
-    depends on MODULE_SKALD
+    depends on USEMODULE_SKALD
    help
        Configure Skald, BLE advertising stack, using Kconfig.
-if KCONFIG_MODULE_SKALD
+if KCONFIG_USEMODULE_SKALD
 config SKALD_INTERVAL
    int "Advertising interval in microseconds"
@ -28,4 +28,4 @@ config ADV_CH_38_DISABLE
 config ADV_CH_39_DISABLE
    bool "Disable advertising on channel 39"
-endif # KCONFIG_MODULE_SKALD
+endif # KCONFIG_USEMODULE_SKALD
--- a/sys/net/credman/Kconfig
+++ b/sys/net/credman/Kconfig
@ -4,14 +4,14 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_CREDMAN
+menuconfig KCONFIG_USEMODULE_CREDMAN
    bool "Configure CREDMAN"
-    depends on MODULE_CREDMAN
+    depends on USEMODULE_CREDMAN
    help
        Configure CREDMAN, Credentials management module for (D)TLS, using
        Kconfig.
-if KCONFIG_MODULE_CREDMAN
+if KCONFIG_USEMODULE_CREDMAN
 config CREDMAN_MAX_CREDENTIALS
    int "MAX number of credentials in credential pool"
@ -20,4 +20,4 @@ config CREDMAN_MAX_CREDENTIALS
        Configure 'CONFIG_CREDMAN_MAX_CREDENTIALS', the maximum number of
        allowed credentials in the credential pool.
-endif # KCONFIG_MODULE_CREDMAN
+endif # KCONFIG_USEMODULE_CREDMAN
--- a/sys/net/gnrc/Kconfig
+++ b/sys/net/gnrc/Kconfig
@ -5,7 +5,7 @@
 # directory for more details.
 #
 menu "GNRC Network stack"
-    depends on MODULE_GNRC
+    depends on USEMODULE_GNRC
 rsource "application_layer/dhcpv6/Kconfig"
 rsource "link_layer/gomach/Kconfig"
--- a/sys/net/gnrc/application_layer/dhcpv6/Kconfig
+++ b/sys/net/gnrc/application_layer/dhcpv6/Kconfig
@ -1,12 +1,12 @@
-menuconfig KCONFIG_MODULE_GNRC_DHCPV6
+menuconfig KCONFIG_USEMODULE_GNRC_DHCPV6
    bool "Configure GNRC-part of DHCPv6"
-    depends on MODULE_GNRC_DHCPV6
+    depends on USEMODULE_GNRC_DHCPV6
    help
        Configure GNRC-part of DHCPv6 via Kconfig.
-if KCONFIG_MODULE_GNRC_DHCPV6
+if KCONFIG_USEMODULE_GNRC_DHCPV6
-if MODULE_GNRC_DHCPV6_CLIENT_6LBR
+if USEMODULE_GNRC_DHCPV6_CLIENT_6LBR
 config GNRC_DHCPV6_CLIENT_6LBR_UPSTREAM
    int "Identifier for the upstream interface of the 6LoWPAN border router"
    default 0
@ -29,6 +29,6 @@ config GNRC_DHCPV6_CLIENT_6LBR_STATIC_ROUTE
        that the upstream router can set a static route for the delegated
        prefix via that address. It is recommended to increase at least @ref
        CONFIG_GNRC_NETIF_IPV6_ADDRS_NUMOF to that end.
-endif # MODULE_GNRC_DHCPV6_CLIENT_6LBR
+endif # USEMODULE_GNRC_DHCPV6_CLIENT_6LBR
-endif # KCONFIG_MODULE_GNRC_DHCPV6
+endif # KCONFIG_USEMODULE_GNRC_DHCPV6
--- a/sys/net/gnrc/link_layer/gomach/Kconfig
+++ b/sys/net/gnrc/link_layer/gomach/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_GOMACH
+menuconfig KCONFIG_USEMODULE_GNRC_GOMACH
    bool "Configure GNRC GOMACH"
-    depends on MODULE_GNRC_GOMACH
+    depends on USEMODULE_GNRC_GOMACH
    help
        Configure the GNRC GOMACH using Kconfig.
-if KCONFIG_MODULE_GNRC_GOMACH
+if KCONFIG_USEMODULE_GNRC_GOMACH
 config GNRC_GOMACH_CP_DURATION_US
    int "Wake-up period (WP) duration in microseconds"
@ -224,4 +224,4 @@ config GNRC_GOMACH_MAX_T2U_RETYR_THRESHOLD
        then we re-initiate the radio, trying to re-calibrate the radio for
        bringing it back to normal condition.
-endif # KCONFIG_MODULE_GNRC_GOMACH
+endif # KCONFIG_USEMODULE_GNRC_GOMACH
--- a/sys/net/gnrc/link_layer/lorawan/Kconfig
+++ b/sys/net/gnrc/link_layer/lorawan/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_LORAWAN
+menuconfig KCONFIG_USEMODULE_GNRC_LORAWAN
    bool "Configure GNRC LoRaWAN"
-    depends on MODULE_GNRC_LORAWAN
+    depends on USEMODULE_GNRC_LORAWAN
    help
        Configure GNRC LoRaWAN module using Kconfig.
-if KCONFIG_MODULE_GNRC_LORAWAN
+if KCONFIG_USEMODULE_GNRC_LORAWAN
 config GNRC_LORAWAN_TIMER_DRIFT
    int "Maximum timer drift"
@ -27,4 +27,4 @@ config GNRC_LORAWAN_MIN_SYMBOLS_TIMEOUT
    default 30
    range 0 1024
-endif # KCONFIG_MODULE_GNRC_LORAWAN
+endif # KCONFIG_USEMODULE_GNRC_LORAWAN
--- a/sys/net/gnrc/link_layer/lwmac/Kconfig
+++ b/sys/net/gnrc/link_layer/lwmac/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_LWMAC
+menuconfig KCONFIG_USEMODULE_GNRC_LWMAC
    bool "Configure GNRC LWMAC"
-    depends on MODULE_GNRC_LWMAC
+    depends on USEMODULE_GNRC_LWMAC
    help
        Configure the GNRC LWMAC using Kconfig.
-if KCONFIG_MODULE_GNRC_LWMAC
+if KCONFIG_USEMODULE_GNRC_LWMAC
 config GNRC_LWMAC_WAKEUP_INTERVAL_US
    int "Time between consecutive wake-ups in microseconds"
@ -150,4 +150,4 @@ config GNRC_LWMAC_RADIO_REINIT_THRESHOLD
        then we re-initialize the radio, trying to re-calibrate the radio for bringing
        it back to normal condition.
-endif # KCONFIG_MODULE_GNRC_LWMAC
+endif # KCONFIG_USEMODULE_GNRC_LWMAC
--- a/sys/net/gnrc/link_layer/mac/Kconfig
+++ b/sys/net/gnrc/link_layer/mac/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_MAC
+menuconfig KCONFIG_USEMODULE_GNRC_MAC
    bool "Configure GNRC MAC"
-    depends on MODULE_GNRC_MAC
+    depends on USEMODULE_GNRC_MAC
    help
        Configure the GNRC MAC using Kconfig.
-if KCONFIG_MODULE_GNRC_MAC
+if KCONFIG_USEMODULE_GNRC_MAC
 config GNRC_MAC_RX_QUEUE_SIZE_EXP
    int "Exponent for the RX queue size (resulting in the queue size 2^n)"
@ -43,4 +43,4 @@ config GNRC_MAC_TX_QUEUE_SIZE_EXP
 config GNRC_MAC_DISABLE_DUTYCYCLE_RECORD
    bool "Disable MAC radio duty-cycle recording and displaying"
-endif # KCONFIG_MODULE_GNRC_MAC
+endif # KCONFIG_USEMODULE_GNRC_MAC
--- a/sys/net/gnrc/netif/Kconfig
+++ b/sys/net/gnrc/netif/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_NETIF
+menuconfig KCONFIG_USEMODULE_GNRC_NETIF
    bool "Configure GNRC network interface"
-    depends on MODULE_GNRC_NETIF
+    depends on USEMODULE_GNRC_NETIF
    help
        Configure GNRC network interface using Kconfig.
-if KCONFIG_MODULE_GNRC_NETIF
+if KCONFIG_USEMODULE_GNRC_NETIF
 config GNRC_NETIF_MSG_QUEUE_SIZE_EXP
    int "Exponent for the message queue size for network interface threads (as 2^n)"
@ -42,10 +42,10 @@ config GNRC_NETIF_MIN_WAIT_AFTER_SEND_US
 config GNRC_NETIF_NONSTANDARD_6LO_MTU
    bool "Enable usage of non standard MTU for 6LoWPAN network interfaces"
-    depends on MODULE_GNRC_NETIF_6LO
+    depends on USEMODULE_GNRC_NETIF_6LO
    help
        Enables the usage of non standard MTU for 6LoWPAN network interfaces.
        This is non compliant with RFC 4944 and might not be supported by other
        implementations.
-endif # KCONFIG_MODULE_GNRC_NETIF
+endif # KCONFIG_USEMODULE_GNRC_NETIF
--- a/sys/net/gnrc/network_layer/ipv6/Kconfig
+++ b/sys/net/gnrc/network_layer/ipv6/Kconfig
@ -6,13 +6,13 @@
 #
 menu "IPv6"
-menuconfig KCONFIG_MODULE_GNRC_IPV6
+menuconfig KCONFIG_USEMODULE_GNRC_IPV6
    bool "Configure GNRC IPv6 module"
-    depends on MODULE_GNRC_IPV6
+    depends on USEMODULE_GNRC_IPV6
    help
        Configure GNRC IPv6 module using Kconfig.
-if KCONFIG_MODULE_GNRC_IPV6
+if KCONFIG_USEMODULE_GNRC_IPV6
 config GNRC_IPV6_MSG_QUEUE_SIZE_EXP
    int "Exponent for the message queue size used for the IPv6 thread (as 2^n)"
@ -22,7 +22,7 @@ config GNRC_IPV6_MSG_QUEUE_SIZE_EXP
        represents the exponent of 2^n, which will be used as the size of
        the queue.
-endif # KCONFIG_MODULE_GNRC_IPV6
+endif # KCONFIG_USEMODULE_GNRC_IPV6
 rsource "blacklist/Kconfig"
 rsource "ext/frag/Kconfig"
--- a/sys/net/gnrc/network_layer/ipv6/blacklist/Kconfig
+++ b/sys/net/gnrc/network_layer/ipv6/blacklist/Kconfig
@ -4,16 +4,16 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_IPV6_BLACKLIST
+menuconfig KCONFIG_USEMODULE_GNRC_IPV6_BLACKLIST
    bool "Configure GNRC IPv6 Blacklisting"
-    depends on MODULE_GNRC_IPV6_BLACKLIST
+    depends on USEMODULE_GNRC_IPV6_BLACKLIST
    help
        Configure GNRC IPv6 Blacklisting module using Kconfig.
-if KCONFIG_MODULE_GNRC_IPV6_BLACKLIST
+if KCONFIG_USEMODULE_GNRC_IPV6_BLACKLIST
 config GNRC_IPV6_BLACKLIST_SIZE
    int "Maximum size of the blacklist"
    default 8
-endif # KCONFIG_MODULE_GNRC_IPV6_BLACKLIST
+endif # KCONFIG_USEMODULE_GNRC_IPV6_BLACKLIST
--- a/sys/net/gnrc/network_layer/ipv6/ext/frag/Kconfig
+++ b/sys/net/gnrc/network_layer/ipv6/ext/frag/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_IPV6_EXT_FRAG
+menuconfig KCONFIG_USEMODULE_GNRC_IPV6_EXT_FRAG
    bool "Configure GNRC IPv6 fragmentation and reassembly"
-    depends on MODULE_GNRC_IPV6_EXT_FRAG
+    depends on USEMODULE_GNRC_IPV6_EXT_FRAG
    help
        Configure GNRC IPv6 fragmentation and reassembly via Kconfig.
-if KCONFIG_MODULE_GNRC_IPV6_EXT_FRAG
+if KCONFIG_USEMODULE_GNRC_IPV6_EXT_FRAG
 config GNRC_IPV6_EXT_FRAG_SEND_SIZE
    int "Number of entries IPv6 in the send buffer"
@ -47,4 +47,4 @@ config GNRC_IPV6_EXT_FRAG_RBUF_DO_NOT_OVERRIDE
        entry when a fragment for a new datagram is received. When set to 1, no
        entry will be overwritten (they will still timeout normally)
-endif # KCONFIG_MODULE_GNRC_IPV6_EXT_FRAG
+endif # KCONFIG_USEMODULE_GNRC_IPV6_EXT_FRAG
--- a/sys/net/gnrc/network_layer/ipv6/nib/Kconfig
+++ b/sys/net/gnrc/network_layer/ipv6/nib/Kconfig
@ -4,55 +4,55 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_IPV6_NIB
+menuconfig KCONFIG_USEMODULE_GNRC_IPV6_NIB
    bool "Configure GNRC IPv6 NIB"
-if KCONFIG_MODULE_GNRC_IPV6_NIB
+if KCONFIG_USEMODULE_GNRC_IPV6_NIB
 config GNRC_IPV6_NIB_6LBR
    bool "6LoWPAN border router features"
-    default y if MODULE_GNRC_IPV6_NIB_6LBR
+    default y if USEMODULE_GNRC_IPV6_NIB_6LBR
    help
        Enable 6LoWPAN Border Router (6LBR) features.
        @see https://tools.ietf.org/html/rfc6775#section-2
 config GNRC_IPV6_NIB_6LR
    bool "6LoWPAN router features"
-    default y if MODULE_GNRC_IPV6_NIB_6LR || GNRC_IPV6_NIB_6LBR
+    default y if USEMODULE_GNRC_IPV6_NIB_6LR || GNRC_IPV6_NIB_6LBR
    help
        Enable 6LoWPAN Router (6LR) features.
        @see https://tools.ietf.org/html/rfc6775#section-2
 config GNRC_IPV6_NIB_6LN
    bool "6LoWPAN node features"
-    default y if MODULE_GNRC_IPV6_NIB_6LN || GNRC_IPV6_NIB_6LR
+    default y if USEMODULE_GNRC_IPV6_NIB_6LN || GNRC_IPV6_NIB_6LR
    help
        Enable 6LoWPAN Node (6LN) features.
        @see https://tools.ietf.org/html/rfc6775#section-2
 config GNRC_IPV6_NIB_ROUTER
    bool "Router features"
-    default y if MODULE_GNRC_IPV6_NIB_ROUTER || GNRC_IPV6_NIB_6LR
+    default y if USEMODULE_GNRC_IPV6_NIB_ROUTER || GNRC_IPV6_NIB_6LR
 config GNRC_IPV6_NIB_SLAAC
    bool "Stateless address auto-configuration"
-    default y if MODULE_GNRC_IPV6_NIB_6LBR
+    default y if USEMODULE_GNRC_IPV6_NIB_6LBR
-    default n if MODULE_GNRC_IPV6_NIB_6LR || MODULE_GNRC_IPV6_NIB_6LN
+    default n if USEMODULE_GNRC_IPV6_NIB_6LR || USEMODULE_GNRC_IPV6_NIB_6LN
    default y
 config GNRC_IPV6_NIB_QUEUE_PKT
    bool "Use packet queue with address resolution"
-    default n if MODULE_GNRC_IPV6_NIB_6LN || GNRC_IPV6_NIB_6LN
+    default n if USEMODULE_GNRC_IPV6_NIB_6LN || GNRC_IPV6_NIB_6LN
    default y
 config GNRC_IPV6_NIB_ARSM
    bool "Use classic NDP address resolution state-machine"
-    default n if MODULE_GNRC_IPV6_NIB_6LN && !GNRC_IPV6_NIB_6LR
+    default n if USEMODULE_GNRC_IPV6_NIB_6LN && !GNRC_IPV6_NIB_6LR
    default y
 config GNRC_IPV6_NIB_DNS
    bool "Support for DNS configuration options"
-    default y if MODULE_GNRC_IPV6_NIB_DNS
+    default y if USEMODULE_GNRC_IPV6_NIB_DNS
 config GNRC_IPV6_NIB_ADV_ROUTER
    bool "Activate router advertising at interface start-up"
@ -78,8 +78,8 @@ endif
 config GNRC_IPV6_NIB_NUMOF
    int "Number of entries in NIB"
-    default 16 if MODULE_GNRC_IPV6_NIB_6LBR
+    default 16 if USEMODULE_GNRC_IPV6_NIB_6LBR
-    default 1 if MODULE_GNRC_IPV6_NIB_6LN && !GNRC_IPV6_NIB_6LR
+    default 1 if USEMODULE_GNRC_IPV6_NIB_6LN && !GNRC_IPV6_NIB_6LR
    default 4
 config GNRC_IPV6_NIB_REACH_TIME_RESET
@ -118,4 +118,4 @@ comment "Warning: Behavior for more than 2 Authoritative Border Router entries"
 comment "is currently not specified or tested."
 endif
-endif # KCONFIG_MODULE_GNRC_IPV6_NIB
+endif # KCONFIG_USEMODULE_GNRC_IPV6_NIB
--- a/sys/net/gnrc/network_layer/ipv6/whitelist/Kconfig
+++ b/sys/net/gnrc/network_layer/ipv6/whitelist/Kconfig
@ -4,16 +4,16 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_IPV6_WHITELIST
+menuconfig KCONFIG_USEMODULE_GNRC_IPV6_WHITELIST
    bool "Configure GNRC IPv6 Whitelisting"
-    depends on MODULE_GNRC_IPV6_WHITELIST
+    depends on USEMODULE_GNRC_IPV6_WHITELIST
    help
        Configure GNRC IPv6 Whitelisting module using Kconfig.
-if KCONFIG_MODULE_GNRC_IPV6_WHITELIST
+if KCONFIG_USEMODULE_GNRC_IPV6_WHITELIST
 config GNRC_IPV6_WHITELIST_SIZE
    int "Maximum size of the whitelist"
    default 8
-endif # KCONFIG_MODULE_GNRC_IPV6_WHITELIST
+endif # KCONFIG_USEMODULE_GNRC_IPV6_WHITELIST
--- a/sys/net/gnrc/network_layer/sixlowpan/Kconfig
+++ b/sys/net/gnrc/network_layer/sixlowpan/Kconfig
@ -5,13 +5,13 @@
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_SIXLOWPAN
+menuconfig KCONFIG_USEMODULE_GNRC_SIXLOWPAN
    bool "Configure GNRC 6LoWPAN"
-    depends on MODULE_GNRC_SIXLOWPAN
+    depends on USEMODULE_GNRC_SIXLOWPAN
    help
        Configure GNRC 6LoWPAN module using Kconfig.
-if KCONFIG_MODULE_GNRC_SIXLOWPAN
+if KCONFIG_USEMODULE_GNRC_SIXLOWPAN
 rsource "frag/Kconfig"
 rsource "nd/Kconfig"
@ -24,4 +24,4 @@ config GNRC_SIXLOWPAN_MSG_QUEUE_SIZE_EXP
        represents the exponent of 2^n, which will be used as the size of
        the queue.
-endif # KCONFIG_MODULE_GNRC_SIXLOWPAN
+endif # KCONFIG_USEMODULE_GNRC_SIXLOWPAN
--- a/sys/net/gnrc/network_layer/sixlowpan/frag/Kconfig
+++ b/sys/net/gnrc/network_layer/sixlowpan/frag/Kconfig
@ -5,10 +5,10 @@
 # directory for more details.
 #
-if MODULE_GNRC_SIXLOWPAN_FRAG
+if USEMODULE_GNRC_SIXLOWPAN_FRAG
 rsource "fb/Kconfig"
 rsource "rb/Kconfig"
 rsource "vrb/Kconfig"
-endif # MODULE_GNRC_SIXLOWPAN_FRAG
+endif # USEMODULE_GNRC_SIXLOWPAN_FRAG
--- a/sys/net/gnrc/network_layer/sixlowpan/frag/fb/Kconfig
+++ b/sys/net/gnrc/network_layer/sixlowpan/frag/fb/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_SIXLOWPAN_FRAG_FB
+menuconfig KCONFIG_USEMODULE_GNRC_SIXLOWPAN_FRAG_FB
    bool "Configure GNRC 6LoWPAN Fragmentation buffer"
-    depends on MODULE_GNRC_SIXLOWPAN_FRAG_FB
+    depends on USEMODULE_GNRC_SIXLOWPAN_FRAG_FB
    help
        Configure GNRC 6LoWPAN Fragmentation buffer using Kconfig.
-if KCONFIG_MODULE_GNRC_SIXLOWPAN_FRAG_FB
+if KCONFIG_USEMODULE_GNRC_SIXLOWPAN_FRAG_FB
 config GNRC_SIXLOWPAN_FRAG_FB_SIZE
    int "Number of datagrams that can be fragmented simultaneously"
@ -19,4 +19,4 @@ config GNRC_SIXLOWPAN_FRAG_FB_SIZE
        This determines the number of @ref gnrc_sixlowpan_frag_fb_t instances
        available.
-endif # KCONFIG_MODULE_GNRC_SIXLOWPAN_FRAG_FB
+endif # KCONFIG_USEMODULE_GNRC_SIXLOWPAN_FRAG_FB
--- a/sys/net/gnrc/network_layer/sixlowpan/frag/rb/Kconfig
+++ b/sys/net/gnrc/network_layer/sixlowpan/frag/rb/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_SIXLOWPAN_FRAG_RB
+menuconfig KCONFIG_USEMODULE_GNRC_SIXLOWPAN_FRAG_RB
    bool "Configure GNRC 6LoWPAN Reassembly buffer"
-    depends on MODULE_GNRC_SIXLOWPAN_FRAG_RB
+    depends on USEMODULE_GNRC_SIXLOWPAN_FRAG_RB
    help
        Configure GNRC 6LoWPAN Reassembly buffer using Kconfig.
-if KCONFIG_MODULE_GNRC_SIXLOWPAN_FRAG_RB
+if KCONFIG_USEMODULE_GNRC_SIXLOWPAN_FRAG_RB
 config GNRC_SIXLOWPAN_FRAG_RBUF_SIZE
    int "Size of the reassembly buffer"
@ -39,4 +39,4 @@ config GNRC_SIXLOWPAN_FRAG_RBUF_DEL_TIMER
        of a reassembly buffer entry on late arriving link-layer
        uplicates.
-endif # KCONFIG_MODULE_GNRC_SIXLOWPAN_FRAG_RB
+endif # KCONFIG_USEMODULE_GNRC_SIXLOWPAN_FRAG_RB
--- a/sys/net/gnrc/network_layer/sixlowpan/frag/vrb/Kconfig
+++ b/sys/net/gnrc/network_layer/sixlowpan/frag/vrb/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_SIXLOWPAN_FRAG_VRB
+menuconfig KCONFIG_USEMODULE_GNRC_SIXLOWPAN_FRAG_VRB
    bool "Configure GNRC 6LoWPAN Virtual reassembly buffer"
-    depends on MODULE_GNRC_SIXLOWPAN_FRAG_VRB
+    depends on USEMODULE_GNRC_SIXLOWPAN_FRAG_VRB
    help
        Configure GNRC 6LoWPAN Virtual reassembly buffer module using Kconfig.
-if KCONFIG_MODULE_GNRC_SIXLOWPAN_FRAG_VRB
+if KCONFIG_USEMODULE_GNRC_SIXLOWPAN_FRAG_VRB
 config GNRC_SIXLOWPAN_FRAG_VRB_SIZE
    int "Size of the virtual reassembly buffer"
@ -23,4 +23,4 @@ config GNRC_SIXLOWPAN_FRAG_VRB_TIMEOUT_US
    int "Timeout for a virtual reassembly buffer entry in microseconds"
    default 3000000
-endif # KCONFIG_MODULE_GNRC_SIXLOWPAN_FRAG_VRB
+endif # KCONFIG_USEMODULE_GNRC_SIXLOWPAN_FRAG_VRB
--- a/sys/net/gnrc/network_layer/sixlowpan/nd/Kconfig
+++ b/sys/net/gnrc/network_layer/sixlowpan/nd/Kconfig
@ -4,21 +4,21 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_SIXLOWPAN_ND
+menuconfig KCONFIG_USEMODULE_GNRC_SIXLOWPAN_ND
    bool "Configure GNRC 6LoWPAN Neighbor Discovery"
-    depends on MODULE_GNRC_SIXLOWPAN_ND
+    depends on USEMODULE_GNRC_SIXLOWPAN_ND
    help
        Configure GNRC 6LoWPAN Neighbor Discovery module using Kconfig.
-if KCONFIG_MODULE_GNRC_SIXLOWPAN_ND
+if KCONFIG_USEMODULE_GNRC_SIXLOWPAN_ND
 config GNRC_SIXLOWPAN_ND_AR_LTIME
    int "Registration lifetime for the address registration option in minutes"
-    depends on MODULE_GNRC_IPV6_NIB
+    depends on USEMODULE_GNRC_IPV6_NIB
    default 15
    help
        This value should be adapted to the devices power-lifecycle so that it is
        greater than the time the device spends sleeping. See RFC 6775, section
        5.8.1.
-endif # KCONFIG_MODULE_GNRC_SIXLOWPAN_ND
+endif # KCONFIG_USEMODULE_GNRC_SIXLOWPAN_ND
--- a/sys/net/gnrc/pktbuf/Kconfig
+++ b/sys/net/gnrc/pktbuf/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_PKTBUF_STATIC
+menuconfig KCONFIG_USEMODULE_GNRC_PKTBUF_STATIC
    bool "Configure the GNRC Packet Buffer"
-    depends on MODULE_GNRC_PKTBUF_STATIC
+    depends on USEMODULE_GNRC_PKTBUF_STATIC
    help
        Configure the GNRC_PKTBUF using Kconfig.
-if KCONFIG_MODULE_GNRC_PKTBUF_STATIC
+if KCONFIG_USEMODULE_GNRC_PKTBUF_STATIC
 config GNRC_PKTBUF_SIZE
    int "Maximum size of the static packet buffer"
@ -21,4 +21,4 @@ config GNRC_PKTBUF_SIZE
        packets (2 incoming, 2 outgoing; 2 * 2 * 1280 B = 5 KiB) + Meta-Data
        (roughly estimated to 1 KiB; might be smaller).
-endif # KCONFIG_MODULE_GNRC_PKTBUF_STATIC
+endif # KCONFIG_USEMODULE_GNRC_PKTBUF_STATIC
--- a/sys/net/gnrc/pktdump/Kconfig
+++ b/sys/net/gnrc/pktdump/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_PKTDUMP
+menuconfig KCONFIG_USEMODULE_GNRC_PKTDUMP
    bool "Configure GNRC Packet Dump"
-    depends on MODULE_GNRC_PKTDUMP
+    depends on USEMODULE_GNRC_PKTDUMP
    help
        Configure the GNRC_PKTDUMP using Kconfig.
-if KCONFIG_MODULE_GNRC_PKTDUMP
+if KCONFIG_USEMODULE_GNRC_PKTDUMP
 config GNRC_PKTDUMP_MSG_QUEUE_SIZE_EXP
    int "Exponent for the queue size (resulting in the queue size 2^n)"
@ -20,4 +20,4 @@ config GNRC_PKTDUMP_MSG_QUEUE_SIZE_EXP
        represents the exponent of 2^n, which will be used as the size of
        the queue.
-endif # KCONFIG_MODULE_GNRC_PKTDUMP
+endif # KCONFIG_USEMODULE_GNRC_PKTDUMP
--- a/sys/net/gnrc/routing/rpl/Kconfig
+++ b/sys/net/gnrc/routing/rpl/Kconfig
@ -5,11 +5,11 @@
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_RPL
+menuconfig KCONFIG_USEMODULE_GNRC_RPL
    bool "Configure RPL routing protocol"
-    depends on MODULE_GNRC_RPL
+    depends on USEMODULE_GNRC_RPL
-if KCONFIG_MODULE_GNRC_RPL
+if KCONFIG_USEMODULE_GNRC_RPL
 menu "Trickle parameters"
@ -141,7 +141,7 @@ config GNRC_RPL_PARENT_TIMEOUT_DIS_RETRIES
 config GNRC_RPL_DEFAULT_NETIF
    int "Default network interface to run the protocol on"
    default 0
-    depends on MODULE_AUTO_INIT_GNRC_RPL
+    depends on USEMODULE_AUTO_INIT_GNRC_RPL
 config GNRC_RPL_MSG_QUEUE_SIZE_EXP
    int "Exponent for the thread's message queue size (as 2^n)"
@ -151,4 +151,4 @@ config GNRC_RPL_MSG_QUEUE_SIZE_EXP
        represents the exponent of 2^n, which will be used as the size of
        the queue.
-endif # KCONFIG_MODULE_GNRC_RPL
+endif # KCONFIG_USEMODULE_GNRC_RPL
--- a/sys/net/gnrc/transport_layer/tcp/Kconfig
+++ b/sys/net/gnrc/transport_layer/tcp/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_GNRC_TCP
+menuconfig KCONFIG_USEMODULE_GNRC_TCP
    bool "Configure GNRC_TCP"
-    depends on MODULE_GNRC_TCP
+    depends on USEMODULE_GNRC_TCP
    help
        Configure the GNRC_TCP using Kconfig.
-if KCONFIG_MODULE_GNRC_TCP
+if KCONFIG_USEMODULE_GNRC_TCP
 config GNRC_TCP_CONNECTION_TIMEOUT_DURATION
    int "Timeout duration for user calls in microseconds"
@ -28,7 +28,7 @@ config GNRC_TCP_MSL
 config GNRC_TCP_MSS
    int "Maximum Segment Size (MSS)"
-    default 1220 if MODULE_GNRC_IPV6
+    default 1220 if USEMODULE_GNRC_IPV6
    default 576
 config GNRC_TCP_MSS_MULTIPLICATOR
@ -48,7 +48,7 @@ config GNRC_TCP_DEFAULT_WINDOW_EN
 config GNRC_TCP_DEFAULT_WINDOW
    int "TCP receive window size"
-    default 1220 if MODULE_GNRC_IPV6
+    default 1220 if USEMODULE_GNRC_IPV6
    default 576
    depends on GNRC_TCP_DEFAULT_WINDOW_EN
    help
@ -126,4 +126,4 @@ config GNRC_TCP_EVENTLOOP_MSG_QUEUE_SIZE_SIZE_EXP
        The number of elements in a message queue must be always a power of two.
        This value defines the exponent of 2^n.
-endif # KCONFIG_MODULE_GNRC_TCP
+endif # KCONFIG_USEMODULE_GNRC_TCP
--- a/sys/net/link_layer/csma_sender/Kconfig
+++ b/sys/net/link_layer/csma_sender/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_CSMA_SENDER
+menuconfig KCONFIG_USEMODULE_CSMA_SENDER
    bool "Configure CSMA sender"
-    depends on MODULE_CSMA_SENDER
+    depends on USEMODULE_CSMA_SENDER
    help
        Configure the CSMA_SENDER using Kconfig.
-if KCONFIG_MODULE_CSMA_SENDER
+if KCONFIG_USEMODULE_CSMA_SENDER
 config CSMA_SENDER_MIN_BE_DEFAULT
    int "Exponent for minimum CSMA/CA backoff time"
@ -39,4 +39,4 @@ config CSMA_SENDER_BACKOFF_PERIOD_UNIT
        Configure 'CONFIG_CSMA_SENDER_BACKOFF_PERIOD_UNIT'. Maximum and Minimum
        CSMA backoff time depends on unit times the value of this configuration.
-endif # KCONFIG_MODULE_CSMA_SENDER
+endif # KCONFIG_USEMODULE_CSMA_SENDER
--- a/sys/net/link_layer/ieee802154/Kconfig
+++ b/sys/net/link_layer/ieee802154/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
-menuconfig KCONFIG_MODULE_IEEE802154
+menuconfig KCONFIG_USEMODULE_IEEE802154
    bool "Configure IEEE802.15.4"
-    depends on MODULE_IEEE802154
+    depends on USEMODULE_IEEE802154
    help
        Configure IEEE802.15.4 module using Kconfig
-if KCONFIG_MODULE_IEEE802154
+if KCONFIG_USEMODULE_IEEE802154
    config IEEE802154_DEFAULT_SUBGHZ_CHANNEL
        int "IEEE802.15.4 default sub-GHZ channel"
@ -33,4 +33,4 @@ if KCONFIG_MODULE_IEEE802154
        int "IEEE802.15.4 default TX power (in dBm)"
        default 0
-endif # KCONFIG_MODULE_IEEE802154
+endif # KCONFIG_USEMODULE_IEEE802154
--- a/sys/net/link_layer/l2filter/Kconfig
+++ b/sys/net/link_layer/l2filter/Kconfig
@ -4,14 +4,14 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_L2FILTER
+menuconfig KCONFIG_USEMODULE_L2FILTER
    bool "Configure L2filter"
-    depends on MODULE_L2FILTER
+    depends on USEMODULE_L2FILTER
    help
        Configure L2filter using Kconfig. This module is used for filtering
        (allowlisting or denylisting) link layer addresses.
-if KCONFIG_MODULE_L2FILTER
+if KCONFIG_USEMODULE_L2FILTER
 config L2FILTER_ADDR_MAXLEN
    int "Maximum length of addresses that can be stored in the filter list"
@ -21,4 +21,4 @@ config L2FILTER_LISTSIZE
    int "Number of slots in each filter list (filter entries per device)"
    default 8
-endif # KCONFIG_MODULE_L2FILTER
+endif # KCONFIG_USEMODULE_L2FILTER
--- a/sys/net/netif/Kconfig
+++ b/sys/net/netif/Kconfig
@ -4,16 +4,16 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_NETIF
+menuconfig KCONFIG_USEMODULE_NETIF
    bool "Configure Network Interfaces"
-    depends on MODULE_NETIF
+    depends on USEMODULE_NETIF
    help
        Configure Network Interfaces (NETIF) using Kconfig.
-if KCONFIG_MODULE_NETIF
+if KCONFIG_USEMODULE_NETIF
 config NETIF_NAMELENMAX
    int "Maximum length for an interface name"
    default 8
-endif # KCONFIG_MODULE_NETIF
+endif # KCONFIG_USEMODULE_NETIF
--- a/sys/net/sock/Kconfig
+++ b/sys/net/sock/Kconfig
@ -4,11 +4,11 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_SOCK_UTIL
+menuconfig KCONFIG_USEMODULE_SOCK_UTIL
    bool "Configure SOCK utility functions"
-    depends on MODULE_SOCK_UTIL
+    depends on USEMODULE_SOCK_UTIL
-if KCONFIG_MODULE_SOCK_UTIL
+if KCONFIG_USEMODULE_SOCK_UTIL
 config SOCK_SCHEME_MAXLEN
    int "Maximum length of the scheme part"
@ -28,4 +28,4 @@ config SOCK_URLPATH_MAXLEN
    help
        This value is used in sock_urlsplit().
-endif # KCONFIG_MODULE_SOCK_UTIL
+endif # KCONFIG_USEMODULE_SOCK_UTIL
--- a/sys/pm_layered/Kconfig
+++ b/sys/pm_layered/Kconfig
@ -5,7 +5,7 @@
 # directory for more details.
 #
-config MOD_PM_LAYERED
+config MODULE_PM_LAYERED
    bool "Platform-independent Power Management"
-    depends on MOD_PERIPH_PM
+    depends on MODULE_PERIPH_PM
    depends on TEST_KCONFIG
--- a/sys/usb/Kconfig
+++ b/sys/usb/Kconfig
@ -6,7 +6,7 @@
 #
 menuconfig KCONFIG_USB
    bool "Configure USB"
-    depends on MODULE_USBUS
+    depends on USEMODULE_USBUS
    help
        Configure the USB peripheral via Kconfig.
--- a/sys/usb/usbus/Kconfig
+++ b/sys/usb/usbus/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_USBUS
+menuconfig KCONFIG_USEMODULE_USBUS
    bool "Configure USB Unified Stack (USBUS)"
-    depends on MODULE_USBUS
+    depends on USEMODULE_USBUS
    help
        Configure the USBUS module via Kconfig.
-if KCONFIG_MODULE_USBUS
+if KCONFIG_USEMODULE_USBUS
 config USBUS_AUTO_ATTACH
    bool "Auto attach"
@ -44,4 +44,4 @@ endchoice
 rsource "cdc/Kconfig"
-endif # KCONFIG_MODULE_USBUS
+endif # KCONFIG_USEMODULE_USBUS
--- a/sys/usb/usbus/cdc/acm/Kconfig
+++ b/sys/usb/usbus/cdc/acm/Kconfig
@ -4,19 +4,19 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_USBUS_CDC_ACM
+menuconfig KCONFIG_USEMODULE_USBUS_CDC_ACM
    bool "Configure USBUS CDC ACM"
-    depends on MODULE_USBUS_CDC_ACM
+    depends on USEMODULE_USBUS_CDC_ACM
    help
        Configure the USBUS CDC ACM module via Kconfig.
-if KCONFIG_MODULE_USBUS_CDC_ACM
+if KCONFIG_USEMODULE_USBUS_CDC_ACM
 config USBUS_CDC_ACM_STDIO_BUF_SIZE_EXP
    int "Buffer size for STDIN and STDOUT data (as exponent of 2^n)"
    default 7
    range 0 31
-    depends on MODULE_STDIO_CDC_ACM
+    depends on USEMODULE_STDIO_CDC_ACM
    help
        As buffer size ALWAYS needs to be power of two, this changes this option
        represents the exponent of 2^n, which will be used as the size of the
@ -43,4 +43,4 @@ config USBUS_CDC_ACM_BULK_EP_SIZE_64
 endchoice
-endif # KCONFIG_MODULE_USBUS_CDC_ACM
+endif # KCONFIG_USEMODULE_USBUS_CDC_ACM
--- a/sys/usb/usbus/cdc/ecm/Kconfig
+++ b/sys/usb/usbus/cdc/ecm/Kconfig
@ -4,13 +4,13 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 #
-menuconfig KCONFIG_MODULE_USBUS_CDC_ECM
+menuconfig KCONFIG_USEMODULE_USBUS_CDC_ECM
    bool "Configure USBUS CDC ECM"
-    depends on MODULE_USBUS_CDC_ECM
+    depends on USEMODULE_USBUS_CDC_ECM
    help
        Configure the USBUS CDC ECM module via Kconfig.
-if KCONFIG_MODULE_USBUS_CDC_ECM
+if KCONFIG_USEMODULE_USBUS_CDC_ECM
 config USBUS_CDC_ECM_CONFIG_SPEED_IND
    bool "Configure upload and download speeds independently"
@ -40,4 +40,4 @@ config USBUS_CDC_ECM_CONFIG_SPEED_UPSTREAM
        This is the link upload speed, defined in bits/second, that the USB
        peripheral will report to the host.
-endif # KCONFIG_MODULE_USBUS_CDC_ECM
+endif # KCONFIG_USEMODULE_USBUS_CDC_ECM
--- a/tests/gnrc_dhcpv6_client_6lbr/Kconfig
+++ b/tests/gnrc_dhcpv6_client_6lbr/Kconfig
@ -1,10 +1,10 @@
-if MODULE_ETHOS
+if USEMODULE_ETHOS
 config GNRC_DHCPV6_CLIENT_6LBR_STATIC_ROUTE
    default y
-    depends on MODULE_GNRC_DHCPV6_CLIENT_6LBR && KCONFIG_MODULE_GNRC_DHCPV6
+    depends on USEMODULE_GNRC_DHCPV6_CLIENT_6LBR && KCONFIG_USEMODULE_GNRC_DHCPV6
 config GNRC_NETIF_IPV6_ADDRS_NUMOF
    # CONFIG_GNRC_DHCPV6_CLIENT_6LBR_STATIC_ROUTE=1 requires one more address
    # for `fe80::2`.
    default 3
-    depends on KCONFIG_MODULE_GNRC_NETIF
+    depends on KCONFIG_USEMODULE_GNRC_NETIF
-endif # MODULE_ETHOS
+endif # USEMODULE_ETHOS
--- a/tests/gnrc_ipv6_ext_frag/app.config
+++ b/tests/gnrc_ipv6_ext_frag/app.config
@ -1,3 +1,3 @@
 # This test fails if the pool size is less than 3
-CONFIG_KCONFIG_MODULE_GNRC_IPV6_EXT_FRAG=y
+CONFIG_KCONFIG_USEMODULE_GNRC_IPV6_EXT_FRAG=y
 CONFIG_GNRC_IPV6_EXT_FRAG_LIMITS_POOL_SIZE=3
`@ -1 +1 @@`
	`CONFIG_MOD_PM_LAYERED=y`	`CONFIG_MODULE_PM_LAYERED=y`