@@ 24,21 24,21 @@ 
 #include <ctl_api.h>
 #include <sam.h>
 
-#include "samd_common.h"
-#include "d2x_gpio.h"
-#include "samd_uart.h"
-#include "samd_sercom.h"
-#include "samd_clocks.h"
+#include "platform_samd_common.h"
+#include "platform_samd_gpio.h"
+#include "platform_samd_uart.h"
+#include "platform_samd_sercom.h"
+#include "platform_samd_clocks.h"
 
 #define F_REF_8M_INTERNAL (8000000UL)
 #define F_REF_DFLL48M    (48000000UL)
 
-typedef struct D21_UART_s {
+typedef struct PLATFORM_SAMD_UARTs {
   CTL_UART_t core;
   Sercom *dev;
   uint8_t uart_no;
   CTL_EVENT_SET_t events;
-} D21_UART_t;
+} PLATFORM_SAMD_UARTt;
 
 static CTL_STATUS_t d21_uart_ready(CTL_UART_t *uart);
 static void uart_interrupt(uint8_t sercom_no);

          
@@ 125,7 125,7 @@ d21_uart_set_pin_config(const struct UAR
 static CTL_STATUS_t
 d21_uart_reconfigure(CTL_UART_t *uart)
 {
-  D21_UART_t *u;
+  PLATFORM_SAMD_UARTt *u;
   uint64_t f_ref;
   uint64_t baud_t;
   uint64_t baud_r;

          
@@ 140,7 140,7 @@ d21_uart_reconfigure(CTL_UART_t *uart)
     return CTL_PARAMETER_ERROR;
   }
 
-  u = (D21_UART_t*)uart;
+  u = (PLATFORM_SAMD_UARTt*)uart;
 
   dev = u->dev;
   baudrate = u->core.__baud;

          
@@ 222,14 222,14 @@ static CTL_STATUS_t d21_uart_ready(CTL_U
 static CTL_STATUS_t
 d21_uart_init(CTL_UART_t *uart)
 {
-  D21_UART_t *u = (D21_UART_t*)uart;
+  PLATFORM_SAMD_UARTt *u = (PLATFORM_SAMD_UARTt*)uart;
   return uart->reconfigure(uart);
 }
 
 static CTL_STATUS_t
 d21_uart_fini(CTL_UART_t *uart)
 {
-  D21_UART_t *u = (D21_UART_t*)uart;
+  PLATFORM_SAMD_UARTt *u = (PLATFORM_SAMD_UARTt*)uart;
   u->dev->USART.INTENCLR.bit.RXC = 1;
   u->dev->USART.INTENCLR.bit.TXC = 1;
   u->dev->USART.INTENCLR.bit.DRE = 1;

          
@@ 241,7 241,7 @@ d21_uart_fini(CTL_UART_t *uart)
 }
 
 static inline char
-d21_uart_getc(D21_UART_t *u)
+d21_uart_getc(PLATFORM_SAMD_UARTt *u)
 {
   char c;
   while (u->dev->USART.INTFLAG.bit.RXC == 0);

          
@@ 250,14 250,14 @@ d21_uart_getc(D21_UART_t *u)
 }
 
 static inline void
-d21_uart_putc(D21_UART_t *u, char c)
+d21_uart_putc(PLATFORM_SAMD_UARTt *u, char c)
 {
   while (u->dev->USART.INTFLAG.bit.DRE == 0);
   u->dev->USART.DATA.reg = (uint8_t)c;
 }
 
 static CTL_STATUS_t
-d21_uart_read_polled(D21_UART_t *u, void *rx, size_t len)
+d21_uart_read_polled(PLATFORM_SAMD_UARTt *u, void *rx, size_t len)
 {
   char *c = rx;
 

          
@@ 270,7 270,7 @@ d21_uart_read_polled(D21_UART_t *u, void
 }
 
 static CTL_STATUS_t
-d21_uart_read_intr(D21_UART_t *u, void *rx, size_t len)
+d21_uart_read_intr(PLATFORM_SAMD_UARTt *u, void *rx, size_t len)
 {
   char *buf = rx;
   size_t n, read = 0;

          
@@ 296,14 296,14 @@ static CTL_STATUS_t
 d21_uart_read(CTL_UART_t *uart, void *rx, size_t len)
 {
   if (uart->__rx) {
-    return d21_uart_read_intr((D21_UART_t*)uart, rx, len);
+    return d21_uart_read_intr((PLATFORM_SAMD_UARTt*)uart, rx, len);
   } else {
-    return d21_uart_read_polled((D21_UART_t*)uart, rx, len);
+    return d21_uart_read_polled((PLATFORM_SAMD_UARTt*)uart, rx, len);
   }
 }
 
 static CTL_STATUS_t
-d21_uart_write_intr(D21_UART_t *u, const void *tx, size_t len)
+d21_uart_write_intr(PLATFORM_SAMD_UARTt *u, const void *tx, size_t len)
 {
   const char *c = tx;
   char t;

          
@@ 331,7 331,7 @@ d21_uart_write_intr(D21_UART_t *u, const
 }
 
 static CTL_STATUS_t
-d21_uart_write_polled(D21_UART_t *u, const void *tx, size_t len)
+d21_uart_write_polled(PLATFORM_SAMD_UARTt *u, const void *tx, size_t len)
 {
   const char *c = tx;
 

          
@@ 347,13 347,13 @@ static CTL_STATUS_t
 d21_uart_write(CTL_UART_t *uart, const void *tx, size_t len)
 {
   if (uart->__tx) {
-    return d21_uart_write_intr((D21_UART_t*)uart, tx, len);
+    return d21_uart_write_intr((PLATFORM_SAMD_UARTt*)uart, tx, len);
   } else {
-    return d21_uart_write_polled((D21_UART_t*)uart, tx, len);
+    return d21_uart_write_polled((PLATFORM_SAMD_UARTt*)uart, tx, len);
   }
 }
 
-static D21_UART_t d21_uarts[] = {
+static PLATFORM_SAMD_UARTt d21_uarts[] = {
   {
     .dev = SERCOM0,
     .uart_no = 0,

          
@@ 440,7 440,7 @@ d21_uart(uint8_t index)
   return NULL;
 }
 
-static void d21_uart_intr_handler(D21_UART_t *u)
+static void d21_uart_intr_handler(PLATFORM_SAMD_UARTt *u)
 {
   if (u->dev->USART.INTFLAG.bit.RXC) {
     ctl_ring_buffer_put_nb(u->core.__rx, u->dev->USART.DATA.reg);