diff --git a/configs/sam4cmp-db/scripts/Make.defs b/configs/sam4cmp-db/scripts/Make.defs
index 60acde6e28..6811676f15 100644
--- a/configs/sam4cmp-db/scripts/Make.defs
+++ b/configs/sam4cmp-db/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/sam4cmp-db/nsh/Make.defs
+# configs/sam4cmp-db/scripts/Make.defs
 #
 #   Copyright (C) 2016 Masayuki Ishikawa. All rights reserved.
 #   Author: Masayuki Ishikawa <masayuki.ishikawa@gmail.com>
@@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y)
   MKDEP = $(TOPDIR)/tools/mkwindeps.sh
   ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/sam4cmp-db.ld}"
 else
   # Linux/Cygwin-native toolchain
   MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
   ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/sam4cmp-db.ld
 endif
 
 CC = $(CROSSDEV)gcc
diff --git a/configs/sam4cmp-db/scripts/ld.script b/configs/sam4cmp-db/scripts/sam4cmp-db.ld
similarity index 98%
rename from configs/sam4cmp-db/scripts/ld.script
rename to configs/sam4cmp-db/scripts/sam4cmp-db.ld
index d82568f84f..b0d8fd590f 100644
--- a/configs/sam4cmp-db/scripts/ld.script
+++ b/configs/sam4cmp-db/scripts/sam4cmp-db.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/sam4cmp-db/scripts/ld.script
+ * configs/sam4cmp-db/scripts/sam4cmp-db.ld
  *
  *   Copyright (C) 2016 Masayuki Ishikawa. All rights reserved.
  *   Author: Masayuki Ishikawa <masayuki.ishikawa@gmail.com>
diff --git a/configs/sam4l-xplained/scripts/Make.defs b/configs/sam4l-xplained/scripts/Make.defs
index fc6a71ace8..93fe88ce3c 100644
--- a/configs/sam4l-xplained/scripts/Make.defs
+++ b/configs/sam4l-xplained/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/sam4l-xplained/nsh/Make.defs
+# configs/sam4l-xplained/scripts/Make.defs
 #
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y)
   MKDEP = $(TOPDIR)/tools/mkwindeps.sh
   ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/sam4l-xplained.ld}"
 else
   # Linux/Cygwin-native toolchain
   MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
   ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/sam4l-xplained.ld
 endif
 
 CC = $(CROSSDEV)gcc
diff --git a/configs/sam4l-xplained/scripts/ld.script b/configs/sam4l-xplained/scripts/sam4l-xplained.ld
similarity index 96%
rename from configs/sam4l-xplained/scripts/ld.script
rename to configs/sam4l-xplained/scripts/sam4l-xplained.ld
index 53f44eedd0..58125976cf 100644
--- a/configs/sam4l-xplained/scripts/ld.script
+++ b/configs/sam4l-xplained/scripts/sam4l-xplained.ld
@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/sam4l-xplained/scripts/ld.script
+ * configs/sam4l-xplained/scripts/sam4l-xplained.ld
  *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/configs/sam4s-xplained-pro/scripts/Make.defs b/configs/sam4s-xplained-pro/scripts/Make.defs
index 5e49491448..02e68b4b07 100644
--- a/configs/sam4s-xplained-pro/scripts/Make.defs
+++ b/configs/sam4s-xplained-pro/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/sam4s-xplained-pro/nsh/Make.defs
+# configs/sam4s-xplained-pro/scripts/Make.defs
 #
-#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y)
   MKDEP = $(TOPDIR)/tools/mkwindeps.sh
   ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained-pro.ld}"
 else
   # Linux/Cygwin-native toolchain
   MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
   ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained-pro.ld
 endif
 
 CC = $(CROSSDEV)gcc
diff --git a/configs/sam4s-xplained-pro/scripts/ld.script b/configs/sam4s-xplained-pro/scripts/sam4s-xplained-pro.ld
similarity index 96%
rename from configs/sam4s-xplained-pro/scripts/ld.script
rename to configs/sam4s-xplained-pro/scripts/sam4s-xplained-pro.ld
index 7c8b56ea2e..175ed69b32 100644
--- a/configs/sam4s-xplained-pro/scripts/ld.script
+++ b/configs/sam4s-xplained-pro/scripts/sam4s-xplained-pro.ld
@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/sam4s-xplained-pro/scripts/ld.script
+ * configs/sam4s-xplained-pro/scripts/sam4s-xplained-pro.ld
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/configs/sam4s-xplained/scripts/Make.defs b/configs/sam4s-xplained/scripts/Make.defs
index 795c90796e..c436a91ba4 100644
--- a/configs/sam4s-xplained/scripts/Make.defs
+++ b/configs/sam4s-xplained/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/sam4s-xplained/nsh/Make.defs
+# configs/sam4s-xplained/scripts/Make.defs
 #
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y)
   MKDEP = $(TOPDIR)/tools/mkwindeps.sh
   ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained.ld}"
 else
   # Linux/Cygwin-native toolchain
   MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
   ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained.ld
 endif
 
 CC = $(CROSSDEV)gcc
diff --git a/configs/sam4s-xplained/scripts/ld.script b/configs/sam4s-xplained/scripts/sam4s-xplained.ld
similarity index 96%
rename from configs/sam4s-xplained/scripts/ld.script
rename to configs/sam4s-xplained/scripts/sam4s-xplained.ld
index 8e4c874df8..bd90b7d6a3 100644
--- a/configs/sam4s-xplained/scripts/ld.script
+++ b/configs/sam4s-xplained/scripts/sam4s-xplained.ld
@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/sam4s-xplained/scripts/ld.script
+ * configs/sam4s-xplained/scripts/sam4s-xplained.ld
  *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/configs/sama5d2-xult/scripts/Make.defs b/configs/sama5d2-xult/scripts/Make.defs
index a8f4081637..c5f922b884 100644
--- a/configs/sama5d2-xult/scripts/Make.defs
+++ b/configs/sama5d2-xult/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/sama5d2-xult/nsh/Make.defs
+# configs/sama5d2-xult/scripts/Make.defs
 #
-#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/samd20-xplained/scripts/Make.defs b/configs/samd20-xplained/scripts/Make.defs
index 4ae003c79b..5c83735fc8 100644
--- a/configs/samd20-xplained/scripts/Make.defs
+++ b/configs/samd20-xplained/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/samd20-xplained/nsh/Make.defs
+# configs/samd20-xplained/scripts/Make.defs
 #
-#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/samd21-xplained/scripts/Make.defs b/configs/samd21-xplained/scripts/Make.defs
index 75f1af4a00..6483bd3f1b 100644
--- a/configs/samd21-xplained/scripts/Make.defs
+++ b/configs/samd21-xplained/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/samd21-xplained/nsh/Make.defs
+# configs/samd21-xplained/scripts/Make.defs
 #
-#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/saml21-xplained/scripts/Make.defs b/configs/saml21-xplained/scripts/Make.defs
index 86e3dc31d7..24a4bc4d2f 100644
--- a/configs/saml21-xplained/scripts/Make.defs
+++ b/configs/saml21-xplained/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/saml21-xplained/nsh/Make.defs
+# configs/saml21-xplained/scripts/Make.defs
 #
-#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/skp16c26/scripts/Make.defs b/configs/skp16c26/scripts/Make.defs
index 81b6f4b075..c879b7cf66 100644
--- a/configs/skp16c26/scripts/Make.defs
+++ b/configs/skp16c26/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/skp16c26/ostest/Make.defs
+# configs/skp16c26/scripts/Make.defs
 #
-#   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,7 @@ ARCHPICFLAGS		= -fpic
 ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow -Wundef
 ARCHDEFINES		=
 ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
-ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script
+ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/skp16c26.ld
 
 CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
 			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
diff --git a/configs/skp16c26/scripts/ostest b/configs/skp16c26/scripts/skp16c26.ld
similarity index 97%
rename from configs/skp16c26/scripts/ostest
rename to configs/skp16c26/scripts/skp16c26.ld
index 8ae1a8697d..0a4b8b9b1a 100644
--- a/configs/skp16c26/scripts/ostest
+++ b/configs/skp16c26/scripts/skp16c26.ld
@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/skp16c26/ostest/ld.script
+ * configs/skp16c26/scripts/skp16c26.ld
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without