diff --git a/boards/ea3131/configs/pgnsh/Make.defs b/boards/ea3131/configs/pgnsh/Make.defs
index a80db56ccf..24788b46e5 100644
--- a/boards/ea3131/configs/pgnsh/Make.defs
+++ b/boards/ea3131/configs/pgnsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/ea3131/pgnsh/Make.defs
+# boards/ea3131/configs/pgnsh/Make.defs
 #
 #   Copyright (C) 2010,2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/imxrt1050-evk/configs/libcxxtest/Make.defs b/boards/imxrt1050-evk/configs/libcxxtest/Make.defs
index 669bea9e0c..154aace583 100644
--- a/boards/imxrt1050-evk/configs/libcxxtest/Make.defs
+++ b/boards/imxrt1050-evk/configs/libcxxtest/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/imxrt1050-evk/scripts/Make.defs
+# boards/imxrt1050-evk/configs/libcxxtest/Make.defs
 #
 #   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/imxrt1060-evk/configs/knsh/Make.defs b/boards/imxrt1060-evk/configs/knsh/Make.defs
index 2ca0286a65..07274c6d49 100644
--- a/boards/imxrt1060-evk/configs/knsh/Make.defs
+++ b/boards/imxrt1060-evk/configs/knsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/imxrt1060-evk/knsh/Make.defs
+# boards/imxrt1060-evk/configs/knsh/Make.defs
 #
 #   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/imxrt1060-evk/configs/libcxxtest/Make.defs b/boards/imxrt1060-evk/configs/libcxxtest/Make.defs
index e424bd9238..5e024a0ece 100644
--- a/boards/imxrt1060-evk/configs/libcxxtest/Make.defs
+++ b/boards/imxrt1060-evk/configs/libcxxtest/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/imxrt1060-evk/scripts/Make.defs
+# imxrt1060-evk/configs/libcxxtest/Make.defs
 #
 #   Copyright (C) 2018 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/lpc4088-devkit/configs/knsh/Make.defs b/boards/lpc4088-devkit/configs/knsh/Make.defs
index dba81f18ec..30781b244d 100644
--- a/boards/lpc4088-devkit/configs/knsh/Make.defs
+++ b/boards/lpc4088-devkit/configs/knsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/lpc4088-devkit/knsh/Make.defs
+# boards/lpc4088-devkit/configs/knsh/Make.defs
 #
 #   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/lpc4088-quickstart/configs/knsh/Make.defs b/boards/lpc4088-quickstart/configs/knsh/Make.defs
index e505bb1c79..ecc1afa8f7 100644
--- a/boards/lpc4088-quickstart/configs/knsh/Make.defs
+++ b/boards/lpc4088-quickstart/configs/knsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/lpc4088-quickstart/knsh/Make.defs
+# boards/lpc4088-quickstart/configs/knsh/Make.defs
 #
 #   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/lpcxpresso-lpc1768/configs/thttpd/Make.defs b/boards/lpcxpresso-lpc1768/configs/thttpd/Make.defs
index 24f6138109..e9537785a7 100644
--- a/boards/lpcxpresso-lpc1768/configs/thttpd/Make.defs
+++ b/boards/lpcxpresso-lpc1768/configs/thttpd/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/lpcxpresso-lpc1768/thttpd/Make.defs
+# boards/lpcxpresso-lpc1768/configs/thttpd/Make.defs
 #
 #   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs b/boards/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs
index 60bfc593c6..e05501782b 100644
--- a/boards/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs
+++ b/boards/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/olimex-lpc1766stk/thttpd-binfs/Make.defs
+# boards/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs b/boards/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs
index 20e81ae3b3..099b00e2d7 100644
--- a/boards/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs
+++ b/boards/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/olimex-lpc1766stk/thttpd-nxflat/Make.defs
+# boards/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs
 #
 #   Copyright (C) 2010, 2012, 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/pnev5180b/configs/knsh/Make.defs b/boards/pnev5180b/configs/knsh/Make.defs
index 5f667a6434..a9e58d4e8d 100644
--- a/boards/pnev5180b/configs/knsh/Make.defs
+++ b/boards/pnev5180b/configs/knsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/pnev5180b/knsh/Make.defs
+# boards/pnev5180b/configs/knsh/Make.defs
 #
 #   Copyright (C) 2019 Gregory Nutt. All rights reserved.
 #   Author: Michael Jung <mijung@gmx.net>
diff --git a/boards/sam3u-ek/configs/knsh/Make.defs b/boards/sam3u-ek/configs/knsh/Make.defs
index 01a09b4291..fa766d87b8 100644
--- a/boards/sam3u-ek/configs/knsh/Make.defs
+++ b/boards/sam3u-ek/configs/knsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/sam3u-ek/knsh/Make.defs
+# boards/sam3u-ek/configs/knsh/Make.defs
 #
 #   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/sama5d4-ek/configs/knsh/Make.defs b/boards/sama5d4-ek/configs/knsh/Make.defs
index 00d6df2d2d..6a98716378 100644
--- a/boards/sama5d4-ek/configs/knsh/Make.defs
+++ b/boards/sama5d4-ek/configs/knsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/sama5d4-ek/knsh/Make.defs
+# boards/sama5d4-ek/configs/knsh/Make.defs
 #
 #   Copyright (C) 2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/samv71-xult/configs/knsh/Make.defs b/boards/samv71-xult/configs/knsh/Make.defs
index f746cc3c31..80319861f0 100644
--- a/boards/samv71-xult/configs/knsh/Make.defs
+++ b/boards/samv71-xult/configs/knsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/samv71-xult/knsh/Make.defs
+# boards/samv71-xult/configs/knsh/Make.defs
 #
 #   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/sim/configs/cxxtest/Make.defs b/boards/sim/configs/cxxtest/Make.defs
index 82b849aada..aeab0f919e 100644
--- a/boards/sim/configs/cxxtest/Make.defs
+++ b/boards/sim/configs/cxxtest/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/sim/cxxtest/Make.defs
+# boards/sim/configs/cxxtest/Make.defs
 #
 #   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/sim/configs/nsh2/Make.defs b/boards/sim/configs/nsh2/Make.defs
index a45db6badb..7549324446 100644
--- a/boards/sim/configs/nsh2/Make.defs
+++ b/boards/sim/configs/nsh2/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/sim/nsh2/Make.defs
+# boards/sim/configs/nsh2/Make.defs
 #
 #   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/stm3240g-eval/configs/knxwm/Make.defs b/boards/stm3240g-eval/configs/knxwm/Make.defs
index 902ff268c5..31b354bf73 100644
--- a/boards/stm3240g-eval/configs/knxwm/Make.defs
+++ b/boards/stm3240g-eval/configs/knxwm/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/stm3240g-eval/knxwm/Make.defs
+# boards/stm3240g-eval/configs/knxwm/Make.defs
 #
 #   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/stm32l476vg-disco/configs/knsh/Make.defs b/boards/stm32l476vg-disco/configs/knsh/Make.defs
index a72969ff75..5c5a597f8e 100644
--- a/boards/stm32l476vg-disco/configs/knsh/Make.defs
+++ b/boards/stm32l476vg-disco/configs/knsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/stm32l476vg-disco/knsh/Make.defs
+# boards/stm32l476vg-disco/configs/knsh/Make.defs
 #
 #   Copyright (C) 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/stm32l4r9ai-disco/configs/knsh/Make.defs b/boards/stm32l4r9ai-disco/configs/knsh/Make.defs
index 4ad16f03b9..212673d231 100644
--- a/boards/stm32l4r9ai-disco/configs/knsh/Make.defs
+++ b/boards/stm32l4r9ai-disco/configs/knsh/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/stm32l4r9ai-disco/knsh/Make.defs
+# boards/stm32l4r9ai-disco/configs/knsh/Make.defs
 #
 #   Copyright (C) 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/z8encore000zco/configs/ostest/Make.defs b/boards/z8encore000zco/configs/ostest/Make.defs
index eb86737fc7..cdca107c60 100644
--- a/boards/z8encore000zco/configs/ostest/Make.defs
+++ b/boards/z8encore000zco/configs/ostest/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/z8encore000zco/ostest/Make.defs
+# boards/z8encore000zco/configs/ostest/Make.defs
 #
 #   Copyright (C) 2008, 2012-2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/boards/z8f64200100kit/configs/ostest/Make.defs b/boards/z8f64200100kit/configs/ostest/Make.defs
index 49d223bbf8..b3de713455 100644
--- a/boards/z8f64200100kit/configs/ostest/Make.defs
+++ b/boards/z8f64200100kit/configs/ostest/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/z8f64200100kit/ostest/Make.defs
+# boards/z8f64200100kit/configs/ostest/Make.defs
 #
 #   Copyright (C) 2008, 2012-2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>