diff --git a/boards/cc2650-launchpad/Makefile.features b/boards/cc2650-launchpad/Makefile.features
index 4d34402c1f..d0b6b248d3 100644
--- a/boards/cc2650-launchpad/Makefile.features
+++ b/boards/cc2650-launchpad/Makefile.features
@@ -1,4 +1,4 @@
-CPU = cc26x0
+CPU = cc26x0_cc13x0
 CPU_MODEL = cc26x0f128
 
 # Put defined MCU peripherals here (in alphabetical order)
diff --git a/boards/cc2650stk/Makefile.features b/boards/cc2650stk/Makefile.features
index 96835c7e4f..67453776d8 100644
--- a/boards/cc2650stk/Makefile.features
+++ b/boards/cc2650stk/Makefile.features
@@ -1,4 +1,4 @@
-CPU = cc26x0
+CPU = cc26x0_cc13x0
 CPU_MODEL = cc26x0f128
 
 # Put defined MCU peripherals here (in alphabetical order)
diff --git a/cpu/cc26x0/doc.txt b/cpu/cc26x0/doc.txt
deleted file mode 100644
index 3b51447ba3..0000000000
--- a/cpu/cc26x0/doc.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @defgroup        cpu_cc26x0 TI CC26x0
- * @ingroup         cpu
- * @brief           Texas Instruments CC26x0 Cortex-M3 MCU specific code
- */
-
-/**
- * @defgroup        cpu_specific_peripheral_memory_map TI CC26x0 peripheral memory map
- * @ingroup         cpu
- * @brief           Texas Instruments CC26x0 memory mappings for peripherals
- */
-
-/**
- * @defgroup        cpu_cc26x0_definitions TI CC26x0 definitions
- * @ingroup         cpu_cc26x0
- * @brief           Texas Instruments CC26x0 specific defines
- */
diff --git a/cpu/cc26x0/Kconfig b/cpu/cc26x0_cc13x0/Kconfig
similarity index 58%
rename from cpu/cc26x0/Kconfig
rename to cpu/cc26x0_cc13x0/Kconfig
index 451abfb83f..a6b3dab263 100644
--- a/cpu/cc26x0/Kconfig
+++ b/cpu/cc26x0_cc13x0/Kconfig
@@ -9,7 +9,14 @@ config CPU_FAM_CC26X0
     bool
     select CPU_CORE_CORTEX_M3
     select CPU_COMMON_CC26XX_CC13XX
-    select HAS_CPU_CC26X0
+    select HAS_CPU_CC26X0_CC13X0
+    select HAS_CORTEXM_MPU
+
+config CPU_FAM_CC13X0
+    bool
+    select CPU_CORE_CORTEX_M3
+    select CPU_COMMON_CC26XX_CC13XX
+    select HAS_CPU_CC26X0_CC13X0
     select HAS_CORTEXM_MPU
 
 ## CPU Models
@@ -17,20 +24,26 @@ config CPU_MODEL_CC26X0F128
     bool
     select CPU_FAM_CC26X0
 
+config CPU_MODEL_CC13X0F128
+    bool
+    select CPU_FAM_CC13X0
+
 ## Definition of specific features
-config HAS_CPU_CC26X0
+config HAS_CPU_CC26X0_CC13X0
     bool
     help
-        Indicates that a 'cc26x0' cpu is being used.
+        Indicates that a 'cc26x0_cc13x0' cpu is being used.
 
 ## Common CPU symbols
 config CPU_FAM
     default "cc26x0" if CPU_FAM_CC26X0
+    default "cc13x0" if CPU_FAM_CC13X0
 
 config CPU_MODEL
     default "cc26x0f128" if CPU_MODEL_CC26X0F128
+    default "cc13x0f128" if CPU_MODEL_CC13X0F128
 
 config CPU
-    default "cc26x0"
+    default "cc26x0_cc13x0"
 
 source "$(RIOTCPU)/cc26xx_cc13xx/Kconfig"
diff --git a/cpu/cc26x0/Makefile b/cpu/cc26x0_cc13x0/Makefile
similarity index 100%
rename from cpu/cc26x0/Makefile
rename to cpu/cc26x0_cc13x0/Makefile
diff --git a/cpu/cc26x0/Makefile.dep b/cpu/cc26x0_cc13x0/Makefile.dep
similarity index 100%
rename from cpu/cc26x0/Makefile.dep
rename to cpu/cc26x0_cc13x0/Makefile.dep
diff --git a/cpu/cc26x0/Makefile.features b/cpu/cc26x0_cc13x0/Makefile.features
similarity index 100%
rename from cpu/cc26x0/Makefile.features
rename to cpu/cc26x0_cc13x0/Makefile.features
diff --git a/cpu/cc26x0/Makefile.include b/cpu/cc26x0_cc13x0/Makefile.include
similarity index 100%
rename from cpu/cc26x0/Makefile.include
rename to cpu/cc26x0_cc13x0/Makefile.include
diff --git a/cpu/cc26x0/cpu.c b/cpu/cc26x0_cc13x0/cpu.c
similarity index 100%
rename from cpu/cc26x0/cpu.c
rename to cpu/cc26x0_cc13x0/cpu.c
diff --git a/cpu/cc26x0_cc13x0/doc.txt b/cpu/cc26x0_cc13x0/doc.txt
new file mode 100644
index 0000000000..aa9a39cfe9
--- /dev/null
+++ b/cpu/cc26x0_cc13x0/doc.txt
@@ -0,0 +1,17 @@
+/**
+ * @defgroup        cpu_cc26x0_cc13x0 TI CC26x0/CC13x0
+ * @ingroup         cpu
+ * @brief           Texas Instruments CC26x0/CC13x0 Cortex-M3 MCU specific code
+ */
+
+/**
+ * @defgroup        cpu_specific_peripheral_memory_map TI CC26x0/CC13x0 peripheral memory map
+ * @ingroup         cpu
+ * @brief           Texas Instruments CC26x0/CC13x0 memory mappings for peripherals
+ */
+
+/**
+ * @defgroup        cpu_cc26x0_cc13x0_definitions TI CC26x0/CC13x0 definitions
+ * @ingroup         cpu_cc26x0_cc13x0
+ * @brief           Texas Instruments CC26x0 specific defines
+ */
diff --git a/cpu/cc26x0/include/cc26x0_aux.h b/cpu/cc26x0_cc13x0/include/cc26x0_cc13x0_aux.h
similarity index 97%
rename from cpu/cc26x0/include/cc26x0_aux.h
rename to cpu/cc26x0_cc13x0/include/cc26x0_cc13x0_aux.h
index e032944869..ed4b92e12d 100644
--- a/cpu/cc26x0/include/cc26x0_aux.h
+++ b/cpu/cc26x0_cc13x0/include/cc26x0_cc13x0_aux.h
@@ -6,15 +6,15 @@
  * details.
  */
 /**
- * @ingroup         cpu_cc26x0_definitions
+ * @ingroup         cpu_cc26x0_cc13x0_definitions
  * @{
  *
  * @file
- * @brief           CC26x0 AUX register definitions
+ * @brief           CC26x0/CC13x0 AUX register definitions
  */
 
-#ifndef CC26X0_AUX_H
-#define CC26X0_AUX_H
+#ifndef CC26X0_CC13X0_AUX_H
+#define CC26X0_CC13X0_AUX_H
 
 #include <stdbool.h>
 
@@ -253,6 +253,5 @@ typedef struct {
 } /* end extern "C" */
 #endif
 
-#endif /* CC26X0_AUX_H */
-
+#endif /* CC26X0_CC13X0_AUX_H */
 /** @}*/
diff --git a/cpu/cc26x0/include/cc26x0_fcfg.h b/cpu/cc26x0_cc13x0/include/cc26x0_cc13x0_fcfg.h
similarity index 96%
rename from cpu/cc26x0/include/cc26x0_fcfg.h
rename to cpu/cc26x0_cc13x0/include/cc26x0_cc13x0_fcfg.h
index a59bd8c09b..41d7fa0f80 100644
--- a/cpu/cc26x0/include/cc26x0_fcfg.h
+++ b/cpu/cc26x0_cc13x0/include/cc26x0_cc13x0_fcfg.h
@@ -6,15 +6,15 @@
  * details.
  */
 /**
- * @ingroup         cpu_cc26x0_definitions
+ * @ingroup         cpu_cc26x0_cc13x0_definitions
  * @{
  *
  * @file
- * @brief           CC26x0 FCFG register definitions
+ * @brief           CC26x0/CC13x0 FCFG register definitions
  */
 
-#ifndef CC26X0_FCFG_H
-#define CC26X0_FCFG_H
+#ifndef CC26X0_CC13X0_FCFG_H
+#define CC26X0_CC13X0_FCFG_H
 
 #include <cc26xx_cc13xx.h>
 
@@ -134,6 +134,5 @@ typedef struct {
 } /* end extern "C" */
 #endif
 
-#endif /* CC26X0_FCFG_H */
-
-/*@}*/
+#endif /* CC26X0_CC13X0_FCFG_H */
+/** @} */
diff --git a/cpu/cc26x0/include/cc26x0_prcm.h b/cpu/cc26x0_cc13x0/include/cc26x0_cc13x0_prcm.h
similarity index 98%
rename from cpu/cc26x0/include/cc26x0_prcm.h
rename to cpu/cc26x0_cc13x0/include/cc26x0_cc13x0_prcm.h
index 0c799f67c2..62572961bc 100644
--- a/cpu/cc26x0/include/cc26x0_prcm.h
+++ b/cpu/cc26x0_cc13x0/include/cc26x0_cc13x0_prcm.h
@@ -7,15 +7,15 @@
  */
 
 /**
- * @ingroup         cpu_cc26x0_definitions
+ * @ingroup         cpu_cc26x0_cc13x0_definitions
  * @{
  *
  * @file
- * @brief           CC26x0 PRCM register definitions
+ * @brief           CC26x0/CC13x0 PRCM register definitions
  */
 
-#ifndef CC26X0_PRCM_H
-#define CC26X0_PRCM_H
+#ifndef CC26X0_CC13X0_PRCM_H
+#define CC26X0_CC13X0_PRCM_H
 
 #include <cc26xx_cc13xx.h>
 
@@ -355,6 +355,5 @@ typedef struct {
 } /* end extern "C" */
 #endif
 
-#endif /* CC26X0_PRCM_H */
-
-/*@}*/
+#endif /* CC26X0_CC13X0_PRCM_H */
+/** @} */
diff --git a/cpu/cc26x0/include/cpu_conf.h b/cpu/cc26x0_cc13x0/include/cpu_conf.h
similarity index 87%
rename from cpu/cc26x0/include/cpu_conf.h
rename to cpu/cc26x0_cc13x0/include/cpu_conf.h
index 510bea0d6b..2e5a850605 100644
--- a/cpu/cc26x0/include/cpu_conf.h
+++ b/cpu/cc26x0_cc13x0/include/cpu_conf.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @addtogroup      cpu_cc26x0
+ * @addtogroup      cpu_cc26x0_cc13x0
  * @{
  *
  * @file
@@ -31,9 +31,9 @@
 
 #include "cpu_conf_cc26xx_cc13xx.h"
 
-#include "cc26x0_aux.h"
-#include "cc26x0_fcfg.h"
-#include "cc26x0_prcm.h"
+#include "cc26x0_cc13x0_aux.h"
+#include "cc26x0_cc13x0_fcfg.h"
+#include "cc26x0_cc13x0_prcm.h"
 
 /**
  * @brief   Bit-Band configuration
diff --git a/cpu/cc26x0/include/periph_cpu.h b/cpu/cc26x0_cc13x0/include/periph_cpu.h
similarity index 93%
rename from cpu/cc26x0/include/periph_cpu.h
rename to cpu/cc26x0_cc13x0/include/periph_cpu.h
index ad199d7262..0692beadb8 100644
--- a/cpu/cc26x0/include/periph_cpu.h
+++ b/cpu/cc26x0_cc13x0/include/periph_cpu.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup         cpu_cc26x0
+ * @ingroup         cpu_cc26x0_cc13x0
  * @{
  *
  * @file
diff --git a/cpu/cc26x0/periph/Makefile b/cpu/cc26x0_cc13x0/periph/Makefile
similarity index 100%
rename from cpu/cc26x0/periph/Makefile
rename to cpu/cc26x0_cc13x0/periph/Makefile
diff --git a/cpu/cc26x0/vendor/driverlib/Makefile b/cpu/cc26x0_cc13x0/vendor/driverlib/Makefile
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/Makefile
rename to cpu/cc26x0_cc13x0/vendor/driverlib/Makefile
diff --git a/cpu/cc26x0/vendor/driverlib/aon_batmon.c b/cpu/cc26x0_cc13x0/vendor/driverlib/aon_batmon.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/aon_batmon.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/aon_batmon.c
diff --git a/cpu/cc26x0/vendor/driverlib/aon_batmon.h b/cpu/cc26x0_cc13x0/vendor/driverlib/aon_batmon.h
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/aon_batmon.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/aon_batmon.h
diff --git a/cpu/cc26x0/vendor/driverlib/aon_rtc.c b/cpu/cc26x0_cc13x0/vendor/driverlib/aon_rtc.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/aon_rtc.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/aon_rtc.c
diff --git a/cpu/cc26x0/vendor/driverlib/aon_rtc.h b/cpu/cc26x0_cc13x0/vendor/driverlib/aon_rtc.h
similarity index 97%
rename from cpu/cc26x0/vendor/driverlib/aon_rtc.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/aon_rtc.h
index 0bc64a351a..3c3f5cca1d 100644
--- a/cpu/cc26x0/vendor/driverlib/aon_rtc.h
+++ b/cpu/cc26x0_cc13x0/vendor/driverlib/aon_rtc.h
@@ -65,7 +65,7 @@ extern "C"
 #include "../inc/hw_memmap.h"
 #include "../inc/hw_aon_rtc.h"
 #include "debug.h"
-#include "../../include/cc26x0_prcm.h"
+#include "../../include/cc26x0_cc13x0_prcm.h"
 
 //*****************************************************************************
 //
diff --git a/cpu/cc26x0/vendor/driverlib/aon_wuc.c b/cpu/cc26x0_cc13x0/vendor/driverlib/aon_wuc.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/aon_wuc.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/aon_wuc.c
diff --git a/cpu/cc26x0/vendor/driverlib/aon_wuc.h b/cpu/cc26x0_cc13x0/vendor/driverlib/aon_wuc.h
similarity index 97%
rename from cpu/cc26x0/vendor/driverlib/aon_wuc.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/aon_wuc.h
index 0f943090de..c6ddc2fdd5 100644
--- a/cpu/cc26x0/vendor/driverlib/aon_wuc.h
+++ b/cpu/cc26x0_cc13x0/vendor/driverlib/aon_wuc.h
@@ -68,7 +68,7 @@ extern "C"
 #include "../inc/hw_aon_rtc.h"
 #include "interrupt.h"
 #include "debug.h"
-#include "../../include/cc26x0_prcm.h"
+#include "../../include/cc26x0_cc13x0_prcm.h"
 
 //*****************************************************************************
 //
diff --git a/cpu/cc26x0/vendor/driverlib/aux_wuc.c b/cpu/cc26x0_cc13x0/vendor/driverlib/aux_wuc.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/aux_wuc.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/aux_wuc.c
diff --git a/cpu/cc26x0/vendor/driverlib/aux_wuc.h b/cpu/cc26x0_cc13x0/vendor/driverlib/aux_wuc.h
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/aux_wuc.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/aux_wuc.h
diff --git a/cpu/cc26x0/vendor/driverlib/cc26x0_cpu.c b/cpu/cc26x0_cc13x0/vendor/driverlib/cc26x0_cpu.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/cc26x0_cpu.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/cc26x0_cpu.c
diff --git a/cpu/cc26x0/vendor/driverlib/cc26x0_cpu.h b/cpu/cc26x0_cc13x0/vendor/driverlib/cc26x0_cpu.h
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/cc26x0_cpu.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/cc26x0_cpu.h
diff --git a/cpu/cc26x0/vendor/driverlib/chipinfo.c b/cpu/cc26x0_cc13x0/vendor/driverlib/chipinfo.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/chipinfo.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/chipinfo.c
diff --git a/cpu/cc26x0/vendor/driverlib/chipinfo.h b/cpu/cc26x0_cc13x0/vendor/driverlib/chipinfo.h
similarity index 97%
rename from cpu/cc26x0/vendor/driverlib/chipinfo.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/chipinfo.h
index fc4b299ccf..049f52b552 100644
--- a/cpu/cc26x0/vendor/driverlib/chipinfo.h
+++ b/cpu/cc26x0_cc13x0/vendor/driverlib/chipinfo.h
@@ -64,7 +64,7 @@ extern "C"
 #include "../inc/hw_types.h"
 #include "../inc/hw_memmap.h"
 #include "../inc/hw_fcfg1.h"
-#include "../../include/cc26x0_prcm.h"
+#include "../../include/cc26x0_cc13x0_prcm.h"
 
 //*****************************************************************************
 //
diff --git a/cpu/cc26x0/vendor/driverlib/ddi.c b/cpu/cc26x0_cc13x0/vendor/driverlib/ddi.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/ddi.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/ddi.c
diff --git a/cpu/cc26x0/vendor/driverlib/ddi.h b/cpu/cc26x0_cc13x0/vendor/driverlib/ddi.h
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/ddi.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/ddi.h
diff --git a/cpu/cc26x0/vendor/driverlib/debug.c b/cpu/cc26x0_cc13x0/vendor/driverlib/debug.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/debug.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/debug.c
diff --git a/cpu/cc26x0/vendor/driverlib/debug.h b/cpu/cc26x0_cc13x0/vendor/driverlib/debug.h
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/debug.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/debug.h
diff --git a/cpu/cc26x0/vendor/driverlib/gpio.c b/cpu/cc26x0_cc13x0/vendor/driverlib/gpio.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/gpio.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/gpio.c
diff --git a/cpu/cc26x0/vendor/driverlib/gpio.h b/cpu/cc26x0_cc13x0/vendor/driverlib/gpio.h
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/gpio.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/gpio.h
diff --git a/cpu/cc26x0/vendor/driverlib/interrupt.c b/cpu/cc26x0_cc13x0/vendor/driverlib/interrupt.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/interrupt.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/interrupt.c
diff --git a/cpu/cc26x0/vendor/driverlib/interrupt.h b/cpu/cc26x0_cc13x0/vendor/driverlib/interrupt.h
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/interrupt.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/interrupt.h
diff --git a/cpu/cc26x0/vendor/driverlib/ioc.c b/cpu/cc26x0_cc13x0/vendor/driverlib/ioc.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/ioc.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/ioc.c
diff --git a/cpu/cc26x0/vendor/driverlib/ioc.h b/cpu/cc26x0_cc13x0/vendor/driverlib/ioc.h
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/ioc.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/ioc.h
diff --git a/cpu/cc26x0/vendor/driverlib/osc.c b/cpu/cc26x0_cc13x0/vendor/driverlib/osc.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/osc.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/osc.c
diff --git a/cpu/cc26x0/vendor/driverlib/osc.h b/cpu/cc26x0_cc13x0/vendor/driverlib/osc.h
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/osc.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/osc.h
diff --git a/cpu/cc26x0/vendor/driverlib/rom.h b/cpu/cc26x0_cc13x0/vendor/driverlib/rom.h
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/rom.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/rom.h
diff --git a/cpu/cc26x0/vendor/driverlib/setup.c b/cpu/cc26x0_cc13x0/vendor/driverlib/setup.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/setup.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/setup.c
diff --git a/cpu/cc26x0/vendor/driverlib/setup.h b/cpu/cc26x0_cc13x0/vendor/driverlib/setup.h
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/setup.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/setup.h
diff --git a/cpu/cc26x0/vendor/driverlib/setup_rom.c b/cpu/cc26x0_cc13x0/vendor/driverlib/setup_rom.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/setup_rom.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/setup_rom.c
diff --git a/cpu/cc26x0/vendor/driverlib/setup_rom.h b/cpu/cc26x0_cc13x0/vendor/driverlib/setup_rom.h
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/setup_rom.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/setup_rom.h
diff --git a/cpu/cc26x0/vendor/driverlib/sys_ctrl.c b/cpu/cc26x0_cc13x0/vendor/driverlib/sys_ctrl.c
similarity index 100%
rename from cpu/cc26x0/vendor/driverlib/sys_ctrl.c
rename to cpu/cc26x0_cc13x0/vendor/driverlib/sys_ctrl.c
diff --git a/cpu/cc26x0/vendor/driverlib/sys_ctrl.h b/cpu/cc26x0_cc13x0/vendor/driverlib/sys_ctrl.h
similarity index 97%
rename from cpu/cc26x0/vendor/driverlib/sys_ctrl.h
rename to cpu/cc26x0_cc13x0/vendor/driverlib/sys_ctrl.h
index 9a3dead690..e74851186b 100644
--- a/cpu/cc26x0/vendor/driverlib/sys_ctrl.h
+++ b/cpu/cc26x0_cc13x0/vendor/driverlib/sys_ctrl.h
@@ -81,7 +81,7 @@ extern "C"
 #include "debug.h"
 //#include "pwr_ctrl.h"
 #include "osc.h"
-#include "../../include/cc26x0_prcm.h"
+#include "../../include/cc26x0_cc13x0_prcm.h"
 #include "aux_wuc.h"
 #include "aon_wuc.h"
 //#include "adi.h"
diff --git a/cpu/cc26x0/vendor/inc/hw_adi.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_adi.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_adi.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_adi.h
diff --git a/cpu/cc26x0/vendor/inc/hw_adi_2_refsys.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_adi_2_refsys.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_adi_2_refsys.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_adi_2_refsys.h
diff --git a/cpu/cc26x0/vendor/inc/hw_adi_3_refsys.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_adi_3_refsys.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_adi_3_refsys.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_adi_3_refsys.h
diff --git a/cpu/cc26x0/vendor/inc/hw_adi_4_aux.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_adi_4_aux.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_adi_4_aux.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_adi_4_aux.h
diff --git a/cpu/cc26x0/vendor/inc/hw_aon_batmon.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_aon_batmon.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_aon_batmon.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_aon_batmon.h
diff --git a/cpu/cc26x0/vendor/inc/hw_aon_event.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_aon_event.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_aon_event.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_aon_event.h
diff --git a/cpu/cc26x0/vendor/inc/hw_aon_ioc.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_aon_ioc.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_aon_ioc.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_aon_ioc.h
diff --git a/cpu/cc26x0/vendor/inc/hw_aon_rtc.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_aon_rtc.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_aon_rtc.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_aon_rtc.h
diff --git a/cpu/cc26x0/vendor/inc/hw_aon_sysctl.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_aon_sysctl.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_aon_sysctl.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_aon_sysctl.h
diff --git a/cpu/cc26x0/vendor/inc/hw_aon_wuc.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_aon_wuc.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_aon_wuc.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_aon_wuc.h
diff --git a/cpu/cc26x0/vendor/inc/hw_aux_aiodio.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_aux_aiodio.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_aux_aiodio.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_aux_aiodio.h
diff --git a/cpu/cc26x0/vendor/inc/hw_aux_anaif.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_aux_anaif.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_aux_anaif.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_aux_anaif.h
diff --git a/cpu/cc26x0/vendor/inc/hw_aux_evctl.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_aux_evctl.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_aux_evctl.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_aux_evctl.h
diff --git a/cpu/cc26x0/vendor/inc/hw_aux_sce.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_aux_sce.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_aux_sce.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_aux_sce.h
diff --git a/cpu/cc26x0/vendor/inc/hw_aux_smph.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_aux_smph.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_aux_smph.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_aux_smph.h
diff --git a/cpu/cc26x0/vendor/inc/hw_aux_tdc.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_aux_tdc.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_aux_tdc.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_aux_tdc.h
diff --git a/cpu/cc26x0/vendor/inc/hw_aux_timer.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_aux_timer.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_aux_timer.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_aux_timer.h
diff --git a/cpu/cc26x0/vendor/inc/hw_aux_wuc.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_aux_wuc.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_aux_wuc.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_aux_wuc.h
diff --git a/cpu/cc26x0/vendor/inc/hw_ccfg.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_ccfg.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_ccfg.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_ccfg.h
diff --git a/cpu/cc26x0/vendor/inc/hw_ccfg_simple_struct.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_ccfg_simple_struct.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_ccfg_simple_struct.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_ccfg_simple_struct.h
diff --git a/cpu/cc26x0/vendor/inc/hw_chip_def.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_chip_def.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_chip_def.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_chip_def.h
diff --git a/cpu/cc26x0/vendor/inc/hw_cpu_dwt.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_cpu_dwt.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_cpu_dwt.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_cpu_dwt.h
diff --git a/cpu/cc26x0/vendor/inc/hw_cpu_fpb.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_cpu_fpb.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_cpu_fpb.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_cpu_fpb.h
diff --git a/cpu/cc26x0/vendor/inc/hw_cpu_itm.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_cpu_itm.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_cpu_itm.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_cpu_itm.h
diff --git a/cpu/cc26x0/vendor/inc/hw_cpu_rom_table.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_cpu_rom_table.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_cpu_rom_table.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_cpu_rom_table.h
diff --git a/cpu/cc26x0/vendor/inc/hw_cpu_scs.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_cpu_scs.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_cpu_scs.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_cpu_scs.h
diff --git a/cpu/cc26x0/vendor/inc/hw_cpu_tiprop.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_cpu_tiprop.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_cpu_tiprop.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_cpu_tiprop.h
diff --git a/cpu/cc26x0/vendor/inc/hw_cpu_tpiu.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_cpu_tpiu.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_cpu_tpiu.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_cpu_tpiu.h
diff --git a/cpu/cc26x0/vendor/inc/hw_crypto.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_crypto.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_crypto.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_crypto.h
diff --git a/cpu/cc26x0/vendor/inc/hw_ddi.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_ddi.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_ddi.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_ddi.h
diff --git a/cpu/cc26x0/vendor/inc/hw_ddi_0_osc.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_ddi_0_osc.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_ddi_0_osc.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_ddi_0_osc.h
diff --git a/cpu/cc26x0/vendor/inc/hw_device.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_device.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_device.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_device.h
diff --git a/cpu/cc26x0/vendor/inc/hw_event.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_event.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_event.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_event.h
diff --git a/cpu/cc26x0/vendor/inc/hw_fcfg1.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_fcfg1.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_fcfg1.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_fcfg1.h
diff --git a/cpu/cc26x0/vendor/inc/hw_flash.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_flash.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_flash.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_flash.h
diff --git a/cpu/cc26x0/vendor/inc/hw_gpio.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_gpio.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_gpio.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_gpio.h
diff --git a/cpu/cc26x0/vendor/inc/hw_gpt.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_gpt.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_gpt.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_gpt.h
diff --git a/cpu/cc26x0/vendor/inc/hw_i2c.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_i2c.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_i2c.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_i2c.h
diff --git a/cpu/cc26x0/vendor/inc/hw_i2s.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_i2s.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_i2s.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_i2s.h
diff --git a/cpu/cc26x0/vendor/inc/hw_ints.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_ints.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_ints.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_ints.h
diff --git a/cpu/cc26x0/vendor/inc/hw_ioc.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_ioc.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_ioc.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_ioc.h
diff --git a/cpu/cc26x0/vendor/inc/hw_memmap.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_memmap.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_memmap.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_memmap.h
diff --git a/cpu/cc26x0/vendor/inc/hw_nvic.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_nvic.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_nvic.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_nvic.h
diff --git a/cpu/cc26x0/vendor/inc/hw_prcm.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_prcm.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_prcm.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_prcm.h
diff --git a/cpu/cc26x0/vendor/inc/hw_rfc_dbell.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_rfc_dbell.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_rfc_dbell.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_rfc_dbell.h
diff --git a/cpu/cc26x0/vendor/inc/hw_rfc_pwr.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_rfc_pwr.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_rfc_pwr.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_rfc_pwr.h
diff --git a/cpu/cc26x0/vendor/inc/hw_rfc_rat.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_rfc_rat.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_rfc_rat.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_rfc_rat.h
diff --git a/cpu/cc26x0/vendor/inc/hw_smph.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_smph.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_smph.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_smph.h
diff --git a/cpu/cc26x0/vendor/inc/hw_ssi.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_ssi.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_ssi.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_ssi.h
diff --git a/cpu/cc26x0/vendor/inc/hw_sysctl.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_sysctl.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_sysctl.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_sysctl.h
diff --git a/cpu/cc26x0/vendor/inc/hw_trng.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_trng.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_trng.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_trng.h
diff --git a/cpu/cc26x0/vendor/inc/hw_types.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_types.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_types.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_types.h
diff --git a/cpu/cc26x0/vendor/inc/hw_uart.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_uart.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_uart.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_uart.h
diff --git a/cpu/cc26x0/vendor/inc/hw_udma.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_udma.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_udma.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_udma.h
diff --git a/cpu/cc26x0/vendor/inc/hw_vims.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_vims.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_vims.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_vims.h
diff --git a/cpu/cc26x0/vendor/inc/hw_wdt.h b/cpu/cc26x0_cc13x0/vendor/inc/hw_wdt.h
similarity index 100%
rename from cpu/cc26x0/vendor/inc/hw_wdt.h
rename to cpu/cc26x0_cc13x0/vendor/inc/hw_wdt.h
diff --git a/cpu/cc26xx_cc13xx/doc.txt b/cpu/cc26xx_cc13xx/doc.txt
index fa5f56731c..9b3d4d9879 100644
--- a/cpu/cc26xx_cc13xx/doc.txt
+++ b/cpu/cc26xx_cc13xx/doc.txt
@@ -4,7 +4,7 @@
  * @brief           Common code for TI cc26xx/cc13xx family
  *
  * This module contains code common to all cc26xx/cc13xx cpus
- * supported by RIOT: @ref cpu_cc26x0, @ref cpu_cc26x2_cc13x2
+ * supported by RIOT: @ref cpu_cc26x0_cc13x0, @ref cpu_cc26x2_cc13x2
  *
  */
 
@@ -14,6 +14,6 @@
  * @brief           Common definitions for TI cc26xx/cc13xx family
  *
  * This module contains definitions common to all cc26xx/cc13xx cpus
- * supported by RIOT: @ref cpu_cc26x0, @ref cpu_cc26x2_cc13x2
+ * supported by RIOT: @ref cpu_cc26x0_cc13x0, @ref cpu_cc26x2_cc13x2
  *
  */