diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt
index 8a5435aecd9..fa943401195 100644
--- a/configs/sama5d3x-ek/README.txt
+++ b/configs/sama5d3x-ek/README.txt
@@ -695,7 +695,7 @@ Networking
   the first time you ping due to the default handling of the ARP
   table.
 
-  On the host side, you should also be able to ping the SAMA5D3-EK:
+  On the host side, you should also be able to ping the SAMA5D3x-EK:
 
     $ ping 10.0.0.2
 
@@ -1930,7 +1930,7 @@ CAN Usage
   CAN connectors
   --------------
 
-  CAN1 and CAN2 are available via RJ-11 connectors on the SAMA5Dx-EK.  Each
+  CAN1 and CAN2 are available via RJ-11 connectors on the SAMA5D3x-EK.  Each
   is wired as follows.  Also shown below is the matching pins if you want connect
   the CAN to a device that uses an DB-9 connector (Such as the IXXAT USB-to-CAN
   Compact).  Both connector types (as well as RJ-45) are common.
@@ -2577,7 +2577,7 @@ Configurations
 
   Information Common to All Configurations
   ----------------------------------------
-  Each SAM3U-EK configuration is maintained in a sub-directory and
+  Each SAMA5D3x-EK configuration is maintained in a sub-directory and
   can be selected as follow:
 
     cd tools
@@ -3105,7 +3105,7 @@ To-Do List
 
 7) The NxWM example does not work well.  This example was designed to work
    with much smaller displays and does not look good or work well with the
-   SAMA5Dx-EKs 800x480 display.  See above for details.
+   SAMA5D3x-EK's 800x480 display.  See above for details.
 
 8) There are lots of LCDC hardware features that are not tested with NuttX.
    The simple NuttX graphics system does not have support for all of the
diff --git a/configs/sama5d3x-ek/demo/setenv.sh b/configs/sama5d3x-ek/demo/setenv.sh
index 8061119a04e..1f31bc3d76b 100755
--- a/configs/sama5d3x-ek/demo/setenv.sh
+++ b/configs/sama5d3x-ek/demo/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/samard3x-ek/demo/setenv.sh
+# configs/sama5d3x-ek/demo/setenv.sh
 #
 #   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3x-ek/hello/setenv.sh b/configs/sama5d3x-ek/hello/setenv.sh
index 3f8d78f8de8..9c5d345a3fb 100755
--- a/configs/sama5d3x-ek/hello/setenv.sh
+++ b/configs/sama5d3x-ek/hello/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/samard3x-ek/hello/setenv.sh
+# configs/sama5d3x-ek/hello/setenv.sh
 #
 #   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3x-ek/include/board_384mhz.h b/configs/sama5d3x-ek/include/board_384mhz.h
index c2bc2426b44..b5054b63b40 100644
--- a/configs/sama5d3x-ek/include/board_384mhz.h
+++ b/configs/sama5d3x-ek/include/board_384mhz.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/sama5df3x-ek/include/board_384mhz.h
+ * configs/sama5d3x-ek/include/board_384mhz.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3x-ek/include/board_396mhz.h b/configs/sama5d3x-ek/include/board_396mhz.h
index d099a068e43..79d136d36be 100644
--- a/configs/sama5d3x-ek/include/board_396mhz.h
+++ b/configs/sama5d3x-ek/include/board_396mhz.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/sama5df3x-ek/include/board_396mhz.h
+ * configs/sama5d3x-ek/include/board_396mhz.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3x-ek/include/board_memorymap.h b/configs/sama5d3x-ek/include/board_memorymap.h
index 6d43ce18b63..868c131c964 100644
--- a/configs/sama5d3x-ek/include/board_memorymap.h
+++ b/configs/sama5d3x-ek/include/board_memorymap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/sama5df3x-ek/include/board_memorymap.h
+ * configs/sama5d3x-ek/include/board_memorymap.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3x-ek/norboot/setenv.sh b/configs/sama5d3x-ek/norboot/setenv.sh
index bf2e5c0fe06..0882927bc2d 100755
--- a/configs/sama5d3x-ek/norboot/setenv.sh
+++ b/configs/sama5d3x-ek/norboot/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/samard3x-ek/norboot/setenv.sh
+# configs/sama5d3x-ek/norboot/setenv.sh
 #
 #   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3x-ek/nsh/setenv.sh b/configs/sama5d3x-ek/nsh/setenv.sh
index ae74c56dbb1..6bf5fd2ded8 100755
--- a/configs/sama5d3x-ek/nsh/setenv.sh
+++ b/configs/sama5d3x-ek/nsh/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/samard3x-ek/nsh/setenv.sh
+# configs/sama5d3x-ek/nsh/setenv.sh
 #
 #   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3x-ek/nx/setenv.sh b/configs/sama5d3x-ek/nx/setenv.sh
index 7642014bf71..42fec3961e7 100755
--- a/configs/sama5d3x-ek/nx/setenv.sh
+++ b/configs/sama5d3x-ek/nx/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/samard3x-ek/nx/setenv.sh
+# configs/sama5d3x-ek/nx/setenv.sh
 #
 #   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3x-ek/nxwm/setenv.sh b/configs/sama5d3x-ek/nxwm/setenv.sh
index d14cbedf942..1a3543d0602 100755
--- a/configs/sama5d3x-ek/nxwm/setenv.sh
+++ b/configs/sama5d3x-ek/nxwm/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/samard3x-ek/nxwm/setenv.sh
+# configs/sama5d3x-ek/nxwm/setenv.sh
 #
 #   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3x-ek/ov2640/setenv.sh b/configs/sama5d3x-ek/ov2640/setenv.sh
index f19f1b92100..6ec2be84e60 100755
--- a/configs/sama5d3x-ek/ov2640/setenv.sh
+++ b/configs/sama5d3x-ek/ov2640/setenv.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# configs/samard3x-ek/ov2640/setenv.sh
+# configs/sama5d3x-ek/ov2640/setenv.sh
 #
 #   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3x-ek/src/sam_can.c b/configs/sama5d3x-ek/src/sam_can.c
index 241043e3c61..bca055a6611 100644
--- a/configs/sama5d3x-ek/src/sam_can.c
+++ b/configs/sama5d3x-ek/src/sam_can.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/sama5d3-ek/src/up_can.c
+ * configs/sama5d3x-ek/src/up_can.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3x-ek/src/sam_cxxinitialize.c b/configs/sama5d3x-ek/src/sam_cxxinitialize.c
index 563c10d7a3a..0b21b79bcf2 100644
--- a/configs/sama5d3x-ek/src/sam_cxxinitialize.c
+++ b/configs/sama5d3x-ek/src/sam_cxxinitialize.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/sama5dx-ek/src/sam_cxxinitialize.c
+ * configs/sama5d3x-ek/src/sam_cxxinitialize.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3x-ek/src/sam_touchscreen.c b/configs/sama5d3x-ek/src/sam_touchscreen.c
index d09a50d01bf..4593576eb63 100644
--- a/configs/sama5d3x-ek/src/sam_touchscreen.c
+++ b/configs/sama5d3x-ek/src/sam_touchscreen.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/sama5d3-ek/src/sam_touchscreen.c
+ * configs/sama5d3x-ek/src/sam_touchscreen.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sama5d3x-ek/src/sama5d3x-ek.h b/configs/sama5d3x-ek/src/sama5d3x-ek.h
index 4e559ab497e..53980e09221 100644
--- a/configs/sama5d3x-ek/src/sama5d3x-ek.h
+++ b/configs/sama5d3x-ek/src/sama5d3x-ek.h
@@ -582,7 +582,7 @@
  * Name: sam_spiinitialize
  *
  * Description:
- *   Called to configure SPI chip select PIO pins for the SAMA4D3x-EK board.
+ *   Called to configure SPI chip select PIO pins for the SAMA5D3x-EK board.
  *
  ************************************************************************************/