diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 07b895ac7..22825df8d 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -14,7 +14,7 @@ config NSH_LIBRARY
 	select READLINE_HAVE_EXTMATCH
 	---help---
 		Build the NSH support library.  This is used, for example, by
-		examples/nsh in order to implement the full NuttShell (NSH).
+		system/nsh in order to implement the full NuttShell (NSH).
 
 if NSH_LIBRARY
 
diff --git a/system/nsh/Make.defs b/system/nsh/Make.defs
index e1b020e2b..25f988ae7 100644
--- a/system/nsh/Make.defs
+++ b/system/nsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/examples/nsh/Make.defs
+# apps/system/nsh/Make.defs
 # Adds selected applications to apps/ build
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -35,5 +35,5 @@
 ############################################################################
 
 ifeq ($(CONFIG_SYSTEM_NSH),y)
-CONFIGURED_APPS += examples/nsh
+CONFIGURED_APPS += system/nsh
 endif
diff --git a/system/nsh/Makefile b/system/nsh/Makefile
index 03641aab8..cd281f1a1 100644
--- a/system/nsh/Makefile
+++ b/system/nsh/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# apps/examples/nsh/Makefile
+# apps/system/nsh/Makefile
 #
 #   Copyright (C) 2007-2008, 2010-2012, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/system/nsh/nsh_main.c b/system/nsh/nsh_main.c
index afcc5ad65..c3a5e4d6b 100644
--- a/system/nsh/nsh_main.c
+++ b/system/nsh/nsh_main.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/nsh/nsh_main.c
+ * system/nsh/nsh_main.c
  *
  *   Copyright (C) 2007-2013, 2017-2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>