diff --git a/hardware/sam/cores/sam/UART.cpp b/hardware/sam/cores/sam/UARTClass.cpp
similarity index 99%
rename from hardware/sam/cores/sam/UART.cpp
rename to hardware/sam/cores/sam/UARTClass.cpp
index 87a2e93a2..9679a8a5a 100644
--- a/hardware/sam/cores/sam/UART.cpp
+++ b/hardware/sam/cores/sam/UARTClass.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "UART.h"
+#include "UARTClass.h"
 
 // Constructors ////////////////////////////////////////////////////////////////
 
diff --git a/hardware/sam/cores/sam/UART.h b/hardware/sam/cores/sam/UARTClass.h
similarity index 100%
rename from hardware/sam/cores/sam/UART.h
rename to hardware/sam/cores/sam/UARTClass.h
diff --git a/hardware/sam/cores/sam/USART.cpp b/hardware/sam/cores/sam/USARTClass.cpp
similarity index 99%
rename from hardware/sam/cores/sam/USART.cpp
rename to hardware/sam/cores/sam/USARTClass.cpp
index 15a063cc6..88feb7f53 100644
--- a/hardware/sam/cores/sam/USART.cpp
+++ b/hardware/sam/cores/sam/USARTClass.cpp
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "USART.h"
+#include "USARTClass.h"
 
 // Constructors ////////////////////////////////////////////////////////////////
 
diff --git a/hardware/sam/cores/sam/USART.h b/hardware/sam/cores/sam/USARTClass.h
similarity index 100%
rename from hardware/sam/cores/sam/USART.h
rename to hardware/sam/cores/sam/USARTClass.h
diff --git a/hardware/sam/variants/arduino_due/variant.h b/hardware/sam/variants/arduino_due/variant.h
index 1b16de009..4704250e4 100644
--- a/hardware/sam/variants/arduino_due/variant.h
+++ b/hardware/sam/variants/arduino_due/variant.h
@@ -35,8 +35,8 @@
  *----------------------------------------------------------------------------*/
 
 #include "Arduino.h"
-#include "UART.h"
-#include "USART.h"
+#include "UARTClass.h"
+#include "USARTClass.h"
 
 /**
  * Libc porting layers
diff --git a/hardware/sam/variants/sam3s_ek/build_iar/libvariant_sam3s_ek.ewp b/hardware/sam/variants/sam3s_ek/build_iar/libvariant_sam3s_ek.ewp
index 7582210dc..35a44c755 100644
--- a/hardware/sam/variants/sam3s_ek/build_iar/libvariant_sam3s_ek.ewp
+++ b/hardware/sam/variants/sam3s_ek/build_iar/libvariant_sam3s_ek.ewp
@@ -1798,16 +1798,16 @@
       <name>$PROJ_DIR$\..\..\common\cortex_handlers.cpp</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\..\common\UART.cpp</name>
+      <name>$PROJ_DIR$\..\..\common\UARTClass.cpp</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\..\common\UART.h</name>
+      <name>$PROJ_DIR$\..\..\common\UARTClass.h</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\..\common\USART.cpp</name>
+      <name>$PROJ_DIR$\..\..\common\USARTClass.cpp</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\..\common\USART.h</name>
+      <name>$PROJ_DIR$\..\..\common\USARTClass.h</name>
     </file>
   </group>
   <file>
diff --git a/hardware/sam/variants/sam3s_ek/variant.h b/hardware/sam/variants/sam3s_ek/variant.h
index 49d841915..9d7b4a0e1 100644
--- a/hardware/sam/variants/sam3s_ek/variant.h
+++ b/hardware/sam/variants/sam3s_ek/variant.h
@@ -35,8 +35,8 @@
  *----------------------------------------------------------------------------*/
 
 #include "Arduino.h"
-#include "UART.h"
-#include "USART.h"
+#include "UARTClass.h"
+#include "USARTClass.h"
 
 /**
  * Libc porting layers
diff --git a/hardware/sam/variants/sam3u_ek/variant.h b/hardware/sam/variants/sam3u_ek/variant.h
index 26e82adb4..9f1cf1bfa 100644
--- a/hardware/sam/variants/sam3u_ek/variant.h
+++ b/hardware/sam/variants/sam3u_ek/variant.h
@@ -35,8 +35,8 @@
  *----------------------------------------------------------------------------*/
 
 #include "Arduino.h"
-#include "UART.h"
-#include "USART.h"
+#include "UARTClass.h"
+#include "USARTClass.h"
 
 /**
  * Libc porting layers