diff --git a/Makefile.in b/Makefile.in
index 7e97e261e..030a2ef2e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -391,15 +391,15 @@ asm/directbl.c: asm/directiv.dat nasmlib/perfhash.pl perllib/phash.ph
 		$(srcdir)/asm/directiv.dat asm/directbl.c
 
 # Editor token files
-editors/nasmtok.el: editors/emacstok.pl asm/tokhash.c asm/pptok.c \
+editors/nasmtok.el: editors/nasmtok.pl asm/tokhash.c asm/pptok.c \
 		 asm/directiv.dat macros/macros.c editors/builtin.mac \
 		 version.mak
-	$(RUNPERL) $(srcdir)/editors/emacstok.pl -el $@ $(srcdir) $(objdir)
+	$(RUNPERL) $(srcdir)/editors/nasmtok.pl -el $@ $(srcdir) $(objdir)
 
-editors/nasmtok.json: editors/emacstok.pl asm/tokhash.c asm/pptok.c \
+editors/nasmtok.json: editors/nasmtok.pl asm/tokhash.c asm/pptok.c \
 		 asm/directiv.dat macros/macros.c editors/builtin.mac \
 		 version.mak
-	$(RUNPERL) $(srcdir)/editors/emacstok.pl -json $@ $(srcdir) $(objdir)
+	$(RUNPERL) $(srcdir)/editors/nasmtok.pl -json $@ $(srcdir) $(objdir)
 
 editors: $(EDITORS) $(PHONY)
 
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index 98192172d..4117df2e4 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -334,15 +334,15 @@ asm\directbl.c: asm\directiv.dat nasmlib\perfhash.pl perllib\phash.ph
 		$(srcdir)\asm\directiv.dat asm\directbl.c
 
 # Editor token files
-editors\nasmtok.el: editors\emacstok.pl asm\tokhash.c asm\pptok.c \
+editors\nasmtok.el: editors\nasmtok.pl asm\tokhash.c asm\pptok.c \
 		 asm\directiv.dat macros\macros.c editors\builtin.mac \
 		 version.mak
-	$(RUNPERL) $(srcdir)\editors\emacstok.pl -el $@ $(srcdir) $(objdir)
+	$(RUNPERL) $(srcdir)\editors\nasmtok.pl -el $@ $(srcdir) $(objdir)
 
-editors\nasmtok.json: editors\emacstok.pl asm\tokhash.c asm\pptok.c \
+editors\nasmtok.json: editors\nasmtok.pl asm\tokhash.c asm\pptok.c \
 		 asm\directiv.dat macros\macros.c editors\builtin.mac \
 		 version.mak
-	$(RUNPERL) $(srcdir)\editors\emacstok.pl -json $@ $(srcdir) $(objdir)
+	$(RUNPERL) $(srcdir)\editors\nasmtok.pl -json $@ $(srcdir) $(objdir)
 
 editors: $(EDITORS) $(PHONY)
 
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index 50ef4d043..f2ec979b8 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -363,15 +363,15 @@ asm/directbl.c: asm/directiv.dat nasmlib/perfhash.pl perllib/phash.ph
 		$(srcdir)/asm/directiv.dat asm/directbl.c
 
 # Editor token files
-editors/nasmtok.el: editors/emacstok.pl asm/tokhash.c asm/pptok.c &
+editors/nasmtok.el: editors/nasmtok.pl asm/tokhash.c asm/pptok.c &
 		 asm/directiv.dat macros/macros.c editors/builtin.mac &
 		 version.mak
-	$(RUNPERL) $(srcdir)/editors/emacstok.pl -el $@ $(srcdir) $(objdir)
+	$(RUNPERL) $(srcdir)/editors/nasmtok.pl -el $@ $(srcdir) $(objdir)
 
-editors/nasmtok.json: editors/emacstok.pl asm/tokhash.c asm/pptok.c &
+editors/nasmtok.json: editors/nasmtok.pl asm/tokhash.c asm/pptok.c &
 		 asm/directiv.dat macros/macros.c editors/builtin.mac &
 		 version.mak
-	$(RUNPERL) $(srcdir)/editors/emacstok.pl -json $@ $(srcdir) $(objdir)
+	$(RUNPERL) $(srcdir)/editors/nasmtok.pl -json $@ $(srcdir) $(objdir)
 
 editors: $(EDITORS) $(PHONY)
 
diff --git a/editors/emacstok.pl b/editors/nasmtok.pl
similarity index 100%
rename from editors/emacstok.pl
rename to editors/nasmtok.pl