diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile
index ce348865a6..a5d5a087d5 100644
--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_ARMV7A),y)          # ARMv7-A
diff --git a/arch/arm64/src/Makefile b/arch/arm64/src/Makefile
index 8b04f6a946..f0598f2309 100644
--- a/arch/arm64/src/Makefile
+++ b/arch/arm64/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 include chip/Make.defs
 
 ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile
index da50e27bee..f7233bc18e 100644
--- a/arch/avr/src/Makefile
+++ b/arch/avr/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_FAMILY_AVR32),y)
diff --git a/arch/ceva/src/Makefile b/arch/ceva/src/Makefile
index cd0c91c132..810443dcba 100644
--- a/arch/ceva/src/Makefile
+++ b/arch/ceva/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 -include chip$(DELIM)Make.defs
 
 ifeq ($(CONFIG_ARCH_XC5),y)
diff --git a/arch/hc/src/Makefile b/arch/hc/src/Makefile
index 607b1f7219..cbc12ffd00 100644
--- a/arch/hc/src/Makefile
+++ b/arch/hc/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_HC12),y)
diff --git a/arch/mips/src/Makefile b/arch/mips/src/Makefile
index 722e4c272f..8e1d0d7468 100644
--- a/arch/mips/src/Makefile
+++ b/arch/mips/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_MIPS),y)
diff --git a/arch/misoc/src/Makefile b/arch/misoc/src/Makefile
index 6773d6e8cd..931fa12d1d 100644
--- a/arch/misoc/src/Makefile
+++ b/arch/misoc/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_CHIP_LM32),y)
diff --git a/arch/or1k/src/Makefile b/arch/or1k/src/Makefile
index 48fcd3ff5e..60eaff9701 100644
--- a/arch/or1k/src/Makefile
+++ b/arch/or1k/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_MOR1KX),y)          # OpenRISC mor1kx
diff --git a/arch/renesas/src/Makefile b/arch/renesas/src/Makefile
index 13cbc84940..f2811a6313 100644
--- a/arch/renesas/src/Makefile
+++ b/arch/renesas/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 include chip/Make.defs
 
 ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
diff --git a/arch/risc-v/src/Makefile b/arch/risc-v/src/Makefile
index c619751850..37ab9c6a5c 100644
--- a/arch/risc-v/src/Makefile
+++ b/arch/risc-v/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 include chip/Make.defs
 ifeq ($(CONFIG_OPENSBI),y)
 include opensbi/Make.defs
diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index 9e89a5faeb..b7f552d6f2 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 
 ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
 APPSDIR     = $(TOPDIR)$(DELIM)$(CONFIG_APPS_DIR)
diff --git a/arch/sparc/src/Makefile b/arch/sparc/src/Makefile
index a6af15bc32..848a72ee2c 100644
--- a/arch/sparc/src/Makefile
+++ b/arch/sparc/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 -include chip/Make.defs
 
 ARCH_SUBDIR = sparc_v8
diff --git a/arch/x86/src/Makefile b/arch/x86/src/Makefile
index 53e6d701b8..1340d16d21 100644
--- a/arch/x86/src/Makefile
+++ b/arch/x86/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_I486),y)
diff --git a/arch/x86_64/src/Makefile b/arch/x86_64/src/Makefile
index 9039c91f93..6468b4cb0c 100644
--- a/arch/x86_64/src/Makefile
+++ b/arch/x86_64/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_INTEL64),y)
diff --git a/arch/xtensa/src/Makefile b/arch/xtensa/src/Makefile
index ec83edd9b8..6973f022db 100644
--- a/arch/xtensa/src/Makefile
+++ b/arch/xtensa/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 include chip/Make.defs
 
 ifeq ($(CONFIG_ARCH_FAMILY_LX6),y)
diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile
index 3456da9066..9abe2afb2c 100644
--- a/arch/z16/src/Makefile
+++ b/arch/z16/src/Makefile
@@ -18,7 +18,7 @@
 #
 ############################################################################
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 include chip/Make.defs
 
 COMPILER = ${shell basename "$(CC)"}
diff --git a/arch/z80/src/Makefile b/arch/z80/src/Makefile
index 3fe81ea10e..a25d81e4f3 100644
--- a/arch/z80/src/Makefile
+++ b/arch/z80/src/Makefile
@@ -20,7 +20,7 @@
 
 # Makefile fragments
 
-include $(TOPDIR)/tools/apps-or-nuttx-Make.defs
+include $(TOPDIR)/tools/Make.defs
 include chip/Make.defs
 
 # Compiler-Dependent Make:  SDCC, Clang, or ZiLOG ZDS-II
diff --git a/tools/apps-or-nuttx-Make.defs b/tools/Make.defs
similarity index 98%
rename from tools/apps-or-nuttx-Make.defs
rename to tools/Make.defs
index dfce5e64ff..d8899bbcd8 100644
--- a/tools/apps-or-nuttx-Make.defs
+++ b/tools/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# apps-or-nuttx-Make.defs
+# tools/Make.defs
 #
 # SPDX-License-Identifier: Apache-2.0
 #