diff --git a/configs/ez80f910200kitg/ostest/Make.defs b/configs/ez80f910200kitg/ostest/Make.defs
index 78924b8108c..5fa695fe32c 100644
--- a/configs/ez80f910200kitg/ostest/Make.defs
+++ b/configs/ez80f910200kitg/ostest/Make.defs
@@ -117,11 +117,11 @@ LINKCMDTEMPLATE 	= $(TOPDIR)/configs/ez80f910200kitg/ostest/ostest.linkcmd
 # Tool names/pathes
 
 CROSSDEV		=
-CC			= $(ZDSBINDIR)/eZ80cc.exe
+CC			= $(ZDSBINDIR)/ez80cc.exe
 CPP			= gcc -E
-LD			= $(ZDSBINDIR)/eZ80link.exe
-AS			= $(ZDSBINDIR)/eZ80asm.exe
-AR			= $(ZDSBINDIR)/eZ80lib.exe
+LD			= $(ZDSBINDIR)/ez80link.exe
+AS			= $(ZDSBINDIR)/ez80asm.exe
+AR			= $(ZDSBINDIR)/ez80lib.exe
 
 # File extensions
 
diff --git a/configs/ez80f910200zco/ostest/Make.defs b/configs/ez80f910200zco/ostest/Make.defs
index 8f3f27975bc..a3840041029 100644
--- a/configs/ez80f910200zco/ostest/Make.defs
+++ b/configs/ez80f910200zco/ostest/Make.defs
@@ -117,11 +117,11 @@ LINKCMDTEMPLATE 	= $(TOPDIR)/configs/ez80f910200zco/ostest/ostest.linkcmd
 # Tool names/pathes
 
 CROSSDEV		=
-CC			= $(ZDSBINDIR)/eZ80cc.exe
+CC			= $(ZDSBINDIR)/ez80cc.exe
 CPP			= gcc -E
-LD			= $(ZDSBINDIR)/eZ80link.exe
-AS			= $(ZDSBINDIR)/eZ80asm.exe
-AR			= $(ZDSBINDIR)/eZ80lib.exe
+LD			= $(ZDSBINDIR)/ez80link.exe
+AS			= $(ZDSBINDIR)/ez80asm.exe
+AR			= $(ZDSBINDIR)/ez80lib.exe
 
 # File extensions
 
diff --git a/tools/incdir.sh b/tools/incdir.sh
index 71c87c10e7b..c9d1b7d4070 100755
--- a/tools/incdir.sh
+++ b/tools/incdir.sh
@@ -68,7 +68,7 @@ fi
 #   sdcc                        -I<dir2> -I<dir2> -I<dir3> ...
 #   $(ZDSBINDIR)/ez8cc.exe      -usrinc:'<dir1>:<dir2:<dir3>:...`
 #   $(ZDSBINDIR)/zneocc.exe     -usrinc:'<dir1>:<dir2:<dir3>:...`
-#   $(ZDSBINDIR)/eZ80cc.exe     -usrinc:'<dir1>:<dir2:<dir3>:...`
+#   $(ZDSBINDIR)/ez80cc.exe     -usrinc:'<dir1>:<dir2:<dir3>:...`
 #
 # Furthermore, just to make matters more difficult, with Windows based
 # toolchains, we have to use the full windows-style paths to the header
@@ -84,7 +84,7 @@ else
 fi
 exefile=`basename "$compiler"`
 
-if [ "X$exefile" = "Xez8cc.exe" -o "X$exefile" = "Xzneocc.exe" -o "X$exefile" = "XeZ80cc.exe" ]; then
+if [ "X$exefile" = "Xez8cc.exe" -o "X$exefile" = "Xzneocc.exe" -o "X$exefile" = "Xez80cc.exe" ]; then
 	fmt=userinc
 else
 	fmt=std