diff --git a/arch/arm/include/sam34/chip.h b/arch/arm/include/sam34/chip.h
index f1881d1f004..cd107d0e9bc 100644
--- a/arch/arm/include/sam34/chip.h
+++ b/arch/arm/include/sam34/chip.h
@@ -50,7 +50,7 @@
 
 /* AT91SAM3U Family *****************************************************************/
 
-#if defined(CONFIG_ARCH_CHIP_AT91SAM3U4E)
+#if defined(CONFIG_ARCH_CHIP_ATSAM3U4E)
 
 /* Internal memory */
 
@@ -95,7 +95,7 @@
  * HSMCI        8 bit    4 bit    8 bit    4 bit    4 bit    4 bit
  */
 
-#elif defined(CONFIG_ARCH_CHIP_AT91SAM3X8E)
+#elif defined(CONFIG_ARCH_CHIP_ATSAM3X8E)
 
 /* Internal memory */
 
@@ -115,7 +115,7 @@
 #  define SAM32_NUDPFS                0            /* No USB full speed device */
 #  define SAM32_NUHPFS                0            /* No USB full speed embedded host */
 
-#elif defined(CONFIG_ARCH_CHIP_AT91SAM3X8C)
+#elif defined(CONFIG_ARCH_CHIP_ATSAM3X8C)
 
 /* Internal memory */
 
@@ -135,7 +135,7 @@
 #  define SAM32_NUDPFS                0            /* No USB full speed device */
 #  define SAM32_NUHPFS                0            /* No USB full speed embedded host */
 
-#elif defined(CONFIG_ARCH_CHIP_AT91SAM3X4E)
+#elif defined(CONFIG_ARCH_CHIP_ATSAM3X4E)
 
 /* Internal memory */
 
@@ -155,7 +155,7 @@
 #  define SAM32_NUDPFS                0            /* No USB full speed device */
 #  define SAM32_NUHPFS                0            /* No USB full speed embedded host */
 
-#elif defined(CONFIG_ARCH_CHIP_AT91SAM3X4C)
+#elif defined(CONFIG_ARCH_CHIP_ATSAM3X4C)
 
 /* Internal memory */
 
@@ -175,7 +175,7 @@
 #  define SAM32_NUDPFS                0            /* No USB full speed device */
 #  define SAM32_NUHPFS                0            /* No USB full speed embedded host */
 
-#elif defined(CONFIG_ARCH_CHIP_AT91SAM3A8C)
+#elif defined(CONFIG_ARCH_CHIP_ATSAM3A8C)
 
 /* Internal memory */
 
@@ -195,7 +195,7 @@
 #  define SAM32_NUDPFS                0            /* No USB full speed device */
 #  define SAM32_NUHPFS                0            /* No USB full speed embedded host */
 
-#elif defined(CONFIG_ARCH_CHIP_AT91SAM3A4C)
+#elif defined(CONFIG_ARCH_CHIP_ATSAM3A4C)
 
 /* Internal memory */
 
diff --git a/arch/arm/src/sam34/Kconfig b/arch/arm/src/sam34/Kconfig
index 28e49ab9647..8ce87762840 100644
--- a/arch/arm/src/sam34/Kconfig
+++ b/arch/arm/src/sam34/Kconfig
@@ -7,16 +7,16 @@ comment "AT91SAM3/4 Configuration Options"
 
 choice
 	prompt "AT91SAM3/4 Chip Selection"
-	default ARCH_CHIP_AT91SAM3U4E
+	default ARCH_CHIP_ATSAM3U4E
 	depends on ARCH_CHIP_SAM34
 
-config ARCH_CHIP_AT91SAM3U4E
-	bool "AT91SAM3U4E"
+config ARCH_CHIP_ATSAM3U4E
+	bool "ATSAM3U4E"
 	select ARCH_CORTEXM3
 	select ARCH_CHIP_SAM3U
 
-config ARCH_CHIP_AT91SAM3X8E
-	bool "AT91SAMSAM3X8E"
+config ARCH_CHIP_ATSAM3X8E
+	bool "ATSAMSAM3X8E"
 	select ARCH_CORTEXM3
 	select ARCH_CHIP_SAM3X
 	select ARCH_HAVE_EXTNOR
@@ -24,13 +24,13 @@ config ARCH_CHIP_AT91SAM3X8E
 	select ARCH_HAVE_EXTSRAM0
 	select ARCH_HAVE_EXTSRAM1
 
-config ARCH_CHIP_AT91SAM3X8C
-	bool "AT91SAM3X8C"
+config ARCH_CHIP_ATSAM3X8C
+	bool "ATSAM3X8C"
 	select ARCH_CORTEXM3
 	select ARCH_CHIP_SAM3X
 
-config ARCH_CHIP_AT91SAM3X4E
-	bool "AT91SAM3X4E"
+config ARCH_CHIP_ATSAM3X4E
+	bool "ATSAM3X4E"
 	select ARCH_CORTEXM3
 	select ARCH_CHIP_SAM3X
 	select ARCH_HAVE_EXTNOR
@@ -38,18 +38,18 @@ config ARCH_CHIP_AT91SAM3X4E
 	select ARCH_HAVE_EXTSRAM0
 	select ARCH_HAVE_EXTSRAM1
 
-config ARCH_CHIP_AT91SAM3X4C
-	bool "AT91SAM3X4C"
+config ARCH_CHIP_ATSAM3X4C
+	bool "ATSAM3X4C"
 	select ARCH_CORTEXM3
 	select ARCH_CHIP_SAM3X
 
-config ARCH_CHIP_AT91SAM3A8C
-	bool "AT91SAM3A8C"
+config ARCH_CHIP_ATSAM3A8C
+	bool "ATSAM3A8C"
 	select ARCH_CORTEXM3
 	select ARCH_CHIP_SAM3A
 
-config ARCH_CHIP_AT91SAM3A4C
-	bool "AT91SAM3A4C"
+config ARCH_CHIP_ATSAM3A4C
+	bool "ATSAM3A4C"
 	select ARCH_CORTEXM3
 	select ARCH_CHIP_SAM3A
 
diff --git a/arch/arm/src/sam34/sam3u_dmac.c b/arch/arm/src/sam34/sam3u_dmac.c
index 90a9bbebe99..eff7a2a0b04 100644
--- a/arch/arm/src/sam34/sam3u_dmac.c
+++ b/arch/arm/src/sam34/sam3u_dmac.c
@@ -152,7 +152,7 @@ static struct dma_linklist_s g_linklist[CONFIG_SAM34_NLLDESC];
 
 static struct sam_dma_s g_dma[SAM34_NDMACHAN] =
 {
-#ifdef CONFIG_ARCH_CHIP_AT91SAM3U4E
+#ifdef CONFIG_ARCH_CHIP_ATSAM3U4E
   /* the AT91SAM3U4E has four DMA channels.  The FIFOs for channels 0-2 are
    * 8 bytes in size; channel 3 is 32 bytes.
    */