diff --git a/configs/amber/scripts/Make.defs b/configs/amber/scripts/Make.defs
index 8b9842e920..e2dba5a78e 100644
--- a/configs/amber/scripts/Make.defs
+++ b/configs/amber/scripts/Make.defs
@@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y)
   MKDEP = $(TOPDIR)/tools/mkwindeps.sh
   ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/hello.ld}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/amber.ld}"
 else
   # Linux/Cygwin-native toolchain
   MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
   ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include"
   ARCHXXINCLUDES =  $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx"
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/hello.ld
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/amber.ld
 endif
 
 CC = $(CROSSDEV)gcc
diff --git a/configs/amber/scripts/amber.ld b/configs/amber/scripts/amber.ld
index 82bae0dc8a..c7639e964d 100644
--- a/configs/amber/scripts/amber.ld
+++ b/configs/amber/scripts/amber.ld
@@ -1,5 +1,5 @@
 /**************************************************************************************
- * configs/amber/scripts/hello.ld
+ * configs/amber/scripts/amber.ld
  *
  *   Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/lpc4330-xplorer/scripts/Make.defs b/configs/lpc4330-xplorer/scripts/Make.defs
index ec8fc2a59c..addbff56d4 100644
--- a/configs/lpc4330-xplorer/scripts/Make.defs
+++ b/configs/lpc4330-xplorer/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/lpc4330-xplorer/nsh/Make.defs
+# configs/lpc4330-xplorer/scripts/Make.defs
 #
-#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2012, 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/lpc4337-ws/scripts/Make.defs b/configs/lpc4337-ws/scripts/Make.defs
index 2800be7c26..9cde02ea00 100644
--- a/configs/lpc4337-ws/scripts/Make.defs
+++ b/configs/lpc4337-ws/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/lpc4337-ws/nsh/Make.defs
+# configs/lpc4337-ws/scripts/Make.defs
 #
-#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2016, 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/lpc4357-evb/scripts/Make.defs b/configs/lpc4357-evb/scripts/Make.defs
index d0fe9706c8..e28bbdceb0 100644
--- a/configs/lpc4357-evb/scripts/Make.defs
+++ b/configs/lpc4357-evb/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/lpc4357-evb/nsh/Make.defs
+# configs/lpc4357-evb/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/lpc4370-link2/scripts/Make.defs b/configs/lpc4370-link2/scripts/Make.defs
index 0dfbced773..b3366b192a 100644
--- a/configs/lpc4370-link2/scripts/Make.defs
+++ b/configs/lpc4370-link2/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/lpc4370-link2/nsh/Make.defs
+# configs/lpc4370-link2/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/lpcxpresso-lpc1115/scripts/Make.defs b/configs/lpcxpresso-lpc1115/scripts/Make.defs
index aac34e079d..4987dd1360 100644
--- a/configs/lpcxpresso-lpc1115/scripts/Make.defs
+++ b/configs/lpcxpresso-lpc1115/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/lpcxpresso-lpc1115/nsh/Make.defs
+# configs/lpcxpresso-lpc1115/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
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
 
-LDSCRIPT = ld.script
+LDSCRIPT = lpcxpresso-lpc1115.ld
 
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
diff --git a/configs/lpcxpresso-lpc1115/scripts/lpcxpresso-lpc1115.ld b/configs/lpcxpresso-lpc1115/scripts/lpcxpresso-lpc1115.ld
index 8e70278680..d317b218fe 100644
--- a/configs/lpcxpresso-lpc1115/scripts/lpcxpresso-lpc1115.ld
+++ b/configs/lpcxpresso-lpc1115/scripts/lpcxpresso-lpc1115.ld
@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/lpcxpresso-lpc1115/scripts/ld.script
+ * configs/lpcxpresso-lpc1115/scripts/lpcxpresso-lpc1115.ld
  *
- *   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/micropendous3/scripts/Make.defs b/configs/micropendous3/scripts/Make.defs
index cb4766fc67..b790d39742 100644
--- a/configs/micropendous3/scripts/Make.defs
+++ b/configs/micropendous3/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/micropendous3/hello/Make.defs
+# configs/micropendous3/scripts/Make.defs
 #
-#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012, 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 = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/hello/ld.script}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/micropendous3.ld"
 else
   # Linux/Cygwin-native toolchain
   MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
   ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include"
   ARCHXXINCLUDES =  $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx"
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/hello/ld.script
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/micropendous3.ld
 endif
 
 CC = $(CROSSDEV)gcc
diff --git a/configs/micropendous3/scripts/micropendous3.ld b/configs/micropendous3/scripts/micropendous3.ld
index 1a0c4b3f46..6f5e5fe208 100644
--- a/configs/micropendous3/scripts/micropendous3.ld
+++ b/configs/micropendous3/scripts/micropendous3.ld
@@ -1,7 +1,7 @@
 /**************************************************************************************
- * configs/micropendous3/hello/ld.script
+ * configs/micropendous3/scripts/micropendous3.ld
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 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/moxa/scripts/Make.defs b/configs/moxa/scripts/Make.defs
index 900a83664f..91a3276f70 100644
--- a/configs/moxa/scripts/Make.defs
+++ b/configs/moxa/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/moxa/nsh/Make.defs
+# configs/moxa/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
@@ -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/moxa.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/moxa.ld
 endif
 
 CC = $(CROSSDEV)gcc
diff --git a/configs/moxa/scripts/moxa.ld b/configs/moxa/scripts/moxa.ld
index 88ebd82a5b..7d5d49a2a0 100644
--- a/configs/moxa/scripts/moxa.ld
+++ b/configs/moxa/scripts/moxa.ld
@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/moxa/scripts/ld.script
+ * configs/moxa/scripts/moxa.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/mx1ads/scripts/Make.defs b/configs/mx1ads/scripts/Make.defs
index 23c9179cce..d9fa63ea74 100644
--- a/configs/mx1ads/scripts/Make.defs
+++ b/configs/mx1ads/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/mx1ads/ostest/Make.defs
+# configs/mx1ads/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
@@ -73,7 +73,7 @@ ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
 ARCHXXINCLUDES		= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
 
 ARCHPICFLAGS		= -fpic -msingle-pic-base -mpic-register=r10
-ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script
+ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/mx1ads.ld
 
 CFLAGS			= $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
 			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
diff --git a/configs/mx1ads/scripts/mx1ads.ld b/configs/mx1ads/scripts/mx1ads.ld
index e16f9de249..84c5ed0f68 100644
--- a/configs/mx1ads/scripts/mx1ads.ld
+++ b/configs/mx1ads/scripts/mx1ads.ld
@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/mx1ads/ostest/ld.script
+ * configs/mx1ads/scripts/mx1ads
  *
- *   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
diff --git a/configs/ne64badge/scripts/Make.defs b/configs/ne64badge/scripts/Make.defs
index 49ba82d8cf..364b7ec489 100644
--- a/configs/ne64badge/scripts/Make.defs
+++ b/configs/ne64badge/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/ne64badge/ostest/Make.defs
+# configs/ne64badge/scripts/Make.defs
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -45,10 +45,10 @@ WINTOOL = n
 
 ifeq ($(CONFIG_HCS12_NONBANKED),y)
   ARCHCPUFLAGS = -m9s12x -mshort -mnolong-calls
-  LDSCRIPT = ld.script.nonbanked
+  LDSCRIPT = ne64badge-nonbanked.ld
 else
   ARCHCPUFLAGS = -m9s12x -mshort -mlong-calls
-  LDSCRIPT = ld.script.banked
+  LDSCRIPT = ne64badge-banked.ld
 endif
 
 ifneq ($(CONFIG_HCS12_MSOFTREGS),0)
@@ -62,14 +62,14 @@ 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)/ostest/$(LDSCRIPT)}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
   MAXOPTIMIZATION = -O2
 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)/ostest/$(LDSCRIPT)
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
 endif
 
 CC = $(CROSSDEV)gcc
diff --git a/configs/ne64badge/scripts/ne64badge-banked.ld b/configs/ne64badge/scripts/ne64badge-banked.ld
index 9ec5f75516..8a86ba95b8 100644
--- a/configs/ne64badge/scripts/ne64badge-banked.ld
+++ b/configs/ne64badge/scripts/ne64badge-banked.ld
@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/ne64badge/ostest/ld.script
+ * configs/ne64badge/ostest/ne64badge-banked.ld
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011m, 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/ne64badge/scripts/ne64badge-nonbanked.ld b/configs/ne64badge/scripts/ne64badge-nonbanked.ld
index f0577a06be..5bf5a1a492 100644
--- a/configs/ne64badge/scripts/ne64badge-nonbanked.ld
+++ b/configs/ne64badge/scripts/ne64badge-nonbanked.ld
@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/ne64badge/ostest/ld.script
+ * configs/ne64badge/ostest/ne64badge-nonbanked.ld
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without