diff --git a/boards/arm/frdm_k64f/pinmux.c b/boards/arm/frdm_k64f/pinmux.c
index 884fffe583a..a1ef0cdd980 100644
--- a/boards/arm/frdm_k64f/pinmux.c
+++ b/boards/arm/frdm_k64f/pinmux.c
@@ -58,7 +58,7 @@ static int frdm_k64f_pinmux_init(struct device *dev)
 	pinmux_pin_set(porte, 26, PORT_PCR_MUX(kPORT_MuxAsGpio));
 	pinmux_pin_set(portb, 21, PORT_PCR_MUX(kPORT_MuxAsGpio));
 
-#ifdef CONFIG_NXP_MCR20A
+#ifdef CONFIG_IEEE802154_MCR20A
 	/* FRDM-MCR20A Reset (D5) */
 	pinmux_pin_set(porta,  2, PORT_PCR_MUX(kPORT_MuxAsGpio));
 	/* FRDM-MCR20A IRQ_B (D2) */
diff --git a/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig b/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig
index 95d0cbeac58..a4467fde837 100644
--- a/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig
+++ b/boards/x86/quark_se_c1000_devboard/Kconfig.defconfig
@@ -46,26 +46,26 @@ endif
 config BLUETOOTH_MONITOR_ON_DEV_NAME
 	default UART_QMSI_1_NAME if BLUETOOTH_DEBUG_MONITOR
 
-if TI_CC2520_LEGACY || TI_CC2520 || TI_CC2520_RAW
+if IEEE802154_CC2520_LEGACY || IEEE802154_CC2520 || IEEE802154_CC2520_RAW
 
 config SPI
 	def_bool y
 config GPIO
 	def_bool y
 
-config TI_CC2520_SPI_DRV_NAME
+config IEEE802154_CC2520_SPI_DRV_NAME
 	default SPI_1_NAME
-config TI_CC2520_SPI_FREQ
+config IEEE802154_CC2520_SPI_FREQ
 	default 4
-config TI_CC2520_SPI_SLAVE
+config IEEE802154_CC2520_SPI_SLAVE
 	default 1
 
 
 if GPIO_QMSI
 
-config TI_CC2520_GPIO_0_NAME
+config IEEE802154_CC2520_GPIO_0_NAME
 	default GPIO_QMSI_0_NAME
-config TI_CC2520_GPIO_1_NAME
+config IEEE802154_CC2520_GPIO_1_NAME
 	default GPIO_QMSI_1_NAME
 
 endif # GPIO_QMSI
@@ -77,14 +77,14 @@ config SPI_1_CS_GPIO_PORT
 	default GPIO_QMSI_0_NAME
 config SPI_1_CS_GPIO_PIN
 	default 11
-config TI_CC2520_GPIO_0_NAME
+config IEEE802154_CC2520_GPIO_0_NAME
 	string
 	default GPIO_QMSI_0_NAME
-config TI_CC2520_GPIO_1_NAME
+config IEEE802154_CC2520_GPIO_1_NAME
 	string
 	default GPIO_QMSI_1_NAME
 endif
 
-endif # TI_CC2520_LEGACY || TI_CC2520 || TI_CC2520_RAW
+endif # IEEE802154_CC2520_LEGACY || IEEE802154_CC2520 || IEEE802154_CC2520_RAW
 
 endif # BOARD_QUARK_SE_C1000_DEVBOARD
diff --git a/boards/x86/quark_se_c1000_devboard/board.c b/boards/x86/quark_se_c1000_devboard/board.c
index d837ef7f6c7..6a015248829 100644
--- a/boards/x86/quark_se_c1000_devboard/board.c
+++ b/boards/x86/quark_se_c1000_devboard/board.c
@@ -10,9 +10,9 @@
 #include <device.h>
 #include <init.h>
 
-#if defined(CONFIG_TI_CC2520_LEGACY) || \
-	defined(CONFIG_TI_CC2520) || \
-	defined(CONFIG_TI_CC2520_RAW)
+#if defined(CONFIG_IEEE802154_CC2520_LEGACY) || \
+	defined(CONFIG_IEEE802154_CC2520) || \
+	defined(CONFIG_IEEE802154_CC2520_RAW)
 
 #include <ieee802154/cc2520.h>
 #include <gpio.h>
@@ -34,7 +34,7 @@ struct cc2520_gpio_configuration *cc2520_configure_gpios(void)
 				  GPIO_INT_ACTIVE_HIGH | GPIO_INT_DEBOUNCE);
 	struct device *gpio;
 
-	gpio = device_get_binding(CONFIG_TI_CC2520_GPIO_1_NAME);
+	gpio = device_get_binding(CONFIG_IEEE802154_CC2520_GPIO_1_NAME);
 	gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_VREG_EN].pin,
 			   flags_noint_out);
 	gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_RESET].pin,
@@ -43,7 +43,7 @@ struct cc2520_gpio_configuration *cc2520_configure_gpios(void)
 	cc2520_gpios[CC2520_GPIO_IDX_VREG_EN].dev = gpio;
 	cc2520_gpios[CC2520_GPIO_IDX_RESET].dev = gpio;
 
-	gpio = device_get_binding(CONFIG_TI_CC2520_GPIO_0_NAME);
+	gpio = device_get_binding(CONFIG_IEEE802154_CC2520_GPIO_0_NAME);
 	gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_SFD].pin,
 			   flags_int_in);
 	gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_FIFOP].pin,
@@ -61,4 +61,6 @@ struct cc2520_gpio_configuration *cc2520_configure_gpios(void)
 	return cc2520_gpios;
 }
 
-#endif /* CONFIG_TI_CC2520_LEGACY || CONFIG_TI_CC2520 || CONFIG_TI_CC2520_RAW */
+#endif /* CONFIG_IEEE802154_CC2520_LEGACY || CONFIG_IEEE802154_CC2520 ||
+	* CONFIG_IEEE802154_CC2520_RAW
+	*/
diff --git a/boards/x86/quark_se_c1000_devboard/board.h b/boards/x86/quark_se_c1000_devboard/board.h
index ca7ed244bed..429cc535a96 100644
--- a/boards/x86/quark_se_c1000_devboard/board.h
+++ b/boards/x86/quark_se_c1000_devboard/board.h
@@ -21,9 +21,9 @@
 #define LED0_GPIO_PORT  CONFIG_GPIO_QMSI_0_NAME
 #define LED0_GPIO_PIN   25
 
-#if defined(CONFIG_TI_CC2520_LEGACY) || \
-	defined(CONFIG_TI_CC2520) || \
-	defined(CONFIG_TI_CC2520_RAW)
+#if defined(CONFIG_IEEE802154_CC2520_LEGACY) || \
+	defined(CONFIG_IEEE802154_CC2520) || \
+	defined(CONFIG_IEEE802154_CC2520_RAW)
 
 /* GPIO numbers where the TI cc2520 chip is connected to */
 #define CC2520_GPIO_VREG_EN	0  /* PIN ?, ATP_AON_INT0 (out) */
@@ -33,7 +33,9 @@
 #define CC2520_GPIO_CCA		6  /* PIN 6, GPIO6 (in) */
 #define CC2520_GPIO_SFD		29 /* PIN 33, GPIO29 (in) */
 
-#endif /* CONFIG_TI_CC2520_LEGACY || CONFIG_TI_CC2520 || CONFIG_TI_CC2520_RAW */
+#endif /* CONFIG_IEEE802154_CC2520_LEGACY || CONFIG_IEEE802154_CC2520 ||
+	* CONFIG_IEEE802154_CC2520_RAW
+	*/
 
 #if defined(CONFIG_USB)
 /* GPIO driver name */
diff --git a/drivers/ieee802154/Kconfig b/drivers/ieee802154/Kconfig
index b2d2bf24a9b..e845cccca7a 100644
--- a/drivers/ieee802154/Kconfig
+++ b/drivers/ieee802154/Kconfig
@@ -58,16 +58,16 @@ source "drivers/ieee802154/Kconfig.cc2520"
 
 source "drivers/ieee802154/Kconfig.mcr20a"
 
-menuconfig UPIPE_15_4
+menuconfig IEEE802154_UPIPE
 	bool "UART PIPE fake radio driver support for QEMU"
 	depends on BOARD_QEMU_X86
 	select NETWORKING
 	select UART_PIPE
 	default n
 
-config UPIPE_15_4_DRV_NAME
+config IEEE802154_UPIPE_DRV_NAME
 	string "UART PIPE Driver name"
-	default "upipe_15_4"
-	depends on UPIPE_15_4
+	default "IEEE802154_UPIPE"
+	depends on IEEE802154_UPIPE
 
 endmenu
diff --git a/drivers/ieee802154/Kconfig.cc2520 b/drivers/ieee802154/Kconfig.cc2520
index 82a6bf9efa3..472e7c9f11f 100644
--- a/drivers/ieee802154/Kconfig.cc2520
+++ b/drivers/ieee802154/Kconfig.cc2520
@@ -1,38 +1,38 @@
 # Kconfig.cc2520 - TI CC2520 configuration options
 #
 
-menuconfig TI_CC2520
+menuconfig IEEE802154_CC2520
 	bool "TI CC2520 Driver support"
 	depends on NETWORKING
 	select NET_L2_IEEE802154
 	default n
 
-menuconfig TI_CC2520_RAW
+menuconfig IEEE802154_CC2520_RAW
 	bool "TI CC2520 Driver RAW channel"
 	select NET_L2_RAW_CHANNEL
 	default n
 	help
-	Enable TI_CC2520 driver with RAW channel
+	Enable IEEE802154_CC2520 driver with RAW channel
 
 	The CC2520 driver with RAW channel allows to export radio interface
 	over USB making an USB 802.15.4 dongle.
 
-if TI_CC2520 || TI_CC2520_RAW
+if IEEE802154_CC2520 || IEEE802154_CC2520_RAW
 
-config TI_CC2520_DRV_NAME
+config IEEE802154_CC2520_DRV_NAME
 	string "TI CC2520 Driver's name"
 	default "cc2520"
 	help
 	This option sets the driver name
 
-config TI_CC2520_SPI_DRV_NAME
+config IEEE802154_CC2520_SPI_DRV_NAME
 	string "SPI driver's name to use to access CC2520"
 	default ""
 	help
 	This option is mandatory to set which SPI controller to use in order
 	to actually control the CC2520 chip.
 
-config TI_CC2520_SPI_FREQ
+config IEEE802154_CC2520_SPI_FREQ
 	int "SPI system frequency"
 	default 0
 	help
@@ -40,14 +40,14 @@ config TI_CC2520_SPI_FREQ
 	depends on the SPI controller being used and also on the system
 	clock.
 
-config TI_CC2520_SPI_SLAVE
+config IEEE802154_CC2520_SPI_SLAVE
 	int "SPI slave linked to CC2520"
 	default 0
 	help
 	This option sets the SPI slave number SPI controller has to switch
 	to when dealing with CC2520 chip.
 
-config TI_CC2520_RX_STACK_SIZE
+config IEEE802154_CC2520_RX_STACK_SIZE
 	int "Driver's internal rx thread stack size"
 	default 800
 	help
@@ -55,7 +55,7 @@ config TI_CC2520_RX_STACK_SIZE
 	The default value should be sufficient, but in case it prooves to be
 	a too little one, this option makes it easy to play with the size.
 
-config TI_CC2520_INIT_PRIO
+config IEEE802154_CC2520_INIT_PRIO
 	int "CC2520 intialization priority"
 	default 80
 	help
diff --git a/drivers/ieee802154/Kconfig.mcr20a b/drivers/ieee802154/Kconfig.mcr20a
index d40b81f88b7..8b7f40549e9 100644
--- a/drivers/ieee802154/Kconfig.mcr20a
+++ b/drivers/ieee802154/Kconfig.mcr20a
@@ -1,39 +1,39 @@
 # Kconfig.mcr20a - NXP MCR20A configuration options
 #
 
-menuconfig  NXP_MCR20A
+menuconfig  IEEE802154_MCR20A
 	bool "NXP MCR20A Driver support"
 	depends on NETWORKING && SPI
 	select NET_L2_IEEE802154
 	default n
 
-menuconfig NXP_MCR20A_RAW
+menuconfig IEEE802154_MCR20A_RAW
 	bool "NXP MCR20A Driver RAW channel"
 	depends on SPI
 	select NET_L2_RAW_CHANNEL
 	default n
 	help
-	Enable NXP_MCR20A driver with RAW channel
+	Enable IEEE802154_MCR20A driver with RAW channel
 
 	The MCR20A driver with RAW channel allows to export radio interface
 	over USB making an USB 802.15.4 dongle.
 
-if NXP_MCR20A || NXP_MCR20A_RAW
+if IEEE802154_MCR20A || IEEE802154_MCR20A_RAW
 
-config NXP_MCR20A_DRV_NAME
+config IEEE802154_MCR20A_DRV_NAME
 	string "NXP MCR20A Driver's name"
 	default "mcr20a"
 	help
 	This option sets the driver name
 
-config NXP_MCR20A_SPI_DRV_NAME
+config IEEE802154_MCR20A_SPI_DRV_NAME
 	string "SPI driver's name to use to access MCR20A"
 	default SPI_0_NAME
 	help
 	This option is mandatory to set which SPI controller to use in order
 	to actually control the MCR20A chip.
 
-config NXP_MCR20A_SPI_FREQ
+config IEEE802154_MCR20A_SPI_FREQ
 	int "SPI system frequency"
 	default 4000000
 	help
@@ -41,7 +41,7 @@ config NXP_MCR20A_SPI_FREQ
 	depends on the SPI controller being used and also on the system
 	clock.
 
-config NXP_MCR20A_SPI_SLAVE
+config IEEE802154_MCR20A_SPI_SLAVE
 	int "SPI slave linked to MCR20A"
 	default 0
 	help
@@ -99,7 +99,7 @@ config MCR20A_CLK_OUT_32768HZ
 
 endchoice
 
-config NXP_MCR20A_RX_STACK_SIZE
+config IEEE802154_MCR20A_RX_STACK_SIZE
 	int "Driver's internal rx thread stack size"
 	default 800
 	help
@@ -107,7 +107,7 @@ config NXP_MCR20A_RX_STACK_SIZE
 	The default value should be sufficient, but in case it proves to be
 	a too little one, this option makes it easy to play with the size.
 
-config NXP_MCR20A_INIT_PRIO
+config IEEE802154_MCR20A_INIT_PRIO
 	int "MCR20A intialization priority"
 	default 80
 	help
diff --git a/drivers/ieee802154/Makefile b/drivers/ieee802154/Makefile
index 801726e4ca9..60efa9a6f45 100644
--- a/drivers/ieee802154/Makefile
+++ b/drivers/ieee802154/Makefile
@@ -1,5 +1,5 @@
-obj-$(CONFIG_TI_CC2520) += ieee802154_cc2520.o
-obj-$(CONFIG_TI_CC2520_RAW) += ieee802154_cc2520.o
-obj-$(CONFIG_UPIPE_15_4) += ieee802154_uart_pipe.o
-obj-$(CONFIG_NXP_MCR20A) += ieee802154_mcr20a.o
-obj-$(CONFIG_NXP_MCR20A_RAW) += ieee802154_mcr20a.o
+obj-$(CONFIG_IEEE802154_CC2520) += ieee802154_cc2520.o
+obj-$(CONFIG_IEEE802154_CC2520_RAW) += ieee802154_cc2520.o
+obj-$(CONFIG_IEEE802154_UPIPE) += ieee802154_uart_pipe.o
+obj-$(CONFIG_IEEE802154_MCR20A) += ieee802154_mcr20a.o
+obj-$(CONFIG_IEEE802154_MCR20A_RAW) += ieee802154_mcr20a.o
diff --git a/drivers/ieee802154/ieee802154_cc2520.c b/drivers/ieee802154/ieee802154_cc2520.c
index 253ee4cc50b..58a78dc72ef 100644
--- a/drivers/ieee802154/ieee802154_cc2520.c
+++ b/drivers/ieee802154/ieee802154_cc2520.c
@@ -600,7 +600,7 @@ static void cc2520_rx(int arg)
 			goto flush;
 		}
 
-#if defined(CONFIG_TI_CC2520_RAW)
+#if defined(CONFIG_IEEE802154_CC2520_RAW)
 		/**
 		 * Reserve 1 byte for length
 		 */
@@ -615,7 +615,7 @@ static void cc2520_rx(int arg)
 
 		net_buf_frag_insert(buf, pkt_buf);
 
-#if defined(CONFIG_TI_CC2520_RAW)
+#if defined(CONFIG_IEEE802154_CC2520_RAW)
 		if (!read_rxfifo_content(&cc2520->spi, pkt_buf, pkt_len)) {
 			SYS_LOG_ERR("No content read");
 			goto flush;
@@ -651,7 +651,7 @@ static void cc2520_rx(int arg)
 			goto out;
 		}
 
-#if defined(CONFIG_TI_CC2520_RAW)
+#if defined(CONFIG_IEEE802154_CC2520_RAW)
 		net_buf_add_u8(pkt_buf, cc2520->lqi);
 #endif
 
@@ -665,7 +665,7 @@ static void cc2520_rx(int arg)
 
 		net_analyze_stack("CC2520 Rx Fiber stack",
 				  (unsigned char *)cc2520->cc2520_rx_stack,
-				  CONFIG_TI_CC2520_RX_STACK_SIZE);
+				  CONFIG_IEEE802154_CC2520_RX_STACK_SIZE);
 		continue;
 flush:
 		_cc2520_print_exceptions(cc2520);
@@ -990,16 +990,17 @@ static inline int configure_spi(struct device *dev)
 	struct cc2520_context *cc2520 = dev->driver_data;
 	struct spi_config spi_conf = {
 		.config = SPI_WORD(8),
-		.max_sys_freq = CONFIG_TI_CC2520_SPI_FREQ,
+		.max_sys_freq = CONFIG_IEEE802154_CC2520_SPI_FREQ,
 	};
 
-	cc2520->spi.dev = device_get_binding(CONFIG_TI_CC2520_SPI_DRV_NAME);
+	cc2520->spi.dev = device_get_binding(
+			CONFIG_IEEE802154_CC2520_SPI_DRV_NAME);
 	if (!cc2520->spi.dev) {
 		SYS_LOG_ERR("Unable to get SPI device");
 		return -ENODEV;
 	}
 
-	cc2520->spi.slave = CONFIG_TI_CC2520_SPI_SLAVE;
+	cc2520->spi.slave = CONFIG_IEEE802154_CC2520_SPI_SLAVE;
 
 	if (spi_configure(cc2520->spi.dev, &spi_conf) != 0 ||
 	    spi_slave_select(cc2520->spi.dev,
@@ -1037,7 +1038,7 @@ static int cc2520_init(struct device *dev)
 	}
 
 	k_thread_spawn(cc2520->cc2520_rx_stack,
-		       CONFIG_TI_CC2520_RX_STACK_SIZE,
+		       CONFIG_IEEE802154_CC2520_RX_STACK_SIZE,
 		       (k_thread_entry_t)cc2520_rx,
 		       dev, NULL, NULL,
 		       K_PRIO_COOP(2), 0, 0);
@@ -1080,21 +1081,21 @@ static struct ieee802154_radio_api cc2520_radio_api = {
 	.get_lqi	= cc2520_get_lqi,
 };
 
-#if defined(CONFIG_TI_CC2520_RAW)
-DEVICE_AND_API_INIT(cc2520, CONFIG_TI_CC2520_DRV_NAME,
+#if defined(CONFIG_IEEE802154_CC2520_RAW)
+DEVICE_AND_API_INIT(cc2520, CONFIG_IEEE802154_CC2520_DRV_NAME,
 		    cc2520_init, &cc2520_context_data, NULL,
-		    POST_KERNEL, CONFIG_TI_CC2520_INIT_PRIO,
+		    POST_KERNEL, CONFIG_IEEE802154_CC2520_INIT_PRIO,
 		    &cc2520_radio_api);
 #else
-NET_DEVICE_INIT(cc2520, CONFIG_TI_CC2520_DRV_NAME,
+NET_DEVICE_INIT(cc2520, CONFIG_IEEE802154_CC2520_DRV_NAME,
 		cc2520_init, &cc2520_context_data, NULL,
-		CONFIG_TI_CC2520_INIT_PRIO,
+		CONFIG_IEEE802154_CC2520_INIT_PRIO,
 		&cc2520_radio_api, IEEE802154_L2,
 		NET_L2_GET_CTX_TYPE(IEEE802154_L2), 125);
 
 NET_STACK_INFO_ADDR(RX, cc2520,
-		    CONFIG_TI_CC2520_RX_STACK_SIZE,
-		    CONFIG_TI_CC2520_RX_STACK_SIZE,
+		    CONFIG_IEEE802154_CC2520_RX_STACK_SIZE,
+		    CONFIG_IEEE802154_CC2520_RX_STACK_SIZE,
 		    ((struct cc2520_context *)(&__device_cc2520))->
 							cc2520_rx_stack,
 		    0);
diff --git a/drivers/ieee802154/ieee802154_cc2520.h b/drivers/ieee802154/ieee802154_cc2520.h
index 0ff7cd3fbf8..37be2e174a9 100644
--- a/drivers/ieee802154/ieee802154_cc2520.h
+++ b/drivers/ieee802154/ieee802154_cc2520.h
@@ -40,7 +40,7 @@ struct cc2520_context {
 	struct k_sem tx_sync;
 	atomic_t tx;
 	/************RX************/
-	char __stack cc2520_rx_stack[CONFIG_TI_CC2520_RX_STACK_SIZE];
+	char __stack cc2520_rx_stack[CONFIG_IEEE802154_CC2520_RX_STACK_SIZE];
 	struct k_sem rx_lock;
 	bool overflow;
 	uint8_t lqi;
diff --git a/drivers/ieee802154/ieee802154_mcr20a.c b/drivers/ieee802154/ieee802154_mcr20a.c
index ecefa6b74da..eae6128fb14 100644
--- a/drivers/ieee802154/ieee802154_mcr20a.c
+++ b/drivers/ieee802154/ieee802154_mcr20a.c
@@ -530,7 +530,7 @@ static inline void mcr20a_rx(struct mcr20a_context *mcr20a)
 		goto out;
 	}
 
-#if defined(CONFIG_NXP_MCR20A_RAW)
+#if defined(CONFIG_IEEE802154_MCR20A_RAW)
 	/* TODO: Test raw mode */
 	/**
 	 * Reserve 1 byte for length
@@ -561,7 +561,7 @@ static inline void mcr20a_rx(struct mcr20a_context *mcr20a)
 		    pkt_len, mcr20a->lqi,
 		    mcr20a_get_rssi(mcr20a->lqi));
 
-#if defined(CONFIG_NXP_MCR20A_RAW)
+#if defined(CONFIG_IEEE802154_MCR20A_RAW)
 	net_buf_add_u8(pkt_buf, mcr20a->lqi);
 #endif
 
@@ -572,7 +572,7 @@ static inline void mcr20a_rx(struct mcr20a_context *mcr20a)
 
 	net_analyze_stack("MCR20A Rx Fiber stack",
 			  mcr20a->mcr20a_rx_stack,
-			  CONFIG_NXP_MCR20A_RX_STACK_SIZE);
+			  CONFIG_IEEE802154_MCR20A_RX_STACK_SIZE);
 	return;
 out:
 	if (buf) {
@@ -1397,16 +1397,17 @@ static inline int configure_spi(struct device *dev)
 	struct mcr20a_context *mcr20a = dev->driver_data;
 	struct spi_config spi_conf = {
 		.config = SPI_WORD(8),
-		.max_sys_freq = CONFIG_NXP_MCR20A_SPI_FREQ,
+		.max_sys_freq = CONFIG_IEEE802154_MCR20A_SPI_FREQ,
 	};
 
-	mcr20a->spi.dev = device_get_binding(CONFIG_NXP_MCR20A_SPI_DRV_NAME);
+	mcr20a->spi.dev = device_get_binding(
+			CONFIG_IEEE802154_MCR20A_SPI_DRV_NAME);
 	if (!mcr20a->spi.dev) {
 		SYS_LOG_ERR("Unable to get SPI device");
 		return -ENODEV;
 	}
 
-	mcr20a->spi.slave = CONFIG_NXP_MCR20A_SPI_SLAVE;
+	mcr20a->spi.slave = CONFIG_IEEE802154_MCR20A_SPI_SLAVE;
 
 	if (spi_configure(mcr20a->spi.dev, &spi_conf) != 0 ||
 	    spi_slave_select(mcr20a->spi.dev,
@@ -1415,8 +1416,9 @@ static inline int configure_spi(struct device *dev)
 		return -EIO;
 	}
 
-	SYS_LOG_DBG("SPI configured %s, %d", CONFIG_NXP_MCR20A_SPI_DRV_NAME,
-		    CONFIG_NXP_MCR20A_SPI_SLAVE);
+	SYS_LOG_DBG("SPI configured %s, %d",
+				CONFIG_IEEE802154_MCR20A_SPI_DRV_NAME,
+				CONFIG_IEEE802154_MCR20A_SPI_SLAVE);
 
 	return 0;
 }
@@ -1451,7 +1453,7 @@ static int mcr20a_init(struct device *dev)
 	}
 
 	k_thread_spawn(mcr20a->mcr20a_rx_stack,
-		       CONFIG_NXP_MCR20A_RX_STACK_SIZE,
+		       CONFIG_IEEE802154_MCR20A_RX_STACK_SIZE,
 		       (k_thread_entry_t)mcr20a_thread_main,
 		       dev, NULL, NULL,
 		       K_PRIO_COOP(2), 0, 0);
@@ -1492,15 +1494,15 @@ static struct ieee802154_radio_api mcr20a_radio_api = {
 	.get_lqi	= mcr20a_get_lqi,
 };
 
-#if defined(CONFIG_NXP_MCR20A_RAW)
-DEVICE_AND_API_INIT(mcr20a, CONFIG_NXP_MCR20A_DRV_NAME,
+#if defined(CONFIG_IEEE802154_MCR20A_RAW)
+DEVICE_AND_API_INIT(mcr20a, CONFIG_IEEE802154_MCR20A_DRV_NAME,
 		    mcr20a_init, &mcr20a_context_data, NULL,
-		    POST_KERNEL, CONFIG_NXP_MCR20A_INIT_PRIO,
+		    POST_KERNEL, CONFIG_IEEE802154_MCR20A_INIT_PRIO,
 		    &mcr20a_radio_api);
 #else
-NET_DEVICE_INIT(mcr20a, CONFIG_NXP_MCR20A_DRV_NAME,
+NET_DEVICE_INIT(mcr20a, CONFIG_IEEE802154_MCR20A_DRV_NAME,
 		mcr20a_init, &mcr20a_context_data, NULL,
-		CONFIG_NXP_MCR20A_INIT_PRIO,
+		CONFIG_IEEE802154_MCR20A_INIT_PRIO,
 		&mcr20a_radio_api, IEEE802154_L2,
 		NET_L2_GET_CTX_TYPE(IEEE802154_L2), 125);
 #endif
diff --git a/drivers/ieee802154/ieee802154_mcr20a.h b/drivers/ieee802154/ieee802154_mcr20a.h
index d9329f6cd7a..e84a5211dd6 100644
--- a/drivers/ieee802154/ieee802154_mcr20a.h
+++ b/drivers/ieee802154/ieee802154_mcr20a.h
@@ -41,7 +41,7 @@ struct mcr20a_context {
 	atomic_t busy;
 	atomic_t seq_retval;
 	/************RX************/
-	char __stack mcr20a_rx_stack[CONFIG_NXP_MCR20A_RX_STACK_SIZE];
+	char __stack mcr20a_rx_stack[CONFIG_IEEE802154_MCR20A_RX_STACK_SIZE];
 	struct k_sem trig_sem;
 	uint8_t lqi;
 };
diff --git a/drivers/ieee802154/ieee802154_uart_pipe.c b/drivers/ieee802154/ieee802154_uart_pipe.c
index 6736f4fd0cd..68307d796c9 100644
--- a/drivers/ieee802154/ieee802154_uart_pipe.c
+++ b/drivers/ieee802154/ieee802154_uart_pipe.c
@@ -282,7 +282,7 @@ static struct ieee802154_radio_api upipe_radio_api = {
 	.stop			= upipe_stop,
 };
 
-NET_DEVICE_INIT(upipe_15_4, CONFIG_UPIPE_15_4_DRV_NAME,
+NET_DEVICE_INIT(upipe_15_4, CONFIG_IEEE802154_UPIPE_DRV_NAME,
 		upipe_init, &upipe_context_data, NULL,
 		CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
 		&upipe_radio_api, IEEE802154_L2,
diff --git a/ext/hal/nxp/mcux/Makefile b/ext/hal/nxp/mcux/Makefile
index 4fb490c941a..5fed754bd37 100644
--- a/ext/hal/nxp/mcux/Makefile
+++ b/ext/hal/nxp/mcux/Makefile
@@ -10,7 +10,7 @@
 MCUX_DEVICE = $(shell echo $(CONFIG_SOC) | tr '[:lower:]' '[:upper:]')
 MCUX_CPU = CPU_$(subst $(DQUOTE),,$(CONFIG_SOC_PART_NUMBER))
 
-ifdef CONFIG_NXP_MCR20A
+ifdef CONFIG_IEEE802154_MCR20A
 ZEPHYRINCLUDE += -I$(srctree)/ext/hal/nxp/mcux/components/mcr20a
 endif
 
diff --git a/samples/net/echo_client/prj_arduino_101_cc2520.conf b/samples/net/echo_client/prj_arduino_101_cc2520.conf
index 70cfd90d585..4a5a3e0722f 100644
--- a/samples/net/echo_client/prj_arduino_101_cc2520.conf
+++ b/samples/net/echo_client/prj_arduino_101_cc2520.conf
@@ -36,8 +36,8 @@ CONFIG_NET_L2_IEEE802154_ORFD=y
 CONFIG_NET_L2_IEEE802154_FRAGMENT=y
 CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
 
-CONFIG_TI_CC2520=y
-CONFIG_TI_CC2520_AUTO_ACK=y
+CONFIG_IEEE802154_CC2520=y
+CONFIG_IEEE802154_CC2520_AUTO_ACK=y
 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
 
 CONFIG_GPIO=y
@@ -47,6 +47,6 @@ CONFIG_SPI_1=y
 CONFIG_SPI_CS_GPIO=y
 CONFIG_SPI_1_CS_GPIO_PORT="GPIO_0"
 CONFIG_SPI_1_CS_GPIO_PIN=0
-CONFIG_TI_CC2520_SPI_DRV_NAME="SPI_1"
-CONFIG_TI_CC2520_SPI_FREQ=4
-CONFIG_TI_CC2520_SPI_SLAVE=1
\ No newline at end of file
+CONFIG_IEEE802154_CC2520_SPI_DRV_NAME="SPI_1"
+CONFIG_IEEE802154_CC2520_SPI_FREQ=4
+CONFIG_IEEE802154_CC2520_SPI_SLAVE=1
\ No newline at end of file
diff --git a/samples/net/echo_client/prj_cc2520.conf b/samples/net/echo_client/prj_cc2520.conf
index 71edb1c9cb7..86ae60956b1 100644
--- a/samples/net/echo_client/prj_cc2520.conf
+++ b/samples/net/echo_client/prj_cc2520.conf
@@ -38,8 +38,8 @@ CONFIG_NET_L2_IEEE802154_ORFD=y
 CONFIG_NET_L2_IEEE802154_FRAGMENT=y
 CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
 
-CONFIG_TI_CC2520=y
-CONFIG_TI_CC2520_AUTO_ACK=y
+CONFIG_IEEE802154_CC2520=y
+CONFIG_IEEE802154_CC2520_AUTO_ACK=y
 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
 
 CONFIG_NET_SAMPLES_IP_ADDRESSES=y
diff --git a/samples/net/echo_client/prj_frdm_k64f_cc2520.conf b/samples/net/echo_client/prj_frdm_k64f_cc2520.conf
index 2f34f5659f7..e4727419482 100644
--- a/samples/net/echo_client/prj_frdm_k64f_cc2520.conf
+++ b/samples/net/echo_client/prj_frdm_k64f_cc2520.conf
@@ -42,12 +42,12 @@ CONFIG_SPI_0=y
 
 CONFIG_SYS_LOG_SPI_LEVEL=1
 
-CONFIG_TI_CC2520=y
-CONFIG_TI_CC2520_AUTO_ACK=y
+CONFIG_IEEE802154_CC2520=y
+CONFIG_IEEE802154_CC2520_AUTO_ACK=y
 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
-CONFIG_TI_CC2520_SPI_DRV_NAME="SPI_0"
-CONFIG_TI_CC2520_SPI_FREQ=4000000
-CONFIG_TI_CC2520_SPI_SLAVE=0
+CONFIG_IEEE802154_CC2520_SPI_DRV_NAME="SPI_0"
+CONFIG_IEEE802154_CC2520_SPI_FREQ=4000000
+CONFIG_IEEE802154_CC2520_SPI_SLAVE=0
 
 CONFIG_NET_SAMPLES_IP_ADDRESSES=y
 CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1"
diff --git a/samples/net/echo_client/prj_frdm_k64f_mcr20a.conf b/samples/net/echo_client/prj_frdm_k64f_mcr20a.conf
index c5f2e455f4c..ac8f07499b7 100644
--- a/samples/net/echo_client/prj_frdm_k64f_mcr20a.conf
+++ b/samples/net/echo_client/prj_frdm_k64f_mcr20a.conf
@@ -40,7 +40,7 @@ CONFIG_GPIO=y
 CONFIG_SPI=y
 CONFIG_SPI_0=y
 
-CONFIG_NXP_MCR20A=y
+CONFIG_IEEE802154_MCR20A=y
 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
 
 CONFIG_NET_SAMPLES_IP_ADDRESSES=y
diff --git a/samples/net/echo_client/prj_qemu_802154.conf b/samples/net/echo_client/prj_qemu_802154.conf
index dd67ac5815a..d4ea56f5d28 100644
--- a/samples/net/echo_client/prj_qemu_802154.conf
+++ b/samples/net/echo_client/prj_qemu_802154.conf
@@ -40,7 +40,7 @@ CONFIG_NET_L2_IEEE802154_ORFD=y
 CONFIG_NET_L2_IEEE802154_FRAGMENT=y
 CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
 
-CONFIG_UPIPE_15_4=y
+CONFIG_IEEE802154_UPIPE=y
 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
 
 CONFIG_NET_SAMPLES_IP_ADDRESSES=y
diff --git a/samples/net/echo_client/src/Makefile b/samples/net/echo_client/src/Makefile
index 8802055a541..a05869c9369 100644
--- a/samples/net/echo_client/src/Makefile
+++ b/samples/net/echo_client/src/Makefile
@@ -1,6 +1,6 @@
 obj-y = echo-client.o
 
-ifeq ($(CONFIG_TI_CC2520),y)
+ifeq ($(CONFIG_IEEE802154_CC2520),y)
 
 ifeq ($(CONFIG_BOARD_ARDUINO_101),y)
 ccflags-y +=-I${ZEPHYR_BASE}/include/drivers/
diff --git a/samples/net/echo_server/prj_arduino_101_cc2520.conf b/samples/net/echo_server/prj_arduino_101_cc2520.conf
index 70cfd90d585..4a5a3e0722f 100644
--- a/samples/net/echo_server/prj_arduino_101_cc2520.conf
+++ b/samples/net/echo_server/prj_arduino_101_cc2520.conf
@@ -36,8 +36,8 @@ CONFIG_NET_L2_IEEE802154_ORFD=y
 CONFIG_NET_L2_IEEE802154_FRAGMENT=y
 CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
 
-CONFIG_TI_CC2520=y
-CONFIG_TI_CC2520_AUTO_ACK=y
+CONFIG_IEEE802154_CC2520=y
+CONFIG_IEEE802154_CC2520_AUTO_ACK=y
 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
 
 CONFIG_GPIO=y
@@ -47,6 +47,6 @@ CONFIG_SPI_1=y
 CONFIG_SPI_CS_GPIO=y
 CONFIG_SPI_1_CS_GPIO_PORT="GPIO_0"
 CONFIG_SPI_1_CS_GPIO_PIN=0
-CONFIG_TI_CC2520_SPI_DRV_NAME="SPI_1"
-CONFIG_TI_CC2520_SPI_FREQ=4
-CONFIG_TI_CC2520_SPI_SLAVE=1
\ No newline at end of file
+CONFIG_IEEE802154_CC2520_SPI_DRV_NAME="SPI_1"
+CONFIG_IEEE802154_CC2520_SPI_FREQ=4
+CONFIG_IEEE802154_CC2520_SPI_SLAVE=1
\ No newline at end of file
diff --git a/samples/net/echo_server/prj_cc2520.conf b/samples/net/echo_server/prj_cc2520.conf
index aa4e9bed8fc..7159d4a8d44 100644
--- a/samples/net/echo_server/prj_cc2520.conf
+++ b/samples/net/echo_server/prj_cc2520.conf
@@ -38,8 +38,8 @@ CONFIG_NET_L2_IEEE802154_ORFD=y
 CONFIG_NET_L2_IEEE802154_FRAGMENT=y
 #CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
 
-CONFIG_TI_CC2520=y
-CONFIG_TI_CC2520_AUTO_ACK=y
+CONFIG_IEEE802154_CC2520=y
+CONFIG_IEEE802154_CC2520_AUTO_ACK=y
 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
 
 CONFIG_NET_SAMPLES_IP_ADDRESSES=y
diff --git a/samples/net/echo_server/prj_frdm_k64f_cc2520.conf b/samples/net/echo_server/prj_frdm_k64f_cc2520.conf
index a913a06e062..7fbf6741426 100644
--- a/samples/net/echo_server/prj_frdm_k64f_cc2520.conf
+++ b/samples/net/echo_server/prj_frdm_k64f_cc2520.conf
@@ -42,12 +42,12 @@ CONFIG_SPI_0=y
 
 CONFIG_SYS_LOG_SPI_LEVEL=1
 
-CONFIG_TI_CC2520=y
-CONFIG_TI_CC2520_AUTO_ACK=y
+CONFIG_IEEE802154_CC2520=y
+CONFIG_IEEE802154_CC2520_AUTO_ACK=y
 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
-CONFIG_TI_CC2520_SPI_DRV_NAME="SPI_0"
-CONFIG_TI_CC2520_SPI_FREQ=4000000
-CONFIG_TI_CC2520_SPI_SLAVE=0
+CONFIG_IEEE802154_CC2520_SPI_DRV_NAME="SPI_0"
+CONFIG_IEEE802154_CC2520_SPI_FREQ=4000000
+CONFIG_IEEE802154_CC2520_SPI_SLAVE=0
 
 CONFIG_NET_SAMPLES_IP_ADDRESSES=y
 CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::2"
diff --git a/samples/net/echo_server/prj_frdm_k64f_mcr20a.conf b/samples/net/echo_server/prj_frdm_k64f_mcr20a.conf
index e8f8d2ff0c5..724420b437a 100644
--- a/samples/net/echo_server/prj_frdm_k64f_mcr20a.conf
+++ b/samples/net/echo_server/prj_frdm_k64f_mcr20a.conf
@@ -39,7 +39,7 @@ CONFIG_GPIO=y
 CONFIG_SPI=y
 CONFIG_SPI_0=y
 
-CONFIG_NXP_MCR20A=y
+CONFIG_IEEE802154_MCR20A=y
 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
 
 CONFIG_NET_SAMPLES_IP_ADDRESSES=y
diff --git a/samples/net/echo_server/prj_qemu_802154.conf b/samples/net/echo_server/prj_qemu_802154.conf
index b42b67ca056..0e2157e0242 100644
--- a/samples/net/echo_server/prj_qemu_802154.conf
+++ b/samples/net/echo_server/prj_qemu_802154.conf
@@ -40,7 +40,7 @@ CONFIG_NET_L2_IEEE802154_ORFD=y
 CONFIG_NET_L2_IEEE802154_FRAGMENT=y
 CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
 
-CONFIG_UPIPE_15_4=y
+CONFIG_IEEE802154_UPIPE=y
 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
 
 CONFIG_NET_SAMPLES_IP_ADDRESSES=y
diff --git a/samples/net/echo_server/src/Makefile b/samples/net/echo_server/src/Makefile
index c4dd7f72660..3f8b03393b0 100644
--- a/samples/net/echo_server/src/Makefile
+++ b/samples/net/echo_server/src/Makefile
@@ -1,6 +1,6 @@
 obj-y = echo-server.o
 
-ifeq ($(CONFIG_TI_CC2520),y)
+ifeq ($(CONFIG_IEEE802154_CC2520),y)
 
 ifeq ($(CONFIG_BOARD_ARDUINO_101),y)
 ccflags-y +=-I${ZEPHYR_BASE}/include/drivers/
diff --git a/samples/net/ieee802154/hw/prj.conf b/samples/net/ieee802154/hw/prj.conf
index 5af2d29b485..311ed0f695f 100644
--- a/samples/net/ieee802154/hw/prj.conf
+++ b/samples/net/ieee802154/hw/prj.conf
@@ -37,8 +37,8 @@ CONFIG_NET_L2_IEEE802154_RFD=y
 CONFIG_NET_L2_IEEE802154_FRAGMENT=y
 #CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
 
-CONFIG_TI_CC2520=y
-CONFIG_TI_CC2520_AUTO_ACK=y
+CONFIG_IEEE802154_CC2520=y
+CONFIG_IEEE802154_CC2520_AUTO_ACK=y
 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
 
 CONFIG_NET_L2_IEEE802154_SHELL=y
diff --git a/samples/net/ieee802154/hw/prj_mcr20a.conf b/samples/net/ieee802154/hw/prj_mcr20a.conf
index 271efe4d145..0b47ba5534d 100644
--- a/samples/net/ieee802154/hw/prj_mcr20a.conf
+++ b/samples/net/ieee802154/hw/prj_mcr20a.conf
@@ -39,7 +39,7 @@ CONFIG_NET_L2_IEEE802154_RFD=y
 CONFIG_NET_L2_IEEE802154_FRAGMENT=y
 #CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
 
-CONFIG_NXP_MCR20A=y
+CONFIG_IEEE802154_MCR20A=y
 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
 
 CONFIG_NET_L2_IEEE802154_SHELL=y
diff --git a/samples/net/ieee802154/hw/src/ieee802154_test.c b/samples/net/ieee802154/hw/src/ieee802154_test.c
index 6bfe55fc9ce..4dc1dbcef85 100644
--- a/samples/net/ieee802154/hw/src/ieee802154_test.c
+++ b/samples/net/ieee802154/hw/src/ieee802154_test.c
@@ -15,11 +15,11 @@
 #include <misc/printk.h>
 #define PRINT	printk
 
-#ifdef CONFIG_TI_CC2520_DRV_NAME
-#define IEEE802154_DRV_NAME	CONFIG_TI_CC2520_DRV_NAME
+#ifdef CONFIG_IEEE802154_CC2520_DRV_NAME
+#define IEEE802154_DRV_NAME	CONFIG_IEEE802154_CC2520_DRV_NAME
 #endif
-#ifdef CONFIG_NXP_MCR20A_DRV_NAME
-#define IEEE802154_DRV_NAME	CONFIG_NXP_MCR20A_DRV_NAME
+#ifdef CONFIG_IEEE802154_MCR20A_DRV_NAME
+#define IEEE802154_DRV_NAME	CONFIG_IEEE802154_MCR20A_DRV_NAME
 #endif
 
 #ifndef CONFIG_NET_L2_IEEE802154_SHELL
diff --git a/samples/net/ieee802154/qemu/prj.conf b/samples/net/ieee802154/qemu/prj.conf
index 6112e5164b1..926023ee39d 100644
--- a/samples/net/ieee802154/qemu/prj.conf
+++ b/samples/net/ieee802154/qemu/prj.conf
@@ -35,5 +35,5 @@ CONFIG_NET_L2_IEEE802154_ORFD=y
 CONFIG_NET_L2_IEEE802154_FRAGMENT=y
 #CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
 
-CONFIG_UPIPE_15_4=y
+CONFIG_IEEE802154_UPIPE=y
 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=4
diff --git a/samples/net/ieee802154/qemu/src/ieee802154_qemu_test.c b/samples/net/ieee802154/qemu/src/ieee802154_qemu_test.c
index ed406f84622..50237842b69 100644
--- a/samples/net/ieee802154/qemu/src/ieee802154_qemu_test.c
+++ b/samples/net/ieee802154/qemu/src/ieee802154_qemu_test.c
@@ -26,7 +26,7 @@ static struct net_if *init_device(void)
 	struct net_if *iface;
 	struct device *dev;
 
-	dev = device_get_binding(CONFIG_UPIPE_15_4_DRV_NAME);
+	dev = device_get_binding(CONFIG_IEEE802154_UPIPE_DRV_NAME);
 	if (!dev) {
 		PRINT("Cannot get UPIPE device\n");
 		return NULL;
diff --git a/samples/net/leds_demo/prj_802154.conf b/samples/net/leds_demo/prj_802154.conf
index c459d3993c9..1efd33265ca 100644
--- a/samples/net/leds_demo/prj_802154.conf
+++ b/samples/net/leds_demo/prj_802154.conf
@@ -8,5 +8,5 @@ CONFIG_NET_LOG=y
 CONFIG_NET_UDP=y
 CONFIG_NET_YAIP=y
 CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_TI_CC2520=y
+CONFIG_IEEE802154_CC2520=y
 CONFIG_ZOAP=y
diff --git a/samples/net/wpan_serial/prj.conf b/samples/net/wpan_serial/prj.conf
index 4343b0c779b..b0c200cb2f8 100644
--- a/samples/net/wpan_serial/prj.conf
+++ b/samples/net/wpan_serial/prj.conf
@@ -10,7 +10,7 @@ CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_LINE_CTRL=y
 
-CONFIG_TI_CC2520_RAW=y
+CONFIG_IEEE802154_CC2520_RAW=y
 CONFIG_NET_BUF=y
 CONFIG_NETWORKING=y
 
diff --git a/samples/net/wpan_serial/src/Makefile b/samples/net/wpan_serial/src/Makefile
index 7ed9624856b..c560055f29f 100644
--- a/samples/net/wpan_serial/src/Makefile
+++ b/samples/net/wpan_serial/src/Makefile
@@ -1,3 +1,3 @@
-ccflags-$(CONFIG_TI_CC2520_RAW) += -I${ZEPHYR_BASE}/subsys/net/ip
+ccflags-$(CONFIG_IEEE802154_CC2520_RAW) += -I${ZEPHYR_BASE}/subsys/net/ip
 
 obj-y += main.o
diff --git a/samples/net/wpan_serial/src/main.c b/samples/net/wpan_serial/src/main.c
index a92e3b97395..86b99acee4c 100644
--- a/samples/net/wpan_serial/src/main.c
+++ b/samples/net/wpan_serial/src/main.c
@@ -505,7 +505,7 @@ static bool init_ieee802154(void)
 
 	SYS_LOG_INF("Initialize ieee802.15.4");
 
-	ieee802154_dev = device_get_binding(CONFIG_TI_CC2520_DRV_NAME);
+	ieee802154_dev = device_get_binding(CONFIG_IEEE802154_CC2520_DRV_NAME);
 	if (!ieee802154_dev) {
 		SYS_LOG_ERR("Cannot get CC250 device");
 		return false;
diff --git a/samples/net/wpanusb/prj.conf b/samples/net/wpanusb/prj.conf
index 0fc0536a7da..4fe6b8243de 100644
--- a/samples/net/wpanusb/prj.conf
+++ b/samples/net/wpanusb/prj.conf
@@ -15,8 +15,8 @@ CONFIG_NET_NBUF_DATA_SIZE=128
 
 CONFIG_NET_L2_IEEE802154=y
 
-#CONFIG_TI_CC2520=y
-CONFIG_TI_CC2520_RAW=y
+#CONFIG_IEEE802154_CC2520=y
+CONFIG_IEEE802154_CC2520_RAW=y
 
 CONFIG_SYS_LOG=y
 CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
diff --git a/samples/net/wpanusb/src/Makefile b/samples/net/wpanusb/src/Makefile
index 16a6a702f01..23af5ad92c8 100644
--- a/samples/net/wpanusb/src/Makefile
+++ b/samples/net/wpanusb/src/Makefile
@@ -1,9 +1,9 @@
 ccflags-y += -I${ZEPHYR_BASE}/usb/include -I${ZEPHYR_BASE}/include/drivers/usb -I${ZEPHYR_BASE}/include/usb/
 
-ccflags-$(CONFIG_TI_CC2520_LEGACY) += -I${ZEPHYR_BASE}/net/ip/contiki/os
-ccflags-$(CONFIG_TI_CC2520_LEGACY) += -I${ZEPHYR_BASE}/net/ip/contiki
-ccflags-$(CONFIG_TI_CC2520_LEGACY) += -I${ZEPHYR_BASE}/net/ip
+ccflags-$(CONFIG_IEEE802154_CC2520_LEGACY) += -I${ZEPHYR_BASE}/net/ip/contiki/os
+ccflags-$(CONFIG_IEEE802154_CC2520_LEGACY) += -I${ZEPHYR_BASE}/net/ip/contiki
+ccflags-$(CONFIG_IEEE802154_CC2520_LEGACY) += -I${ZEPHYR_BASE}/net/ip
 
-ccflags-$(CONFIG_TI_CC2520_RAW) += -I${ZEPHYR_BASE}/subsys/net/ip
+ccflags-$(CONFIG_IEEE802154_CC2520_RAW) += -I${ZEPHYR_BASE}/subsys/net/ip
 
 obj-y += wpanusb.o
diff --git a/samples/net/wpanusb/src/wpanusb.c b/samples/net/wpanusb/src/wpanusb.c
index 528d93f2f7f..e764c70ec47 100644
--- a/samples/net/wpanusb/src/wpanusb.c
+++ b/samples/net/wpanusb/src/wpanusb.c
@@ -587,7 +587,7 @@ void main(void)
 #if DYNAMIC_REGISTER
 	ieee802154_dev = ieee802154_register_raw();
 #else
-	ieee802154_dev = device_get_binding(CONFIG_TI_CC2520_DRV_NAME);
+	ieee802154_dev = device_get_binding(CONFIG_IEEE802154_CC2520_DRV_NAME);
 	if (!ieee802154_dev) {
 		SYS_LOG_ERR("Cannot get CC250 device");
 		return;
diff --git a/samples/net/zoap_server/prj_cc2520.conf b/samples/net/zoap_server/prj_cc2520.conf
index ea85c824263..934a1a5980a 100644
--- a/samples/net/zoap_server/prj_cc2520.conf
+++ b/samples/net/zoap_server/prj_cc2520.conf
@@ -8,7 +8,7 @@ CONFIG_NET_LOG=y
 CONFIG_NET_UDP=y
 CONFIG_NET_YAIP=y
 CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_TI_CC2520=y
+CONFIG_IEEE802154_CC2520=y
 CONFIG_ZOAP=y
 CONFIG_NET_SAMPLES_IP_ADDRESSES=y
 CONFIG_NET_SAMPLES_MY_IPV6_ADDR="2001:db8::1"
diff --git a/samples/net/zperf/prj_quark_se_c1000_devboard.conf b/samples/net/zperf/prj_quark_se_c1000_devboard.conf
index cff8c26ff67..a2b53213721 100644
--- a/samples/net/zperf/prj_quark_se_c1000_devboard.conf
+++ b/samples/net/zperf/prj_quark_se_c1000_devboard.conf
@@ -26,7 +26,7 @@ CONFIG_NET_L2_IEEE802154_ORFD_PAN_ID=0xabcd
 CONFIG_NET_L2_IEEE802154_ORFD_CHANNEL=26
 CONFIG_NET_L2_IEEE802154_FRAGMENT=y
 
-CONFIG_TI_CC2520=y
+CONFIG_IEEE802154_CC2520=y
 
 CONFIG_NET_6LO=y
 CONFIG_NET_6LO_CONTEXT=y