diff --git a/.gitignore b/.gitignore
index 0ff1ebfa2..811266435 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@ COOJA.testlog
 *.simplelink
 *.sky
 *.firmware
-*.srf06-cc26xx
+*.cc26x0-cc13x0
 *.zoul
 
 # do not ignore platform makefiles
@@ -47,7 +47,7 @@ COOJA.testlog
 !Makefile.nrf52dk
 !Makefile.openmote-cc2538
 !Makefile.sky
-!Makefile.srf06-cc26xx
+!Makefile.cc26x0-cc13x0
 !Makefile.zoul
 
 # other nRF52 build artifacts
diff --git a/.gitmodules b/.gitmodules
index ed5ea056d..6481bbb93 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,10 +2,10 @@
 	path = tools/cc2538-bsl
 	url = https://github.com/JelmerT/cc2538-bsl.git
 [submodule "arch/cpu/cc26xx-cc13xx/lib/cc26xxware"]
-	path = arch/cpu/cc26xx-cc13xx/lib/cc26xxware
+	path = arch/cpu/cc26x0-cc13x0/lib/cc26xxware
 	url = https://github.com/contiki-ng/cc26xxware.git
 [submodule "arch/cpu/cc26xx-cc13xx/lib/cc13xxware"]
-	path = arch/cpu/cc26xx-cc13xx/lib/cc13xxware
+	path = arch/cpu/cc26x0-cc13x0/lib/cc13xxware
 	url = https://github.com/contiki-ng/cc13xxware.git
 [submodule "tools/sensniff"]
 	path = tools/sensniff
@@ -26,5 +26,5 @@
 	path = arch/cpu/simplelink-cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx
 	url = https://github.com/contiki-ng/coresdk_cc13xx_cc26xx.git
 [submodule "arch/cpu/cc26xx-cc13xx/lib/cc2640r2-sdk"]
-	path = arch/cpu/cc26xx-cc13xx/lib/cc2640r2-sdk
+	path = arch/cpu/cc26x0-cc13x0/lib/cc2640r2-sdk
 	url = https://github.com/contiki-ng/cc2640r2-sdk.git
diff --git a/arch/cpu/cc26xx-cc13xx/Makefile.cc13xx b/arch/cpu/cc26x0-cc13x0/Makefile.cc13x0
similarity index 80%
rename from arch/cpu/cc26xx-cc13xx/Makefile.cc13xx
rename to arch/cpu/cc26x0-cc13x0/Makefile.cc13x0
index 5ea92e30c..c29ee7270 100644
--- a/arch/cpu/cc26xx-cc13xx/Makefile.cc13xx
+++ b/arch/cpu/cc26x0-cc13x0/Makefile.cc13x0
@@ -4,4 +4,4 @@ CONTIKI_CPU_SOURCEFILES += smartrf-settings.c prop-mode.c prop-mode-tx-power.c c
 
 CFLAGS += -DCPU_FAMILY_CC13X0=1 -DCPU_FAMILY_CC13XX=1
 
-include $(CONTIKI_CPU)/Makefile.cc26xx-cc13xx
+include $(CONTIKI_CPU)/Makefile.cc26x0-cc13x0
diff --git a/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx b/arch/cpu/cc26x0-cc13x0/Makefile.cc26x0
similarity index 65%
rename from arch/cpu/cc26xx-cc13xx/Makefile.cc26xx
rename to arch/cpu/cc26x0-cc13x0/Makefile.cc26x0
index 34a147f7b..51db3f205 100644
--- a/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx
+++ b/arch/cpu/cc26x0-cc13x0/Makefile.cc26x0
@@ -2,4 +2,4 @@ TI_XXWARE_PATH = lib/cc26xxware
 
 CFLAGS += -DCPU_FAMILY_CC26X0=1 -DCPU_FAMILY_CC26XX=1
 
-include $(CONTIKI_CPU)/Makefile.cc26xx-cc13xx
+include $(CONTIKI_CPU)/Makefile.cc26x0-cc13x0
diff --git a/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx b/arch/cpu/cc26x0-cc13x0/Makefile.cc26x0-cc13x0
similarity index 98%
rename from arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
rename to arch/cpu/cc26x0-cc13x0/Makefile.cc26x0-cc13x0
index 592ddfbd8..e62b8be05 100644
--- a/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
+++ b/arch/cpu/cc26x0-cc13x0/Makefile.cc26x0-cc13x0
@@ -1,4 +1,4 @@
-CPU_ABS_PATH       = arch/cpu/cc26xx-cc13xx
+CPU_ABS_PATH       = arch/cpu/cc26x0-cc13x0
 TI_XXWARE = $(CONTIKI_CPU)/$(TI_XXWARE_PATH)
 
 ifeq (,$(wildcard $(TI_XXWARE)/*))
diff --git a/arch/cpu/cc26xx-cc13xx/Makefile.cc26x0r2f b/arch/cpu/cc26x0-cc13x0/Makefile.cc26x0r2f
similarity index 67%
rename from arch/cpu/cc26xx-cc13xx/Makefile.cc26x0r2f
rename to arch/cpu/cc26x0-cc13x0/Makefile.cc26x0r2f
index 56d041516..5118cd6a8 100644
--- a/arch/cpu/cc26xx-cc13xx/Makefile.cc26x0r2f
+++ b/arch/cpu/cc26x0-cc13x0/Makefile.cc26x0r2f
@@ -2,4 +2,4 @@ TI_XXWARE_PATH = lib/cc2640r2-sdk
 
 CFLAGS += -DCPU_FAMILY_CC26X0R2=1 -DCPU_FAMILY_CC26XXR2=1
 
-include $(CONTIKI_CPU)/Makefile.cc26xx-cc13xx
+include $(CONTIKI_CPU)/Makefile.cc26x0-cc13x0
diff --git a/arch/cpu/cc26xx-cc13xx/ble-addr.c b/arch/cpu/cc26x0-cc13x0/ble-addr.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/ble-addr.c
rename to arch/cpu/cc26x0-cc13x0/ble-addr.c
diff --git a/arch/cpu/cc26xx-cc13xx/ble-addr.h b/arch/cpu/cc26x0-cc13x0/ble-addr.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/ble-addr.h
rename to arch/cpu/cc26x0-cc13x0/ble-addr.h
diff --git a/arch/cpu/cc26xx-cc13xx/cc13x0-cc26x0-cm3.h b/arch/cpu/cc26x0-cc13x0/cc13x0-cc26x0-cm3.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/cc13x0-cc26x0-cm3.h
rename to arch/cpu/cc26x0-cc13x0/cc13x0-cc26x0-cm3.h
diff --git a/arch/cpu/cc26xx-cc13xx/cc13xx-cc26xx-conf.h b/arch/cpu/cc26x0-cc13x0/cc13xx-cc26xx-conf.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/cc13xx-cc26xx-conf.h
rename to arch/cpu/cc26x0-cc13x0/cc13xx-cc26xx-conf.h
diff --git a/arch/cpu/cc26xx-cc13xx/cc13xx-cc26xx-def.h b/arch/cpu/cc26x0-cc13x0/cc13xx-cc26xx-def.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/cc13xx-cc26xx-def.h
rename to arch/cpu/cc26x0-cc13x0/cc13xx-cc26xx-def.h
diff --git a/arch/cpu/cc26xx-cc13xx/cc26xx.ld b/arch/cpu/cc26x0-cc13x0/cc26xx.ld
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/cc26xx.ld
rename to arch/cpu/cc26x0-cc13x0/cc26xx.ld
diff --git a/arch/cpu/cc26xx-cc13xx/ccxxware-conf.h b/arch/cpu/cc26x0-cc13x0/ccxxware-conf.h
similarity index 98%
rename from arch/cpu/cc26xx-cc13xx/ccxxware-conf.h
rename to arch/cpu/cc26x0-cc13x0/ccxxware-conf.h
index bc26f1171..c101deb08 100644
--- a/arch/cpu/cc26xx-cc13xx/ccxxware-conf.h
+++ b/arch/cpu/cc26x0-cc13x0/ccxxware-conf.h
@@ -36,7 +36,7 @@
  * @{
  *
  * \file
- *  CCxxware-specific configuration for the cc26xx-cc13xx CPU family
+ *  CCxxware-specific configuration for the cc26x0-cc13x0 CPU family
  */
 #ifndef CCXXWARE_CONF_H_
 #define CCXXWARE_CONF_H_
diff --git a/arch/cpu/cc26xx-cc13xx/clock.c b/arch/cpu/cc26x0-cc13x0/clock.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/clock.c
rename to arch/cpu/cc26x0-cc13x0/clock.c
diff --git a/arch/cpu/cc26xx-cc13xx/dbg.c b/arch/cpu/cc26x0-cc13x0/dbg.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dbg.c
rename to arch/cpu/cc26x0-cc13x0/dbg.c
diff --git a/arch/cpu/cc26xx-cc13xx/dev/adc-sensor.c b/arch/cpu/cc26x0-cc13x0/dev/adc-sensor.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/adc-sensor.c
rename to arch/cpu/cc26x0-cc13x0/dev/adc-sensor.c
diff --git a/arch/cpu/cc26xx-cc13xx/dev/adc-sensor.h b/arch/cpu/cc26x0-cc13x0/dev/adc-sensor.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/adc-sensor.h
rename to arch/cpu/cc26x0-cc13x0/dev/adc-sensor.h
diff --git a/arch/cpu/cc26xx-cc13xx/dev/aux-ctrl.c b/arch/cpu/cc26x0-cc13x0/dev/aux-ctrl.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/aux-ctrl.c
rename to arch/cpu/cc26x0-cc13x0/dev/aux-ctrl.c
diff --git a/arch/cpu/cc26xx-cc13xx/dev/aux-ctrl.h b/arch/cpu/cc26x0-cc13x0/dev/aux-ctrl.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/aux-ctrl.h
rename to arch/cpu/cc26x0-cc13x0/dev/aux-ctrl.h
diff --git a/arch/cpu/cc26xx-cc13xx/dev/batmon-sensor.c b/arch/cpu/cc26x0-cc13x0/dev/batmon-sensor.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/batmon-sensor.c
rename to arch/cpu/cc26x0-cc13x0/dev/batmon-sensor.c
diff --git a/arch/cpu/cc26xx-cc13xx/dev/batmon-sensor.h b/arch/cpu/cc26x0-cc13x0/dev/batmon-sensor.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/batmon-sensor.h
rename to arch/cpu/cc26x0-cc13x0/dev/batmon-sensor.h
diff --git a/arch/cpu/cc26xx-cc13xx/dev/cc26xx-uart.c b/arch/cpu/cc26x0-cc13x0/dev/cc26xx-uart.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/cc26xx-uart.c
rename to arch/cpu/cc26x0-cc13x0/dev/cc26xx-uart.c
diff --git a/arch/cpu/cc26xx-cc13xx/dev/cc26xx-uart.h b/arch/cpu/cc26x0-cc13x0/dev/cc26xx-uart.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/cc26xx-uart.h
rename to arch/cpu/cc26x0-cc13x0/dev/cc26xx-uart.h
diff --git a/arch/cpu/cc26xx-cc13xx/dev/contiki-watchdog.c b/arch/cpu/cc26x0-cc13x0/dev/contiki-watchdog.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/contiki-watchdog.c
rename to arch/cpu/cc26x0-cc13x0/dev/contiki-watchdog.c
diff --git a/arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.c b/arch/cpu/cc26x0-cc13x0/dev/gpio-hal-arch.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.c
rename to arch/cpu/cc26x0-cc13x0/dev/gpio-hal-arch.c
diff --git a/arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.h b/arch/cpu/cc26x0-cc13x0/dev/gpio-hal-arch.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.h
rename to arch/cpu/cc26x0-cc13x0/dev/gpio-hal-arch.h
diff --git a/arch/cpu/cc26xx-cc13xx/dev/gpio-interrupt.c b/arch/cpu/cc26x0-cc13x0/dev/gpio-interrupt.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/gpio-interrupt.c
rename to arch/cpu/cc26x0-cc13x0/dev/gpio-interrupt.c
diff --git a/arch/cpu/cc26xx-cc13xx/dev/oscillators.c b/arch/cpu/cc26x0-cc13x0/dev/oscillators.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/oscillators.c
rename to arch/cpu/cc26x0-cc13x0/dev/oscillators.c
diff --git a/arch/cpu/cc26xx-cc13xx/dev/oscillators.h b/arch/cpu/cc26x0-cc13x0/dev/oscillators.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/oscillators.h
rename to arch/cpu/cc26x0-cc13x0/dev/oscillators.h
diff --git a/arch/cpu/cc26xx-cc13xx/dev/soc-rtc.c b/arch/cpu/cc26x0-cc13x0/dev/soc-rtc.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/soc-rtc.c
rename to arch/cpu/cc26x0-cc13x0/dev/soc-rtc.c
diff --git a/arch/cpu/cc26xx-cc13xx/dev/soc-rtc.h b/arch/cpu/cc26x0-cc13x0/dev/soc-rtc.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/soc-rtc.h
rename to arch/cpu/cc26x0-cc13x0/dev/soc-rtc.h
diff --git a/arch/cpu/cc26xx-cc13xx/dev/soc-trng.c b/arch/cpu/cc26x0-cc13x0/dev/soc-trng.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/soc-trng.c
rename to arch/cpu/cc26x0-cc13x0/dev/soc-trng.c
diff --git a/arch/cpu/cc26xx-cc13xx/dev/soc-trng.h b/arch/cpu/cc26x0-cc13x0/dev/soc-trng.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/soc-trng.h
rename to arch/cpu/cc26x0-cc13x0/dev/soc-trng.h
diff --git a/arch/cpu/cc26xx-cc13xx/dev/spi-arch.c b/arch/cpu/cc26x0-cc13x0/dev/spi-arch.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/dev/spi-arch.c
rename to arch/cpu/cc26x0-cc13x0/dev/spi-arch.c
diff --git a/arch/cpu/cc26xx-cc13xx/doxygen-group.txt b/arch/cpu/cc26x0-cc13x0/doxygen-group.txt
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/doxygen-group.txt
rename to arch/cpu/cc26x0-cc13x0/doxygen-group.txt
diff --git a/arch/cpu/cc26xx-cc13xx/fault-handlers.c b/arch/cpu/cc26x0-cc13x0/fault-handlers.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/fault-handlers.c
rename to arch/cpu/cc26x0-cc13x0/fault-handlers.c
diff --git a/arch/cpu/cc26xx-cc13xx/ieee-addr.c b/arch/cpu/cc26x0-cc13x0/ieee-addr.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/ieee-addr.c
rename to arch/cpu/cc26x0-cc13x0/ieee-addr.c
diff --git a/arch/cpu/cc26xx-cc13xx/ieee-addr.h b/arch/cpu/cc26x0-cc13x0/ieee-addr.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/ieee-addr.h
rename to arch/cpu/cc26x0-cc13x0/ieee-addr.h
diff --git a/arch/cpu/cc26xx-cc13xx/int-master.c b/arch/cpu/cc26x0-cc13x0/int-master.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/int-master.c
rename to arch/cpu/cc26x0-cc13x0/int-master.c
diff --git a/arch/cpu/cc26xx-cc13xx/lib/cc13xxware b/arch/cpu/cc26x0-cc13x0/lib/cc13xxware
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/lib/cc13xxware
rename to arch/cpu/cc26x0-cc13x0/lib/cc13xxware
diff --git a/arch/cpu/cc26xx-cc13xx/lib/cc2640r2-sdk b/arch/cpu/cc26x0-cc13x0/lib/cc2640r2-sdk
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/lib/cc2640r2-sdk
rename to arch/cpu/cc26x0-cc13x0/lib/cc2640r2-sdk
diff --git a/arch/cpu/cc26xx-cc13xx/lib/cc26xxware b/arch/cpu/cc26x0-cc13x0/lib/cc26xxware
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/lib/cc26xxware
rename to arch/cpu/cc26x0-cc13x0/lib/cc26xxware
diff --git a/arch/cpu/cc26xx-cc13xx/lpm.c b/arch/cpu/cc26x0-cc13x0/lpm.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/lpm.c
rename to arch/cpu/cc26x0-cc13x0/lpm.c
diff --git a/arch/cpu/cc26xx-cc13xx/lpm.h b/arch/cpu/cc26x0-cc13x0/lpm.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/lpm.h
rename to arch/cpu/cc26x0-cc13x0/lpm.h
diff --git a/arch/cpu/cc26xx-cc13xx/random.c b/arch/cpu/cc26x0-cc13x0/random.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/random.c
rename to arch/cpu/cc26x0-cc13x0/random.c
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/api/ieee_cmd.h b/arch/cpu/cc26x0-cc13x0/rf-core/api/ieee_cmd.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/api/ieee_cmd.h
rename to arch/cpu/cc26x0-cc13x0/rf-core/api/ieee_cmd.h
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/api/ieee_mailbox.h b/arch/cpu/cc26x0-cc13x0/rf-core/api/ieee_mailbox.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/api/ieee_mailbox.h
rename to arch/cpu/cc26x0-cc13x0/rf-core/api/ieee_mailbox.h
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/ble-cc2650.c b/arch/cpu/cc26x0-cc13x0/rf-core/ble-cc2650.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/ble-cc2650.c
rename to arch/cpu/cc26x0-cc13x0/rf-core/ble-cc2650.c
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/ble-hal-cc26xx.c b/arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/ble-hal-cc26xx.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/ble-hal-cc26xx.c
rename to arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/ble-hal-cc26xx.c
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/ble-hal-cc26xx.h b/arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/ble-hal-cc26xx.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/ble-hal-cc26xx.h
rename to arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/ble-hal-cc26xx.h
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/rf-ble-cmd.c b/arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/rf-ble-cmd.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/rf-ble-cmd.c
rename to arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/rf-ble-cmd.c
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/rf-ble-cmd.h b/arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/rf-ble-cmd.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/rf-ble-cmd.h
rename to arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/rf-ble-cmd.h
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/cc13xx-50kbps-tsch.c b/arch/cpu/cc26x0-cc13x0/rf-core/cc13xx-50kbps-tsch.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/cc13xx-50kbps-tsch.c
rename to arch/cpu/cc26x0-cc13x0/rf-core/cc13xx-50kbps-tsch.c
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/cc13xx-50kbps-tsch.h b/arch/cpu/cc26x0-cc13x0/rf-core/cc13xx-50kbps-tsch.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/cc13xx-50kbps-tsch.h
rename to arch/cpu/cc26x0-cc13x0/rf-core/cc13xx-50kbps-tsch.h
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/dot-15-4g.h b/arch/cpu/cc26x0-cc13x0/rf-core/dot-15-4g.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/dot-15-4g.h
rename to arch/cpu/cc26x0-cc13x0/rf-core/dot-15-4g.h
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/arch/cpu/cc26x0-cc13x0/rf-core/ieee-mode.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
rename to arch/cpu/cc26x0-cc13x0/rf-core/ieee-mode.c
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode-tx-power.c b/arch/cpu/cc26x0-cc13x0/rf-core/prop-mode-tx-power.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/prop-mode-tx-power.c
rename to arch/cpu/cc26x0-cc13x0/rf-core/prop-mode-tx-power.c
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.c b/arch/cpu/cc26x0-cc13x0/rf-core/prop-mode.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
rename to arch/cpu/cc26x0-cc13x0/rf-core/prop-mode.c
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.h b/arch/cpu/cc26x0-cc13x0/rf-core/prop-mode.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.h
rename to arch/cpu/cc26x0-cc13x0/rf-core/prop-mode.h
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.c b/arch/cpu/cc26x0-cc13x0/rf-core/rf-ble.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.c
rename to arch/cpu/cc26x0-cc13x0/rf-core/rf-ble.c
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.h b/arch/cpu/cc26x0-cc13x0/rf-core/rf-ble.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.h
rename to arch/cpu/cc26x0-cc13x0/rf-core/rf-ble.h
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-core.c b/arch/cpu/cc26x0-cc13x0/rf-core/rf-core.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/rf-core.c
rename to arch/cpu/cc26x0-cc13x0/rf-core/rf-core.c
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-core.h b/arch/cpu/cc26x0-cc13x0/rf-core/rf-core.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/rf-core.h
rename to arch/cpu/cc26x0-cc13x0/rf-core/rf-core.h
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-switch.h b/arch/cpu/cc26x0-cc13x0/rf-core/rf-switch.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/rf-switch.h
rename to arch/cpu/cc26x0-cc13x0/rf-core/rf-switch.h
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c b/arch/cpu/cc26x0-cc13x0/rf-core/smartrf-settings.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c
rename to arch/cpu/cc26x0-cc13x0/rf-core/smartrf-settings.c
diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.h b/arch/cpu/cc26x0-cc13x0/rf-core/smartrf-settings.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.h
rename to arch/cpu/cc26x0-cc13x0/rf-core/smartrf-settings.h
diff --git a/arch/cpu/cc26xx-cc13xx/rtimer-arch.c b/arch/cpu/cc26x0-cc13x0/rtimer-arch.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rtimer-arch.c
rename to arch/cpu/cc26x0-cc13x0/rtimer-arch.c
diff --git a/arch/cpu/cc26xx-cc13xx/rtimer-arch.h b/arch/cpu/cc26x0-cc13x0/rtimer-arch.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/rtimer-arch.h
rename to arch/cpu/cc26x0-cc13x0/rtimer-arch.h
diff --git a/arch/cpu/cc26xx-cc13xx/slip-arch.c b/arch/cpu/cc26x0-cc13x0/slip-arch.c
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/slip-arch.c
rename to arch/cpu/cc26x0-cc13x0/slip-arch.c
diff --git a/arch/cpu/cc26xx-cc13xx/ti-lib.h b/arch/cpu/cc26x0-cc13x0/ti-lib.h
similarity index 100%
rename from arch/cpu/cc26xx-cc13xx/ti-lib.h
rename to arch/cpu/cc26x0-cc13x0/ti-lib.h
diff --git a/arch/cpu/simplelink-cc13xx-cc26xx/Makefile.cc13xx-cc26xx b/arch/cpu/simplelink-cc13xx-cc26xx/Makefile.cc13xx-cc26xx
index dfd14637e..263c92b1b 100644
--- a/arch/cpu/simplelink-cc13xx-cc26xx/Makefile.cc13xx-cc26xx
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/Makefile.cc13xx-cc26xx
@@ -3,7 +3,7 @@
 
 CC13x2_CC26x2_PRE_RTM ?= 1
 
-# Core SDK is placed as a submodule under arch/cpu/cc13xx-cc26xx/lib.
+# Core SDK is placed as a submodule under arch/cpu/simplelink-cc13xx-cc26xx/lib.
 # Do a sanity check that Core SDK submodule has been initialized.
 ifndef CORE_SDK
  CORE_SDK := $(CONTIKI_CPU)/lib/coresdk_cc13xx_cc26xx
diff --git a/arch/platform/srf06-cc26xx/Makefile.srf06-cc26xx b/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0
similarity index 84%
rename from arch/platform/srf06-cc26xx/Makefile.srf06-cc26xx
rename to arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0
index 03eefcf8b..43cc7ea3f 100644
--- a/arch/platform/srf06-cc26xx/Makefile.srf06-cc26xx
+++ b/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0
@@ -1,12 +1,12 @@
-# srf06-cc26xx platform makefile
+# cc26x0-cc13x0 platform makefile
 
 ifndef CONTIKI
   $(error CONTIKI not defined! You must specify where CONTIKI resides!)
 endif
 
 ### Board and BSP selection
-BOARD ?= srf06/cc26xx
-BOARDS = srf06/cc26xx srf06/cc13xx launchpad/cc2640r2 launchpad/cc2650 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350
+BOARD ?= srf06/cc26x0
+BOARDS = srf06/cc26x0 srf06/cc13x0 launchpad/cc2640r2 launchpad/cc2650 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350
 
 CONTIKI_TARGET_DIRS += .
 
@@ -25,5 +25,5 @@ SMALL ?= 0
 ### Define the CPU directory and pull in the correct CPU makefile. This will
 ### be defined by one of the makefiles included above and it can be either
 ### Makefile.cc26xx or Makefile.cc13xx
-CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc26xx-cc13xx
+CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc26x0-cc13x0
 include $(CONTIKI_CPU)/Makefile.$(CPU_FAMILY)
diff --git a/arch/platform/srf06-cc26xx/cfs-coffee-arch.h b/arch/platform/cc26x0-cc13x0/cfs-coffee-arch.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/cfs-coffee-arch.h
rename to arch/platform/cc26x0-cc13x0/cfs-coffee-arch.h
diff --git a/arch/platform/srf06-cc26xx/common/xmem.c b/arch/platform/cc26x0-cc13x0/common/xmem.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/common/xmem.c
rename to arch/platform/cc26x0-cc13x0/common/xmem.c
diff --git a/arch/platform/srf06-cc26xx/contiki-conf.h b/arch/platform/cc26x0-cc13x0/contiki-conf.h
similarity index 98%
rename from arch/platform/srf06-cc26xx/contiki-conf.h
rename to arch/platform/cc26x0-cc13x0/contiki-conf.h
index 23c086db3..de61c102c 100644
--- a/arch/platform/srf06-cc26xx/contiki-conf.h
+++ b/arch/platform/cc26x0-cc13x0/contiki-conf.h
@@ -32,7 +32,7 @@
  * @{
  *
  * \file
- *  Configuration for the srf06-cc26xx platform
+ *  Configuration for the cc26x0-cc13x0 platform
  */
 #ifndef CONTIKI_CONF_H
 #define CONTIKI_CONF_H
diff --git a/arch/platform/srf06-cc26xx/launchpad/Makefile.launchpad b/arch/platform/cc26x0-cc13x0/launchpad/Makefile.launchpad
similarity index 100%
rename from arch/platform/srf06-cc26xx/launchpad/Makefile.launchpad
rename to arch/platform/cc26x0-cc13x0/launchpad/Makefile.launchpad
diff --git a/arch/platform/srf06-cc26xx/launchpad/board-buttons.c b/arch/platform/cc26x0-cc13x0/launchpad/board-buttons.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/launchpad/board-buttons.c
rename to arch/platform/cc26x0-cc13x0/launchpad/board-buttons.c
diff --git a/arch/platform/srf06-cc26xx/launchpad/board-peripherals.h b/arch/platform/cc26x0-cc13x0/launchpad/board-peripherals.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/launchpad/board-peripherals.h
rename to arch/platform/cc26x0-cc13x0/launchpad/board-peripherals.h
diff --git a/arch/platform/srf06-cc26xx/launchpad/board.c b/arch/platform/cc26x0-cc13x0/launchpad/board.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/launchpad/board.c
rename to arch/platform/cc26x0-cc13x0/launchpad/board.c
diff --git a/arch/platform/srf06-cc26xx/launchpad/cc1310/Makefile.cc1310 b/arch/platform/cc26x0-cc13x0/launchpad/cc1310/Makefile.cc1310
similarity index 91%
rename from arch/platform/srf06-cc26xx/launchpad/cc1310/Makefile.cc1310
rename to arch/platform/cc26x0-cc13x0/launchpad/cc1310/Makefile.cc1310
index 8d3d2abd4..e9f7bab91 100644
--- a/arch/platform/srf06-cc26xx/launchpad/cc1310/Makefile.cc1310
+++ b/arch/platform/cc26x0-cc13x0/launchpad/cc1310/Makefile.cc1310
@@ -1,5 +1,5 @@
 ### Will allow the inclusion of the correct CPU makefile
-CPU_FAMILY = cc13xx
+CPU_FAMILY = cc13x0
 
 ### Add to the source dirs
 CONTIKI_TARGET_DIRS += launchpad/cc1310
diff --git a/arch/platform/srf06-cc26xx/launchpad/cc1310/board.h b/arch/platform/cc26x0-cc13x0/launchpad/cc1310/board.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/launchpad/cc1310/board.h
rename to arch/platform/cc26x0-cc13x0/launchpad/cc1310/board.h
diff --git a/arch/platform/srf06-cc26xx/launchpad/cc1350/Makefile.cc1350 b/arch/platform/cc26x0-cc13x0/launchpad/cc1350/Makefile.cc1350
similarity index 93%
rename from arch/platform/srf06-cc26xx/launchpad/cc1350/Makefile.cc1350
rename to arch/platform/cc26x0-cc13x0/launchpad/cc1350/Makefile.cc1350
index 0d1f65359..811a3f61b 100644
--- a/arch/platform/srf06-cc26xx/launchpad/cc1350/Makefile.cc1350
+++ b/arch/platform/cc26x0-cc13x0/launchpad/cc1350/Makefile.cc1350
@@ -1,5 +1,5 @@
 ### Will allow the inclusion of the correct CPU makefile
-CPU_FAMILY = cc13xx
+CPU_FAMILY = cc13x0
 
 ### Add to the source dirs
 CONTIKI_TARGET_DIRS += launchpad/cc1350
diff --git a/arch/platform/srf06-cc26xx/launchpad/cc1350/board.h b/arch/platform/cc26x0-cc13x0/launchpad/cc1350/board.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/launchpad/cc1350/board.h
rename to arch/platform/cc26x0-cc13x0/launchpad/cc1350/board.h
diff --git a/arch/platform/srf06-cc26xx/launchpad/cc1350/rf-switch.c b/arch/platform/cc26x0-cc13x0/launchpad/cc1350/rf-switch.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/launchpad/cc1350/rf-switch.c
rename to arch/platform/cc26x0-cc13x0/launchpad/cc1350/rf-switch.c
diff --git a/arch/platform/srf06-cc26xx/launchpad/cc1350/tx-power-driver.c b/arch/platform/cc26x0-cc13x0/launchpad/cc1350/tx-power-driver.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/launchpad/cc1350/tx-power-driver.c
rename to arch/platform/cc26x0-cc13x0/launchpad/cc1350/tx-power-driver.c
diff --git a/arch/platform/srf06-cc26xx/launchpad/cc2640r2/Makefile.cc2640r2 b/arch/platform/cc26x0-cc13x0/launchpad/cc2640r2/Makefile.cc2640r2
similarity index 100%
rename from arch/platform/srf06-cc26xx/launchpad/cc2640r2/Makefile.cc2640r2
rename to arch/platform/cc26x0-cc13x0/launchpad/cc2640r2/Makefile.cc2640r2
diff --git a/arch/platform/srf06-cc26xx/launchpad/cc2640r2/board.h b/arch/platform/cc26x0-cc13x0/launchpad/cc2640r2/board.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/launchpad/cc2640r2/board.h
rename to arch/platform/cc26x0-cc13x0/launchpad/cc2640r2/board.h
diff --git a/arch/platform/srf06-cc26xx/launchpad/cc2650/Makefile.cc2650 b/arch/platform/cc26x0-cc13x0/launchpad/cc2650/Makefile.cc2650
similarity index 91%
rename from arch/platform/srf06-cc26xx/launchpad/cc2650/Makefile.cc2650
rename to arch/platform/cc26x0-cc13x0/launchpad/cc2650/Makefile.cc2650
index 72e50de3a..399cd79e5 100644
--- a/arch/platform/srf06-cc26xx/launchpad/cc2650/Makefile.cc2650
+++ b/arch/platform/cc26x0-cc13x0/launchpad/cc2650/Makefile.cc2650
@@ -1,5 +1,5 @@
 ### Will allow the inclusion of the correct CPU makefile
-CPU_FAMILY = cc26xx
+CPU_FAMILY = cc26x0
 
 ### Add to the source dirs
 CONTIKI_TARGET_DIRS += launchpad/cc2650
diff --git a/arch/platform/srf06-cc26xx/launchpad/cc2650/board.h b/arch/platform/cc26x0-cc13x0/launchpad/cc2650/board.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/launchpad/cc2650/board.h
rename to arch/platform/cc26x0-cc13x0/launchpad/cc2650/board.h
diff --git a/arch/platform/srf06-cc26xx/launchpad/leds-arch.c b/arch/platform/cc26x0-cc13x0/launchpad/leds-arch.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/launchpad/leds-arch.c
rename to arch/platform/cc26x0-cc13x0/launchpad/leds-arch.c
diff --git a/arch/platform/srf06-cc26xx/platform.c b/arch/platform/cc26x0-cc13x0/platform.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/platform.c
rename to arch/platform/cc26x0-cc13x0/platform.c
diff --git a/arch/platform/srf06-cc26xx/sensortag/Makefile.sensortag b/arch/platform/cc26x0-cc13x0/sensortag/Makefile.sensortag
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/Makefile.sensortag
rename to arch/platform/cc26x0-cc13x0/sensortag/Makefile.sensortag
diff --git a/arch/platform/srf06-cc26xx/sensortag/bmp-280-sensor.c b/arch/platform/cc26x0-cc13x0/sensortag/bmp-280-sensor.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/bmp-280-sensor.c
rename to arch/platform/cc26x0-cc13x0/sensortag/bmp-280-sensor.c
diff --git a/arch/platform/srf06-cc26xx/sensortag/bmp-280-sensor.h b/arch/platform/cc26x0-cc13x0/sensortag/bmp-280-sensor.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/bmp-280-sensor.h
rename to arch/platform/cc26x0-cc13x0/sensortag/bmp-280-sensor.h
diff --git a/arch/platform/srf06-cc26xx/sensortag/board-buttons.c b/arch/platform/cc26x0-cc13x0/sensortag/board-buttons.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/board-buttons.c
rename to arch/platform/cc26x0-cc13x0/sensortag/board-buttons.c
diff --git a/arch/platform/srf06-cc26xx/sensortag/board-i2c.c b/arch/platform/cc26x0-cc13x0/sensortag/board-i2c.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/board-i2c.c
rename to arch/platform/cc26x0-cc13x0/sensortag/board-i2c.c
diff --git a/arch/platform/srf06-cc26xx/sensortag/board-i2c.h b/arch/platform/cc26x0-cc13x0/sensortag/board-i2c.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/board-i2c.h
rename to arch/platform/cc26x0-cc13x0/sensortag/board-i2c.h
diff --git a/arch/platform/srf06-cc26xx/sensortag/board-peripherals.h b/arch/platform/cc26x0-cc13x0/sensortag/board-peripherals.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/board-peripherals.h
rename to arch/platform/cc26x0-cc13x0/sensortag/board-peripherals.h
diff --git a/arch/platform/srf06-cc26xx/sensortag/board.c b/arch/platform/cc26x0-cc13x0/sensortag/board.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/board.c
rename to arch/platform/cc26x0-cc13x0/sensortag/board.c
diff --git a/arch/platform/srf06-cc26xx/sensortag/buzzer.c b/arch/platform/cc26x0-cc13x0/sensortag/buzzer.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/buzzer.c
rename to arch/platform/cc26x0-cc13x0/sensortag/buzzer.c
diff --git a/arch/platform/srf06-cc26xx/sensortag/buzzer.h b/arch/platform/cc26x0-cc13x0/sensortag/buzzer.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/buzzer.h
rename to arch/platform/cc26x0-cc13x0/sensortag/buzzer.h
diff --git a/arch/platform/srf06-cc26xx/sensortag/cc1350/Makefile.cc1350 b/arch/platform/cc26x0-cc13x0/sensortag/cc1350/Makefile.cc1350
similarity index 91%
rename from arch/platform/srf06-cc26xx/sensortag/cc1350/Makefile.cc1350
rename to arch/platform/cc26x0-cc13x0/sensortag/cc1350/Makefile.cc1350
index cdae4c2b1..f0f924e97 100644
--- a/arch/platform/srf06-cc26xx/sensortag/cc1350/Makefile.cc1350
+++ b/arch/platform/cc26x0-cc13x0/sensortag/cc1350/Makefile.cc1350
@@ -1,5 +1,5 @@
 ### Will allow the inclusion of the correct CPU makefile
-CPU_FAMILY = cc13xx
+CPU_FAMILY = cc13x0
 
 ### Add to the source dirs
 CONTIKI_TARGET_DIRS += sensortag/cc1350
diff --git a/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h b/arch/platform/cc26x0-cc13x0/sensortag/cc1350/board.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/cc1350/board.h
rename to arch/platform/cc26x0-cc13x0/sensortag/cc1350/board.h
diff --git a/arch/platform/srf06-cc26xx/sensortag/cc1350/leds-arch.c b/arch/platform/cc26x0-cc13x0/sensortag/cc1350/leds-arch.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/cc1350/leds-arch.c
rename to arch/platform/cc26x0-cc13x0/sensortag/cc1350/leds-arch.c
diff --git a/arch/platform/srf06-cc26xx/sensortag/cc2650/Makefile.cc2650 b/arch/platform/cc26x0-cc13x0/sensortag/cc2650/Makefile.cc2650
similarity index 91%
rename from arch/platform/srf06-cc26xx/sensortag/cc2650/Makefile.cc2650
rename to arch/platform/cc26x0-cc13x0/sensortag/cc2650/Makefile.cc2650
index e91cabda4..4aa83e352 100644
--- a/arch/platform/srf06-cc26xx/sensortag/cc2650/Makefile.cc2650
+++ b/arch/platform/cc26x0-cc13x0/sensortag/cc2650/Makefile.cc2650
@@ -1,5 +1,5 @@
 ### Will allow the inclusion of the correct CPU makefile
-CPU_FAMILY = cc26xx
+CPU_FAMILY = cc26x0
 
 ### Add to the source dirs
 CONTIKI_TARGET_DIRS += sensortag/cc2650
diff --git a/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h b/arch/platform/cc26x0-cc13x0/sensortag/cc2650/board.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/cc2650/board.h
rename to arch/platform/cc26x0-cc13x0/sensortag/cc2650/board.h
diff --git a/arch/platform/srf06-cc26xx/sensortag/cc2650/leds-arch.c b/arch/platform/cc26x0-cc13x0/sensortag/cc2650/leds-arch.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/cc2650/leds-arch.c
rename to arch/platform/cc26x0-cc13x0/sensortag/cc2650/leds-arch.c
diff --git a/arch/platform/srf06-cc26xx/sensortag/hdc-1000-sensor.c b/arch/platform/cc26x0-cc13x0/sensortag/hdc-1000-sensor.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/hdc-1000-sensor.c
rename to arch/platform/cc26x0-cc13x0/sensortag/hdc-1000-sensor.c
diff --git a/arch/platform/srf06-cc26xx/sensortag/hdc-1000-sensor.h b/arch/platform/cc26x0-cc13x0/sensortag/hdc-1000-sensor.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/hdc-1000-sensor.h
rename to arch/platform/cc26x0-cc13x0/sensortag/hdc-1000-sensor.h
diff --git a/arch/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.c b/arch/platform/cc26x0-cc13x0/sensortag/mpu-9250-sensor.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.c
rename to arch/platform/cc26x0-cc13x0/sensortag/mpu-9250-sensor.c
diff --git a/arch/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.h b/arch/platform/cc26x0-cc13x0/sensortag/mpu-9250-sensor.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.h
rename to arch/platform/cc26x0-cc13x0/sensortag/mpu-9250-sensor.h
diff --git a/arch/platform/srf06-cc26xx/sensortag/opt-3001-sensor.c b/arch/platform/cc26x0-cc13x0/sensortag/opt-3001-sensor.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/opt-3001-sensor.c
rename to arch/platform/cc26x0-cc13x0/sensortag/opt-3001-sensor.c
diff --git a/arch/platform/srf06-cc26xx/sensortag/opt-3001-sensor.h b/arch/platform/cc26x0-cc13x0/sensortag/opt-3001-sensor.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/opt-3001-sensor.h
rename to arch/platform/cc26x0-cc13x0/sensortag/opt-3001-sensor.h
diff --git a/arch/platform/srf06-cc26xx/sensortag/sensor-common.c b/arch/platform/cc26x0-cc13x0/sensortag/sensor-common.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/sensor-common.c
rename to arch/platform/cc26x0-cc13x0/sensortag/sensor-common.c
diff --git a/arch/platform/srf06-cc26xx/sensortag/sensor-common.h b/arch/platform/cc26x0-cc13x0/sensortag/sensor-common.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/sensor-common.h
rename to arch/platform/cc26x0-cc13x0/sensortag/sensor-common.h
diff --git a/arch/platform/srf06-cc26xx/sensortag/sensortag-sensors.c b/arch/platform/cc26x0-cc13x0/sensortag/sensortag-sensors.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/sensortag-sensors.c
rename to arch/platform/cc26x0-cc13x0/sensortag/sensortag-sensors.c
diff --git a/arch/platform/srf06-cc26xx/sensortag/tmp-007-sensor.c b/arch/platform/cc26x0-cc13x0/sensortag/tmp-007-sensor.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/tmp-007-sensor.c
rename to arch/platform/cc26x0-cc13x0/sensortag/tmp-007-sensor.c
diff --git a/arch/platform/srf06-cc26xx/sensortag/tmp-007-sensor.h b/arch/platform/cc26x0-cc13x0/sensortag/tmp-007-sensor.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/sensortag/tmp-007-sensor.h
rename to arch/platform/cc26x0-cc13x0/sensortag/tmp-007-sensor.h
diff --git a/arch/platform/srf06-cc26xx/srf06/Makefile.srf06 b/arch/platform/cc26x0-cc13x0/srf06/Makefile.srf06
similarity index 100%
rename from arch/platform/srf06-cc26xx/srf06/Makefile.srf06
rename to arch/platform/cc26x0-cc13x0/srf06/Makefile.srf06
diff --git a/arch/platform/srf06-cc26xx/srf06/als-sensor.c b/arch/platform/cc26x0-cc13x0/srf06/als-sensor.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/srf06/als-sensor.c
rename to arch/platform/cc26x0-cc13x0/srf06/als-sensor.c
diff --git a/arch/platform/srf06-cc26xx/srf06/als-sensor.h b/arch/platform/cc26x0-cc13x0/srf06/als-sensor.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/srf06/als-sensor.h
rename to arch/platform/cc26x0-cc13x0/srf06/als-sensor.h
diff --git a/arch/platform/srf06-cc26xx/srf06/board-buttons.c b/arch/platform/cc26x0-cc13x0/srf06/board-buttons.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/srf06/board-buttons.c
rename to arch/platform/cc26x0-cc13x0/srf06/board-buttons.c
diff --git a/arch/platform/srf06-cc26xx/srf06/board-peripherals.h b/arch/platform/cc26x0-cc13x0/srf06/board-peripherals.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/srf06/board-peripherals.h
rename to arch/platform/cc26x0-cc13x0/srf06/board-peripherals.h
diff --git a/arch/platform/srf06-cc26xx/srf06/board.c b/arch/platform/cc26x0-cc13x0/srf06/board.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/srf06/board.c
rename to arch/platform/cc26x0-cc13x0/srf06/board.c
diff --git a/arch/platform/srf06-cc26xx/srf06/cc13xx/Makefile.cc13xx b/arch/platform/cc26x0-cc13x0/srf06/cc13x0/Makefile.cc13x0
similarity index 72%
rename from arch/platform/srf06-cc26xx/srf06/cc13xx/Makefile.cc13xx
rename to arch/platform/cc26x0-cc13x0/srf06/cc13x0/Makefile.cc13x0
index b83084651..ec20fcb63 100644
--- a/arch/platform/srf06-cc26xx/srf06/cc13xx/Makefile.cc13xx
+++ b/arch/platform/cc26x0-cc13x0/srf06/cc13x0/Makefile.cc13x0
@@ -1,7 +1,7 @@
 ### Will allow the inclusion of the correct CPU makefile
-CPU_FAMILY = cc13xx
+CPU_FAMILY = cc13x0
 
 ### Include the common sensortag makefile
 include $(PLATFORM_ROOT_DIR)/srf06/Makefile.srf06
 
-CONTIKI_TARGET_DIRS += srf06/cc13xx
+CONTIKI_TARGET_DIRS += srf06/cc13x0
diff --git a/arch/platform/srf06-cc26xx/srf06/cc13xx/board.h b/arch/platform/cc26x0-cc13x0/srf06/cc13x0/board.h
similarity index 100%
rename from arch/platform/srf06-cc26xx/srf06/cc13xx/board.h
rename to arch/platform/cc26x0-cc13x0/srf06/cc13x0/board.h
diff --git a/arch/platform/srf06-cc26xx/srf06/cc26xx/Makefile.cc26xx b/arch/platform/cc26x0-cc13x0/srf06/cc26x0/Makefile.cc26x0
similarity index 71%
rename from arch/platform/srf06-cc26xx/srf06/cc26xx/Makefile.cc26xx
rename to arch/platform/cc26x0-cc13x0/srf06/cc26x0/Makefile.cc26x0
index 841442a5c..84ef217a8 100644
--- a/arch/platform/srf06-cc26xx/srf06/cc26xx/Makefile.cc26xx
+++ b/arch/platform/cc26x0-cc13x0/srf06/cc26x0/Makefile.cc26x0
@@ -1,7 +1,7 @@
 ### Will allow the inclusion of the correct CPU makefile
-CPU_FAMILY = cc26xx
+CPU_FAMILY = cc26x0
 
 ### Include the common makefile
 include $(PLATFORM_ROOT_DIR)/srf06/Makefile.srf06
 
-CONTIKI_TARGET_DIRS += srf06/cc26xx
+CONTIKI_TARGET_DIRS += srf06/cc26x0
diff --git a/arch/platform/srf06-cc26xx/srf06/cc26xx/board.h b/arch/platform/cc26x0-cc13x0/srf06/cc26x0/board.h
similarity index 99%
rename from arch/platform/srf06-cc26xx/srf06/cc26xx/board.h
rename to arch/platform/cc26x0-cc13x0/srf06/cc26x0/board.h
index f31a94fb3..cd6d2b1e4 100644
--- a/arch/platform/srf06-cc26xx/srf06/cc26xx/board.h
+++ b/arch/platform/cc26x0-cc13x0/srf06/cc26x0/board.h
@@ -31,7 +31,7 @@
 /** \addtogroup cc26xx-srf-tag
  * @{
  *
- * \defgroup srf06-cc26xx-peripherals Peripherals for the SmartRF06EB + CC26xxEM
+ * \defgroup cc26x0-cc13x0-peripherals Peripherals for the SmartRF06EB + CC26xxEM
  *
  * Defines related to the SmartRF06 Evaluation Board with a CC26xxEM
  *
diff --git a/arch/platform/srf06-cc26xx/srf06/leds-arch.c b/arch/platform/cc26x0-cc13x0/srf06/leds-arch.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/srf06/leds-arch.c
rename to arch/platform/cc26x0-cc13x0/srf06/leds-arch.c
diff --git a/arch/platform/srf06-cc26xx/srf06/srf06-sensors.c b/arch/platform/cc26x0-cc13x0/srf06/srf06-sensors.c
similarity index 100%
rename from arch/platform/srf06-cc26xx/srf06/srf06-sensors.c
rename to arch/platform/cc26x0-cc13x0/srf06/srf06-sensors.c
diff --git a/examples/6tisch/channel-selection-demo/Makefile b/examples/6tisch/channel-selection-demo/Makefile
index a44c76f10..ada4a5062 100644
--- a/examples/6tisch/channel-selection-demo/Makefile
+++ b/examples/6tisch/channel-selection-demo/Makefile
@@ -4,7 +4,7 @@ all: $(CONTIKI_PROJECT)
 CONTIKI=../../..
 
 PLATFORMS_EXCLUDE = sky nrf52dk native
-BOARDS_EXCLUDE = srf06/cc13xx launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350
+BOARDS_EXCLUDE = srf06/cc13x0 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350
 
 # The channel selection library
 MODULES += os/services/tsch-cs
diff --git a/examples/6tisch/etsi-plugtest-2017/README.md b/examples/6tisch/etsi-plugtest-2017/README.md
index ab296bff8..7369918fa 100644
--- a/examples/6tisch/etsi-plugtest-2017/README.md
+++ b/examples/6tisch/etsi-plugtest-2017/README.md
@@ -18,7 +18,7 @@ The following hardwares were used in the event:
 
 * Zolertia Remote (TARGET=`zoul`, BOARD=`remote`)
 * JN156x (TARGET=`jn516`)
-* CC2650 LaunchPad (TARGET=`srf06-cc26xx`, BOARD=`launchpad/cc2650`)
+* CC2650 LaunchPad (TARGET=`cc26x0-cc13x0`, BOARD=`launchpad/cc2650`)
 
 ## Usage
 
diff --git a/examples/6tisch/tsch-stats/Makefile b/examples/6tisch/tsch-stats/Makefile
index 0c8863301..5fdb5feb6 100644
--- a/examples/6tisch/tsch-stats/Makefile
+++ b/examples/6tisch/tsch-stats/Makefile
@@ -4,7 +4,7 @@ all: $(CONTIKI_PROJECT)
 CONTIKI=../../..
 
 PLATFORMS_EXCLUDE = sky nrf52dk native
-BOARDS_EXCLUDE = srf06/cc13xx launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350
+BOARDS_EXCLUDE = srf06/cc13x0 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350
 
 # force Orchestra from command line
 MAKE_WITH_ORCHESTRA ?= 0
diff --git a/examples/benchmarks/rpl-req-resp/Makefile b/examples/benchmarks/rpl-req-resp/Makefile
index 11413ecd3..e23a35d5f 100644
--- a/examples/benchmarks/rpl-req-resp/Makefile
+++ b/examples/benchmarks/rpl-req-resp/Makefile
@@ -2,7 +2,7 @@ CONTIKI_PROJECT = node
 all: $(CONTIKI_PROJECT)
 
 PLATFORMS_EXCLUDE = sky nrf52dk native simplelink
-BOARDS_EXCLUDE = srf06/cc13xx launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350
+BOARDS_EXCLUDE = srf06/cc13x0 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350
 
 MODULES_REL += ../testbeds
 MODULES += os/services/deployment
diff --git a/examples/dev/button-hal/Makefile b/examples/dev/button-hal/Makefile
index b2a73fe3c..263e9ec65 100644
--- a/examples/dev/button-hal/Makefile
+++ b/examples/dev/button-hal/Makefile
@@ -3,6 +3,6 @@ CONTIKI = ../../..
 
 all: $(CONTIKI_PROJECT)
 
-PLATFORMS_ONLY = srf06-cc26xx cc2538dk openmote-cc2538 zoul native simplelink
+PLATFORMS_ONLY = cc26x0-cc13x0 cc2538dk openmote-cc2538 zoul native simplelink
 
 include $(CONTIKI)/Makefile.include
diff --git a/examples/dev/gpio-hal/Makefile b/examples/dev/gpio-hal/Makefile
index 70f38a11a..234388c09 100644
--- a/examples/dev/gpio-hal/Makefile
+++ b/examples/dev/gpio-hal/Makefile
@@ -1,7 +1,7 @@
 CONTIKI_PROJECT = gpio-hal-example
 CONTIKI = ../../..
 
-PLATFORMS_ONLY = srf06-cc26xx cc2538dk openmote-cc2538 zoul native simplelink
+PLATFORMS_ONLY = cc26x0-cc13x0 cc2538dk openmote-cc2538 zoul native simplelink
 
 include $(CONTIKI)/Makefile.identify-target
 
diff --git a/examples/dev/gpio-hal/srf06-cc26xx/pins.c b/examples/dev/gpio-hal/cc26x0-cc13x0/pins.c
similarity index 100%
rename from examples/dev/gpio-hal/srf06-cc26xx/pins.c
rename to examples/dev/gpio-hal/cc26x0-cc13x0/pins.c
diff --git a/examples/mqtt-client/Makefile b/examples/mqtt-client/Makefile
index a9ab11613..29b3267e1 100644
--- a/examples/mqtt-client/Makefile
+++ b/examples/mqtt-client/Makefile
@@ -8,6 +8,6 @@ CONTIKI = ../..
 
 MODULES_REL += arch/platform/$(TARGET)
 
-PLATFORMS_ONLY = srf06-cc26xx cc2538dk openmote-cc2538 zoul native simplelink
+PLATFORMS_ONLY = cc26x0-cc13x0 cc2538dk openmote-cc2538 zoul native simplelink
 
 include $(CONTIKI)/Makefile.include
diff --git a/examples/mqtt-client/arch/cpu/cc26xx-cc13xx/builtin-sensors.c b/examples/mqtt-client/arch/cpu/cc26x0-cc13x0/builtin-sensors.c
similarity index 100%
rename from examples/mqtt-client/arch/cpu/cc26xx-cc13xx/builtin-sensors.c
rename to examples/mqtt-client/arch/cpu/cc26x0-cc13x0/builtin-sensors.c
diff --git a/examples/mqtt-client/arch/cpu/cc26xx-cc13xx/builtin-sensors.h b/examples/mqtt-client/arch/cpu/cc26x0-cc13x0/builtin-sensors.h
similarity index 100%
rename from examples/mqtt-client/arch/cpu/cc26xx-cc13xx/builtin-sensors.h
rename to examples/mqtt-client/arch/cpu/cc26x0-cc13x0/builtin-sensors.h
diff --git a/examples/mqtt-client/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 b/examples/mqtt-client/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0
new file mode 100644
index 000000000..7c74123c6
--- /dev/null
+++ b/examples/mqtt-client/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0
@@ -0,0 +1 @@
+MODULES_REL += arch/cpu/cc26x0-cc13x0
diff --git a/examples/mqtt-client/arch/platform/srf06-cc26xx/module-macros.h b/examples/mqtt-client/arch/platform/cc26x0-cc13x0/module-macros.h
similarity index 100%
rename from examples/mqtt-client/arch/platform/srf06-cc26xx/module-macros.h
rename to examples/mqtt-client/arch/platform/cc26x0-cc13x0/module-macros.h
diff --git a/examples/mqtt-client/arch/platform/srf06-cc26xx/mqtt-client-extensions.c b/examples/mqtt-client/arch/platform/cc26x0-cc13x0/mqtt-client-extensions.c
similarity index 100%
rename from examples/mqtt-client/arch/platform/srf06-cc26xx/mqtt-client-extensions.c
rename to examples/mqtt-client/arch/platform/cc26x0-cc13x0/mqtt-client-extensions.c
diff --git a/examples/mqtt-client/arch/platform/srf06-cc26xx/Makefile.srf06-cc26xx b/examples/mqtt-client/arch/platform/srf06-cc26xx/Makefile.srf06-cc26xx
deleted file mode 100644
index dcec87bad..000000000
--- a/examples/mqtt-client/arch/platform/srf06-cc26xx/Makefile.srf06-cc26xx
+++ /dev/null
@@ -1 +0,0 @@
-MODULES_REL += arch/cpu/cc26xx-cc13xx
diff --git a/examples/multicast/srf06-cc26xx/module-macros.h b/examples/multicast/cc26x0-cc13x0/module-macros.h
similarity index 100%
rename from examples/multicast/srf06-cc26xx/module-macros.h
rename to examples/multicast/cc26x0-cc13x0/module-macros.h
diff --git a/examples/platform-specific/cc26xx/Makefile b/examples/platform-specific/cc26x0-cc13x0/Makefile
similarity index 78%
rename from examples/platform-specific/cc26xx/Makefile
rename to examples/platform-specific/cc26x0-cc13x0/Makefile
index 40e484bcc..9962ab32a 100644
--- a/examples/platform-specific/cc26xx/Makefile
+++ b/examples/platform-specific/cc26x0-cc13x0/Makefile
@@ -1,6 +1,6 @@
 CONTIKI_PROJECT = cc26xx-demo
 
-PLATFORMS_ONLY = srf06-cc26xx
+PLATFORMS_ONLY = cc26x0-cc13x0
 
 all: $(CONTIKI_PROJECT)
 
diff --git a/examples/platform-specific/cc26xx/Makefile.target b/examples/platform-specific/cc26x0-cc13x0/Makefile.target
similarity index 100%
rename from examples/platform-specific/cc26xx/Makefile.target
rename to examples/platform-specific/cc26x0-cc13x0/Makefile.target
diff --git a/examples/platform-specific/cc26xx/README.md b/examples/platform-specific/cc26x0-cc13x0/README.md
similarity index 100%
rename from examples/platform-specific/cc26xx/README.md
rename to examples/platform-specific/cc26x0-cc13x0/README.md
diff --git a/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/Makefile b/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/Makefile
new file mode 100644
index 000000000..052927896
--- /dev/null
+++ b/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/Makefile
@@ -0,0 +1,11 @@
+CONTIKI_PROJECT=client
+
+all: $(CONTIKI_PROJECT)
+
+PLATFORMS_ONLY = cc26x0-cc13x0
+BOARDS_ONLY = launchpad/cc2650 sensortag/cc2650 srf06/cc26x0
+
+MAKE_MAC = MAKE_MAC_BLE
+MAKE_NET = MAKE_NET_IPV6
+CONTIKI = ../../../..
+include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/cc26xx/ble-ipv6/README.md b/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/README.md
similarity index 95%
rename from examples/platform-specific/cc26xx/ble-ipv6/README.md
rename to examples/platform-specific/cc26x0-cc13x0/ble-ipv6/README.md
index d33c7329f..078667264 100644
--- a/examples/platform-specific/cc26xx/ble-ipv6/README.md
+++ b/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/README.md
@@ -28,12 +28,12 @@ It has been tested on the TI CC2650 SensorTag and the TI CC2650 LaunchPad hardwa
 The IPv6-over-BLE stack comes with the following modules:
 
 ### BLE radio
-The implementation of the BLE radio for the TI CC26xx platform is implemented in `arch/cpu/cc26xx-cc13xx/rf-core/ble-cc2650.c`
-and `arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/*.[ch]`.
+The implementation of the BLE radio for the TI CC26xx platform is implemented in `arch/cpu/cc26x0-cc13x0/rf-core/ble-cc2650.c`
+and `arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/*.[ch]`.
 These files contain all the hardware specific code for supporting BLE as a link layer.
 
 ### BLE L2CAP layer
-The L2CAP LE credit-based flow control support is implemented in `arch/cpu/cc26xx-cc13xx/rf-core/ble-l2cap.c`.
+The L2CAP LE credit-based flow control support is implemented in `arch/cpu/cc26x0-cc13x0/rf-core/ble-l2cap.c`.
 Besides implementing rudimentary L2CAP support, this module handles fragmentation of large IPv6 packets.
 
 ## Using BLEach
diff --git a/examples/platform-specific/cc26xx/ble-ipv6/client.c b/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/client.c
similarity index 100%
rename from examples/platform-specific/cc26xx/ble-ipv6/client.c
rename to examples/platform-specific/cc26x0-cc13x0/ble-ipv6/client.c
diff --git a/examples/platform-specific/cc26xx/ble-ipv6/project-conf.h b/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/project-conf.h
similarity index 100%
rename from examples/platform-specific/cc26xx/ble-ipv6/project-conf.h
rename to examples/platform-specific/cc26x0-cc13x0/ble-ipv6/project-conf.h
diff --git a/examples/platform-specific/cc26xx/cc26xx-demo.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-demo.c
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-demo.c
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-demo.c
index 81e99f3fa..1b71feeb7 100644
--- a/examples/platform-specific/cc26xx/cc26xx-demo.c
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-demo.c
@@ -42,7 +42,7 @@
  *   Example project demonstrating the CC13xx/CC26xx platforms
  *
  *   This example will work for the following boards:
- *   - srf06-cc26xx: SmartRF06EB + CC13xx/CC26xx EM
+ *   - cc26x0-cc13x0: SmartRF06EB + CC13xx/CC26xx EM
  *   - CC2650 and CC1350 SensorTag
  *   - CC1310, CC1350, CC2650 LaunchPads
  *
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/Makefile
similarity index 87%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/Makefile
index 05dbface1..6d70a3a24 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/Makefile
@@ -1,7 +1,7 @@
-CONTIKI_PROJECT = cc26xx-web-demo
+CONTIKI_PROJECT = cc26x0-web-demo
 all: $(CONTIKI_PROJECT)
 
-PLATFORMS_ONLY = srf06-cc26xx
+PLATFORMS_ONLY = cc26x0-cc13x0
 
 MODULES_REL += ./resources
 
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile.target b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/Makefile.target
similarity index 100%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile.target
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/Makefile.target
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/README.md b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/README.md
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/README.md
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/README.md
index 912fcb72a..6a85ee0b5 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/README.md
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/README.md
@@ -180,6 +180,6 @@ parser into the firmware.
 
 IBM Watson IoT Platform
 ----------------------------
-To use IBM Watson IoT Platform, you have to go to SECURITY tab of Device page to select "TLS Optional". This step is critical. If you don't do this, you need to use TLS for connection and default cc26xx-web-demo won't work.
+To use IBM Watson IoT Platform, you have to go to SECURITY tab of Device page to select "TLS Optional". This step is critical. If you don't do this, you need to use TLS for connection and default cc26x0-web-demo won't work.
 
 ![IBM Watson IoT Platform TLS Optional Configuration](img/ibm-watson-iot-platform-tls-optional.png)
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-web-demo.c
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-web-demo.c
index 3944a58b2..6333d5ad5 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-web-demo.c
@@ -28,7 +28,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
- * \addtogroup cc26xx-web-demo
+ * \addtogroup cc26x0-web-demo
  * @{
  *
  * \file
@@ -48,7 +48,7 @@
 #include "dev/button-hal.h"
 #include "batmon-sensor.h"
 #include "httpd-simple.h"
-#include "cc26xx-web-demo.h"
+#include "cc26x0-web-demo.h"
 #include "mqtt-client.h"
 #include "coap-server.h"
 
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-web-demo.h
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-web-demo.h
index f59e41bc7..e7252496c 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/cc26xx-web-demo.h
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-web-demo.h
@@ -31,7 +31,7 @@
  * \addtogroup cc26xx-examples
  * @{
  *
- * \defgroup cc26xx-web-demo CC26xx Web Demo
+ * \defgroup cc26x0-web-demo CC26xx Web Demo
  * @{
  *
  *   An example demonstrating:
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cetic-6lbr-client.c
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cetic-6lbr-client.c
index 569a36a89..fc8044380 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/cetic-6lbr-client.c
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cetic-6lbr-client.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 /**
- * \addtogroup cc26xx-web-demo
+ * \addtogroup cc26x0-web-demo
  * @{
  *
  * \file
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/coap-server.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/coap-server.c
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/coap-server.c
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/coap-server.c
index 37b9a295d..bda7eb8ff 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/coap-server.c
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/coap-server.c
@@ -28,7 +28,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
- * \addtogroup cc26xx-web-demo
+ * \addtogroup cc26x0-web-demo
  * @{
  *
  * \file
@@ -40,7 +40,7 @@
 #include "coap-engine.h"
 #include "board-peripherals.h"
 #include "rf-core/rf-ble.h"
-#include "cc26xx-web-demo.h"
+#include "cc26x0-web-demo.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/coap-server.h b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/coap-server.h
similarity index 98%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/coap-server.h
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/coap-server.h
index 7399597c8..0d8c1d40b 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/coap-server.h
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/coap-server.h
@@ -28,7 +28,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
- * \addtogroup cc26xx-web-demo
+ * \addtogroup cc26x0-web-demo
  * @{
  *
  * \file
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/httpd-simple.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/httpd-simple.c
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/httpd-simple.c
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/httpd-simple.c
index e23e78efe..287452bb3 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/httpd-simple.c
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/httpd-simple.c
@@ -29,7 +29,7 @@
  *
  */
 /**
- * \addtogroup cc26xx-web-demo
+ * \addtogroup cc26x0-web-demo
  * @{
  *
  * \file
@@ -42,7 +42,7 @@
 #include "batmon-sensor.h"
 #include "lib/sensors.h"
 #include "lib/list.h"
-#include "cc26xx-web-demo.h"
+#include "cc26x0-web-demo.h"
 #include "mqtt-client.h"
 #include "net-uart.h"
 
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/httpd-simple.h b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/httpd-simple.h
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/httpd-simple.h
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/httpd-simple.h
index 25b8db3e5..2b04b264c 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/httpd-simple.h
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/httpd-simple.h
@@ -44,7 +44,7 @@
 /*---------------------------------------------------------------------------*/
 #include "contiki-net.h"
 #include "sys/process.h"
-#include "cc26xx-web-demo.h"
+#include "cc26x0-web-demo.h"
 /*---------------------------------------------------------------------------*/
 /* Ideally a multiple of TCP_MSS */
 #ifdef HTTPD_SIMPLE_CONF_MAIN_BUF_SIZE
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/img/6lbr-web.png b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/6lbr-web.png
similarity index 100%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/img/6lbr-web.png
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/6lbr-web.png
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/img/ibm-watson-iot-platform-tls-optional.png b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/ibm-watson-iot-platform-tls-optional.png
similarity index 100%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/img/ibm-watson-iot-platform-tls-optional.png
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/ibm-watson-iot-platform-tls-optional.png
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/img/quickstart-sensortag.png b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/quickstart-sensortag.png
similarity index 100%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/img/quickstart-sensortag.png
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/quickstart-sensortag.png
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/img/sensor-readings-config.png b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/sensor-readings-config.png
similarity index 100%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/img/sensor-readings-config.png
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/sensor-readings-config.png
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/img/well-known-core.png b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/well-known-core.png
similarity index 100%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/img/well-known-core.png
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/img/well-known-core.png
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/mqtt-client.c
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/mqtt-client.c
index 7562fb89a..0250de322 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.c
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/mqtt-client.c
@@ -28,7 +28,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
- * \addtogroup cc26xx-web-demo
+ * \addtogroup cc26x0-web-demo
  * @{
  *
  * \file
@@ -45,7 +45,7 @@
 #include "lib/sensors.h"
 #include "dev/button-hal.h"
 #include "board-peripherals.h"
-#include "cc26xx-web-demo.h"
+#include "cc26x0-web-demo.h"
 #include "dev/leds.h"
 #include "mqtt-client.h"
 #include "httpd-simple.h"
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.h b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/mqtt-client.h
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.h
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/mqtt-client.h
index ab7c08227..68b26af6d 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/mqtt-client.h
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/mqtt-client.h
@@ -28,7 +28,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
- * \addtogroup cc26xx-web-demo
+ * \addtogroup cc26x0-web-demo
  * @{
  *
  * \file
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/net-uart.c
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.c
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/net-uart.c
index ca3bf8c82..a2ea899da 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.c
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/net-uart.c
@@ -28,7 +28,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
- * \addtogroup cc26xx-web-demo
+ * \addtogroup cc26x0-web-demo
  * @{
  *
  * \file
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.h b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/net-uart.h
similarity index 100%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/net-uart.h
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/net-uart.h
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/project-conf.h b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/project-conf.h
similarity index 100%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/project-conf.h
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/project-conf.h
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-ble-advd.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-ble-advd.c
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-ble-advd.c
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-ble-advd.c
index a94a0b7a0..b32cb82ec 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-ble-advd.c
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-ble-advd.c
@@ -28,7 +28,7 @@
  */
 /*---------------------------------------------------------------------------*/
 /**
- * \addtogroup cc26xx-web-demo
+ * \addtogroup cc26x0-web-demo
  * @{
  *
  * \file
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-device.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-device.c
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-device.c
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-device.c
index 46344d1ef..bc61b8510 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-device.c
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-device.c
@@ -29,7 +29,7 @@
  */
 /*---------------------------------------------------------------------------*/
 /**
- * \addtogroup cc26xx-web-demo
+ * \addtogroup cc26x0-web-demo
  * @{
  *
  * \file
@@ -41,7 +41,7 @@
 #include "coap.h"
 #include "sys/clock.h"
 #include "coap-server.h"
-#include "cc26xx-web-demo.h"
+#include "cc26x0-web-demo.h"
 
 #include "ti-lib.h"
 
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-leds.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-leds.c
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-leds.c
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-leds.c
index 6c396145c..538ecc0bd 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-leds.c
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-leds.c
@@ -29,7 +29,7 @@
  */
 /*---------------------------------------------------------------------------*/
 /**
- * \addtogroup cc26xx-web-demo
+ * \addtogroup cc26x0-web-demo
  * @{
  *
  * \file
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-net.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-net.c
similarity index 98%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-net.c
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-net.c
index 81575f345..43a4da354 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-net.c
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-net.c
@@ -29,7 +29,7 @@
  */
 /*---------------------------------------------------------------------------*/
 /**
- * \addtogroup cc26xx-web-demo
+ * \addtogroup cc26x0-web-demo
  * @{
  *
  * \file
@@ -41,7 +41,7 @@
 #include "coap.h"
 #include "net/ipv6/uip-ds6.h"
 #include "coap-server.h"
-#include "cc26xx-web-demo.h"
+#include "cc26x0-web-demo.h"
 
 #include "ti-lib.h"
 
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-sensors.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-sensors.c
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-sensors.c
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-sensors.c
index 9ccc79e97..1852f7cb6 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-sensors.c
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-sensors.c
@@ -29,7 +29,7 @@
  */
 /*---------------------------------------------------------------------------*/
 /**
- * \addtogroup cc26xx-web-demo
+ * \addtogroup cc26x0-web-demo
  * @{
  *
  * \file
@@ -39,7 +39,7 @@
 #include "contiki.h"
 #include "coap-engine.h"
 #include "coap.h"
-#include "cc26xx-web-demo.h"
+#include "cc26x0-web-demo.h"
 #include "coap-server.h"
 
 #include <stdio.h>
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-toggle-leds.c b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-toggle-leds.c
similarity index 99%
rename from examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-toggle-leds.c
rename to examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-toggle-leds.c
index 1c708b539..00e632cef 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-toggle-leds.c
+++ b/examples/platform-specific/cc26x0-cc13x0/cc26x0-web-demo/resources/res-toggle-leds.c
@@ -31,7 +31,7 @@
  */
 /*---------------------------------------------------------------------------*/
 /**
- * \addtogroup cc26xx-web-demo
+ * \addtogroup cc26x0-web-demo
  * @{
  *
  * \file
diff --git a/examples/platform-specific/cc26xx/project-conf.h b/examples/platform-specific/cc26x0-cc13x0/project-conf.h
similarity index 100%
rename from examples/platform-specific/cc26xx/project-conf.h
rename to examples/platform-specific/cc26x0-cc13x0/project-conf.h
diff --git a/examples/platform-specific/cc26xx/very-sleepy-demo/Makefile b/examples/platform-specific/cc26x0-cc13x0/very-sleepy-demo/Makefile
similarity index 83%
rename from examples/platform-specific/cc26xx/very-sleepy-demo/Makefile
rename to examples/platform-specific/cc26x0-cc13x0/very-sleepy-demo/Makefile
index 46da822d3..d62dff3e3 100644
--- a/examples/platform-specific/cc26xx/very-sleepy-demo/Makefile
+++ b/examples/platform-specific/cc26x0-cc13x0/very-sleepy-demo/Makefile
@@ -1,6 +1,6 @@
 CONTIKI_PROJECT = very-sleepy-demo
 
-PLATFORMS_ONLY = srf06-cc26xx
+PLATFORMS_ONLY = cc26x0-cc13x0
 
 all: $(CONTIKI_PROJECT)
 
diff --git a/examples/platform-specific/cc26xx/very-sleepy-demo/Makefile.target b/examples/platform-specific/cc26x0-cc13x0/very-sleepy-demo/Makefile.target
similarity index 100%
rename from examples/platform-specific/cc26xx/very-sleepy-demo/Makefile.target
rename to examples/platform-specific/cc26x0-cc13x0/very-sleepy-demo/Makefile.target
diff --git a/examples/platform-specific/cc26xx/very-sleepy-demo/README.md b/examples/platform-specific/cc26x0-cc13x0/very-sleepy-demo/README.md
similarity index 100%
rename from examples/platform-specific/cc26xx/very-sleepy-demo/README.md
rename to examples/platform-specific/cc26x0-cc13x0/very-sleepy-demo/README.md
diff --git a/examples/platform-specific/cc26xx/very-sleepy-demo/project-conf.h b/examples/platform-specific/cc26x0-cc13x0/very-sleepy-demo/project-conf.h
similarity index 100%
rename from examples/platform-specific/cc26xx/very-sleepy-demo/project-conf.h
rename to examples/platform-specific/cc26x0-cc13x0/very-sleepy-demo/project-conf.h
diff --git a/examples/platform-specific/cc26xx/very-sleepy-demo/very-sleepy-demo.c b/examples/platform-specific/cc26x0-cc13x0/very-sleepy-demo/very-sleepy-demo.c
similarity index 100%
rename from examples/platform-specific/cc26xx/very-sleepy-demo/very-sleepy-demo.c
rename to examples/platform-specific/cc26x0-cc13x0/very-sleepy-demo/very-sleepy-demo.c
diff --git a/examples/platform-specific/cc26xx/ble-ipv6/Makefile b/examples/platform-specific/cc26xx/ble-ipv6/Makefile
deleted file mode 100644
index 4ba928ad3..000000000
--- a/examples/platform-specific/cc26xx/ble-ipv6/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-CONTIKI_PROJECT=client
-
-all: $(CONTIKI_PROJECT)
-
-PLATFORMS_ONLY = srf06-cc26xx
-BOARDS_ONLY = launchpad/cc2650 sensortag/cc2650 srf06/cc26xx
-
-MAKE_MAC = MAKE_MAC_BLE
-MAKE_NET = MAKE_NET_IPV6
-CONTIKI = ../../../..
-include $(CONTIKI)/Makefile.include
\ No newline at end of file
diff --git a/examples/sensniff/Makefile b/examples/sensniff/Makefile
index 090bc694d..3b7c5116c 100644
--- a/examples/sensniff/Makefile
+++ b/examples/sensniff/Makefile
@@ -1,7 +1,7 @@
 CONTIKI_PROJECT = sensniff
 CONTIKI = ../..
 
-PLATFORMS_ONLY = cc2538dk openmote-cc2538 zoul srf06-cc26xx jn516x simplelink
+PLATFORMS_ONLY = cc2538dk openmote-cc2538 zoul cc26x0-cc13x0 jn516x simplelink
 
 PROJECT_SOURCEFILES += sensniff-mac.c netstack.c
 MODULES_REL += pool $(TARGET)
diff --git a/examples/sensniff/srf06-cc26xx/target-conf.h b/examples/sensniff/cc26x0-cc13x0/target-conf.h
similarity index 100%
rename from examples/sensniff/srf06-cc26xx/target-conf.h
rename to examples/sensniff/cc26x0-cc13x0/target-conf.h
diff --git a/examples/storage/cfs-coffee/README.md b/examples/storage/cfs-coffee/README.md
index 028f518f8..640124d56 100644
--- a/examples/storage/cfs-coffee/README.md
+++ b/examples/storage/cfs-coffee/README.md
@@ -23,7 +23,7 @@ Supported Hardware (tested or known to work)
 * cc2538dk
 * openmote-cc2538
 * zoul
-* TI srf06-cc26xx
+* TI cc26x0-cc13x0
     - sensortag
     - launchpad
 
diff --git a/tests/02-compile-arm-ports-01/Makefile b/tests/02-compile-arm-ports-01/Makefile
index aaebab164..43e008c8e 100644
--- a/tests/02-compile-arm-ports-01/Makefile
+++ b/tests/02-compile-arm-ports-01/Makefile
@@ -2,41 +2,41 @@ EXAMPLESDIR=../../examples
 TOOLSDIR=../../tools
 
 EXAMPLES = \
-platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx \
-platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:MAKE_ROUTING=MAKE_ROUTING_RPL_CLASSIC \
-platform-specific/cc26xx/very-sleepy-demo/srf06-cc26xx:BOARD=sensortag/cc2650 \
-platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=sensortag/cc2650 \
-platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=sensortag/cc1350 \
-platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=srf06/cc13xx \
-platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc2650 \
-platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1310 \
-platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1350 \
-platform-specific/cc26xx/very-sleepy-demo/srf06-cc26xx \
-platform-specific/cc26xx/ble-ipv6/srf06-cc26xx:BOARD=sensortag/cc2650 \
-nullnet/srf06-cc26xx:BOARD=sensortag/cc2650 \
-rpl-border-router/srf06-cc26xx:BOARD=launchpad/cc2650 \
-sensniff/srf06-cc26xx \
-sensniff/srf06-cc26xx:BOARD=launchpad/cc1310 \
-dev/gpio-hal/srf06-cc26xx:BOARD=srf06/cc13xx \
-dev/gpio-hal/srf06-cc26xx:BOARD=srf06/cc26xx \
-dev/gpio-hal/srf06-cc26xx:BOARD=sensortag/cc1350 \
-dev/gpio-hal/srf06-cc26xx:BOARD=sensortag/cc2650 \
-dev/gpio-hal/srf06-cc26xx:BOARD=launchpad/cc1310 \
-dev/gpio-hal/srf06-cc26xx:BOARD=launchpad/cc1350 \
-dev/gpio-hal/srf06-cc26xx:BOARD=launchpad/cc2650 \
-dev/gpio-hal/srf06-cc26xx:BOARD=launchpad/cc2640r2 \
-dev/leds/srf06-cc26xx:BOARD=srf06/cc13xx \
-dev/leds/srf06-cc26xx:BOARD=srf06/cc26xx \
-dev/leds/srf06-cc26xx:BOARD=sensortag/cc1350 \
-dev/leds/srf06-cc26xx:BOARD=sensortag/cc2650 \
-dev/leds/srf06-cc26xx:BOARD=launchpad/cc1310 \
-dev/leds/srf06-cc26xx:BOARD=launchpad/cc1350 \
-dev/leds/srf06-cc26xx:BOARD=launchpad/cc2650 \
-dev/leds/srf06-cc26xx:BOARD=launchpad/cc2640r2 \
-6tisch/etsi-plugtest-2017/srf06-cc26xx:BOARD=launchpad/cc2650 \
-mqtt-client/srf06-cc26xx:BOARD=srf06/cc26xx \
-mqtt-client/srf06-cc26xx:BOARD=launchpad/cc2650 \
-mqtt-client/srf06-cc26xx:BOARD=sensortag/cc2650 \
+platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0 \
+platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0:MAKE_ROUTING=MAKE_ROUTING_RPL_CLASSIC \
+platform-specific/cc26x0-cc13x0/very-sleepy-demo/cc26x0-cc13x0:BOARD=sensortag/cc2650 \
+platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0:BOARD=sensortag/cc2650 \
+platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0:BOARD=sensortag/cc1350 \
+platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0:BOARD=srf06/cc13x0 \
+platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0:BOARD=launchpad/cc2650 \
+platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0:BOARD=launchpad/cc1310 \
+platform-specific/cc26x0-cc13x0/cc26x0-web-demo/cc26x0-cc13x0:BOARD=launchpad/cc1350 \
+platform-specific/cc26x0-cc13x0/very-sleepy-demo/cc26x0-cc13x0 \
+platform-specific/cc26x0-cc13x0/ble-ipv6/cc26x0-cc13x0:BOARD=sensortag/cc2650 \
+nullnet/cc26x0-cc13x0:BOARD=sensortag/cc2650 \
+rpl-border-router/cc26x0-cc13x0:BOARD=launchpad/cc2650 \
+sensniff/cc26x0-cc13x0 \
+sensniff/cc26x0-cc13x0:BOARD=launchpad/cc1310 \
+dev/gpio-hal/cc26x0-cc13x0:BOARD=srf06/cc13x0 \
+dev/gpio-hal/cc26x0-cc13x0:BOARD=srf06/cc26x0 \
+dev/gpio-hal/cc26x0-cc13x0:BOARD=sensortag/cc1350 \
+dev/gpio-hal/cc26x0-cc13x0:BOARD=sensortag/cc2650 \
+dev/gpio-hal/cc26x0-cc13x0:BOARD=launchpad/cc1310 \
+dev/gpio-hal/cc26x0-cc13x0:BOARD=launchpad/cc1350 \
+dev/gpio-hal/cc26x0-cc13x0:BOARD=launchpad/cc2650 \
+dev/gpio-hal/cc26x0-cc13x0:BOARD=launchpad/cc2640r2 \
+dev/leds/cc26x0-cc13x0:BOARD=srf06/cc13x0 \
+dev/leds/cc26x0-cc13x0:BOARD=srf06/cc26x0 \
+dev/leds/cc26x0-cc13x0:BOARD=sensortag/cc1350 \
+dev/leds/cc26x0-cc13x0:BOARD=sensortag/cc2650 \
+dev/leds/cc26x0-cc13x0:BOARD=launchpad/cc1310 \
+dev/leds/cc26x0-cc13x0:BOARD=launchpad/cc1350 \
+dev/leds/cc26x0-cc13x0:BOARD=launchpad/cc2650 \
+dev/leds/cc26x0-cc13x0:BOARD=launchpad/cc2640r2 \
+6tisch/etsi-plugtest-2017/cc26x0-cc13x0:BOARD=launchpad/cc2650 \
+mqtt-client/cc26x0-cc13x0:BOARD=srf06/cc26x0 \
+mqtt-client/cc26x0-cc13x0:BOARD=launchpad/cc2650 \
+mqtt-client/cc26x0-cc13x0:BOARD=sensortag/cc2650 \
 hello-world/simplelink:BOARD=launchpad/cc26x2r1 \
 hello-world/simplelink:BOARD=sensortag/cc2650 \
 nullnet/simplelink:BOARD=sensortag/cc2650 \
diff --git a/tools/doxygen/Doxyfile b/tools/doxygen/Doxyfile
index dab2c18e3..2cd7dba72 100644
--- a/tools/doxygen/Doxyfile
+++ b/tools/doxygen/Doxyfile
@@ -807,8 +807,8 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */cpu/cc26xx-cc13xx/lib/* \
-                         */cpu/cc26xx-cc13xx/rf-core/api/* \
+EXCLUDE_PATTERNS       = */cpu/cc26x0-cc13x0/lib/* \
+                         */cpu/cc26x0-cc13x0/rf-core/api/* \
                          */cpu/simplelink-cc13xx-cc26xx/lib/* \
                          */cpu/simplelink-cc13xx-cc26xx/rf-settings/* \
                          */cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/driverlib/* \