diff --git a/.gitmodules b/.gitmodules
index 8fdbdbe63..22742f302 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,6 +22,7 @@
 [submodule "tools/motelist"]
 	path = tools/motelist
 	url = https://github.com/contiki-ng/motelist
-[submodule "arch/cpu/cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx"]
-	path = arch/cpu/cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx
+[submodule "arch/cpu/simplelink-cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx"]
+	path = arch/cpu/simplelink-cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx
 	url = https://github.com/tiepettersen/coresdk_cc13xx_cc26xx.git
+
diff --git a/arch/cpu/cc13xx-cc26xx/Makefile.cc13xx-cc26xx b/arch/cpu/simplelink-cc13xx-cc26xx/Makefile.cc13xx-cc26xx
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/Makefile.cc13xx-cc26xx
rename to arch/cpu/simplelink-cc13xx-cc26xx/Makefile.cc13xx-cc26xx
diff --git a/arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/Makefile.cc13x0-cc26x0 b/arch/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/Makefile.cc13x0-cc26x0
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/Makefile.cc13x0-cc26x0
rename to arch/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/Makefile.cc13x0-cc26x0
diff --git a/arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0-cm3.h b/arch/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0-cm3.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0-cm3.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0-cm3.h
diff --git a/arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0.icf b/arch/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0.icf
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0.icf
rename to arch/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0.icf
diff --git a/arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0.lds b/arch/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0.lds
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0.lds
rename to arch/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/cc13x0-cc26x0.lds
diff --git a/arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/driverlib/rf_ieee_cmd.h b/arch/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/driverlib/rf_ieee_cmd.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/driverlib/rf_ieee_cmd.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/driverlib/rf_ieee_cmd.h
diff --git a/arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/driverlib/rf_ieee_mailbox.h b/arch/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/driverlib/rf_ieee_mailbox.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/driverlib/rf_ieee_mailbox.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/driverlib/rf_ieee_mailbox.h
diff --git a/arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/rf_patches/rf_patch_cpe_ieee.h b/arch/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/rf_patches/rf_patch_cpe_ieee.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/cc13x0-cc26x0/rf_patches/rf_patch_cpe_ieee.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/rf_patches/rf_patch_cpe_ieee.h
diff --git a/arch/cpu/cc13xx-cc26xx/cc13x2-cc26x2/Makefile.cc13x2-cc26x2 b/arch/cpu/simplelink-cc13xx-cc26xx/cc13x2-cc26x2/Makefile.cc13x2-cc26x2
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/cc13x2-cc26x2/Makefile.cc13x2-cc26x2
rename to arch/cpu/simplelink-cc13xx-cc26xx/cc13x2-cc26x2/Makefile.cc13x2-cc26x2
diff --git a/arch/cpu/cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2-cm4.h b/arch/cpu/simplelink-cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2-cm4.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2-cm4.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2-cm4.h
diff --git a/arch/cpu/cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2.icf b/arch/cpu/simplelink-cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2.icf
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2.icf
rename to arch/cpu/simplelink-cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2.icf
diff --git a/arch/cpu/cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2.lds b/arch/cpu/simplelink-cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2.lds
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2.lds
rename to arch/cpu/simplelink-cc13xx-cc26xx/cc13x2-cc26x2/cc13x2-cc26x2.lds
diff --git a/arch/cpu/cc13xx-cc26xx/cc13xx-cc26xx-conf.h b/arch/cpu/simplelink-cc13xx-cc26xx/cc13xx-cc26xx-conf.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/cc13xx-cc26xx-conf.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/cc13xx-cc26xx-conf.h
diff --git a/arch/cpu/cc13xx-cc26xx/cc13xx-cc26xx-def.h b/arch/cpu/simplelink-cc13xx-cc26xx/cc13xx-cc26xx-def.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/cc13xx-cc26xx-def.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/cc13xx-cc26xx-def.h
diff --git a/arch/cpu/cc13xx-cc26xx/ccfg-conf.c b/arch/cpu/simplelink-cc13xx-cc26xx/ccfg-conf.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/ccfg-conf.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/ccfg-conf.c
diff --git a/arch/cpu/cc13xx-cc26xx/dev/clock-arch.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/clock-arch.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/dev/clock-arch.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/clock-arch.c
diff --git a/arch/cpu/cc13xx-cc26xx/dev/dbg-arch.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/dbg-arch.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/dev/dbg-arch.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/dbg-arch.c
diff --git a/arch/cpu/cc13xx-cc26xx/dev/gpio-hal-arch.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/gpio-hal-arch.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/dev/gpio-hal-arch.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/gpio-hal-arch.c
diff --git a/arch/cpu/cc13xx-cc26xx/dev/gpio-hal-arch.h b/arch/cpu/simplelink-cc13xx-cc26xx/dev/gpio-hal-arch.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/dev/gpio-hal-arch.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/gpio-hal-arch.h
diff --git a/arch/cpu/cc13xx-cc26xx/dev/int-master-arch.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/int-master-arch.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/dev/int-master-arch.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/int-master-arch.c
diff --git a/arch/cpu/cc13xx-cc26xx/dev/random.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/random.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/dev/random.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/random.c
diff --git a/arch/cpu/cc13xx-cc26xx/dev/rtimer-arch.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/rtimer-arch.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/dev/rtimer-arch.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/rtimer-arch.c
diff --git a/arch/cpu/cc13xx-cc26xx/dev/rtimer-arch.h b/arch/cpu/simplelink-cc13xx-cc26xx/dev/rtimer-arch.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/dev/rtimer-arch.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/rtimer-arch.h
diff --git a/arch/cpu/cc13xx-cc26xx/dev/slip-arch.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/slip-arch.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/dev/slip-arch.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/slip-arch.c
diff --git a/arch/cpu/cc13xx-cc26xx/dev/spi-arch.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/spi-arch.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/dev/spi-arch.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/spi-arch.c
diff --git a/arch/cpu/cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_gcc.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_gcc.c
similarity index 97%
rename from arch/cpu/cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_gcc.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_gcc.c
index 4c47a9ad6..7c542084b 100644
--- a/arch/cpu/cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_gcc.c
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_gcc.c
@@ -129,13 +129,6 @@ localProgramStart(void)
   uint32_t count;
   uint32_t i;
 
-#if defined(__ARM_ARCH_7EM__) && defined(__VFP_FP__) && !defined(__SOFTFP__)
-  volatile uint32_t *pui32Cpacr = (uint32_t *)0xE000ED88;
-
-  /* Enable Coprocessor Access Control (CPAC) */
-  *pui32Cpacr |= (0xF << 20);
-#endif
-
   IntMasterDisable();
 
   /* Final trim of device */
@@ -193,7 +186,10 @@ resetISR(void)
     "movt r0, #:upper16:resetVectors  \n"
     "ldr r0, [r0]                     \n"
     "mov sp, r0                       \n"
-    "bl localProgramStart             \n"
+    "bx %0                            \n"
+    : /* output */
+    : /* input */
+    "r"(localProgramStart)
   );
 }
 /*---------------------------------------------------------------------------*/
@@ -217,7 +213,7 @@ nmiISR(void)
  *
  * Provide a view into the CPU state from the provided stack pointer.
  */
-void
+static void
 debugHardfault(uint32_t *sp)
 {
   volatile uint32_t r0;  /**< R0 register */
@@ -259,7 +255,10 @@ faultISR(void)
     "ite eq            \n"
     "mrseq r0, msp     \n"
     "mrsne r0, psp     \n"
-    "b debugHardfault  \n"
+    "bx %0             \n"
+    : /* output */
+    : /* input */
+    "r"(debugHardfault)
   );
 }
 /*---------------------------------------------------------------------------*/
diff --git a/arch/cpu/cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_iar.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_iar.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_iar.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_iar.c
diff --git a/arch/cpu/cc13xx-cc26xx/dev/trng-arch.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/trng-arch.c
similarity index 95%
rename from arch/cpu/cc13xx-cc26xx/dev/trng-arch.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/trng-arch.c
index 5196c5c6e..5371bdcb4 100644
--- a/arch/cpu/cc13xx-cc26xx/dev/trng-arch.c
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/dev/trng-arch.c
@@ -46,7 +46,8 @@
 /*---------------------------------------------------------------------------*/
 /*
  * Very dirty workaround because the pre-compiled TI drivers library for
- * CC13x0/CC26x0 is missing the CryptoKey object file.
+ * CC13x0/CC26x0 is missing the CryptoKey object file. This can be removed
+ * when the pre-compiled library includes the missing object file.
  */
 #include <ti/devices/DeviceFamily.h>
 #if (DeviceFamily_PARENT == DeviceFamily_PARENT_CC13X0_CC26X0)
diff --git a/arch/cpu/cc13xx-cc26xx/dev/trng-arch.h b/arch/cpu/simplelink-cc13xx-cc26xx/dev/trng-arch.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/dev/trng-arch.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/trng-arch.h
diff --git a/arch/cpu/cc13xx-cc26xx/dev/uart0-arch.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/uart0-arch.c
similarity index 95%
rename from arch/cpu/cc13xx-cc26xx/dev/uart0-arch.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/uart0-arch.c
index 4bf529ddd..d9dbfb30a 100644
--- a/arch/cpu/cc13xx-cc26xx/dev/uart0-arch.c
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/dev/uart0-arch.c
@@ -112,6 +112,15 @@ uart0_write(const void *buf, size_t buf_size)
 }
 /*---------------------------------------------------------------------------*/
 int_fast32_t
+uart0_write_byte(uint8_t byte)
+{
+  if(!initialized) {
+    return UART_STATUS_ERROR;
+  }
+  return UART_write(uart_handle, &byte, 1);
+}
+/*---------------------------------------------------------------------------*/
+int_fast32_t
 uart0_set_callback(uart0_input_fxn_t input_cb)
 {
   if(!initialized) {
diff --git a/arch/cpu/cc13xx-cc26xx/dev/uart0-arch.h b/arch/cpu/simplelink-cc13xx-cc26xx/dev/uart0-arch.h
similarity index 91%
rename from arch/cpu/cc13xx-cc26xx/dev/uart0-arch.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/uart0-arch.h
index 17a93519a..9d4a69fe1 100644
--- a/arch/cpu/cc13xx-cc26xx/dev/uart0-arch.h
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/dev/uart0-arch.h
@@ -65,6 +65,14 @@ void uart0_init(void);
  */
 int_fast32_t uart0_write(const void *buf, size_t buf_size);
 
+/**
+ * \brief           Writes a single byte to the UART interface.
+ * \param byte      Byte to write.
+ * \return          Number of bytes that has been written to the UART. If an
+ *                  error occurs, a negative value is returned.
+ */
+int_fast32_t uart0_write_byte(uint8_t byte);
+
 /**
  * \brief           Set the callback function for when bytes are received
  *                  on UART0.
diff --git a/arch/cpu/cc13xx-cc26xx/dev/watchdog-arch.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/watchdog-arch.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/dev/watchdog-arch.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/dev/watchdog-arch.c
diff --git a/arch/cpu/cc13xx-cc26xx/doxygen-group.txt b/arch/cpu/simplelink-cc13xx-cc26xx/doxygen-group.txt
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/doxygen-group.txt
rename to arch/cpu/simplelink-cc13xx-cc26xx/doxygen-group.txt
diff --git a/arch/cpu/cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx b/arch/cpu/simplelink-cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx
rename to arch/cpu/simplelink-cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/ble-settings.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/ble-settings.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/ble-settings.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/ble-settings.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/ble-settings.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/ble-settings.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/ble-settings.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/ble-settings.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/ble-tx-power.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/ble-tx-power.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/ble-tx-power.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/ble-tx-power.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/ieee-settings.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/ieee-settings.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/ieee-settings.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/ieee-settings.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/ieee-settings.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/ieee-settings.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/ieee-settings.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/ieee-settings.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/ieee-tx-power.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/ieee-tx-power.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/ieee-tx-power.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/ieee-tx-power.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/prop-settings.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/prop-settings.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/prop-settings.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/prop-settings.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/prop-settings.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/prop-settings.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/prop-settings.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/prop-settings.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/prop-tx-power.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/prop-tx-power.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x0/prop-tx-power.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x0/prop-tx-power.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/ble-tx-power.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ble-tx-power.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/ble-tx-power.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ble-tx-power.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/ieee-settings.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ieee-settings.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/ieee-settings.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ieee-settings.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/ieee-settings.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ieee-settings.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/ieee-settings.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ieee-settings.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/ieee-tx-power.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ieee-tx-power.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/ieee-tx-power.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ieee-tx-power.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/prop-settings.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/prop-settings.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/prop-settings.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/prop-settings.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/prop-settings.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/prop-settings.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/prop-settings.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/prop-settings.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/prop-tx-power.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/prop-tx-power.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc13x2/prop-tx-power.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/prop-tx-power.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc26x0/ble-settings.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x0/ble-settings.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc26x0/ble-settings.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x0/ble-settings.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc26x0/ble-settings.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x0/ble-settings.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc26x0/ble-settings.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x0/ble-settings.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc26x0/ble-tx-power.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x0/ble-tx-power.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc26x0/ble-tx-power.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x0/ble-tx-power.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc26x0/ieee-settings.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x0/ieee-settings.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc26x0/ieee-settings.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x0/ieee-settings.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc26x0/ieee-settings.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x0/ieee-settings.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc26x0/ieee-settings.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x0/ieee-settings.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc26x0/ieee-tx-power.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x0/ieee-tx-power.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc26x0/ieee-tx-power.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x0/ieee-tx-power.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc26x2/ble-settings.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x2/ble-settings.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc26x2/ble-settings.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x2/ble-settings.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc26x2/ble-settings.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x2/ble-settings.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc26x2/ble-settings.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x2/ble-settings.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc26x2/ble-tx-power.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x2/ble-tx-power.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc26x2/ble-tx-power.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x2/ble-tx-power.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc26x2/ieee-settings.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x2/ieee-settings.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc26x2/ieee-settings.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x2/ieee-settings.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc26x2/ieee-settings.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x2/ieee-settings.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc26x2/ieee-settings.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x2/ieee-settings.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf-settings/cc26x2/ieee-tx-power.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x2/ieee-tx-power.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf-settings/cc26x2/ieee-tx-power.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc26x2/ieee-tx-power.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf/ble-addr.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-addr.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/ble-addr.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-addr.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf/ble-addr.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-addr.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/ble-addr.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-addr.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf/ble-beacond.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-beacond.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/ble-beacond.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-beacond.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf/ble-beacond.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-beacond.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/ble-beacond.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-beacond.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf/data-queue.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf/data-queue.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/data-queue.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/data-queue.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf/data-queue.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf/data-queue.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/data-queue.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/data-queue.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf/dot-15-4g.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf/dot-15-4g.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/dot-15-4g.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/dot-15-4g.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf/ieee-addr.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf/ieee-addr.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/ieee-addr.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/ieee-addr.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf/ieee-addr.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf/ieee-addr.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/ieee-addr.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/ieee-addr.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf/ieee-mode.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf/ieee-mode.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/ieee-mode.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/ieee-mode.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf/prop-mode.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf/prop-mode.c
similarity index 99%
rename from arch/cpu/cc13xx-cc26xx/rf/prop-mode.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/prop-mode.c
index 16877f333..a100f262a 100644
--- a/arch/cpu/cc13xx-cc26xx/rf/prop-mode.c
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/rf/prop-mode.c
@@ -78,6 +78,9 @@
 #define LOG_MODULE "Radio"
 #define LOG_LEVEL LOG_LEVEL_NONE
 /*---------------------------------------------------------------------------*/
+#undef CLAMP
+#define CLAMP(v, vmin, vmax)  (MAX(MIN(v, vmax), vmin))
+/*---------------------------------------------------------------------------*/
 /* Configuration parameters */
 #define PROP_MODE_DYN_WHITENER        PROP_MODE_CONF_DW
 #define PROP_MODE_USE_CRC16           PROP_MODE_CONF_USE_CRC16
diff --git a/arch/cpu/cc13xx-cc26xx/rf/rf.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf/rf.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/rf.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/rf.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf/sched.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf/sched.c
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/sched.c
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/sched.c
diff --git a/arch/cpu/cc13xx-cc26xx/rf/sched.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf/sched.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/sched.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/sched.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf/settings.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf/settings.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/settings.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/settings.h
diff --git a/arch/cpu/cc13xx-cc26xx/rf/tx-power.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf/tx-power.h
similarity index 100%
rename from arch/cpu/cc13xx-cc26xx/rf/tx-power.h
rename to arch/cpu/simplelink-cc13xx-cc26xx/rf/tx-power.h
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/Makefile.cc13xx-cc26xx b/arch/platform/simplelink/cc13xx-cc26xx/Makefile.cc13xx-cc26xx
index 959e19105..5c34a233f 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/Makefile.cc13xx-cc26xx
+++ b/arch/platform/simplelink/cc13xx-cc26xx/Makefile.cc13xx-cc26xx
@@ -6,7 +6,7 @@
 BOARD_PLATFORMS = launchpad sensortag srf06
 
 # All supported boards for this SimpleLink family
-BOARDS := $(foreach BOARD, $(BOARD_PLATFORMS), \
+BOARDS = $(foreach BOARD, $(BOARD_PLATFORMS), \
   $(shell cd $(FAMILY_PATH); find $(BOARD)/* -type d -print))
 
 ################################################################################
@@ -34,7 +34,7 @@ DEFINES += SUPPORTS_IEEE_MODE=$(SUPPORTS_IEEE_MODE)
 DEFINES += SUPPORTS_BLE_BEACON=$(SUPPORTS_BLE_BEACON)
 DEFINES += SUPPORTS_HIGH_PA=$(SUPPORTS_HIGH_PA)
 
-### If the user-specified a Node ID, pass a define
+# If the user-specified a Node ID, pass a define
 ifdef NODEID
   DEFINES += IEEE_ADDR_NODE_ID=$(NODEID)
 endif
@@ -49,7 +49,7 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
 CPU_FAMILY = cc13xx-cc26xx
 
 # Define the CPU directory and pull in the correct CPU Makefile
-CONTIKI_CPU := $(realpath $(CONTIKI)/arch/cpu/$(CPU_FAMILY))
+CONTIKI_CPU := $(realpath $(CONTIKI)/arch/cpu/simplelink-$(CPU_FAMILY))
 include $(CONTIKI_CPU)/Makefile.$(CPU_FAMILY)
 
 MODULES += os/net os/net/mac os/net/mac/framer