diff --git a/configs/pic32mz-starterkit/nsh/setenv.sh b/configs/pic32mz-starterkit/nsh/setenv.sh
index 0ba0c7eb75..869b931d85 100755
--- a/configs/pic32mz-starterkit/nsh/setenv.sh
+++ b/configs/pic32mz-starterkit/nsh/setenv.sh
@@ -58,7 +58,7 @@ fi
 export TOOLCHAIN_POSTBIN=:"/cygdrive/c/pinguino-11/compilers/p32/bin"
 
 # This is the path to the tools subdirectory
-export PIC32TOOL_DIR="${WD}/tools/pic32mz"
+export PIC32TOOL_DIR="${WD}/tools/pic32mx"
 
 # Add the path to the toolchain to the PATH varialble
 export PATH="${TOOLCHAIN_PREBIN}${PIC32TOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}${TOOLCHAIN_POSTBIN}"
diff --git a/configs/pic32mz-starterkit/scripts/c32-release.ld b/configs/pic32mz-starterkit/scripts/c32-release.ld
index e19fc073f6..0de81101bf 100644
--- a/configs/pic32mz-starterkit/scripts/c32-release.ld
+++ b/configs/pic32mz-starterkit/scripts/c32-release.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/pic32mz-starterkit/nsh/ld.script
+ * configs/pic32mz-starterkit/nsh/c32-release.ld
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/pic32mz-starterkit/scripts/mips-release.ld b/configs/pic32mz-starterkit/scripts/mips-release.ld
index cc51d43fe0..c64d44aa0e 100644
--- a/configs/pic32mz-starterkit/scripts/mips-release.ld
+++ b/configs/pic32mz-starterkit/scripts/mips-release.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/pic32mz-starterkit/nsh/ld.script
+ * configs/pic32mz-starterkit/nsh/mips-release.ld
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>