diff --git a/arch/arm/src/sam34/chip/sam3u_pmc.h b/arch/arm/src/sam34/chip/sam_pmc.h
similarity index 99%
rename from arch/arm/src/sam34/chip/sam3u_pmc.h
rename to arch/arm/src/sam34/chip/sam_pmc.h
index 8fd82a8f4c..a1d282e23b 100644
--- a/arch/arm/src/sam34/chip/sam3u_pmc.h
+++ b/arch/arm/src/sam34/chip/sam_pmc.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/sam34/chip/sam3u_pmc.h
+ * arch/arm/src/sam34/chip/sam_pmc.h
  * Power Management Controller (PMC) for the SAM3U, SAM3X, SAM3A, and SAM4S
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PMC_H
-#define __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PMC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H
 
 /********************************************************************************************
  * Included Files
@@ -529,4 +529,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PMC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H */
diff --git a/arch/arm/src/sam34/sam3u_dmac.c b/arch/arm/src/sam34/sam3u_dmac.c
index 9a5d85aa61..f2304c9318 100644
--- a/arch/arm/src/sam34/sam3u_dmac.c
+++ b/arch/arm/src/sam34/sam3u_dmac.c
@@ -57,7 +57,7 @@
 
 #include "sam_dmac.h"
 #include "sam_periphclks.h"
-#include "chip/sam3u_pmc.h"
+#include "chip/sam_pmc.h"
 #include "chip/sam3u_dmac.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/sam34/sam3u_periphclks.h b/arch/arm/src/sam34/sam3u_periphclks.h
index 309454a026..145ebe4ac4 100644
--- a/arch/arm/src/sam34/sam3u_periphclks.h
+++ b/arch/arm/src/sam34/sam3u_periphclks.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 #include <arch/irq.h>
-#include "chip/sam3u_pmc.h"
+#include "chip/sam_pmc.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/sam34/sam3x_periphclks.h b/arch/arm/src/sam34/sam3x_periphclks.h
index 51de6aa276..a6b106cc88 100644
--- a/arch/arm/src/sam34/sam3x_periphclks.h
+++ b/arch/arm/src/sam34/sam3x_periphclks.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 #include <arch/irq.h>
-#include "chip/sam3u_pmc.h"
+#include "chip/sam_pmc.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/sam34/sam4e_periphclks.h b/arch/arm/src/sam34/sam4e_periphclks.h
index 68ef58c0e2..ad996593d1 100644
--- a/arch/arm/src/sam34/sam4e_periphclks.h
+++ b/arch/arm/src/sam34/sam4e_periphclks.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 #include <arch/irq.h>
-#include "chip/sam3u_pmc.h"
+#include "chip/sam_pmc.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/sam34/sam4s_periphclks.h b/arch/arm/src/sam34/sam4s_periphclks.h
index 0e9995c96b..d44e432f2d 100644
--- a/arch/arm/src/sam34/sam4s_periphclks.h
+++ b/arch/arm/src/sam34/sam4s_periphclks.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 #include <arch/irq.h>
-#include "chip/sam3u_pmc.h"
+#include "chip/sam_pmc.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/sam34/sam_clockconfig.c b/arch/arm/src/sam34/sam_clockconfig.c
index ebe7dc0c37..8e1c4ced84 100644
--- a/arch/arm/src/sam34/sam_clockconfig.c
+++ b/arch/arm/src/sam34/sam_clockconfig.c
@@ -49,7 +49,7 @@
 #include "up_internal.h"
 
 #include "sam_clockconfig.h"
-#include "chip/sam3u_pmc.h"
+#include "chip/sam_pmc.h"
 #include "chip/sam3u_eefc.h"
 #include "chip/sam3u_wdt.h"
 #include "chip/sam3u_supc.h"
diff --git a/arch/arm/src/sam34/sam_gpioirq.c b/arch/arm/src/sam34/sam_gpioirq.c
index 399a3eb191..ddb6e85606 100644
--- a/arch/arm/src/sam34/sam_gpioirq.c
+++ b/arch/arm/src/sam34/sam_gpioirq.c
@@ -56,7 +56,7 @@
 #include "sam_gpio.h"
 #include "sam_periphclks.h"
 #include "chip/sam3u_pio.h"
-#include "chip/sam3u_pmc.h"
+#include "chip/sam_pmc.h"
 
 #ifdef CONFIG_GPIO_IRQ
 
diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c
index 42ae70d8f7..5a406752cd 100644
--- a/arch/arm/src/sam34/sam_hsmci.c
+++ b/arch/arm/src/sam34/sam_hsmci.c
@@ -65,7 +65,7 @@
 #include "sam_hsmci.h"
 #include "sam_periphclks.h"
 #include "chip/sam3u_dmac.h"
-#include "chip/sam3u_pmc.h"
+#include "chip/sam_pmc.h"
 #include "chip/sam_hsmci.h"
 #include "chip/sam_pinmap.h"
 
diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c
index 278eb55d2d..dc0647e753 100644
--- a/arch/arm/src/sam34/sam_spi.c
+++ b/arch/arm/src/sam34/sam_spi.c
@@ -59,7 +59,7 @@
 #include "sam_gpio.h"
 #include "sam_spi.h"
 #include "sam_periphclks.h"
-#include "chip/sam3u_pmc.h"
+#include "chip/sam_pmc.h"
 #include "chip/sam_spi.h"
 #include "chip/sam_pinmap.h"